chore: adapt code to updated dependencies

Author: mistic100

README.md

@@ -40,12 +40,12 @@ $ npm install jQuery-QueryBuilder
 
 jQuery-QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder).
 ### Dependencies
- * jQuery >= 1.10
- * Bootstrap >= 3.1 (CSS only)
+ * [jQuery 3](https://jquery.com)
+ * [Bootstrap 3](https://getbootstrap.com/docs/3.3) (CSS only)
  * [jQuery.extendext](https://github.com/mistic100/jQuery.extendext)
  * [doT.js](http://olado.github.io/doT)
  * [MomentJS](http://momentjs.com) (optional, for Date/Time validation)
- * [SQL Parser](https://github.com/mistic100/sql-parser) (option, for SQL methods)
+ * [SQL Parser](https://github.com/mistic100/sql-parser) (optional, for SQL methods)
  * Other Bootstrap/jQuery plugins used by plugins
 
 ($.extendext and doT.js are directly included in the [standalone](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/dist/js/query-builder.standalone.js) file)

package.json

@@ -9,14 +9,14 @@
   "description": "jQuery plugin for user friendly query/filter creator",
   "main": "dist/js/query-builder.js",
   "dependencies": {
-    "bootstrap": ">=4.0.0",
+    "bootstrap": ">=3.1.0 <4",
     "dot": ">=1.0.3",
     "jquery": "^3.3.1",
     "jquery-extendext": ">=0.1.2",
     "moment": "^2.21.0"
   },
   "devDependencies": {
-    "awesome-bootstrap-checkbox": "^1.0.1",
+    "awesome-bootstrap-checkbox": "^0.3.7",
     "blanket": "^1.2.3",
     "bootbox": "^4.4.0",
     "bootstrap-select": "^1.12.4",

src/plugins/sortable/plugin.js

@@ -47,8 +47,8 @@ QueryBuilder.define('sortable', function(options) {
         // Configure drag
         if (!node.flags.no_sortable) {
             interact(node.$el[0])
-                .allowFrom(QueryBuilder.selectors.drag_handle)
                 .draggable({
+                    allowForm: QueryBuilder.selectors.drag_handle,
                     onstart: function(event) {
                         // get model of dragged element
                         src = self.getModel(event.target);

src/utils.js

@@ -111,24 +111,24 @@ Utils.changeType = function(value, type) {
     }
 
     switch (type) {
-    // @formatter:off
-    case 'integer':
-        if (typeof value === 'string' && !/^-?\d+$/.test(value)) {
-            return value;
-        }
-        return parseInt(value);
-    case 'double':
-        if (typeof value === 'string' && !/^-?\d+\.?\d*$/.test(value)) {
-            return value;
-        }
-        return parseFloat(value);
-    case 'boolean':
-        if (typeof value === 'string' && !/^(0|1|true|false){1}$/i.test(value)) {
-            return value;
-        }
-        return value === true || value === 1 || value.toLowerCase() === 'true' || value === '1';
-    default: return value;
-    // @formatter:on
+        // @formatter:off
+        case 'integer':
+            if (typeof value === 'string' && !/^-?\d+$/.test(value)) {
+                return value;
+            }
+            return parseInt(value);
+        case 'double':
+            if (typeof value === 'string' && !/^-?\d+\.?\d*$/.test(value)) {
+                return value;
+            }
+            return parseFloat(value);
+        case 'boolean':
+            if (typeof value === 'string' && !/^(0|1|true|false){1}$/i.test(value)) {
+                return value;
+            }
+            return value === true || value === 1 || value.toLowerCase() === 'true' || value === '1';
+        default: return value;
+        // @formatter:on
     }
 };
 
@@ -146,12 +146,12 @@ Utils.escapeString = function(value) {
         .replace(/[\0\n\r\b\\\'\"]/g, function(s) {
             switch (s) {
                 // @formatter:off
-            case '\0': return '\\0';
-            case '\n': return '\\n';
-            case '\r': return '\\r';
-            case '\b': return '\\b';
-            default:   return '\\' + s;
-            // @formatter:off
+                case '\0': return '\\0';
+                case '\n': return '\\n';
+                case '\r': return '\\r';
+                case '\b': return '\\b';
+                default:   return '\\' + s;
+                // @formatter:off
             }
         })
         // uglify compliant

tests/index.html

@@ -17,7 +17,6 @@
 
   <link rel="stylesheet" href="../dist/css/query-builder.default.css">
 
-  <script src="../node_modules/bind-polyfill/index.js"></script>
   <script src="../node_modules/jquery/dist/jquery.js"></script>
   <script src="../node_modules/qunit/qunit/qunit.js"></script>
   <script src="../node_modules/blanket/dist/qunit/blanket.js"></script>