Skip to content

Commit 9ca912b

Browse files
committed
Version 1.4.3
1 parent 16d8b6a commit 9ca912b

File tree

6 files changed

+200
-147
lines changed

6 files changed

+200
-147
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module.exports = function(grunt) {
55
js_files_to_load = [],
66
css_files_to_load = [],
77
files_for_standalone = [
8-
'bower_components/microevent-mistic100/microevent.js',
8+
'bower_components/uevent/uevent.js',
99
'bower_components/jquery-extendext/jQuery.extendext.js',
1010
'dist/query-builder.js'
1111
],

dist/query-builder.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*!
2-
* jQuery QueryBuilder 1.4.2
3-
* Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
4-
* Licensed under MIT (http://opensource.org/licenses/MIT)
5-
*/
1+
/*!
2+
* jQuery QueryBuilder 1.4.3
3+
* Copyright 2014-2016 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
4+
* Licensed under MIT (http://opensource.org/licenses/MIT)
5+
*/
66
.query-builder .rule-container,
77
.query-builder .rules-group-container,
88
.query-builder .rule-placeholder {
@@ -101,10 +101,10 @@
101101
}
102102
.query-builder .rules-list>*:last-child:after {
103103
display:none;
104-
}
104+
}
105105
.query-builder .tooltip-inner {
106106
color:#fdd !important;
107-
}
107+
}
108108
.query-builder p.filter-description {
109109
margin:5px 0 0 0;
110110
background:#D9EDF7;
@@ -113,7 +113,7 @@
113113
border-radius:4px;
114114
padding:2px 5px;
115115
font-size:0.8em;
116-
}
116+
}
117117
.query-builder .drag-handle {
118118
cursor:move;
119119
display:inline-block;

dist/query-builder.js

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
/*!
2-
* jQuery QueryBuilder 1.4.2
3-
* Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
4-
* Licensed under MIT (http://opensource.org/licenses/MIT)
5-
*/
6-
1+
/*!
2+
* jQuery QueryBuilder 1.4.3
3+
* Copyright 2014-2016 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
4+
* Licensed under MIT (http://opensource.org/licenses/MIT)
5+
*/
6+
77
// Modules: bt-selectpicker, bt-tooltip-errors, filter-description, loopback-support, mongodb-support, sortable, sql-support
88
(function(root, factory) {
99
if (typeof define === 'function' && define.amd) {
10-
define(['jquery', 'microevent', 'jQuery.extendext'], factory);
10+
define(['jquery', 'uevent', 'jQuery.extendext'], factory);
1111
}
1212
else {
13-
factory(root.jQuery, root.MicroEvent);
13+
factory(root.jQuery, root.uEvent);
1414
}
15-
}(this, function($, MicroEvent) {
15+
}(this, function($, uEvent) {
1616
"use strict";
17-
17+
1818
var types = [
1919
'string',
2020
'integer',
@@ -44,7 +44,7 @@
4444
this.init(options);
4545
};
4646

47-
MicroEvent.mixin(QueryBuilder);
47+
uEvent.mixin(QueryBuilder);
4848

4949

5050
QueryBuilder.DEFAULTS = {
@@ -1391,7 +1391,7 @@
13911391
<i class="' + this.icons.add_group + '"></i> '+ this.lang.add_group +' \
13921392
</button>'
13931393
:'') +' \
1394-
'+ (level>1 ?
1394+
'+ (level>1 ?
13951395
'<button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
13961396
<i class="' + this.icons.remove_group + '"></i> '+ this.lang.delete_group +' \
13971397
</button>'
@@ -1692,6 +1692,7 @@
16921692
});
16931693
}
16941694

1695+
16951696
$.fn.queryBuilder.define('bt-selectpicker', function(options) {
16961697
if (!$.fn.selectpicker || !$.fn.selectpicker.Constructor) {
16971698
$.error('Bootstrap Select is required to use "bt-selectpicker" plugin. Get it here: http://silviomoreto.github.io/bootstrap-select');
@@ -1714,7 +1715,7 @@ $.fn.queryBuilder.define('bt-selectpicker', function(options) {
17141715
$rule.find('.rule-operator-container select').selectpicker(options);
17151716
});
17161717
});
1717-
1718+
17181719
$.fn.queryBuilder.define('bt-tooltip-errors', function(options) {
17191720
if (!$.fn.tooltip || !$.fn.tooltip.Constructor || !$.fn.tooltip.Constructor.prototype.fixTitle) {
17201721
$.error('Bootstrap Tooltip is required to use "bt-tooltip-errors" plugin. Get it here: http://getbootstrap.com');
@@ -1737,7 +1738,7 @@ $.fn.queryBuilder.define('bt-tooltip-errors', function(options) {
17371738
.tooltip('fixTitle');
17381739
});
17391740
});
1740-
1741+
17411742
$.fn.queryBuilder.define('filter-description', function(options) {
17421743
options = $.extend({
17431744
icon: 'glyphicon glyphicon-info-sign',
@@ -1841,7 +1842,7 @@ $.fn.queryBuilder.define('filter-description', function(options) {
18411842
});
18421843
}
18431844
});
1844-
1845+
18451846
$.fn.queryBuilder.defaults.set({
18461847
loopbackOperators: {
18471848
equal: function(v){ return v[0]; },
@@ -1962,7 +1963,7 @@ $.fn.queryBuilder.defaults.set({
19621963
function escapeRegExp(str) {
19631964
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
19641965
}
1965-
1966+
19661967
$.fn.queryBuilder.defaults.set({
19671968
mongoOperators: {
19681969
equal: function(v){ return v[0]; },
@@ -2231,7 +2232,7 @@ $.fn.queryBuilder.defaults.set({
22312232
function escapeRegExp(str) {
22322233
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
22332234
}
2234-
2235+
22352236
$.fn.queryBuilder.define('sortable', function(options) {
22362237
options = $.extend({
22372238
default_no_sortable: false,
@@ -2377,7 +2378,7 @@ $.fn.queryBuilder.define('sortable', function(options) {
23772378
return;
23782379
}
23792380
}
2380-
2381+
23812382
$.fn.queryBuilder.defaults.set({
23822383
sqlOperators: {
23832384
equal: '= ?',
@@ -2586,4 +2587,4 @@ $.fn.queryBuilder.defaults.set({
25862587
.replace(/\t/g, '\\t')
25872588
.replace(/\x1a/g, '\\Z');
25882589
}
2589-
}));
2590+
}));

dist/query-builder.min.js

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

0 commit comments

Comments
 (0)