Merge branch 'develop'

Author: radiolips

.gitignore

@@ -1,3 +1,4 @@
+dist
 node_modules
 bower_components
 coverage

.travis.yml

@@ -6,25 +6,25 @@ sudo: required
 addons:
   chrome: stable
 #before_install:
-#- npm install -g protractor@3.3.0
+#- yarn global add protractor@3.3.0
 cache:
   directories:
     - node_modules
 install:
-#- npm install -g npm@6.0.1
-- npm install -g grunt-cli
-- npm install -g bower
-#- npm install selenium-webdriver
-- npm install
+#- yarn global add npm@6.0.1
+- yarn global add grunt-cli
+- yarn global add bower
+#- yarn add selenium-webdriver
+- yarn
 - bower 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
 script:
-- npm run build
-- npm test
+- yarn build
+- yarn test
 # - grunt e2e-test
 notifications:
   slack:

PULL_REQUEST_TEMPLATE.md

@@ -3,5 +3,5 @@ Please explain the changes you made here. Include an example of what your change
 
 ### Checklist
 - [ ] Created tests which fail without the change (if possible)
-- [ ] All tests passing (`npm test`)
+- [ ] All tests passing (`yarn test`)
 - [ ] Extended the README / documentation, if necessary

README.md

@@ -16,7 +16,7 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
-- [gridstack.js News](#gridstackjs-news)
+<!--- [gridstack.js News](#gridstackjs-news) -->
 - [Demo and examples](#demo-and-examples)
 - [Usage](#usage)
   - [Requirements](#requirements)
@@ -36,15 +36,15 @@ Join gridstack.js on Slack: https://gridstackjs.troolee.com
 - [Changes](#changes)
 - [The Team](#the-team)
 
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+<!-- END doctoc generated TOC please keep comment here to allow auto update 
 
 
 gridstack.js News
 =====
 
 Version 1.0 is coming! Check out the blog post here for more information:
 [https://dylandreams.com/2017/04/26/gridstack-10-coming-soon/](https://dylandreams.com/2017/04/26/gridstack-10-coming-soon/) and [subscribe to the blog](https://dylandreams.com) for more gridstack news and tutorials.
-
+-->
 
 Demo and examples
 ====
@@ -57,10 +57,8 @@ Usage
 
 ## Requirements
 
-* [lodash.js](https://lodash.com) (>= 4.17.10, full build)
 * [jQuery](http://jquery.com) (>= 3.1.0)
-
-Note: You can still use [underscore.js](http://underscorejs.org) (>= 1.7.0) instead of lodash.js
+* `Array.prototype.find` for IE and older browsers ([core.js](https://github.com/zloirock/core-js#ecmascript-6-array) allows to include specific polyfills)
 
 #### Using gridstack.js with jQuery UI
 
@@ -80,9 +78,9 @@ Note: You can still use [underscore.js](http://underscorejs.org) (>= 1.7.0) inst
 * Using CDN:
 
 ```html
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.4.0/gridstack.min.css" />
-<script type="text/javascript" src='//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.4.0/gridstack.min.js'></script>
-<script type="text/javascript" src='//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.4.0/gridstack.jQueryUI.min.js'></script>
+<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.5.0/gridstack.min.css" />
+<script type="text/javascript" src='//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.5.0/gridstack.min.js'></script>
+<script type="text/javascript" src='//cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.5.0/gridstack.jQueryUI.min.js'></script>
 ```
 
 * Using bower:
@@ -99,7 +97,7 @@ $ bower install gridstack
 $ npm install gridstack
 ```
 
-You can download files from `dist` directory as well.
+You can download source and build and use `dist` directory as well for latest non published code.
 
 ## Basic usage
 
@@ -156,7 +154,7 @@ Please use [jQuery UI Touch Punch](https://github.com/furf/jquery-ui-touch-punch
 working on touch-based devices.
 
 ```html
-<script src="lodash.min.js"></script>
+<script src="core-js/client/shim.min.js"></script>
 <script src="jquery.min.js"></script>
 <script src="jquery-ui.min.js"></script>
 <script src="jquery.ui.touch-punch.min.js"></script>
@@ -311,11 +309,13 @@ for i in range(N):
 There are at least two more issues with gridstack in IE8 with jQueryUI resizable (it seems it doesn't work) and
 droppable. If you have any suggestions about support of IE8 you are welcome here: https://github.com/gridstack/gridstack.js/issues/76
 
+<!-- fixed in 0.5.0 with #643 ?
 ## Use with require.js
 
 If you're using require.js and a single file jQueryUI please check out this
 [Stackoverflow question](http://stackoverflow.com/questions/35582945/redundant-dependencies-with-requirejs) to get it
 working properly.
+-->
 
 Changes
 =====

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "1.0.0-dev",
+  "version": "0.5.0",
   "homepage": "https://github.com/gridstack/gridstack.js",
   "authors": [
     "Pavel Reznikov <pashka.reznikov@gmail.com>",
@@ -15,7 +15,6 @@
     "amd"
   ],
   "dependencies": {
-    "lodash": ">= 4.17.10",
     "jquery": ">= 3.1.0",
     "jquery-ui": ">= 1.12.0"
   },

demo/anijs.html

@@ -10,15 +10,15 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>AniJS demo</title>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
     <link rel="stylesheet" href="../dist/gridstack.css"/>
     <link rel="stylesheet" href="https://anijs.github.io/lib/anicollection/anicollection.css" />
 
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.0/lodash.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.6.9/shim.min.js"></script>
     <script src="../dist/gridstack.js"></script>
     <script src="../dist/gridstack.jQueryUI.js"></script>
 
@@ -86,4 +86,4 @@ <h4>Widget added</h4>
         });
     </script>
 </body>
-</html>
+</html>

demo/float.html

@@ -10,13 +10,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Float grid demo</title>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="../dist/gridstack.css"/>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.0/lodash.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.6.9/shim.min.js"></script>
     <script src="../dist/gridstack.js"></script>
     <script src="../dist/gridstack.jQueryUI.js"></script>
 
@@ -75,7 +75,7 @@ <h1>Float grid demo</h1>
                                 width: 1 + 3 * Math.random(),
                                 height: 1 + 3 * Math.random()
                             };
-                    this.grid.addWidget($('<div><div class="grid-stack-item-content" /><div/>'),
+                    this.grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'),
                         node.x, node.y, node.width, node.height);
                     return false;
                 }.bind(this);

demo/knockout.html

@@ -10,14 +10,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Knockout.js demo</title>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="../dist/gridstack.css"/>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.0/lodash.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.6.9/shim.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
     <script src="../dist/gridstack.js"></script>
     <script src="../dist/gridstack.jQueryUI.js"></script>
 
@@ -63,7 +63,7 @@ <h1>knockout.js Demo</h1>
                                 }).data('gridstack');
                             }
 
-                            var item = _.find(items, function (i) { return i.nodeType == 1 });
+                            var item = items.find(function (i) { return i.nodeType == 1 });
                             grid.addWidget(item);
                             ko.utils.domNodeDisposal.addDisposeCallback(item, function () {
                                 grid.removeWidget(item);

demo/knockout2.html

@@ -10,14 +10,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Knockout.js demo</title>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="../dist/gridstack.css"/>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.0/lodash.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.2.0/knockout-min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.6.9/shim.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/knockout/3.5.0/knockout-min.js"></script>
     <script src="../dist/gridstack.js"></script>
     <script src="../dist/gridstack.jQueryUI.js"></script>
 
@@ -63,7 +63,7 @@ <h1>knockout.js Demo</h1>
                                 }).data('gridstack');
                             }
 
-                            var item = _.find(items, function (i) { return i.nodeType == 1 });
+                            var item = items.find(function (i) { return i.nodeType == 1 });
                             grid.addWidget(item);
                             ko.utils.domNodeDisposal.addDisposeCallback(item, function () {
                                 grid.removeWidget(item);

demo/nested.html

@@ -10,13 +10,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Nested grids demo</title>
 
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
     <link rel="stylesheet" href="../dist/gridstack.css"/>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.0/lodash.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.6.9/shim.min.js"></script>
     <script src="../dist/gridstack.js"></script>
     <script src="../dist/gridstack.jQueryUI.js"></script>