Merge branch 'develop'

Author: radiolips

.eslintignore

@@ -0,0 +1,3 @@
+dist/*.js
+demo/*
+spec/*

.eslintrc.json

@@ -0,0 +1,20 @@
+{
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "es6": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "sourceType": "module"
+  },
+  "rules": {
+    "indent": ["error", 2],
+    "max-len": ["error", 180],
+    "camelcase": "error",
+    "no-trailing-spaces": "error"
+  }
+} 

.jscsrc

@@ -1,11 +1,10 @@
-// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+/*eslint-disable camelcase */
 module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-jscs');
+  grunt.loadNpmTasks('grunt-eslint');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-protractor-runner');
   grunt.loadNpmTasks('grunt-contrib-connect');
@@ -37,6 +36,7 @@ module.exports = function(grunt) {
       dist: {
         files: {
           'dist/gridstack.js': ['src/gridstack.js'],
+          'dist/gridstack.d.ts': ['src/gridstack.d.ts'],
           'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
         }
       }
@@ -57,12 +57,8 @@ module.exports = function(grunt) {
       }
     },
 
-    jshint: {
-      all: ['src/*.js']
-    },
-
-    jscs: {
-      all: ['*.js', 'src/*.js', ],
+    eslint: {
+      target: ['*.js', 'src/*.js']
     },
 
     watch: {
@@ -106,7 +102,8 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.registerTask('lint', ['jshint', 'jscs']);
-  grunt.registerTask('default', ['sass', 'cssmin', 'jshint', 'jscs', 'copy', 'uglify']);
+  grunt.registerTask('lint', ['eslint']);
+  grunt.registerTask('default', ['sass', 'cssmin', 'eslint', 'copy', 'uglify']);
   grunt.registerTask('e2e-test', ['connect', 'protractor_webdriver', 'protractor']);
 };
+/*eslint-enable camelcase */

Gruntfile.js

@@ -69,9 +69,9 @@ Usage
 * Using CDN:
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].1/dist/gridstack.min.css" />
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/gridstack.min.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/gridstack.jQueryUI.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.min.css" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/gridstack.jQueryUI.min.js"></script>
 ```
 
 * Using bower:

README.md

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.1-dev",
+  "version": "0.5.2-dev",
   "homepage": "https://github.com/gridstack/gridstack.js",
   "authors": [
     "Pavel Reznikov <[email protected]>",

bower.json

@@ -75,8 +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></div>'),
-            node.x, node.y, node.width, node.height);
+          this.grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'), node);
           return false;
         }.bind(this);
 

demo/float.html

@@ -107,8 +107,7 @@ <h1>Responsive grid demo</h1>
           this.grid.removeAll();
           var items = GridStackUI.Utils.sort(this.serializedData);
           items.forEach(function (node, i) {
-            this.grid.addWidget($('<div><div class="grid-stack-item-content">' + i + '</div></div>'),
-              node.x, node.y, node.width, node.height);
+            this.grid.addWidget($('<div><div class="grid-stack-item-content">' + i + '</div></div>'), node);
           }.bind(this));
           return false;
         }.bind(this);

demo/responsive.html

@@ -77,8 +77,7 @@ <h1>Serialization demo</h1>
                     this.grid.removeAll();
                     var items = GridStackUI.Utils.sort(this.serializedData);
                     items.forEach(function (node) {
-                        this.grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'),
-                            node.x, node.y, node.width, node.height);
+                        this.grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'), node);
                     }, this);
                     return false;
                 }.bind(this);

demo/serialization.html

@@ -18,8 +18,8 @@
     <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>
+    <script src="../src/gridstack.js"></script>
+    <script src="../src/gridstack.jQueryUI.js"></script>
 
     <style type="text/css">
         #grid1 {
@@ -129,8 +129,7 @@ <h1>Two grids demo</h1>
                 var grid = $(this).data('gridstack');
 
                 items.forEach(function (node) {
-                    grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'),
-                        node.x, node.y, node.width, node.height);
+                    grid.addWidget($('<div><div class="grid-stack-item-content"></div></div>'), node);
                 });
             });