Skip to content

Commit

Permalink
Version 1.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mistic100 committed Mar 15, 2016
1 parent 16d8b6a commit 9ca912b
Show file tree
Hide file tree
Showing 6 changed files with 200 additions and 147 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = function(grunt) {
js_files_to_load = [],
css_files_to_load = [],
files_for_standalone = [
'bower_components/microevent-mistic100/microevent.js',
'bower_components/uevent/uevent.js',
'bower_components/jquery-extendext/jQuery.extendext.js',
'dist/query-builder.js'
],
Expand Down
16 changes: 8 additions & 8 deletions dist/query-builder.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* jQuery QueryBuilder 1.4.2
* Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (http://opensource.org/licenses/MIT)
*/
/*!
* jQuery QueryBuilder 1.4.3
* Copyright 2014-2016 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (http://opensource.org/licenses/MIT)
*/
.query-builder .rule-container,
.query-builder .rules-group-container,
.query-builder .rule-placeholder {
Expand Down Expand Up @@ -101,10 +101,10 @@
}
.query-builder .rules-list>*:last-child:after {
display:none;
}
}
.query-builder .tooltip-inner {
color:#fdd !important;
}
}
.query-builder p.filter-description {
margin:5px 0 0 0;
background:#D9EDF7;
Expand All @@ -113,7 +113,7 @@
border-radius:4px;
padding:2px 5px;
font-size:0.8em;
}
}
.query-builder .drag-handle {
cursor:move;
display:inline-block;
Expand Down
39 changes: 20 additions & 19 deletions dist/query-builder.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*!
* jQuery QueryBuilder 1.4.2
* Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (http://opensource.org/licenses/MIT)
*/

/*!
* jQuery QueryBuilder 1.4.3
* Copyright 2014-2016 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (http://opensource.org/licenses/MIT)
*/

// Modules: bt-selectpicker, bt-tooltip-errors, filter-description, loopback-support, mongodb-support, sortable, sql-support
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery', 'microevent', 'jQuery.extendext'], factory);
define(['jquery', 'uevent', 'jQuery.extendext'], factory);
}
else {
factory(root.jQuery, root.MicroEvent);
factory(root.jQuery, root.uEvent);
}
}(this, function($, MicroEvent) {
}(this, function($, uEvent) {
"use strict";

var types = [
'string',
'integer',
Expand Down Expand Up @@ -44,7 +44,7 @@
this.init(options);
};

MicroEvent.mixin(QueryBuilder);
uEvent.mixin(QueryBuilder);


QueryBuilder.DEFAULTS = {
Expand Down Expand Up @@ -1391,7 +1391,7 @@
<i class="' + this.icons.add_group + '"></i> '+ this.lang.add_group +' \
</button>'
:'') +' \
'+ (level>1 ?
'+ (level>1 ?
'<button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
<i class="' + this.icons.remove_group + '"></i> '+ this.lang.delete_group +' \
</button>'
Expand Down Expand Up @@ -1692,6 +1692,7 @@
});
}


$.fn.queryBuilder.define('bt-selectpicker', function(options) {
if (!$.fn.selectpicker || !$.fn.selectpicker.Constructor) {
$.error('Bootstrap Select is required to use "bt-selectpicker" plugin. Get it here: http://silviomoreto.github.io/bootstrap-select');
Expand All @@ -1714,7 +1715,7 @@ $.fn.queryBuilder.define('bt-selectpicker', function(options) {
$rule.find('.rule-operator-container select').selectpicker(options);
});
});


$.fn.queryBuilder.define('bt-tooltip-errors', function(options) {
if (!$.fn.tooltip || !$.fn.tooltip.Constructor || !$.fn.tooltip.Constructor.prototype.fixTitle) {
$.error('Bootstrap Tooltip is required to use "bt-tooltip-errors" plugin. Get it here: http://getbootstrap.com');
Expand All @@ -1737,7 +1738,7 @@ $.fn.queryBuilder.define('bt-tooltip-errors', function(options) {
.tooltip('fixTitle');
});
});


$.fn.queryBuilder.define('filter-description', function(options) {
options = $.extend({
icon: 'glyphicon glyphicon-info-sign',
Expand Down Expand Up @@ -1841,7 +1842,7 @@ $.fn.queryBuilder.define('filter-description', function(options) {
});
}
});


$.fn.queryBuilder.defaults.set({
loopbackOperators: {
equal: function(v){ return v[0]; },
Expand Down Expand Up @@ -1962,7 +1963,7 @@ $.fn.queryBuilder.defaults.set({
function escapeRegExp(str) {
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
}


$.fn.queryBuilder.defaults.set({
mongoOperators: {
equal: function(v){ return v[0]; },
Expand Down Expand Up @@ -2231,7 +2232,7 @@ $.fn.queryBuilder.defaults.set({
function escapeRegExp(str) {
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
}


$.fn.queryBuilder.define('sortable', function(options) {
options = $.extend({
default_no_sortable: false,
Expand Down Expand Up @@ -2377,7 +2378,7 @@ $.fn.queryBuilder.define('sortable', function(options) {
return;
}
}


$.fn.queryBuilder.defaults.set({
sqlOperators: {
equal: '= ?',
Expand Down Expand Up @@ -2586,4 +2587,4 @@ $.fn.queryBuilder.defaults.set({
.replace(/\t/g, '\\t')
.replace(/\x1a/g, '\\Z');
}
}));
}));
8 changes: 4 additions & 4 deletions dist/query-builder.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 9ca912b

Please sign in to comment.