Skip to content

Commit 6d43793

Browse files
mistic100mistic100
committed
next version is 2.0.0
1 parent 4137fe0 commit 6d43793

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+7418
-5746
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Core vs Modules
44
I want to keep the core clean of extra (and certainly awesome) functionalities. That includes, but is not limited to, export/import modules, visual aids, etc.
55

6-
Check to doc about [creating plugins](http://mistic100.github.io/jQuery-QueryBuilder/dev-plugins.html)
6+
Check to doc about [creating plugins](http://mistic100.github.io/jQuery-QueryBuilder/dev/plugins.html)
77

88
## Unit tests
99
Any big feature must have it's own QUnit tests suite. Of course existing tests must still pass after changes.

‎Gruntfile.js‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ module.exports = function(grunt) {
7676

7777
function removeJshint(src) {
7878
return src
79-
.replace(/\/\*jshint [a-z:]+ \*\/\r?\n/g, '')
80-
.replace(/\/\*jshint -[EWI]{1}[0-9]{3} \*\/\r?\n/g, '');
79+
.replace(/\/\*jshint [a-z:]+ \*\/\r?\n\r?\n?/g, '')
80+
.replace(/\/\*jshint -[EWI]{1}[0-9]{3} \*\/\r?\n\r?\n?/g, '');
8181
}
8282

8383

@@ -202,7 +202,7 @@ module.exports = function(grunt) {
202202
},
203203
files: [{
204204
expand: true,
205-
src: ['dist/css/*.css', '!dist/css/*.min.css', 'dist/scss/*.scss', 'dist/scss/plugins/*.scss'],
205+
src: ['dist/css/*.css', 'dist/scss/*.scss'],
206206
dest: ''
207207
}]
208208
}
@@ -272,7 +272,7 @@ module.exports = function(grunt) {
272272
// compress js
273273
uglify: {
274274
options: {
275-
banner: '<%= banner %>\n',
275+
banner: '<%= banner %>\n\n',
276276
mangle: { except: ['$'] }
277277
},
278278
dist: {
@@ -289,10 +289,6 @@ module.exports = function(grunt) {
289289

290290
// compress css
291291
cssmin: {
292-
options: {
293-
banner: '<%= banner %>',
294-
keepSpecialComments: 0
295-
},
296292
dist: {
297293
files: [{
298294
expand: true,
@@ -468,8 +464,8 @@ module.exports = function(grunt) {
468464
'copy:sass_plugins',
469465
'wrap:sass',
470466
'sass',
471-
'concat:css',
472-
'cssmin'
467+
'cssmin',
468+
'concat:css'
473469
]);
474470

475471
grunt.registerTask('build_lang', [

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "jQuery-QueryBuilder",
3-
"version": "1.4.2",
3+
"version": "2.0.0",
44
"authors": [{
55
"name": "Damien \"Mistic\" Sorel",
66
"email": "[email protected]",
77
"homepage": "http://www.strangeplanet.fr"
88
}],
99
"description": "jQuery plugin for user friendly query/filter creator",
1010
"main": [
11-
"dist/query-builder.js",
12-
"dist/query-builder.css"
11+
"dist/js/query-builder.js",
12+
"dist/css/query-builder.default.css"
1313
],
1414
"dependencies": {
1515
"jquery": ">= 1.9.0",

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mistic100/jquery-querybuilder",
3-
"version": "1.4.2",
3+
"version": "2.0.0",
44
"authors": [{
55
"name": "Damien \"Mistic\" Sorel",
66
"email": "[email protected]",

‎dist/css/query-builder.dark.css‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
/*!
2+
* jQuery QueryBuilder 2.0.0
3+
* Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
4+
* Licensed under MIT (http://opensource.org/licenses/MIT)
5+
*/
6+
7+
.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {
8+
position: relative;
9+
margin: 4px 0;
10+
border-radius: 5px;
11+
padding: 5px;
12+
border: 1px solid #111;
13+
background: rgba(40, 40, 40, 0.9);
14+
}
15+
16+
.query-builder .rule-container .rule-filter-container,
17+
.query-builder .rule-container .rule-operator-container,
18+
.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .drag-handle {
19+
display: inline-block;
20+
margin: 0 5px 0 0;
21+
vertical-align: middle;
22+
}
23+
24+
.query-builder .rules-group-container {
25+
padding: 10px;
26+
padding-bottom: 6px;
27+
border: 1px solid #00164A;
28+
background: rgba(50, 70, 80, 0.5);
29+
}
30+
.query-builder .rules-group-container .rules-group-header {
31+
margin-bottom: 10px;
32+
}
33+
.query-builder .rules-group-container .rules-group-header input[name$=_cond] {
34+
display: none;
35+
}
36+
.query-builder .rules-group-container .rules-list {
37+
list-style: none;
38+
padding: 0 0 0 15px;
39+
margin: 0;
40+
}
41+
.query-builder .rule-container .rule-value-container {
42+
border-left: 1px solid #ddd;
43+
padding-left: 5px;
44+
}
45+
.query-builder .rule-container .rule-value-container label {
46+
margin-bottom: 0;
47+
font-weight: normal;
48+
}
49+
.query-builder .rule-container .rule-value-container label.block {
50+
display: block;
51+
}
52+
.query-builder .rule-container select, .query-builder .rule-container input[type=text], .query-builder .rule-container input[type=number] {
53+
padding: 1px;
54+
}
55+
.query-builder .error-container {
56+
display: none;
57+
cursor: help;
58+
color: #F00;
59+
}
60+
.query-builder .has-error {
61+
background-color: #322;
62+
border-color: #800;
63+
}
64+
.query-builder .has-error .error-container {
65+
display: inline-block !important;
66+
}
67+
.query-builder .rules-list > *:before, .query-builder .rules-list > *:after {
68+
content: '';
69+
position: absolute;
70+
left: -10px;
71+
width: 10px;
72+
height: calc(50% + 4px);
73+
border-color: #222;
74+
border-style: solid;
75+
}
76+
.query-builder .rules-list > *:before {
77+
top: -4px;
78+
border-width: 0 0 2px 2px;
79+
}
80+
.query-builder .rules-list > *:after {
81+
top: 50%;
82+
border-width: 0 0 0 2px;
83+
}
84+
.query-builder .rules-list > *:first-child:before {
85+
top: -12px;
86+
height: calc(50% + 14px);
87+
}
88+
.query-builder .rules-list > *:last-child:before {
89+
border-radius: 0 0 0 4px;
90+
}
91+
.query-builder .rules-list > *:last-child:after {
92+
display: none;
93+
}
94+
95+
.query-builder .error-container + .tooltip .tooltip-inner {
96+
color: #F22 !important;
97+
}
98+
99+
.query-builder p.filter-description {
100+
margin: 5px 0 0 0;
101+
background: rgba(0, 170, 255, 0.2);
102+
border: 1px solid #346F7B;
103+
color: #AAD1E4;
104+
border-radius: 5px;
105+
padding: 2.5px 5px;
106+
font-size: 0.8em;
107+
}
108+
109+
.query-builder .drag-handle {
110+
cursor: move;
111+
vertical-align: middle;
112+
margin-left: 5px;
113+
}
114+
.query-builder .dragged {
115+
opacity: 0.5;
116+
}
117+
.query-builder .rule-placeholder {
118+
border: 1px dashed #BBB;
119+
opacity: 0.7;
120+
}

‎dist/css/query-builder.dark.min.css‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/css/query-builder.default.css‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
/*!
2+
* jQuery QueryBuilder 2.0.0
3+
* Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
4+
* Licensed under MIT (http://opensource.org/licenses/MIT)
5+
*/
6+
7+
.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {
8+
position: relative;
9+
margin: 4px 0;
10+
border-radius: 5px;
11+
padding: 5px;
12+
border: 1px solid #EEE;
13+
background: rgba(255, 255, 255, 0.9);
14+
}
15+
16+
.query-builder .rule-container .rule-filter-container,
17+
.query-builder .rule-container .rule-operator-container,
18+
.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .drag-handle {
19+
display: inline-block;
20+
margin: 0 5px 0 0;
21+
vertical-align: middle;
22+
}
23+
24+
.query-builder .rules-group-container {
25+
padding: 10px;
26+
padding-bottom: 6px;
27+
border: 1px solid #DCC896;
28+
background: rgba(250, 240, 210, 0.5);
29+
}
30+
.query-builder .rules-group-container .rules-group-header {
31+
margin-bottom: 10px;
32+
}
33+
.query-builder .rules-group-container .rules-group-header input[name$=_cond] {
34+
display: none;
35+
}
36+
.query-builder .rules-group-container .rules-list {
37+
list-style: none;
38+
padding: 0 0 0 15px;
39+
margin: 0;
40+
}
41+
.query-builder .rule-container .rule-value-container {
42+
border-left: 1px solid #ddd;
43+
padding-left: 5px;
44+
}
45+
.query-builder .rule-container .rule-value-container label {
46+
margin-bottom: 0;
47+
font-weight: normal;
48+
}
49+
.query-builder .rule-container .rule-value-container label.block {
50+
display: block;
51+
}
52+
.query-builder .rule-container select, .query-builder .rule-container input[type=text], .query-builder .rule-container input[type=number] {
53+
padding: 1px;
54+
}
55+
.query-builder .error-container {
56+
display: none;
57+
cursor: help;
58+
color: #F00;
59+
}
60+
.query-builder .has-error {
61+
background-color: #FDD;
62+
border-color: #F99;
63+
}
64+
.query-builder .has-error .error-container {
65+
display: inline-block !important;
66+
}
67+
.query-builder .rules-list > *:before, .query-builder .rules-list > *:after {
68+
content: '';
69+
position: absolute;
70+
left: -10px;
71+
width: 10px;
72+
height: calc(50% + 4px);
73+
border-color: #CCC;
74+
border-style: solid;
75+
}
76+
.query-builder .rules-list > *:before {
77+
top: -4px;
78+
border-width: 0 0 2px 2px;
79+
}
80+
.query-builder .rules-list > *:after {
81+
top: 50%;
82+
border-width: 0 0 0 2px;
83+
}
84+
.query-builder .rules-list > *:first-child:before {
85+
top: -12px;
86+
height: calc(50% + 14px);
87+
}
88+
.query-builder .rules-list > *:last-child:before {
89+
border-radius: 0 0 0 4px;
90+
}
91+
.query-builder .rules-list > *:last-child:after {
92+
display: none;
93+
}
94+
95+
.query-builder .error-container + .tooltip .tooltip-inner {
96+
color: #F99 !important;
97+
}
98+
99+
.query-builder p.filter-description {
100+
margin: 5px 0 0 0;
101+
background: #D9EDF7;
102+
border: 1px solid #BCE8F1;
103+
color: #31708F;
104+
border-radius: 5px;
105+
padding: 2.5px 5px;
106+
font-size: 0.8em;
107+
}
108+
109+
.query-builder .drag-handle {
110+
cursor: move;
111+
vertical-align: middle;
112+
margin-left: 5px;
113+
}
114+
.query-builder .dragged {
115+
opacity: 0.5;
116+
}
117+
.query-builder .rule-placeholder {
118+
border: 1px dashed #BBB;
119+
opacity: 0.7;
120+
}

‎dist/css/query-builder.default.min.css‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/i18n/da.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
/*!
2-
* jQuery QueryBuilder 1.4.2
2+
* jQuery QueryBuilder 2.0.0
33
* Oversat af Jna Borup Coyle, [email protected]
44
* Licensed under MIT (http://opensource.org/licenses/MIT)
55
*/
6+
67
jQuery.fn.queryBuilder.defaults({ lang: {
78
"add_rule": "Tilføj regel",
89
"add_group": "Tilføj gruppe",
910
"delete_rule": "Slet regel",
1011
"delete_group": "Slet gruppe",
12+
"conditions": {
13+
"AND": "OG",
14+
"OR": "ELLER"
15+
},
1116
"condition_and": "OG",
1217
"condition_or": "ELLER",
1318
"operators": {

‎dist/i18n/de.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
/*!
2-
* jQuery QueryBuilder 1.4.2
2+
* jQuery QueryBuilder 2.0.0
33
* German translation by "raimu"
44
* Licensed under MIT (http://opensource.org/licenses/MIT)
55
*/
6+
67
jQuery.fn.queryBuilder.defaults({ lang: {
78
"add_rule": "neue Regel",
89
"add_group": "neue Gruppe",
910
"delete_rule": "löschen",
1011
"delete_group": "löschen",
11-
"condition_and": "UND",
12-
"condition_or": "ODER",
12+
"conditions": {
13+
"AND": "UND",
14+
"OR": "ODER"
15+
},
1316
"operators": {
1417
"equal": "gleich",
1518
"not_equal": "ungleich",

0 commit comments

Comments
 (0)