Merge pull request #1075 from adumesny/develop

fix min file license, poly.js rename, @0.5.4

Author: Alain Dumesny

Gruntfile.js

@@ -12,9 +12,6 @@ module.exports = function(grunt) {
 
   grunt.initConfig({
     sass: {
-      options: {
-        outputStyle: 'expanded'
-      },
       dist: {
         files: {
           'dist/gridstack.css': 'src/gridstack.scss',
@@ -25,6 +22,9 @@ module.exports = function(grunt) {
 
     cssmin: {
       dist: {
+        options: {
+          keepSpecialComments: '*'
+        },
         files: {
           'dist/gridstack.min.css': ['dist/gridstack.css'],
           'dist/gridstack-extra.min.css': ['dist/gridstack-extra.css']
@@ -38,7 +38,7 @@ module.exports = function(grunt) {
           'dist/gridstack.js': ['src/gridstack.js'],
           'dist/gridstack.d.ts': ['src/gridstack.d.ts'],
           'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
-          'dist/gridstack.poly.js': ['src/gridstack.poly.js'],
+          'dist/gridstack-poly.js': ['src/gridstack-poly.js'],
           'dist/jquery-ui.js': ['src/jquery-ui.js'],
           'dist/jquery-ui.min.js': ['src/jquery-ui.min.js'],
         }
@@ -49,14 +49,16 @@ module.exports = function(grunt) {
       options: {
         sourceMap: true,
         sourceMapName: 'dist/gridstack.min.map',
-        preserveComments: 'some'
+        output: {
+          comments: 'some'
+        }
       },
       dist: {
         files: {
           'dist/gridstack.min.js': ['src/gridstack.js'],
           'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
-          'dist/gridstack.poly.min.js': ['src/gridstack.poly.js'],
-          'dist/gridstack.all.js': ['src/gridstack.poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
+          'dist/gridstack-poly.min.js': ['src/gridstack-poly.js'],
+          'dist/gridstack.all.js': ['src/gridstack-poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
         }
       }
     },

README.md

@@ -47,7 +47,7 @@ Usage
 
 * [jQuery](http://jquery.com) (>= 1.8)
 * `Array.prototype.find`, and `Number.isNaN()` for IE and older browsers.
-  * Note: as of v0.5.4 We supply a separate `gridstack.poly.js` for that 
+  * Note: as of v0.5.4 We supply a separate `gridstack-poly.js` for that 
 (part of `gridstack.all.js`) or you can look at other pollyfills 
 ([core.js](https://github.com/zloirock/core-js#ecmascript-6-array) and [mozilla.org](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find)).
 
@@ -62,17 +62,17 @@ Using gridstack.js with jQuery UI
 * Using CDN (minimized):
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.min.css" />
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.all.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.min.css" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.all.js"></script>
 ```
 
 * Using CDN (debug):
 
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.css" />
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/jquery-ui.js"></script>
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.jQueryUI.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.css" />
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/jquery-ui.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.jQueryUI.js"></script>
 ```
 
 * or local:
@@ -191,7 +191,7 @@ $('.grid-stack').gridstack( {column: N} );
 
 2) include `gridstack-extra.css` if **N < 12** (else custom CSS - see next). Without these, things will not render/work correctly.
 ```html
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack-extra.css"/>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack-extra.css"/>
 
 <div class="grid-stack grid-stack-N">...</div>
 ```

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.4",
+  "version": "0.5.4-dev",
   "homepage": "https://github.com/gridstack/gridstack.js",
   "authors": [
     "Pavel Reznikov <pashka.reznikov@gmail.com>",

doc/CHANGES.md

@@ -5,6 +5,7 @@ Change log
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
 
+- [v0.5.4-dev (upcoming changes)](#v054-dev-upcoming-changes)
 - [v0.5.4 (2019-11-26)](#v054-2019-11-26)
 - [v0.5.3 (2019-11-20)](#v053-2019-11-20)
 - [v0.5.2 (2019-11-13)](#v052-2019-11-13)
@@ -23,15 +24,19 @@ Change log
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+## v0.5.4-dev (upcoming changes)
+
+- min files include rev number/license
+
 ## v0.5.4 (2019-11-26)
 
 - fix for griditems with x=0 placement wrong order (introduced by [#1017](https://github.com/gridstack/gridstack.js/issues/10510174)) ([#1054](https://github.com/gridstack/gridstack.js/issues/1054)).
 - fix `cellHeight(val)` not working due to style change (introduced by [#937](https://github.com/gridstack/gridstack.js/issues/937)) ([#1068](https://github.com/gridstack/gridstack.js/issues/1068)).
-- add `gridstack.poly.js` for IE and older browsers, removed `core-js` lib from samples (<1k vs 85k), and all IE8 mentions ([#1061](https://github.com/gridstack/gridstack.js/pull/1061)).
+- add `gridstack-poly.js` for IE and older browsers, removed `core-js` lib from samples (<1k vs 85k), and all IE8 mentions ([#1061](https://github.com/gridstack/gridstack.js/pull/1061)).
 - add `jquery-ui.js` (and min.js) as minimal subset we need (55k vs 248k), which is now part of `gridstack.all.js`. Include individual parts if you need your own lib instead of all.js
 ([#1064](https://github.com/gridstack/gridstack.js/pull/1064)).
 - changed jquery dependency to lowest we can use (>=1.8) ([#629](https://github.com/gridstack/gridstack.js/issues/629)).
-- add advance demo from web site
+- add advance demo from web site ([#1073](https://github.com/gridstack/gridstack.js/issues/1073)).
 
 ## v0.5.3 (2019-11-20)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gridstack",
-  "version": "0.5.4",
+  "version": "0.5.4-dev",
   "description": "gridstack.js is a jQuery plugin for widget layout",
   "main": "dist/gridstack.js",
   "repository": {

src/gridstack-extra.scss

@@ -1,3 +1,10 @@
+/*!
+ * gridstack extra CSS for [1-11] columns (non default)
+ * https://gridstackjs.com/
+ * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
+ * gridstack.js may be freely distributed under the MIT license.
+*/
+
 $gridstack-columns: 12 !default;
 
 @mixin grid-stack-items($gridstack-columns) {

src/gridstack.poly.js src/gridstack-poly.jssrc/gridstack.poly.js renamed to src/gridstack-poly.js

@@ -1,12 +1,9 @@
+/** gridstack.js 0.5.4-dev - IE and older browsers Polyfills for this library @preserve*/
 /**
- * gridstack.js 0.5.4
  * https://gridstackjs.com/
- * (c) 2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
+ * (c) 2019 Alain Dumesny
  * gridstack.js may be freely distributed under the MIT license.
- * @preserve
- */
-
-// IE and older browsers Polyfills for this library
+*/
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isNaN
 Number.isNaN = Number.isNaN || function isNaN(input) {

src/gridstack.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Gridstack 0.5.4
+// Type definitions for Gridstack 0.5.4-dev
 // Project: https://gridstackjs.com/
 // Definitions by: Pascal Senn <https://github.com/PascalSenn>
 //                 Ricky Blankenaufulland <https://github.com/ZoolWay>

src/gridstack.jQueryUI.js

@@ -1,9 +1,8 @@
+/** gridstack.js 0.5.4-dev - JQuery UI Drag&Drop plugin @preserve */
 /**
- * gridstack.js 0.5.4
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.
- * @preserve
 */
 (function(factory) {
   if (typeof define === 'function' && define.amd) {

src/gridstack.js

@@ -1,5 +1,5 @@
 /**
- * gridstack.js 0.5.4
+ * gridstack.js 0.5.4-dev
  * https://gridstackjs.com/
  * (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
  * gridstack.js may be freely distributed under the MIT license.