Skip to content

Commit 630da44

Browse files
mistic100mistic100
committed
next version is 1.4.0
1 parent 5760f70 commit 630da44

23 files changed

+3729
-802
lines changed

‎Gruntfile.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ module.exports = function(grunt) {
153153
// compress js
154154
uglify: {
155155
options: {
156-
banner: '<%= banner %>\n'
156+
banner: '<%= banner %>\n',
157+
mangle: { except: ['$'] }
157158
},
158159
dist: {
159160
files: {

‎README.md‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ jQuery plugin offering an interface to create complex queries.
77
## Documentation
88
http://mistic100.github.io/jQuery-QueryBuilder
99

10-
### Requirements
10+
### Dependencies
1111
* Bootstrap 3.x CSS
1212
* jQuery >= 1.9
13+
* [jQuery.extendext](https://github.com/mistic100/microevent.js)
14+
* [MicroEvent](https://github.com/mistic100/microevent.js) (mistic100 version)
1315
* (optional) MomentJS
1416
* (optional) any widgets library like jQuery UI
1517

18+
($.extendext and MicroEvent are directly included in the [standalone](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/dist/query-builder.standalone.js) file)
19+
1620
### Browser support
1721
* Internet Explorer >= 10
1822
* Mozilla FireFox ??
@@ -23,15 +27,15 @@ http://mistic100.github.io/jQuery-QueryBuilder
2327
### Build
2428
Run `grunt` in root directory to generate minified files inside `dist`.
2529

26-
You can choose which modules to include with `--modules`
30+
You can choose which plugins to include with `--modules`
2731
```bash
28-
# include "sql" module
29-
grunt --modules=sql
32+
# include "sql-support" plugin
33+
grunt --modules=sql-support
3034

3135
# disable all modules
3236
grunt --modules=false
3337
```
34-
All modules are included by default.
38+
All plugins are included by default.
3539

3640
You can also include ONE language with `--lang`
3741
```bash
@@ -41,6 +45,12 @@ grunt --lang=fr
4145

4246
Run `grunt test` to run jsHint and the Mocha test suite.
4347

48+
Run `grunt list_modules` to get the list of available plugins and languages.
49+
50+
### Contributing
51+
Changes have to be done only in `src` directory. The `dist` directory is updated only once in a while before a release.
52+
53+
4454
### Inspiration
4555
* [Knockout Query Builder](http://kindohm.com/posts/2013/09/25/knockout-query-builder/)
4656
* [jui_filter_rules](http://www.pontikis.net/labs/jui_filter_rules/)

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jQuery-QueryBuilder",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"authors": [{
55
"name": "Damien \"Mistic\" Sorel",
66
"homepage": "http://www.strangeplanet.fr"

‎dist/i18n/da.js‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
1414

1515
"filter_select_placeholder": "------",
1616

17-
"operator_equal": "lig med",
18-
"operator_not_equal": "ikke lige med",
19-
"operator_in": "i",
20-
"operator_not_in": "ikke i",
21-
"operator_less": "mindre",
22-
"operator_less_or_equal": "mindre eller lig med",
23-
"operator_greater": "større",
24-
"operator_greater_or_equal": "større eller lig med",
25-
"operator_begins_with": "begynder med",
26-
"operator_not_begins_with": "begynder ikke med",
27-
"operator_contains": "indeholder",
28-
"operator_not_contains": "indeholder ikke",
29-
"operator_ends_with": "slutter med",
30-
"operator_not_ends_with": "slutter ikke med",
31-
"operator_is_empty": "er tom",
32-
"operator_is_not_empty": "er ikke tom",
33-
"operator_is_null": "er null",
34-
"operator_is_not_null": "er ikke null"
17+
"operators": {
18+
"equal": "lig med",
19+
"not_equal": "ikke lige med",
20+
"in": "i",
21+
"not_in": "ikke i",
22+
"less": "mindre",
23+
"less_or_equal": "mindre eller lig med",
24+
"greater": "større",
25+
"greater_or_equal": "større eller lig med",
26+
"begins_with": "begynder med",
27+
"not_begins_with": "begynder ikke med",
28+
"contains": "indeholder",
29+
"not_contains": "indeholder ikke",
30+
"ends_with": "slutter med",
31+
"not_ends_with": "slutter ikke med",
32+
"is_empty": "er tom",
33+
"is_not_empty": "er ikke tom",
34+
"is_null": "er null",
35+
"is_not_null": "er ikke null"
36+
}
3537
}});

‎dist/i18n/de.js‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
1414

1515
"filter_select_placeholder": "------",
1616

17-
"operator_equal": "gleich",
18-
"operator_not_equal": "ungleich",
19-
"operator_in": "in",
20-
"operator_not_in": "nicht in",
21-
"operator_less": "kleiner",
22-
"operator_less_or_equal": "kleiner gleich",
23-
"operator_greater": "größer",
24-
"operator_greater_or_equal": "größer gleich",
25-
"operator_begins_with": "beginnt mit",
26-
"operator_not_begins_with": "beginnt nicht mit",
27-
"operator_contains": "enthält",
28-
"operator_not_contains": "enthält nicht",
29-
"operator_ends_with": "endet mit",
30-
"operator_not_ends_with": "endet nicht mit",
31-
"operator_is_empty": "ist leer",
32-
"operator_is_not_empty": "ist nicht leer",
33-
"operator_is_null": "ist null",
34-
"operator_is_not_null": "ist nicht null"
17+
"operators": {
18+
"equal": "gleich",
19+
"not_equal": "ungleich",
20+
"in": "in",
21+
"not_in": "nicht in",
22+
"less": "kleiner",
23+
"less_or_equal": "kleiner gleich",
24+
"greater": "größer",
25+
"greater_or_equal": "größer gleich",
26+
"begins_with": "beginnt mit",
27+
"not_begins_with": "beginnt nicht mit",
28+
"contains": "enthält",
29+
"not_contains": "enthält nicht",
30+
"ends_with": "endet mit",
31+
"not_ends_with": "endet nicht mit",
32+
"is_empty": "ist leer",
33+
"is_not_empty": "ist nicht leer",
34+
"is_null": "ist null",
35+
"is_not_null": "ist nicht null"
36+
}
3537
}});

‎dist/i18n/en.js‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,46 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
1414

1515
"filter_select_placeholder": "------",
1616

17-
"operator_equal": "equal",
18-
"operator_not_equal": "not equal",
19-
"operator_in": "in",
20-
"operator_not_in": "not in",
21-
"operator_less": "less",
22-
"operator_less_or_equal": "less or equal",
23-
"operator_greater": "greater",
24-
"operator_greater_or_equal": "greater or equal",
25-
"operator_between": "between",
26-
"operator_begins_with": "begins with",
27-
"operator_not_begins_with": "doesn't begin with",
28-
"operator_contains": "contains",
29-
"operator_not_contains": "doesn't contain",
30-
"operator_ends_with": "ends with",
31-
"operator_not_ends_with": "doesn't end with",
32-
"operator_is_empty": "is empty",
33-
"operator_is_not_empty": "is not empty",
34-
"operator_is_null": "is null",
35-
"operator_is_not_null": "is not null"
17+
"operators": {
18+
"equal": "equal",
19+
"not_equal": "not equal",
20+
"in": "in",
21+
"not_in": "not in",
22+
"less": "less",
23+
"less_or_equal": "less or equal",
24+
"greater": "greater",
25+
"greater_or_equal": "greater or equal",
26+
"between": "between",
27+
"begins_with": "begins with",
28+
"not_begins_with": "doesn't begin with",
29+
"contains": "contains",
30+
"not_contains": "doesn't contain",
31+
"ends_with": "ends with",
32+
"not_ends_with": "doesn't end with",
33+
"is_empty": "is empty",
34+
"is_not_empty": "is not empty",
35+
"is_null": "is null",
36+
"is_not_null": "is not null"
37+
},
38+
39+
"errors": {
40+
"no_filter": "No filter selected",
41+
"empty_group": "The group is empty",
42+
"radio_empty": "No value selected",
43+
"checkbox_empty": "No value selected",
44+
"select_empty": "No value selected",
45+
"string_empty": "Empty value",
46+
"string_exceed_min_length": "Must contain at least {0} characters",
47+
"string_exceed_max_length": "Must not contain more than {0} characters",
48+
"string_invalid_format": "Invalid format ({0})",
49+
"number_nan": "Not a number",
50+
"number_not_integer": "Not an integer",
51+
"number_not_double": "Not a real number",
52+
"number_exceed_min": "Must be greater than {0}",
53+
"number_exceed_max": "Must be lower than {0}",
54+
"number_wrong_step": "Must be a multiple of {0}",
55+
"datetime_invalid": "Invalid date format ({0})",
56+
"datetime_exceed_min": "Must be after {0}",
57+
"datetime_exceed_max": "Must be before {0}"
58+
}
3659
}});

‎dist/i18n/es.js‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,46 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
1414

1515
"filter_select_placeholder": "------",
1616

17-
"operator_equal": "igual",
18-
"operator_not_equal": "distinto",
19-
"operator_in": "en",
20-
"operator_not_in": "no en",
21-
"operator_less": "menot",
22-
"operator_less_or_equal": "menor o igual",
23-
"operator_greater": "mayor",
24-
"operator_greater_or_equal": "mayor o igual",
25-
"operator_between": "entre",
26-
"operator_begins_with": "empieza por",
27-
"operator_not_begins_with": "no empieza por",
28-
"operator_contains": "contiene",
29-
"operator_not_contains": "no contiene",
30-
"operator_ends_with": "acaba con",
31-
"operator_not_ends_with": "no acaba con",
32-
"operator_is_empty": "esta vacio",
33-
"operator_is_not_empty": "no esta vacio",
34-
"operator_is_null": "es nulo",
35-
"operator_is_not_null": "no es nulo"
17+
"operators": {
18+
"equal": "igual",
19+
"not_equal": "distinto",
20+
"in": "en",
21+
"not_in": "no en",
22+
"less": "menor",
23+
"less_or_equal": "menor o igual",
24+
"greater": "mayor",
25+
"greater_or_equal": "mayor o igual",
26+
"between": "entre",
27+
"begins_with": "empieza por",
28+
"not_begins_with": "no empieza por",
29+
"contains": "contiene",
30+
"not_contains": "no contiene",
31+
"ends_with": "acaba con",
32+
"not_ends_with": "no acaba con",
33+
"is_empty": "esta vacio",
34+
"is_not_empty": "no esta vacio",
35+
"is_null": "es nulo",
36+
"is_not_null": "no es nulo"
37+
},
38+
39+
"errors": {
40+
"no_filter": "No se ha seleccionado ningun filtro",
41+
"empty_group": "El grupo esta vacio",
42+
"radio_empty": "Ningun valor seleccionado",
43+
"checkbox_empty": "Ningun valor seleccionado",
44+
"select_empty": "Ningun valor seleccionado",
45+
"string_empty": "Cadena vacia",
46+
"string_exceed_min_length": "Debe contener al menos {0} caracteres",
47+
"string_exceed_max_length": "No debe contener mas de {0} caracteres",
48+
"string_invalid_format": "Formato invalido ({0})",
49+
"number_nan": "No es un numero",
50+
"number_not_integer": "No es un numero entero",
51+
"number_not_double": "No es un numero real",
52+
"number_exceed_min": "Debe ser mayor que {0}",
53+
"number_exceed_max": "Debe ser menot que {0}",
54+
"number_wrong_step": "Debe ser multiplo de {0}",
55+
"datetime_invalid": "Formato de fecha invalido ({0})",
56+
"datetime_exceed_min": "Debe ser posterior a {0}",
57+
"datetime_exceed_max": "Debe ser anterior a {0}"
58+
}
3659
}});

‎dist/i18n/fr.js‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,46 @@ jQuery.fn.queryBuilder.defaults.set({ lang: {
1414

1515
"filter_select_placeholder": "------",
1616

17-
"operator_equal": "égal",
18-
"operator_not_equal": "non égal",
19-
"operator_in": "dans",
20-
"operator_not_in": "pas dans",
21-
"operator_less": "inférieur",
22-
"operator_less_or_equal": "inférieur ou égal",
23-
"operator_greater": "supérieur",
24-
"operator_greater_or_equal": "supérieur ou égal",
25-
"operator_between": "entre",
26-
"operator_begins_with": "commence par",
27-
"operator_not_begins_with": "ne commence pas par",
28-
"operator_contains": "contient",
29-
"operator_not_contains": "ne contient pas",
30-
"operator_ends_with": "finit par",
31-
"operator_not_ends_with": "ne finit pas par",
32-
"operator_is_empty": "est vide",
33-
"operator_is_not_empty": "n'est pas vide",
34-
"operator_is_null": "est nul",
35-
"operator_is_not_null": "n'est pas nul"
17+
"operators": {
18+
"equal": "égal",
19+
"not_equal": "non égal",
20+
"in": "dans",
21+
"not_in": "pas dans",
22+
"less": "inférieur",
23+
"less_or_equal": "inférieur ou égal",
24+
"greater": "supérieur",
25+
"greater_or_equal": "supérieur ou égal",
26+
"between": "entre",
27+
"begins_with": "commence par",
28+
"not_begins_with": "ne commence pas par",
29+
"contains": "contient",
30+
"not_contains": "ne contient pas",
31+
"ends_with": "finit par",
32+
"not_ends_with": "ne finit pas par",
33+
"is_empty": "est vide",
34+
"is_not_empty": "n'est pas vide",
35+
"is_null": "est nul",
36+
"is_not_null": "n'est pas nul"
37+
},
38+
39+
"errors": {
40+
"no_filter": "Aucun filtre sélectionné",
41+
"empty_group": "Le groupe est vide",
42+
"radio_empty": "Pas de valeur selectionnée",
43+
"checkbox_empty": "Pas de valeur selectionnée",
44+
"select_empty": "Pas de valeur selectionnée",
45+
"string_empty": "Valeur vide",
46+
"string_exceed_min_length": "Doit contenir au moins {0} caractères",
47+
"string_exceed_max_length": "Ne doit pas contenir plus de {0} caractères",
48+
"string_invalid_format": "Format invalide ({0})",
49+
"number_nan": "N'est pas un nombre",
50+
"number_not_integer": "N'est pas un entier",
51+
"number_not_double": "N'est pas un nombre réel",
52+
"number_exceed_min": "Doit être plus grand que {0}",
53+
"number_exceed_max": "Doit être plus petit que {0}",
54+
"number_wrong_step": "Doit être un multiple de {0}",
55+
"datetime_invalid": "Fomat de date invalide ({0})",
56+
"datetime_exceed_min": "Doit être après {0}",
57+
"datetime_exceed_max": "Doit être avant {0}"
58+
}
3659
}});

0 commit comments

Comments
 (0)