Merge commit 'f29236a78fa14795745d36efcb79ee20e02e947b'

radiolips · radiolips · commit d3b77baf8c20 · 2016-08-10T12:45:43.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,35 +1,31 @@
 language: node_js
-
 node_js:
-    - "5.7.0"
-
+- 5.7.0
 env:
-    - CXX=g++-4.8
-
+- CXX=g++-4.8
 addons:
-    apt:
-        sources:
-            - ubuntu-toolchain-r-test
-        packages:
-            - g++-4.8
-
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
 before_install:
-    - npm install -g protractor
-
+- npm install -g protractor
 install:
-    - npm install -g npm@2
-    - npm install -g grunt-cli
-    - npm install -g bower
-    - bower install
-    - npm install
-    - ./node_modules/protractor/bin/webdriver-manager update --standalone
-
+- npm install -g npm@2
+- npm install -g grunt-cli
+- npm install -g bower
+- bower install
+- npm install
+- ./node_modules/protractor/bin/webdriver-manager update --standalone
 before_script:
-    - export CHROME_BIN=chromium-browser
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
 script:
-    - npm run build
-    - npm test
-    - grunt e2e-test
+- npm run build
+- npm test
+- grunt e2e-test
+notifications:
+  slack:
+    secure: iGLGsYyVIyKVpVVCskGh/zc6Pkqe0D7jpUtbywSbnq6l5seE6bvBVqm0F2FSCIN+AIC+qal2mPEWysDVsLACm5tTEeA8NfL8dmCrAKbiFbi+gHl4mnHHCHl7ii/7UkoIIXNc5UXbgMSXRS5l8UcsSDlN8VxC5zWstbJvjeYIvbA=
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ gridstack.js
 gridstack.js is a jQuery plugin for widget layout. This is drag-and-drop multi-column grid. It allows you to build
 draggable responsive bootstrap v3 friendly layouts. It also works great with [knockout.js](http://knockoutjs.com), [angular.js](https://angularjs.org) and touch devices.
 
-Inspired by [gridster.js](http://gridster.net). Built with love.
+Inspired by [gridster.js](https://github.com/ducksboard/gridster.js). Built with love.
 
 Join gridstack.js on Slack: https://gridstackjs.troolee.com
 
@@ -45,6 +45,7 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
   - [Using AniJS](#using-anijs)
 - [The Team](#the-team)
 - [Changes](#changes)
+      - [v0.2.6-dev (Development version)](#v026-dev-development-version)
       - [v0.2.5 (2016-03-02)](#v025-2016-03-02)
       - [v0.2.4 (2016-02-15)](#v024-2016-02-15)
       - [v0.2.3 (2015-06-23)](#v023-2015-06-23)
@@ -69,8 +70,8 @@ Usage
 ## Requirements
 
 * [lodash.js](https://lodash.com) (>= 3.5.0, full build)
-* [jQuery](http://jquery.com) (>= 1.11.0)
-* [jQuery UI](http://jqueryui.com) (>= 1.11.0). Minimum required components: Core, Widget, Mouse, Draggable, Resizable
+* [jQuery](http://jquery.com) (>= 3.1.0)
+* [jQuery UI](http://jqueryui.com) (>= 1.12.0). Minimum required components: Core, Widget, Mouse, Draggable, Resizable
 * (Optional) [jquery-ui-touch-punch](https://github.com/furf/jquery-ui-touch-punch) for touch-based devices support
 
 Note: You can still use [underscore.js](http://underscorejs.org) (>= 1.7.0) instead of lodash.js
@@ -473,6 +474,11 @@ for help.
 Changes
 =======
 
+#### v0.2.6-dev (Development version)
+
+- update requirements to the latest versions
+- fix jQuery `size()`
+
 #### v0.2.5 (2016-03-02)
 
 - update names to respect js naming convention.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.2.5",
+  "version": "0.2.6-dev",
   "homepage": "https://github.com/troolee/gridstack.js",
   "authors": [
     "Pavel Reznikov <pashka.reznikov@gmail.com>"
@@ -14,9 +14,9 @@
     "amd"
   ],
   "dependencies": {
-    "lodash": ">= 3.5.0",
-    "jquery": ">= 1.11.0",
-    "jquery-ui": ">= 1.11.0"
+    "lodash": ">= 4.14.2",
+    "jquery": ">= 3.1.0",
+    "jquery-ui": ">= 1.12.0"
   },
   "keywords": [
     "gridstack",
diff --git a/dist/gridstack.js b/dist/gridstack.js
@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.2.5
+ * gridstack.js 0.2.6-dev
  * http://troolee.github.io/gridstack.js/
  * (c) 2014-2016 Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
@@ -508,7 +508,7 @@
         // jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 
         opts.itemClass = opts.itemClass || 'grid-stack-item';
-        var isNested = this.container.closest('.' + opts.itemClass).size() > 0;
+        var isNested = this.container.closest('.' + opts.itemClass).length > 0;
 
         this.opts = _.defaults(opts || {}, {
             width: parseInt(this.container.attr('data-gs-width')) || 12,
@@ -684,22 +684,22 @@
                 });
             }
             trashZone
-              .on('dropover', function(event, ui) {
-                  var el = $(ui.draggable);
-                  var node = el.data('_gridstack_node');
-                  if (node._grid !== self) {
-                      return;
-                  }
-                  self._setupRemovingTimeout(el);
-              })
-              .on('dropout', function(event, ui) {
-                  var el = $(ui.draggable);
-                  var node = el.data('_gridstack_node');
-                  if (node._grid !== self) {
-                      return;
-                  }
-                  self._clearRemovingTimeout(el);
-              });
+                .on('dropover', function(event, ui) {
+                    var el = $(ui.draggable);
+                    var node = el.data('_gridstack_node');
+                    if (node._grid !== self) {
+                        return;
+                    }
+                    self._setupRemovingTimeout(el);
+                })
+                .on('dropout', function(event, ui) {
+                    var el = $(ui.draggable);
+                    var node = el.data('_gridstack_node');
+                    if (node._grid !== self) {
+                        return;
+                    }
+                    self._clearRemovingTimeout(el);
+                });
         }
 
         if (!self.opts.staticGrid && self.opts.acceptWidgets) {
diff --git a/dist/gridstack.min.js b/dist/gridstack.min.js
diff --git a/dist/gridstack.min.map b/dist/gridstack.min.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.2.5",
+  "version": "0.2.6-dev",
   "description": "gridstack.js is a jQuery plugin for widget layout",
   "main": "dist/gridstack.js",
   "repository": {
@@ -25,9 +25,9 @@
   },
   "homepage": "http://troolee.github.io/gridstack.js/",
   "dependencies": {
-    "jquery": "^2.2.1",
-    "jquery-ui": "^1.10.5",
-    "lodash": "^4.5.1"
+    "jquery": "^3.1.0",
+    "jquery-ui": "^1.12.0",
+    "lodash": "^4.14.2"
   },
   "devDependencies": {
     "connect": "^3.4.1",
@@ -42,14 +42,14 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt-doctoc": "^0.1.1",
     "grunt-jscs": "^2.8.0",
-    "grunt-protractor-runner": "^3.0.0",
+    "grunt-protractor-runner": "^3.2.0",
     "grunt-protractor-webdriver": "^0.2.5",
     "grunt-sass": "^1.1.0",
     "jasmine-core": "^2.4.1",
-    "karma": "^0.13.22",
-    "karma-coverage": "^0.5.5",
+    "karma": "^1.1.2",
+    "karma-coverage": "^1.1.1",
     "karma-coveralls": "^1.1.2",
-    "karma-jasmine": "^0.3.7",
+    "karma-jasmine": "^1.0.2",
     "karma-phantomjs-launcher": "^1.0.0",
     "phantomjs-prebuilt": "^2.1.5",
     "serve-static": "^1.10.2"
diff --git a/spec/utils-spec.js b/spec/utils-spec.js
@@ -67,14 +67,14 @@ describe('gridstack utils', function() {
 
             var style = $('STYLE[data-gs-style-id=' + _id + ']');
 
-            expect(style.size()).toEqual(1);
+            expect(style.length).toEqual(1);
             expect(style.prop('tagName')).toEqual('STYLE');
 
             utils.removeStylesheet(_id)
 
             style = $('STYLE[data-gs-style-id=' + _id + ']');
 
-            expect(style.size()).toEqual(0);
+            expect(style.length).toEqual(0);
         });
 
     });
diff --git a/src/gridstack.js b/src/gridstack.js
@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.2.5
+ * gridstack.js 0.2.6-dev
  * http://troolee.github.io/gridstack.js/
  * (c) 2014-2016 Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
@@ -511,7 +511,7 @@
         // jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 
         opts.itemClass = opts.itemClass || 'grid-stack-item';
-        var isNested = this.container.closest('.' + opts.itemClass).size() > 0;
+        var isNested = this.container.closest('.' + opts.itemClass).length > 0;
 
         this.opts = _.defaults(opts || {}, {
             width: parseInt(this.container.attr('data-gs-width')) || 12,
@@ -687,22 +687,22 @@
                 });
             }
             trashZone
-              .on('dropover', function(event, ui) {
-                  var el = $(ui.draggable);
-                  var node = el.data('_gridstack_node');
-                  if (node._grid !== self) {
-                      return;
-                  }
-                  self._setupRemovingTimeout(el);
-              })
-              .on('dropout', function(event, ui) {
-                  var el = $(ui.draggable);
-                  var node = el.data('_gridstack_node');
-                  if (node._grid !== self) {
-                      return;
-                  }
-                  self._clearRemovingTimeout(el);
-              });
+                .on('dropover', function(event, ui) {
+                    var el = $(ui.draggable);
+                    var node = el.data('_gridstack_node');
+                    if (node._grid !== self) {
+                        return;
+                    }
+                    self._setupRemovingTimeout(el);
+                })
+                .on('dropout', function(event, ui) {
+                    var el = $(ui.draggable);
+                    var node = el.data('_gridstack_node');
+                    if (node._grid !== self) {
+                        return;
+                    }
+                    self._clearRemovingTimeout(el);
+                });
         }
 
         if (!self.opts.staticGrid && self.opts.acceptWidgets) {
