next version is 2.0.1

mistic100 · Apr 8, 2015 · f81d0d2 · f81d0d2
1 parent 14c9934
commit f81d0d2
Show file tree

Hide file tree

Showing 25 changed files with 55 additions and 49 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jQuery-QueryBuilder",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "email": "[email protected]",

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mistic100/jquery-querybuilder",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "authors": [{
     "name": "Damien \"Mistic\" Sorel",
     "email": "[email protected]",

diff --git a/dist/css/query-builder.dark.css b/dist/css/query-builder.dark.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/css/query-builder.dark.min.css b/dist/css/query-builder.dark.min.css
diff --git a/dist/css/query-builder.default.css b/dist/css/query-builder.default.css
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/css/query-builder.default.min.css b/dist/css/query-builder.default.min.css
diff --git a/dist/i18n/da.js b/dist/i18n/da.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Oversat af Jna Borup Coyle, [email protected]
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/de.js b/dist/i18n/de.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * German translation by "raimu"
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/en.js b/dist/i18n/en.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Reference language file
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/es.js b/dist/i18n/es.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Spanish translation by "pyarza"
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/fr.js b/dist/i18n/fr.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * French translation by Damien "Mistic" Sorel
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/it.js b/dist/i18n/it.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Italian translation
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/nl.js b/dist/i18n/nl.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Dutch translation by "Roywcm"
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/no.js b/dist/i18n/no.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Oversat af Jna Borup Coyle, [email protected]
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/pl.js b/dist/i18n/pl.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Polish translation by Artur Smolarek
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/pt-BR.js b/dist/i18n/pt-BR.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Portuguese Brazilian translation by Leandro Gehlen ([email protected])
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/ro.js b/dist/i18n/ro.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Romanian translation by ArianServ
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/i18n/ru.js b/dist/i18n/ru.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Локализационный файл
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/js/query-builder.js b/dist/js/query-builder.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
@@ -771,7 +771,9 @@ QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
         if ($valueContainer.is(':empty') || rule.operator.nb_inputs !== previousOperator.nb_inputs) {
             this.createRuleInput(rule);
         }
+    }
 
+    if (rule.operator) {
         rule.$el.find('.rule-operator-container [name$=_operator]').val(rule.operator.type);
     }
 
@@ -1076,9 +1078,6 @@ QueryBuilder.prototype.setRules = function(data) {
                 if (rule.id === undefined) {
                     error('Missing rule field id');
                 }
-                if (rule.value === undefined) {
-                    rule.value = '';
-                }
                 if (rule.operator === undefined) {
                     rule.operator = 'equal';
                 }
@@ -1096,7 +1095,7 @@ QueryBuilder.prototype.setRules = function(data) {
                     model.data = rule.data;
                 }
 
-                if (model.operator.nb_inputs !== 0) {
+                if (model.operator.nb_inputs !== 0 && rule.value !== undefined) {
                     that.setRuleValue(model, rule.value);
                 }
             }
@@ -2890,13 +2889,15 @@ QueryBuilder.define('sortable', function(options) {
 
             src = Model(e.target);
 
-            var ph = $('<div class="rule-placeholder">&nbsp;</div>');
-            ph.css('min-height', src.$el.height());
+            // Chrome glitchs
+            // - helper invisible if hidden immediately
+            // - "dragend" is called immediately if we modify the DOM directly
+            setTimeout(function() {
+                var ph = $('<div class="rule-placeholder">&nbsp;</div>');
+                ph.css('min-height', src.$el.height());
 
-            placeholder = src.parent.addRule(ph, src.getPos());
+                placeholder = src.parent.addRule(ph, src.getPos());
 
-            // Chrome glitch (helper invisible if hidden immediately)
-            setTimeout(function() {
                 src.$el.hide();
             }, 0);
         });
@@ -2906,7 +2907,9 @@ QueryBuilder.define('sortable', function(options) {
             e.preventDefault();
             e.stopPropagation();
 
-            moveSortableToTarget(placeholder, $(e.target));
+            if (placeholder) {
+                moveSortableToTarget(placeholder, $(e.target));
+            }
         });
 
         // dragover: prevent glitches

diff --git a/dist/js/query-builder.min.js b/dist/js/query-builder.min.js
diff --git a/dist/js/query-builder.standalone.js b/dist/js/query-builder.standalone.js
@@ -124,7 +124,7 @@
 }));
 
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */
@@ -896,7 +896,9 @@ QueryBuilder.prototype.updateRuleOperator = function(rule, previousOperator) {
         if ($valueContainer.is(':empty') || rule.operator.nb_inputs !== previousOperator.nb_inputs) {
             this.createRuleInput(rule);
         }
+    }
 
+    if (rule.operator) {
         rule.$el.find('.rule-operator-container [name$=_operator]').val(rule.operator.type);
     }
 
@@ -1201,9 +1203,6 @@ QueryBuilder.prototype.setRules = function(data) {
                 if (rule.id === undefined) {
                     error('Missing rule field id');
                 }
-                if (rule.value === undefined) {
-                    rule.value = '';
-                }
                 if (rule.operator === undefined) {
                     rule.operator = 'equal';
                 }
@@ -1221,7 +1220,7 @@ QueryBuilder.prototype.setRules = function(data) {
                     model.data = rule.data;
                 }
 
-                if (model.operator.nb_inputs !== 0) {
+                if (model.operator.nb_inputs !== 0 && rule.value !== undefined) {
                     that.setRuleValue(model, rule.value);
                 }
             }
@@ -3015,13 +3014,15 @@ QueryBuilder.define('sortable', function(options) {
 
             src = Model(e.target);
 
-            var ph = $('<div class="rule-placeholder">&nbsp;</div>');
-            ph.css('min-height', src.$el.height());
+            // Chrome glitchs
+            // - helper invisible if hidden immediately
+            // - "dragend" is called immediately if we modify the DOM directly
+            setTimeout(function() {
+                var ph = $('<div class="rule-placeholder">&nbsp;</div>');
+                ph.css('min-height', src.$el.height());
 
-            placeholder = src.parent.addRule(ph, src.getPos());
+                placeholder = src.parent.addRule(ph, src.getPos());
 
-            // Chrome glitch (helper invisible if hidden immediately)
-            setTimeout(function() {
                 src.$el.hide();
             }, 0);
         });
@@ -3031,7 +3032,9 @@ QueryBuilder.define('sortable', function(options) {
             e.preventDefault();
             e.stopPropagation();
 
-            moveSortableToTarget(placeholder, $(e.target));
+            if (placeholder) {
+                moveSortableToTarget(placeholder, $(e.target));
+            }
         });
 
         // dragover: prevent glitches

diff --git a/dist/js/query-builder.standalone.min.js b/dist/js/query-builder.standalone.min.js
diff --git a/dist/scss/dark.scss b/dist/scss/dark.scss
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/dist/scss/default.scss b/dist/scss/default.scss
@@ -1,5 +1,5 @@
 /*!
- * jQuery QueryBuilder 2.0.0
+ * jQuery QueryBuilder 2.0.1
  * Copyright 2014-2015 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
  * Licensed under MIT (http://opensource.org/licenses/MIT)
  */

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jQuery-QueryBuilder",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": {
     "name": "Damien \"Mistic\" Sorel",
     "email": "[email protected]",