Skip to content

Commit 5fa0c26

Browse files
author
francisco.bagulho
committed
Merge branch 'dev'
* dev: possibility to define a dynamic field Swedish translations (mistic100#865) Hungarian translation (mistic100#862) Remove travis Updated italian translation (mistic100#837) Slovak translation (mistic100#830) Add Github CI Russian translation typos (mistic100#820) Added missing Russian strings in main translation (Translation by Hubbitus) Updated Russian translation (Translation by Hubbitus) Added Lithuanian translation (mistic100#766) Support different placeholders for each input when nb_inputs > 1 (mistic100#764) Added swahili translation (mistic100#754) feat: add source map for easier debugging (mistic100#749) chg: [plugin:chosen] avoid creating useless chosen widget (mistic100#743) Make some methods visible in the doc (mistic100#696 )
2 parents d858d9a + 5e91e45 commit 5fa0c26

File tree

29 files changed

+438
-26
lines changed

29 files changed

+438
-26
lines changed

‎.github/workflows/main.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v1
12+
- name: build
13+
run: |
14+
npm install
15+
npm run test
16+
npm run build

‎.travis.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎Gruntfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ module.exports = function(grunt) {
243243
uglify: {
244244
options: {
245245
banner: '<%= banner %>\n',
246-
mangle: { reserved: ['$'] }
246+
mangle: { reserved: ['$'] },
247+
sourceMap: true,
247248
},
248249
dist: {
249250
files: [{

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![npm version](https://img.shields.io/npm/v/jQuery-QueryBuilder.svg?style=flat-square)](https://www.npmjs.com/package/jQuery-QueryBuilder)
44
[![jsDelivr CDN](https://data.jsdelivr.com/v1/package/npm/jQuery-QueryBuilder/badge)](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder)
5-
[![Build Status](https://img.shields.io/travis/mistic100/jQuery-QueryBuilder.svg?style=flat-square)](https://travis-ci.org/mistic100/jQuery-QueryBuilder)
5+
[![Build Status](https://github.com/mistic100/jQuery-QueryBuilder/workflows/CI/badge.svg)](https://github.com/mistic100/jQuery-QueryBuilder/actions)
66
[![Coverage Status](https://img.shields.io/coveralls/mistic100/jQuery-QueryBuilder/master.svg?style=flat-square)](https://coveralls.io/r/mistic100/jQuery-QueryBuilder)
77
[![Dependencies Status](https://david-dm.org/mistic100/jQuery-QueryBuilder/status.svg?style=flat-square)](https://david-dm.org/mistic100/jQuery-QueryBuilder)
88

@@ -64,7 +64,7 @@ jQuery-QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/package/
6464

6565
#### Run
6666

67-
Install Node and Bower dependencies `npm install` then run `grunt` in the root directory to generate production files inside `dist`.
67+
Install Node dependencies `npm install` then run `grunt` in the root directory to generate production files inside `dist`.
6868

6969
#### Options
7070

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424
"bootswatch-dist": "git+https://github.com/dbtek/bootswatch-dist.git#slate",
2525
"chosenjs": "^1.4.3",
2626
"deepmerge": "^2.1.0",
27-
"foodoc": "^0.0.8",
27+
"foodoc": "^0.0.9",
2828
"grunt": "^1.0.2",
2929
"grunt-banner": "^0.6.0",
30+
"grunt-cli": "^1.3.2",
3031
"grunt-contrib-clean": "^1.0.0",
3132
"grunt-contrib-concat": "^1.0.0",
3233
"grunt-contrib-connect": "^1.0.0",
@@ -69,6 +70,7 @@
6970
"url": "https://github.com/mistic100/jQuery-QueryBuilder/issues"
7071
},
7172
"scripts": {
73+
"build": "grunt",
7274
"serve": "grunt serve",
7375
"test": "grunt test"
7476
}

‎src/core.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,11 @@ QueryBuilder.prototype.createRuleOperators = function(rule) {
653653
return;
654654
}
655655

656+
if (rule.filter.dynamic_filter) {
657+
var $filterDynamic = $(this.getRuleFilterDynamic(rule.filter));
658+
rule.$el.find(QueryBuilder.selectors.filter_container).append($filterDynamic);
659+
}
660+
656661
var operators = this.getOperators(rule.filter);
657662
var $operatorSelect = $(this.getRuleOperatorSelect(rule, operators));
658663

‎src/data.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ QueryBuilder.prototype.nextRuleId = function() {
270270
* @param {string|object} filter - filter id or filter object
271271
* @returns {object[]}
272272
* @fires QueryBuilder.changer:getOperators
273-
* @private
274273
*/
275274
QueryBuilder.prototype.getOperators = function(filter) {
276275
if (typeof filter == 'string') {
@@ -318,7 +317,6 @@ QueryBuilder.prototype.getOperators = function(filter) {
318317
* @param {boolean} [doThrow=true]
319318
* @returns {object|null}
320319
* @throws UndefinedFilterError
321-
* @private
322320
*/
323321
QueryBuilder.prototype.getFilterById = function(id, doThrow) {
324322
if (id == '-1') {
@@ -342,7 +340,6 @@ QueryBuilder.prototype.getFilterById = function(id, doThrow) {
342340
* @param {boolean} [doThrow=true]
343341
* @returns {object|null}
344342
* @throws UndefinedOperatorError
345-
* @private
346343
*/
347344
QueryBuilder.prototype.getOperatorByType = function(type, doThrow) {
348345
if (type == '-1') {

‎src/defaults.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ QueryBuilder.DEFAULTS = {
155155
templates: {
156156
group: null,
157157
rule: null,
158+
filterDynamic: null,
158159
filterSelect: null,
159160
operatorSelect: null,
160161
ruleValueSelect: null

‎src/i18n/hu.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"__locale": "Hungarian - Magyar (hu)",
3+
"__author": "Szabó Attila \"Tailor993\", https://www.tailor993.hu",
4+
5+
"add_rule": "Feltétel hozzáadása",
6+
"add_group": "Csoport hozzáadása",
7+
"delete_rule": "Feltétel törlése",
8+
"delete_group": "Csoport törlése",
9+
10+
"conditions": {
11+
"AND": "ÉS",
12+
"OR": "VAGY"
13+
},
14+
15+
"operators": {
16+
"equal": "egyenlő",
17+
"not_equal": "nem egyenlő",
18+
"in": "bennevan",
19+
"not_in": "nincs benne",
20+
"less": "kisebb",
21+
"less_or_equal": "kisebb vagy egyenlő",
22+
"greater": "nagyobb",
23+
"greater_or_equal": "nagyobb vagy egyenlő",
24+
"between": "közötte",
25+
"not_between": "nincs közötte",
26+
"begins_with": "ezzel kezdődik",
27+
"not_begins_with": "ezzel nem kezdődik",
28+
"contains": "tartalmazza",
29+
"not_contains": "nem tartalmazza",
30+
"ends_with": "erre végződik",
31+
"not_ends_with": "errre nem végződik",
32+
"is_empty": "üres",
33+
"is_not_empty": "nem üres",
34+
"is_null": "null",
35+
"is_not_null": "nem null"
36+
},
37+
38+
"errors": {
39+
"no_filter": "Nincs kiválasztott feltétel",
40+
"empty_group": "A csoport üres",
41+
"radio_empty": "Nincs kiválasztott érték",
42+
"checkbox_empty": "Nincs kiválasztott érték",
43+
"select_empty": "Nincs kiválasztott érték",
44+
"string_empty": "Üres érték",
45+
"string_exceed_min_length": "A megadott szöveg rövidebb a várt {0} karakternél",
46+
"string_exceed_max_length": "A megadott szöveg nem tartalmazhat többet, mint {0} karaktert",
47+
"string_invalid_format": "Nem megfelelő formátum ({0})",
48+
"number_nan": "Nem szám",
49+
"number_not_integer": "Nem egész szám (integer)",
50+
"number_not_double": "Nem valós szám",
51+
"number_exceed_min": "Nagyobbnak kell lennie, mint {0}",
52+
"number_exceed_max": "Kisebbnek kell lennie, mint {0}",
53+
"number_wrong_step": "{0} többszörösének kell lennie.",
54+
"number_between_invalid": "INem megfelelő érték, {0} nagyobb, mint {1}",
55+
"datetime_empty": "Üres érték",
56+
"datetime_invalid": "nem megfelelő dátum formátum ({0})",
57+
"datetime_exceed_min": "A dátumnak későbbinek kell lennie, mint{0}",
58+
"datetime_exceed_max": "A dátumnak korábbinak kell lennie, mint {0}",
59+
"datetime_between_invalid": "Nem megfelelő értékek, {0} nagyobb, mint {1}",
60+
"boolean_not_valid": "Nem igaz/hamis (boolean)",
61+
"operator_not_multiple": "Ez a művelet: \"{1}\" nem fogadhat el több értéket"
62+
}
63+
}

‎src/i18n/it.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"__locale": "Italian (it)",
3-
"__author": "davegraziosi",
3+
"__author": "davegraziosi, Giuseppe Lodi Rizzini",
44

55
"add_rule": "Aggiungi regola",
66
"add_group": "Aggiungi gruppo",
@@ -51,11 +51,13 @@
5151
"number_exceed_min": "Deve essere maggiore di {0}",
5252
"number_exceed_max": "Deve essere minore di {0}",
5353
"number_wrong_step": "Deve essere multiplo di {0}",
54+
"number_between_invalid": "Valori non validi, {0} è maggiore di {1}",
5455
"datetime_empty": "Valore vuoto",
5556
"datetime_invalid": "Formato data non valido ({0})",
5657
"datetime_exceed_min": "Deve essere successivo a {0}",
5758
"datetime_exceed_max": "Deve essere precedente a {0}",
59+
"datetime_between_invalid": "Valori non validi, {0} è maggiore di {1}",
5860
"boolean_not_valid": "Non è un booleano",
5961
"operator_not_multiple": "L'Operatore {0} non può accettare valori multipli"
6062
}
61-
}
63+
}

‎src/i18n/lt.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"__locale": "Lithuanian (lt)",
3+
"__author": "Dalius Guzauskas (aka Tichij), https://lt.linkedin.com/in/daliusg",
4+
5+
"add_rule": "Pridėti taisyklę",
6+
"add_group": "Pridėti grupę",
7+
"delete_rule": "Ištrinti",
8+
"delete_group": "Ištrinti",
9+
10+
"conditions": {
11+
"AND": "IR",
12+
"OR": "ARBA"
13+
},
14+
15+
"operators": {
16+
"equal": "lygu",
17+
"not_equal": "nėra lygu",
18+
"in": "iš nurodytų",
19+
"not_in": "ne iš nurodytų",
20+
"less": "mažiau",
21+
"less_or_equal": "mažiau arba lygu",
22+
"greater": "daugiau",
23+
"greater_or_equal": "daugiau arba lygu",
24+
"between": "tarp",
25+
"not_between": "nėra tarp",
26+
"begins_with": "prasideda",
27+
"not_begins_with": "neprasideda",
28+
"contains": "turi",
29+
"not_contains": "neturi",
30+
"ends_with": "baigiasi",
31+
"not_ends_with": "nesibaigia",
32+
"is_empty": "tuščia",
33+
"is_not_empty": "ne tuščia",
34+
"is_null": "neapibrėžta",
35+
"is_not_null": "nėra neapibrėžta"
36+
},
37+
38+
"errors": {
39+
"no_filter": "Nepasirinktas filtras",
40+
"empty_group": "Grupė tuščia",
41+
"radio_empty": "Nepasirinkta reikšmė",
42+
"checkbox_empty": "Nepasirinkta reikšmė",
43+
"select_empty": "Nepasirinkta reikšmė",
44+
"string_empty": "Tuščia reikšmė",
45+
"string_exceed_min_length": "Turi būti bent {0} simbolių",
46+
"string_exceed_max_length": "Turi būti ne daugiau kaip {0} simbolių",
47+
"string_invalid_format": "Klaidingas formatas ({0})",
48+
"number_nan": "Nėra skaičius",
49+
"number_not_integer": "Ne sveikasis skaičius",
50+
"number_not_double": "Ne realusis skaičius",
51+
"number_exceed_min": "Turi būti daugiau už {0}",
52+
"number_exceed_max": "Turi būti mažiau už {0}",
53+
"number_wrong_step": "Turi būti {0} kartotinis",
54+
"number_between_invalid": "Klaidingos reikšmės, {0} yra daugiau už {1}",
55+
"datetime_empty": "Tuščia reikšmė",
56+
"datetime_invalid": "Klaidingas datos formatas ({0})",
57+
"datetime_exceed_min": "Turi būti po {0}",
58+
"datetime_exceed_max": "Turi būti prieš {0}",
59+
"datetime_between_invalid": "Klaidingos reikšmės, {0} yra daugiau už {1}",
60+
"boolean_not_valid": "Nėra loginis tipas",
61+
"operator_not_multiple": "Operatorius \"{1}\" negali priimti kelių reikšmių"
62+
}
63+
}

‎src/i18n/ru.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"greater": "больше",
2222
"greater_or_equal": "больше или равно",
2323
"between": "между",
24+
"not_between": "не между",
2425
"begins_with": "начинается с",
2526
"not_begins_with": "не начинается с",
2627
"contains": "содержит",
@@ -36,10 +37,10 @@
3637
"errors": {
3738
"no_filter": "Фильтр не выбран",
3839
"empty_group": "Группа пуста",
39-
"radio_empty": "Не выбранно значение",
40-
"checkbox_empty": "Не выбранно значение",
41-
"select_empty": "Не выбранно значение",
42-
"string_empty": "Не заполненно",
40+
"radio_empty": "Не выбрано значение",
41+
"checkbox_empty": "Не выбрано значение",
42+
"select_empty": "Не выбрано значение",
43+
"string_empty": "Не заполнено",
4344
"string_exceed_min_length": "Должен содержать больше {0} символов",
4445
"string_exceed_max_length": "Должен содержать меньше {0} символов",
4546
"string_invalid_format": "Неверный формат ({0})",
@@ -49,10 +50,12 @@
4950
"number_exceed_min": "Должно быть больше {0}",
5051
"number_exceed_max": "Должно быть меньше, чем {0}",
5152
"number_wrong_step": "Должно быть кратно {0}",
52-
"datetime_empty": "Не заполненно",
53+
"number_between_invalid": "Недопустимые значения, {0} больше {1}",
54+
"datetime_empty": "Не заполнено",
5355
"datetime_invalid": "Неверный формат даты ({0})",
5456
"datetime_exceed_min": "Должно быть, после {0}",
5557
"datetime_exceed_max": "Должно быть, до {0}",
58+
"datetime_between_invalid": "Недопустимые значения, {0} больше {1}",
5659
"boolean_not_valid": "Не логическое",
5760
"operator_not_multiple": "Оператор \"{1}\" не поддерживает много значений"
5861
}

‎src/i18n/sk.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"__locale": "Slovensky (sk)",
3+
"__author": "k2s",
4+
5+
"add_rule": "Pridať podmienku",
6+
"add_group": "Pridať skupinu",
7+
"delete_rule": "Zmazať",
8+
"delete_group": "Zmazať",
9+
10+
"conditions": {
11+
"AND": "A",
12+
"OR": "ALEBO"
13+
},
14+
15+
"operators": {
16+
"equal": "rovné",
17+
"not_equal": "nerovné",
18+
"in": "v",
19+
"not_in": "nie v",
20+
"less": "menej",
21+
"less_or_equal": "menej alebo rovné",
22+
"greater": "väčšie",
23+
"greater_or_equal": "väčšie alebo rovné",
24+
"between": "medzi",
25+
"not_between": "nie medzi",
26+
"begins_with": "začína na",
27+
"not_begins_with": "nezačína na",
28+
"contains": "obsahuje",
29+
"not_contains": "neobsahuje",
30+
"ends_with": "končí na",
31+
"not_ends_with": "nekončí na",
32+
"is_empty": "je prázdne",
33+
"is_not_empty": "nie je prázdne",
34+
"is_null": "je null",
35+
"is_not_null": "nie je null"
36+
},
37+
38+
"errors": {
39+
"no_filter": "Nie je zvolený filter",
40+
"empty_group": "Skupina je prázdna",
41+
"radio_empty": "Nie je označená hodnota",
42+
"checkbox_empty": "Nie je označená hodnota",
43+
"select_empty": "Nie je označená hodnota",
44+
"string_empty": "Prázdna hodnota",
45+
"string_exceed_min_length": "Musí obsahovať aspon {0} znakov",
46+
"string_exceed_max_length": "Nesmie obsahovať viac ako {0} znakov",
47+
"string_invalid_format": "Chybný formát ({0})",
48+
"number_nan": "Nie je číslo",
49+
"number_not_integer": "Nie je celé číslo",
50+
"number_not_double": "Nie je desatinné číslo",
51+
"number_exceed_min": "Musí byť väčšie ako {0}",
52+
"number_exceed_max": "Musí byť menšie ako {0}",
53+
"number_wrong_step": "Musí byť násobkom čísla {0}",
54+
"number_between_invalid": "Chybné hodnoty, {0} je väčšie ako {1}",
55+
"datetime_empty": "Prázdna hodnota",
56+
"datetime_invalid": "Chybný formát dátumu ({0})",
57+
"datetime_exceed_min": "Musí byť neskôr ako {0}",
58+
"datetime_exceed_max": "Musí byť skôr ako {0}",
59+
"datetime_between_invalid": "Chybné hodnoty, {0} je neskôr ako {1}",
60+
"boolean_not_valid": "Neplatné áno/nie",
61+
"operator_not_multiple": "Operátor '{1}' nepodporuje viacero hodnôt"
62+
}
63+
}

0 commit comments

Comments
 (0)