next version is 1.4.0

Author: mistic100

Gruntfile.js

@@ -153,7 +153,8 @@ module.exports = function(grunt) {
         // compress js
         uglify: {
             options: {
-                banner: '<%= banner %>\n'
+                banner: '<%= banner %>\n',
+                mangle: { except: ['$'] }
             },
             dist: {
                 files: {

README.md

@@ -7,12 +7,16 @@ jQuery plugin offering an interface to create complex queries.
 ## Documentation
 http://mistic100.github.io/jQuery-QueryBuilder
 
-### Requirements
+### Dependencies
  * Bootstrap 3.x CSS
  * jQuery >= 1.9
+ * [jQuery.extendext](https://github.com/mistic100/microevent.js)
+ * [MicroEvent](https://github.com/mistic100/microevent.js) (mistic100 version)
  * (optional) MomentJS
  * (optional) any widgets library like jQuery UI
 
+($.extendext and MicroEvent are directly included in the [standalone](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/dist/query-builder.standalone.js) file)
+
 ### Browser support
  * Internet Explorer >= 10
  * Mozilla FireFox ??
@@ -23,15 +27,15 @@ http://mistic100.github.io/jQuery-QueryBuilder
 ### Build
 Run `grunt` in root directory to generate minified files inside `dist`.
 
-You can choose which modules to include with `--modules`
+You can choose which plugins to include with `--modules`
 ```bash
-# include "sql" module
-grunt --modules=sql
+# include "sql-support" plugin
+grunt --modules=sql-support
 
 # disable all modules
 grunt --modules=false
 ```
-All modules are included by default.
+All plugins are included by default.
 
 You can also include ONE language with `--lang`
 ```bash
@@ -41,6 +45,12 @@ grunt --lang=fr
 
 Run `grunt test` to run jsHint and the Mocha test suite.
 
+Run `grunt list_modules` to get the list of available plugins and languages.
+
+### Contributing
+Changes have to be done only in `src` directory. The `dist` directory is updated only once in a while before a release.
+
+
 ### Inspiration
  * [Knockout Query Builder](http://kindohm.com/posts/2013/09/25/knockout-query-builder/)
  * [jui_filter_rules](http://www.pontikis.net/labs/jui_filter_rules/)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jQuery-QueryBuilder",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "homepage": "http://www.strangeplanet.fr"

dist/i18n/da.js

@@ -14,22 +14,24 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
 
   "filter_select_placeholder": "------",
 
-  "operator_equal": "lig med",
-  "operator_not_equal": "ikke lige med",
-  "operator_in": "i",
-  "operator_not_in": "ikke i",
-  "operator_less": "mindre",
-  "operator_less_or_equal": "mindre eller lig med",
-  "operator_greater": "større",
-  "operator_greater_or_equal": "større eller lig med",
-  "operator_begins_with": "begynder med",
-  "operator_not_begins_with": "begynder ikke med",
-  "operator_contains": "indeholder",
-  "operator_not_contains": "indeholder ikke",
-  "operator_ends_with": "slutter med",
-  "operator_not_ends_with": "slutter ikke med",
-  "operator_is_empty": "er tom",
-  "operator_is_not_empty": "er ikke tom",
-  "operator_is_null": "er null",
-  "operator_is_not_null": "er ikke null"
+  "operators": {
+    "equal": "lig med",
+    "not_equal": "ikke lige med",
+    "in": "i",
+    "not_in": "ikke i",
+    "less": "mindre",
+    "less_or_equal": "mindre eller lig med",
+    "greater": "større",
+    "greater_or_equal": "større eller lig med",
+    "begins_with": "begynder med",
+    "not_begins_with": "begynder ikke med",
+    "contains": "indeholder",
+    "not_contains": "indeholder ikke",
+    "ends_with": "slutter med",
+    "not_ends_with": "slutter ikke med",
+    "is_empty": "er tom",
+    "is_not_empty": "er ikke tom",
+    "is_null": "er null",
+    "is_not_null": "er ikke null"
+  }
 }});

dist/i18n/de.js

@@ -14,22 +14,24 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
 
   "filter_select_placeholder": "------",
 
-  "operator_equal": "gleich",
-  "operator_not_equal": "ungleich",
-  "operator_in": "in",
-  "operator_not_in": "nicht in",
-  "operator_less": "kleiner",
-  "operator_less_or_equal": "kleiner gleich",
-  "operator_greater": "größer",
-  "operator_greater_or_equal": "größer gleich",
-  "operator_begins_with": "beginnt mit",
-  "operator_not_begins_with": "beginnt nicht mit",
-  "operator_contains": "enthält",
-  "operator_not_contains": "enthält nicht",
-  "operator_ends_with": "endet mit",
-  "operator_not_ends_with": "endet nicht mit",
-  "operator_is_empty": "ist leer",
-  "operator_is_not_empty": "ist nicht leer",
-  "operator_is_null": "ist null",
-  "operator_is_not_null": "ist nicht null"
+  "operators": {
+    "equal": "gleich",
+    "not_equal": "ungleich",
+    "in": "in",
+    "not_in": "nicht in",
+    "less": "kleiner",
+    "less_or_equal": "kleiner gleich",
+    "greater": "größer",
+    "greater_or_equal": "größer gleich",
+    "begins_with": "beginnt mit",
+    "not_begins_with": "beginnt nicht mit",
+    "contains": "enthält",
+    "not_contains": "enthält nicht",
+    "ends_with": "endet mit",
+    "not_ends_with": "endet nicht mit",
+    "is_empty": "ist leer",
+    "is_not_empty": "ist nicht leer",
+    "is_null": "ist null",
+    "is_not_null": "ist nicht null"
+  }
 }});

dist/i18n/en.js

@@ -14,23 +14,46 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
 
   "filter_select_placeholder": "------",
 
-  "operator_equal": "equal",
-  "operator_not_equal": "not equal",
-  "operator_in": "in",
-  "operator_not_in": "not in",
-  "operator_less": "less",
-  "operator_less_or_equal": "less or equal",
-  "operator_greater": "greater",
-  "operator_greater_or_equal": "greater or equal",
-  "operator_between": "between",
-  "operator_begins_with": "begins with",
-  "operator_not_begins_with": "doesn't begin with",
-  "operator_contains": "contains",
-  "operator_not_contains": "doesn't contain",
-  "operator_ends_with": "ends with",
-  "operator_not_ends_with": "doesn't end with",
-  "operator_is_empty": "is empty",
-  "operator_is_not_empty": "is not empty",
-  "operator_is_null": "is null",
-  "operator_is_not_null": "is not null"
+  "operators": {
+    "equal": "equal",
+    "not_equal": "not equal",
+    "in": "in",
+    "not_in": "not in",
+    "less": "less",
+    "less_or_equal": "less or equal",
+    "greater": "greater",
+    "greater_or_equal": "greater or equal",
+    "between": "between",
+    "begins_with": "begins with",
+    "not_begins_with": "doesn't begin with",
+    "contains": "contains",
+    "not_contains": "doesn't contain",
+    "ends_with": "ends with",
+    "not_ends_with": "doesn't end with",
+    "is_empty": "is empty",
+    "is_not_empty": "is not empty",
+    "is_null": "is null",
+    "is_not_null": "is not null"
+  },
+  
+  "errors": {
+    "no_filter": "No filter selected",
+    "empty_group": "The group is empty",
+    "radio_empty": "No value selected",
+    "checkbox_empty": "No value selected",
+    "select_empty": "No value selected",
+    "string_empty": "Empty value",
+    "string_exceed_min_length": "Must contain at least {0} characters",
+    "string_exceed_max_length": "Must not contain more than {0} characters",
+    "string_invalid_format": "Invalid format ({0})",
+    "number_nan": "Not a number",
+    "number_not_integer": "Not an integer",
+    "number_not_double": "Not a real number",
+    "number_exceed_min": "Must be greater than {0}",
+    "number_exceed_max": "Must be lower than {0}",
+    "number_wrong_step": "Must be a multiple of {0}",
+    "datetime_invalid": "Invalid date format ({0})",
+    "datetime_exceed_min": "Must be after {0}",
+    "datetime_exceed_max": "Must be before {0}"
+  }
 }});

dist/i18n/es.js

@@ -14,23 +14,46 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
 
   "filter_select_placeholder": "------",
 
-  "operator_equal": "igual",
-  "operator_not_equal": "distinto",
-  "operator_in": "en",
-  "operator_not_in": "no en",
-  "operator_less": "menot",
-  "operator_less_or_equal": "menor o igual",
-  "operator_greater": "mayor",
-  "operator_greater_or_equal": "mayor o igual",
-  "operator_between": "entre",
-  "operator_begins_with": "empieza por",
-  "operator_not_begins_with": "no empieza por",
-  "operator_contains": "contiene",
-  "operator_not_contains": "no contiene",
-  "operator_ends_with": "acaba con",
-  "operator_not_ends_with": "no acaba con",
-  "operator_is_empty": "esta vacio",
-  "operator_is_not_empty": "no esta vacio",
-  "operator_is_null": "es nulo",
-  "operator_is_not_null": "no es nulo"
+  "operators": {
+    "equal": "igual",
+    "not_equal": "distinto",
+    "in": "en",
+    "not_in": "no en",
+    "less": "menor",
+    "less_or_equal": "menor o igual",
+    "greater": "mayor",
+    "greater_or_equal": "mayor o igual",
+    "between": "entre",
+    "begins_with": "empieza por",
+    "not_begins_with": "no empieza por",
+    "contains": "contiene",
+    "not_contains": "no contiene",
+    "ends_with": "acaba con",
+    "not_ends_with": "no acaba con",
+    "is_empty": "esta vacio",
+    "is_not_empty": "no esta vacio",
+    "is_null": "es nulo",
+    "is_not_null": "no es nulo"
+  },
+  
+  "errors": {
+    "no_filter": "No se ha seleccionado ningun filtro",
+    "empty_group": "El grupo esta vacio",
+    "radio_empty": "Ningun valor seleccionado",
+    "checkbox_empty": "Ningun valor seleccionado",
+    "select_empty": "Ningun valor seleccionado",
+    "string_empty": "Cadena vacia",
+    "string_exceed_min_length": "Debe contener al menos {0} caracteres",
+    "string_exceed_max_length": "No debe contener mas de {0} caracteres",
+    "string_invalid_format": "Formato invalido ({0})",
+    "number_nan": "No es un numero",
+    "number_not_integer": "No es un numero entero",
+    "number_not_double": "No es un numero real",
+    "number_exceed_min": "Debe ser mayor que {0}",
+    "number_exceed_max": "Debe ser menot que {0}",
+    "number_wrong_step": "Debe ser multiplo de {0}",
+    "datetime_invalid": "Formato de fecha invalido ({0})",
+    "datetime_exceed_min": "Debe ser posterior a {0}",
+    "datetime_exceed_max": "Debe ser anterior a {0}"
+  }
 }});

dist/i18n/fr.js

@@ -14,23 +14,46 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
 
   "filter_select_placeholder": "------",
 
-  "operator_equal": "égal",
-  "operator_not_equal": "non égal",
-  "operator_in": "dans",
-  "operator_not_in": "pas dans",
-  "operator_less": "inférieur",
-  "operator_less_or_equal": "inférieur ou égal",
-  "operator_greater": "supérieur",
-  "operator_greater_or_equal": "supérieur ou égal",
-  "operator_between": "entre",
-  "operator_begins_with": "commence par",
-  "operator_not_begins_with": "ne commence pas par",
-  "operator_contains": "contient",
-  "operator_not_contains": "ne contient pas",
-  "operator_ends_with": "finit par",
-  "operator_not_ends_with": "ne finit pas par",
-  "operator_is_empty": "est vide",
-  "operator_is_not_empty": "n'est pas vide",
-  "operator_is_null": "est nul",
-  "operator_is_not_null": "n'est pas nul"
+  "operators": {
+    "equal": "égal",
+    "not_equal": "non égal",
+    "in": "dans",
+    "not_in": "pas dans",
+    "less": "inférieur",
+    "less_or_equal": "inférieur ou égal",
+    "greater": "supérieur",
+    "greater_or_equal": "supérieur ou égal",
+    "between": "entre",
+    "begins_with": "commence par",
+    "not_begins_with": "ne commence pas par",
+    "contains": "contient",
+    "not_contains": "ne contient pas",
+    "ends_with": "finit par",
+    "not_ends_with": "ne finit pas par",
+    "is_empty": "est vide",
+    "is_not_empty": "n'est pas vide",
+    "is_null": "est nul",
+    "is_not_null": "n'est pas nul"
+  },
+  
+  "errors": {
+    "no_filter": "Aucun filtre sélectionné",
+    "empty_group": "Le groupe est vide",
+    "radio_empty": "Pas de valeur selectionnée",
+    "checkbox_empty": "Pas de valeur selectionnée",
+    "select_empty": "Pas de valeur selectionnée",
+    "string_empty": "Valeur vide",
+    "string_exceed_min_length": "Doit contenir au moins {0} caractères",
+    "string_exceed_max_length": "Ne doit pas contenir plus de {0} caractères",
+    "string_invalid_format": "Format invalide ({0})",
+    "number_nan": "N'est pas un nombre",
+    "number_not_integer": "N'est pas un entier",
+    "number_not_double": "N'est pas un nombre réel",
+    "number_exceed_min": "Doit être plus grand que {0}",
+    "number_exceed_max": "Doit être plus petit que {0}",
+    "number_wrong_step": "Doit être un multiple de {0}",
+    "datetime_invalid": "Fomat de date invalide ({0})",
+    "datetime_exceed_min": "Doit être après {0}",
+    "datetime_exceed_max": "Doit être avant {0}"
+  }
 }});