Skip to content

Commit e7c78df

Browse files
committed
Update doc for 2.4.0
1 parent f4be767 commit e7c78df

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

+8395
-943
lines changed

.bowerrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "/dist"
3-
}
2+
"directory": "dist"
3+
}

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Gemfile.lock
44
/*.iml
55

66
# commit minimum dependencies
7-
/dist/**/*.map
87
/dist/bootstrap
98
/dist/jquery
109
/dist/bootstrap-datepicker/*
@@ -36,3 +35,6 @@ Gemfile.lock
3635
/dist/bootstrap-select/dist/js/i18n
3736
/dist/sql-parser/lib
3837
/dist/doT
38+
/dist/interact/*
39+
!/dist/interact/dist
40+
/dist/**/*.map

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# name of the software
22
name: jQuery QueryBuilder
33
# current version of the software
4-
version: 2.3.3
4+
version: 2.4.0
55
# url of the download button
66
downloadUrl: https://github.com/mistic100/jQuery-QueryBuilder
77
# links to file/dir viewers
88
treeUrl: https://github.com/mistic100/jQuery-QueryBuilder/tree/master
99
blobUrl: https://github.com/mistic100/jQuery-QueryBuilder/blob/master
10-
cdnUrl: https://cdn.jsdelivr.net/jquery.query-builder/2.3.3
10+
cdnUrl: https://cdn.jsdelivr.net/jquery.query-builder/2.4.0
1111
# licence of the software
1212
license: MIT License
1313
licenseUrl: http://opensource.org/licenses/MIT

assets/css/style.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,8 @@
3333

3434
a[data-bootbox] {
3535
cursor: pointer;
36-
}
36+
}
37+
38+
h5 {
39+
font-weight: bold;
40+
}

assets/demo-import-export.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ var mongo_import_export = {
1313
}
1414

1515
$('#builder-import_export').queryBuilder({
16-
plugins: ['bt-tooltip-errors'],
17-
16+
plugins: [
17+
'bt-tooltip-errors',
18+
'not-group'
19+
],
20+
1821
filters: [{
1922
id: 'name',
2023
label: 'Name',
@@ -77,16 +80,16 @@ $('#btn-set-mongo').on('click', function() {
7780

7881
$('#btn-get-sql').on('click', function() {
7982
var result = $('#builder-import_export').queryBuilder('getSQL', 'question_mark');
80-
83+
8184
if (result.sql.length) {
8285
alert(result.sql + '\n\n' + JSON.stringify(result.params, null, 2));
8386
}
8487
});
8588

8689
$('#btn-get-mongo').on('click', function() {
8790
var result = $('#builder-import_export').queryBuilder('getMongo');
88-
91+
8992
if (!$.isEmptyObject(result)) {
9093
alert(JSON.stringify(result, null, 2));
9194
}
92-
});
95+
});

assets/demo-plugins.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ $('#builder-plugins').queryBuilder({
2626
'bt-tooltip-errors',
2727
'bt-selectpicker',
2828
'bt-checkbox',
29-
'invert'
29+
'invert',
30+
'not-group'
3031
],
31-
32+
3233
filters: [{
3334
id: 'name',
3435
label: 'Name',
@@ -87,8 +88,8 @@ $('#btn-set').on('click', function() {
8788

8889
$('#btn-get').on('click', function() {
8990
var result = $('#builder-plugins').queryBuilder('getRules');
90-
91+
9192
if (!$.isEmptyObject(result)) {
9293
alert(JSON.stringify(result, null, 2));
9394
}
94-
});
95+
});

assets/flags/flags.css

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.flag {
22
background-image: url(flags.png);
33
background-repeat: no-repeat;
4-
display: block;
4+
display: inline-block;
55
}
66

77
.flag-al {
@@ -129,3 +129,15 @@
129129
height: 11px;
130130
background-position: 0 -55px;
131131
}
132+
133+
.flag-bg {
134+
width: 16px;
135+
height: 11px;
136+
background-position: -16px -55px;
137+
}
138+
139+
.flag-el {
140+
width: 16px;
141+
height: 11px;
142+
background-position: -32px -55px;
143+
}

assets/flags/flags.png

531 Bytes
Loading

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "jquery-querybuilder-doc",
3-
"version": "0.0.0",
43
"dependencies": {
54
"jQuery-QueryBuilder": "git://github.com/mistic100/jQuery-QueryBuilder.git#master",
65
"bootstrap-datepicker": "latest",
@@ -9,6 +8,7 @@
98
"bootstrap-treeview": "latest",
109
"awesome-bootstrap-checkbox": "latest",
1110
"bootstrap-select": "latest",
12-
"sql-parser": "latest"
11+
"sql-parser": "latest",
12+
"interact": "^1.2.6"
1313
}
1414
}

demo.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ <h1 id="import_export" class="page-header">
123123
<script src="{{site.github.url}}/dist/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
124124
<script src="{{site.github.url}}/dist/jQuery-QueryBuilder/dist/js/query-builder.standalone.min.js"></script>
125125
<script src="{{site.github.url}}/dist/sql-parser/browser/sql-parser.js"></script>
126+
<script src="{{site.github.url}}/dist/interact/dist/interact.min.js"></script>
126127

127128
<script>var baseurl = '{{site.github.url}}';</script>
128129
<script src="{{site.github.url}}/assets/demo-basic.js"></script>

0 commit comments

Comments
 (0)