Skip to content

Commit 16d8b6a

Browse files
committed
Version 1.4.3
1 parent cfbdb2a commit 16d8b6a

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jQuery-QueryBuilder",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"authors": [{
55
"name": "Damien \"Mistic\" Sorel",
66
"homepage": "http://www.strangeplanet.fr"
@@ -14,7 +14,7 @@
1414
"jquery": ">= 1.9.0",
1515
"bootstrap": "^3.1.0",
1616
"momentjs": "^2.6.0",
17-
"microevent-mistic100": "^2.0.0",
17+
"uevent": "^1.0.0",
1818
"jquery-extendext": "^0.1.1"
1919
},
2020
"keywords": [

composer.json

Lines changed: 2 additions & 2 deletions
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": "1.4.3",
44
"description": "jQuery plugin for user friendly query/filter creator",
55
"keywords": [
66
"jquery",
@@ -23,4 +23,4 @@
2323
"twbs/bootstrap": "3.2.*@dev"
2424
},
2525
"license": "MIT"
26-
}
26+
}

examples/index.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
<div class="container">
1818
<div class="col-md-12 col-lg-10 col-lg-offset-1">
1919
<p><a href="http://www.eyecon.ro/bootstrap-slider">Bootstrap Slider</a> and <a href="http://bootboxjs.com">Bootbox</a> must be installed with Bower to run this demo.</p>
20-
20+
2121
<div id="builder"></div>
22-
22+
2323
<div class="btn-group">
2424
<button class="btn btn-warning reset">Reset</button>
2525
<button class="btn btn-success set">Set rules</button>
2626
<button class="btn btn-success set-mongo">Set rules from MongoDB</button>
2727
</div>
28-
28+
2929
<div class="btn-group">
3030
<button class="btn btn-primary parse-json">JSON</button>
3131
<button class="btn btn-primary parse-sql" data-stmt="question_mark">SQL (question mark)</button>
@@ -42,7 +42,7 @@ <h3>Output</h3>
4242
</div>
4343

4444
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
45-
<script src="../bower_components/microevent-mistic100/microevent.js"></script>
45+
<script src="../bower_components/uevent/uevent.js"></script>
4646
<script src="../bower_components/jquery-extendext/jQuery.extendext.js"></script>
4747
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
4848
<script src="../src/query-builder.js"></script>
@@ -58,17 +58,17 @@ <h3>Output</h3>
5858
// define filters
5959
$('#builder').queryBuilder({
6060
allow_empty: true,
61-
61+
6262
onValidationError: function($target, err) {
6363
console.error(err, $target);
6464
},
65-
65+
6666
plugins: {
6767
'bt-tooltip-errors': { delay: 100},
6868
'sortable': null,
6969
'filter-description': { mode: 'bootbox' }
7070
},
71-
71+
7272
filters: [
7373
/*
7474
* basic
@@ -139,7 +139,7 @@ <h3>Output</h3>
139139
min: 0,
140140
step: 0.01
141141
}
142-
},
142+
},
143143
/*
144144
* slider
145145
*/
@@ -162,7 +162,7 @@ <h3>Output</h3>
162162
input.slider('setValue', value);
163163
input.val(value); // don't know why I need it
164164
}
165-
},
165+
},
166166
/*
167167
* placeholder and regex validation
168168
*/
@@ -197,10 +197,10 @@ <h3>Output</h3>
197197
},
198198
input: function($rule, filter) {
199199
var $container = $rule.find('.rule-value-container');
200-
200+
201201
$container.on('change', '[name=coord_1]', function(){
202202
var h = '';
203-
203+
204204
switch ($(this).val()) {
205205
case 'A':
206206
h = '<option value="-1">-</option> <option value="1">1</option> <option value="2">2</option>';
@@ -212,10 +212,10 @@ <h3>Output</h3>
212212
h = '<option value="-1">-</option> <option value="5">5</option> <option value="6">6</option>';
213213
break;
214214
}
215-
215+
216216
$container.find('[name=coord_2]').html(h).toggle(h!='');
217217
});
218-
218+
219219
return '\
220220
<select name="coord_1"> \
221221
<option value="-1">-</option> \
@@ -232,7 +232,7 @@ <h3>Output</h3>
232232
onAfterSetValue: function($rule, value, filter, operator) {
233233
if (operator.accept_values) {
234234
var val = value[0].split('.');
235-
235+
236236
$rule.find('[name=coord_1]').val(val[0]).trigger('change');
237237
$rule.find('[name=coord_2]').val(val[1]);
238238
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jQuery-QueryBuilder",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"author": {
55
"name": "Damien \"Mistic\" Sorel",
66
"homepage": "http://www.strangeplanet.fr"

src/.wrapper.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
(function(root, factory) {
22
if (typeof define === 'function' && define.amd) {
3-
define(['jquery', 'microevent', 'jQuery.extendext'], factory);
3+
define(['jquery', 'uevent', 'jQuery.extendext'], factory);
44
}
55
else {
6-
factory(root.jQuery, root.MicroEvent);
6+
factory(root.jQuery, root.uEvent);
77
}
8-
}(this, function($, MicroEvent) {
8+
}(this, function($, uEvent) {
99
"use strict";
10-
10+
1111
@@js
12-
}));
12+
}));

src/query-builder.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
this.init(options);
4444
};
4545

46-
MicroEvent.mixin(QueryBuilder);
46+
uEvent.mixin(QueryBuilder);
4747

4848

4949
// DEFAULT CONFIG
@@ -1404,7 +1404,7 @@
14041404
<i class="' + this.icons.add_group + '"></i> '+ this.lang.add_group +' \
14051405
</button>'
14061406
:'') +' \
1407-
'+ (level>1 ?
1407+
'+ (level>1 ?
14081408
'<button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
14091409
<i class="' + this.icons.remove_group + '"></i> '+ this.lang.delete_group +' \
14101410
</button>'
@@ -1709,4 +1709,4 @@
17091709
});
17101710
}
17111711

1712-
}(jQuery));
1712+
}(jQuery));

tests/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<head>
44
<title>jQuery-QueryBuilder</title>
55
<meta charset="utf-8">
6-
6+
77
<link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css">
88
<link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
99
<link rel="stylesheet" href="../src/query-builder.css">
10-
10+
1111
<script src="../bower_components/jquery/dist/jquery.min.js"></script>
1212
<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
13-
<script src="../bower_components/microevent-mistic100/microevent.js"></script>
13+
<script src="../bower_components/uevent/uevent.js"></script>
1414
<script src="../bower_components/jquery-extendext/jQuery.extendext.js"></script>
1515
<script src="../src/query-builder.js"></script>
1616
<script src="../src/plugins/sql-support/plugin.js"></script>
@@ -24,7 +24,7 @@
2424
<div class="col-lg-8 col-lg-push-2">
2525
<div id="qunit"></div>
2626
<div id="qunit-fixture"></div>
27-
27+
2828
<div id="container1"></div>
2929
<div id="container2"></div>
3030
<div id="container3"></div>

0 commit comments

Comments
 (0)