Skip to content

Commit 6033da4

Browse files
mistic100mistic100
committed
Version 2.4.4
2 parents ed733d2 + d8fbbaf commit 6033da4

Some content is hidden

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

49 files changed

+1090
-921
lines changed

‎.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
- Please search in the [documentation](http://querybuilder.js.org) before asking.
44
- Any issue without enough details won't get any answer and will be closed.
55
- Help requests must be exhaustive, precise and come with some code explaining the need (use Markdown code highlight).
6-
- Bug reports must come with a simple test case, preferably on jsFiddle, Plunker, etc. (QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/projects/jquery.query-builder) to be used on such platforms).
6+
- Bug reports must come with a simple test case, preferably on jsFiddle, Plunker, etc. (QueryBuilder is available on [jsDelivr](https://cdn.jsdelivr.net/npm/jQuery-QueryBuilder/dist/) and [unpkg](https://unpkg.com/jQuery-QueryBuilder/dist/) to be used on such platforms).

‎Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ module.exports = function(grunt) {
2222
'src/public.js',
2323
'src/data.js',
2424
'src/template.js',
25-
'src/model.js',
2625
'src/utils.js',
26+
'src/model.js',
2727
'src/jquery.js'
2828
],
2929
js_files_for_standalone: [

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2015 Damien Sorel
3+
Copyright (c) 2014-2017 Damien Sorel
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ $ bower install jQuery-QueryBuilder
3535
$ npm install jQuery-QueryBuilder
3636
```
3737

38+
#### Via CDN
39+
40+
jQuery-QueryBuilder is available on [jsDelivr](https://cdn.jsdelivr.net/npm/jQuery-QueryBuilder/dist/) and [unpkg](https://unpkg.com/jQuery-QueryBuilder/dist/))
41+
3842
### Dependencies
3943
* jQuery >= 1.10
4044
* Bootstrap >= 3.1 (CSS only)

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

+146-146
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,150 @@
11
/*!
2-
* jQuery QueryBuilder 2.4.3
2+
* jQuery QueryBuilder 2.4.4
33
* Copyright 2014-2017 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
44
* Licensed under MIT (http://opensource.org/licenses/MIT)
55
*/
6-
.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {
7-
position: relative;
8-
margin: 4px 0;
9-
border-radius: 5px;
10-
padding: 5px;
11-
border: 1px solid #111;
12-
background: rgba(40, 40, 40, 0.9);
13-
}
14-
15-
.query-builder .rule-container .rule-filter-container,
16-
.query-builder .rule-container .rule-operator-container,
17-
.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .drag-handle {
18-
display: inline-block;
19-
margin: 0 5px 0 0;
20-
vertical-align: middle;
21-
}
22-
23-
.query-builder .rules-group-container {
24-
padding: 10px;
25-
padding-bottom: 6px;
26-
border: 1px solid #00164A;
27-
background: rgba(50, 70, 80, 0.5);
28-
}
29-
.query-builder .rules-group-header {
30-
margin-bottom: 10px;
31-
}
32-
.query-builder .rules-group-header .group-conditions .btn.readonly:not(.active),
33-
.query-builder .rules-group-header .group-conditions input[name$=_cond] {
34-
border: 0;
35-
clip: rect(0 0 0 0);
36-
height: 1px;
37-
margin: -1px;
38-
overflow: hidden;
39-
padding: 0;
40-
position: absolute;
41-
width: 1px;
42-
white-space: nowrap;
43-
}
44-
.query-builder .rules-group-header .group-conditions .btn.readonly {
45-
border-radius: 3px;
46-
}
47-
.query-builder .rules-list {
48-
list-style: none;
49-
padding: 0 0 0 15px;
50-
margin: 0;
51-
}
52-
.query-builder .rule-value-container {
53-
border-left: 1px solid #DDD;
54-
padding-left: 5px;
55-
}
56-
.query-builder .rule-value-container label {
57-
margin-bottom: 0;
58-
font-weight: normal;
59-
}
60-
.query-builder .rule-value-container label.block {
61-
display: block;
62-
}
63-
.query-builder .rule-value-container select, .query-builder .rule-value-container input[type=text], .query-builder .rule-value-container input[type=number] {
64-
padding: 1px;
65-
}
66-
.query-builder .error-container {
67-
display: none;
68-
cursor: help;
69-
color: #F00;
70-
}
71-
.query-builder .has-error {
72-
background-color: #322;
73-
border-color: #800;
74-
}
75-
.query-builder .has-error .error-container {
76-
display: inline-block !important;
77-
}
78-
.query-builder .rules-list > *::before, .query-builder .rules-list > *::after {
79-
content: '';
80-
position: absolute;
81-
left: -10px;
82-
width: 10px;
83-
height: calc(50% + 4px);
84-
border-color: #222;
85-
border-style: solid;
86-
}
87-
.query-builder .rules-list > *::before {
88-
top: -4px;
89-
border-width: 0 0 2px 2px;
90-
}
91-
.query-builder .rules-list > *::after {
92-
top: 50%;
93-
border-width: 0 0 0 2px;
94-
}
95-
.query-builder .rules-list > *:first-child::before {
96-
top: -12px;
97-
height: calc(50% + 14px);
98-
}
99-
.query-builder .rules-list > *:last-child::before {
100-
border-radius: 0 0 0 4px;
101-
}
102-
.query-builder .rules-list > *:last-child::after {
103-
display: none;
104-
}
105-
106-
.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked + label::after {
107-
font-family: 'Glyphicons Halflings';
108-
content: '\e013';
109-
}
110-
.query-builder.bt-checkbox-glyphicons .checkbox label::after {
111-
padding-left: 4px;
112-
padding-top: 2px;
113-
font-size: 9px;
114-
}
115-
116-
.query-builder .error-container + .tooltip .tooltip-inner {
117-
color: #F22 !important;
118-
}
119-
120-
.query-builder p.filter-description {
121-
margin: 5px 0 0 0;
122-
background: rgba(0, 170, 255, 0.2);
123-
border: 1px solid #346F7B;
124-
color: #AAD1E4;
125-
border-radius: 5px;
126-
padding: 2.5px 5px;
127-
font-size: .8em;
128-
}
129-
130-
.query-builder .rules-group-header [data-invert] {
131-
margin-left: 5px;
132-
}
133-
134-
.query-builder .drag-handle {
135-
cursor: move;
136-
vertical-align: middle;
137-
margin-left: 5px;
138-
}
139-
.query-builder .dragging {
140-
position: fixed;
141-
opacity: .5;
142-
z-index: 100;
143-
}
144-
.query-builder .dragging::before, .query-builder .dragging::after {
145-
display: none;
146-
}
147-
.query-builder .rule-placeholder {
148-
border: 1px dashed #BBB;
149-
opacity: .7;
150-
}
6+
.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rule-placeholder {
7+
position: relative;
8+
margin: 4px 0;
9+
border-radius: 5px;
10+
padding: 5px;
11+
border: 1px solid #111;
12+
background: rgba(40, 40, 40, 0.9);
13+
}
14+
15+
.query-builder .rule-container .rule-filter-container,
16+
.query-builder .rule-container .rule-operator-container,
17+
.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .drag-handle {
18+
display: inline-block;
19+
margin: 0 5px 0 0;
20+
vertical-align: middle;
21+
}
22+
23+
.query-builder .rules-group-container {
24+
padding: 10px;
25+
padding-bottom: 6px;
26+
border: 1px solid #00164A;
27+
background: rgba(50, 70, 80, 0.5);
28+
}
29+
.query-builder .rules-group-header {
30+
margin-bottom: 10px;
31+
}
32+
.query-builder .rules-group-header .group-conditions .btn.readonly:not(.active),
33+
.query-builder .rules-group-header .group-conditions input[name$=_cond] {
34+
border: 0;
35+
clip: rect(0 0 0 0);
36+
height: 1px;
37+
margin: -1px;
38+
overflow: hidden;
39+
padding: 0;
40+
position: absolute;
41+
width: 1px;
42+
white-space: nowrap;
43+
}
44+
.query-builder .rules-group-header .group-conditions .btn.readonly {
45+
border-radius: 3px;
46+
}
47+
.query-builder .rules-list {
48+
list-style: none;
49+
padding: 0 0 0 15px;
50+
margin: 0;
51+
}
52+
.query-builder .rule-value-container {
53+
border-left: 1px solid #DDD;
54+
padding-left: 5px;
55+
}
56+
.query-builder .rule-value-container label {
57+
margin-bottom: 0;
58+
font-weight: normal;
59+
}
60+
.query-builder .rule-value-container label.block {
61+
display: block;
62+
}
63+
.query-builder .rule-value-container select, .query-builder .rule-value-container input[type=text], .query-builder .rule-value-container input[type=number] {
64+
padding: 1px;
65+
}
66+
.query-builder .error-container {
67+
display: none;
68+
cursor: help;
69+
color: #F00;
70+
}
71+
.query-builder .has-error {
72+
background-color: #322;
73+
border-color: #800;
74+
}
75+
.query-builder .has-error .error-container {
76+
display: inline-block !important;
77+
}
78+
.query-builder .rules-list > *::before, .query-builder .rules-list > *::after {
79+
content: '';
80+
position: absolute;
81+
left: -10px;
82+
width: 10px;
83+
height: calc(50% + 4px);
84+
border-color: #222;
85+
border-style: solid;
86+
}
87+
.query-builder .rules-list > *::before {
88+
top: -4px;
89+
border-width: 0 0 2px 2px;
90+
}
91+
.query-builder .rules-list > *::after {
92+
top: 50%;
93+
border-width: 0 0 0 2px;
94+
}
95+
.query-builder .rules-list > *:first-child::before {
96+
top: -12px;
97+
height: calc(50% + 14px);
98+
}
99+
.query-builder .rules-list > *:last-child::before {
100+
border-radius: 0 0 0 4px;
101+
}
102+
.query-builder .rules-list > *:last-child::after {
103+
display: none;
104+
}
105+
106+
.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked + label::after {
107+
font-family: 'Glyphicons Halflings';
108+
content: '\e013';
109+
}
110+
.query-builder.bt-checkbox-glyphicons .checkbox label::after {
111+
padding-left: 4px;
112+
padding-top: 2px;
113+
font-size: 9px;
114+
}
115+
116+
.query-builder .error-container + .tooltip .tooltip-inner {
117+
color: #F22 !important;
118+
}
119+
120+
.query-builder p.filter-description {
121+
margin: 5px 0 0 0;
122+
background: rgba(0, 170, 255, 0.2);
123+
border: 1px solid #346F7B;
124+
color: #AAD1E4;
125+
border-radius: 5px;
126+
padding: 2.5px 5px;
127+
font-size: .8em;
128+
}
129+
130+
.query-builder .rules-group-header [data-invert] {
131+
margin-left: 5px;
132+
}
133+
134+
.query-builder .drag-handle {
135+
cursor: move;
136+
vertical-align: middle;
137+
margin-left: 5px;
138+
}
139+
.query-builder .dragging {
140+
position: fixed;
141+
opacity: .5;
142+
z-index: 100;
143+
}
144+
.query-builder .dragging::before, .query-builder .dragging::after {
145+
display: none;
146+
}
147+
.query-builder .rule-placeholder {
148+
border: 1px dashed #BBB;
149+
opacity: .7;
150+
}

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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)