allineamento versione

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jQuery-QueryBuilder-Custom",
-  "version": "2.5.2.7",
+  "version": "2.5.2.16",
   "authors": [
     {
       "name": "Damien \"Mistic\" Sorel",

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "mistic100/jquery-querybuilder",
-  "version": "2.5.2.7",
+  "version": "2.5.2.9",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "email": "contact@git.strangeplanet.fr",

dist/i18n/query-builder.ar.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Arabic (ar)
  * Author: Mohamed YOUNES, https://github.com/MedYOUNES
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.az.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Azerbaijan (az)
  * Author: Megaplan, mborisv <bm@megaplan.ru>
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.bg.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Bulgarian (bg)
  * Author: Valentin Hristov
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.cs.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Čeština (cs)
  * Author: Megaplan, mborisv <bm@megaplan.ru>
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.da.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Danish (da)
  * Author: Jna Borup Coyle, github@coyle.dk
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.de.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: German (de)
  * Author: "raimu"
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.el.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Greek (el)
  * Author: Stelios Patsatzis, https://www.linkedin.com/in/stelios-patsatzis-89841561
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.en.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: English (en)
  * Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
  * Licensed under MIT (https://opensource.org/licenses/MIT)
@@ -24,6 +24,10 @@ QueryBuilder.regional['en'] = {
   "add_group": "Add group",
   "delete_rule": "Delete",
   "delete_group": "Delete",
+  "add_rule_title": "Add rule",
+  "add_group_title": "Add group",
+  "delete_rule_title": "Delete rule",
+  "delete_group_title": "Delete group",
   "conditions": {
     "AND": "AND",
     "OR": "OR"

dist/i18n/query-builder.es.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Spanish (es)
  * Author: "pyarza", "kddlb"
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.fa-IR.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Farsi (fa-ir)
  * Author: Behzad Sedighzade, behzad.sedighzade@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.fr.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: French (fr)
  * Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.he.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Hebrew (he)
  * Author: Kfir Stri https://github.com/kfirstri
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.it.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Italian (it)
  * Author: davegraziosi
  * Licensed under MIT (https://opensource.org/licenses/MIT)
@@ -24,6 +24,10 @@ QueryBuilder.regional['it'] = {
   "add_group": "Aggiungi gruppo",
   "delete_rule": "Elimina",
   "delete_group": "Elimina",
+  "add_rule_title": "Aggiungi regola",
+  "add_group_title": "Aggiungi gruppo",
+  "delete_rule_title": "Elimina regola",
+  "delete_group_title": "Elimina gruppo",
   "conditions": {
     "AND": "E",
     "OR": "O"

dist/i18n/query-builder.nl.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Dutch (nl)
  * Author: "Roywcm"
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.no.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Norwegian (no)
  * Author: Jna Borup Coyle, github@coyle.dk
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.pl.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Polish (pl)
  * Author: Artur Smolarek
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.pt-BR.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Brazilian Portuguese (pr-BR)
  * Author: Leandro Gehlen, leandrogehlen@gmail.com; Marcos Ferretti, marcosvferretti@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.pt-PT.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Portuguese (pt-PT)
  * Author: Miguel Guerreiro, migas.csi@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.ro.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Romanian (ro)
  * Author: ArianServ
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.ru.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Russian (ru)
  * Licensed under MIT (https://opensource.org/licenses/MIT)
  */

dist/i18n/query-builder.sq.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Albanian (sq)
  * Author: Tomor Pupovci
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.tr.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Turkish (tr)
  * Author: Aykut Alpgiray Ateş
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.ua.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Ukrainian (ua)
  * Author: Megaplan, mborisv <bm@megaplan.ru>
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/i18n/query-builder.zh-CN.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: Simplified Chinese (zh_CN)
  * Author: shadowwind, shatteredwindgo@gmail.com
  * Licensed under MIT (https://opensource.org/licenses/MIT)

dist/js/query-builder.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Copyright 2014-2019 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (https://opensource.org/licenses/MIT)
  */
@@ -2687,16 +2687,16 @@ QueryBuilder.templates.group = '\
   <div class="rules-group-header"> \
     <div class="btn-group pull-right group-actions"> \
       <button type="button" class="btn btn-xs btn-success" data-add="rule"> \
-        <i class="{{= it.icons.add_rule }}"></i> {{= it.translate("add_rule") }} \
+        <i class="{{= it.icons.add_rule }}" title="{{= it.translate("add_rule_title") }}" ></i> {{= it.translate("add_rule") }} \
       </button> \
       {{? it.settings.allow_groups===-1 || it.settings.allow_groups>=it.level }} \
         <button type="button" class="btn btn-xs btn-success" data-add="group"> \
-          <i class="{{= it.icons.add_group }}"></i> {{= it.translate("add_group") }} \
+          <i class="{{= it.icons.add_group }}" title="{{= it.translate("add_group_title") }}"></i> {{= it.translate("add_group") }} \
         </button> \
       {{?}} \
       {{? it.level>1 }} \
         <button type="button" class="btn btn-xs btn-danger" data-delete="group"> \
-          <i class="{{= it.icons.remove_group }}"></i> {{= it.translate("delete_group") }} \
+          <i class="{{= it.icons.remove_group }}" title="{{= it.translate("delete_group_title") }}" ></i> {{= it.translate("delete_group") }} \
         </button> \
       {{?}} \
     </div> \
@@ -2721,7 +2721,7 @@ QueryBuilder.templates.rule = '\
   <div class="rule-header"> \
     <div class="btn-group pull-right rule-actions"> \
       <button type="button" class="btn btn-xs btn-danger" data-delete="rule"> \
-        <i class="{{= it.icons.remove_rule }}"></i> {{= it.translate("delete_rule") }} \
+        <i class="{{= it.icons.remove_rule }}" title="{{= it.translate("delete_rule_title") }}" ></i> {{= it.translate("delete_rule") }} \
       </button> \
     </div> \
   </div> \
@@ -4282,13 +4282,13 @@ QueryBuilder.define('collapse-groups', function(options) {
 
     // Collapse any groups that were saved as collapsed
     this.on('afterSetRules', function() {
-        $.each($(Selectors.group_container), function(i, el) {
+        $.each(self.$el.find(Selectors.group_container), function(i, el) {
             var group = self.getModel($(el));
             if (group.collapsed) {
-                self.collapse($(el).find('[data-collapse="group"]'), options);
+                self.collapse($(el).find('[data-collapse="group"]:first'), options);
             }
             if (group.name) {
-                $(el).find('.group-name').val(group.name);
+                $(el).find('.group-name:first').val(group.name);
             }
         });
     });
@@ -4347,10 +4347,10 @@ QueryBuilder.extend({
         var selectors = QueryBuilder.selectors;
         var $iconEl = $el.find('i');
 
-        $el.closest(selectors.group_container).find(selectors.rules_list).slideToggle('fast');
-        $el.parent().parent().find(selectors.group_condition).parent().parent().toggleClass("collapsed");
-        $el.parent().parent().find(selectors.add_rule).toggleClass("collapsed");
-        $el.parent().parent().find(selectors.add_group).toggleClass("collapsed");
+        $el.closest(selectors.group_container).find(selectors.rules_list+':first').slideToggle('fast');
+        $el.parent().parent().find(selectors.group_condition+':first').parent().parent().toggleClass("collapsed");
+        $el.parent().parent().find(selectors.add_rule+':first').toggleClass("collapsed");
+        $el.parent().parent().find(selectors.add_group+':first').toggleClass("collapsed");
 
         $iconEl.toggleClass(options.iconUp).toggleClass(options.iconDown);
     },
@@ -5780,6 +5780,13 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                     if (sql === undefined) {
                         Utils.error('UndefinedSQLOperator', 'Unknown SQL operation for operator "{0}"', rule.operator);
                     }
+                    var sqlFn;
+
+                    if (typeof sql.sqlFn == 'function' ){
+                        sqlFn = function(v) {
+                            return sql.sqlFn(rule.value);
+                        };
+                    } else {
 
                     if (ope.nb_inputs !== 0) {
                         if (!(rule.value instanceof Array)) {
@@ -5806,7 +5813,7 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                                 value += stmt.add(rule, v);
                             }
                             else {
-                            	if (sql.ic) {
+                            	if (sql.ic || rule.data.ignore_case===true) {
 	                            	if (sql.sep) {
 		                            	if (typeof v === 'string') { 
 		                            		v = v.split(',').map(function(e) { return '\'' + e.trim().toLowerCase()+ '\'';});
@@ -5815,8 +5822,8 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
 		  				    	v = v.map(function(e) { return e.toString().trim().toLowerCase();});
 		  			        }
 	                            	} else {
-	                            		v = v.toLowerCase();
 	                            		if (typeof v == 'string') {
+											v = v.toLowerCase();
 	                                    	v = '\'' + v + '\'';
 	                                    }
 	                            	}
@@ -5873,12 +5880,12 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                         });
                     }
 
-                    var sqlFn = function(v) {
+                    sqlFn = function(v) {
                         return sql.op.replace('?', function() {
                             return v;
                         });
                     };
-
+                    }
                     /**
                      * Modifies the SQL field used by a rule
                      * @event changer:getSQLField
@@ -5888,10 +5895,16 @@ QueryBuilder.extend(/** @lends module:plugins.SqlSupport.prototype */ {
                      * @returns {string}
                      */
                     var field = self.change('getSQLField', rule.field, rule);
-		    if (sql.ic) {
-			field = "LOWER("+field+")";
-		    }
-                    var ruleExpression = field + ' ' + sqlFn(value);
+                    if (sql.ic || rule.data.ignore_case===true) {
+                        field = "LOWER("+field+")";
+                    }
+
+                    var ruleExpression;
+                    if (typeof sql.sqlFullFn === 'function' ){
+                        ruleExpression = sql.sqlFullFn(field, value, rule.value);
+                    } else {
+                        ruleExpression = field + ' ' + sqlFn(value);
+                    }
 
                     /**
                      * Modifies the SQL generated for a rule
@@ -6324,7 +6337,7 @@ QueryBuilder.extend(/** @lends module:plugins.UniqueFilter.prototype */ {
 
 
 /*!
- * jQuery QueryBuilder 2.5.2.7
+ * jQuery QueryBuilder 2.5.2.16
  * Locale: English (en)
  * Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
  * Licensed under MIT (https://opensource.org/licenses/MIT)
@@ -6337,6 +6350,10 @@ QueryBuilder.regional['en'] = {
   "add_group": "Add group",
   "delete_rule": "Delete",
   "delete_group": "Delete",
+  "add_rule_title": "Add rule",
+  "add_group_title": "Add group",
+  "delete_rule_title": "Delete rule",
+  "delete_group_title": "Delete group",
   "conditions": {
     "AND": "AND",
     "OR": "OR"