Skip to content

Commit b12174a

Browse files
author
Alain Dumesny
committed
fix min file license, poly.js rename, @0.5.4
* @latest was causing issues (browser caching), switched to @0.5.4 includes * renamed gridstack.poly.js to -poly.js (match others) * fix uglify to keep license/rev text info again in .min.js files * CSS now also keep new license text * next rev prep
1 parent d6f590e commit b12174a

13 files changed

+49
-32
lines changed

‎Gruntfile.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ module.exports = function(grunt) {
1212

1313
grunt.initConfig({
1414
sass: {
15-
options: {
16-
outputStyle: 'expanded'
17-
},
1815
dist: {
1916
files: {
2017
'dist/gridstack.css': 'src/gridstack.scss',
@@ -25,6 +22,9 @@ module.exports = function(grunt) {
2522

2623
cssmin: {
2724
dist: {
25+
options: {
26+
keepSpecialComments: '*'
27+
},
2828
files: {
2929
'dist/gridstack.min.css': ['dist/gridstack.css'],
3030
'dist/gridstack-extra.min.css': ['dist/gridstack-extra.css']
@@ -38,7 +38,7 @@ module.exports = function(grunt) {
3838
'dist/gridstack.js': ['src/gridstack.js'],
3939
'dist/gridstack.d.ts': ['src/gridstack.d.ts'],
4040
'dist/gridstack.jQueryUI.js': ['src/gridstack.jQueryUI.js'],
41-
'dist/gridstack.poly.js': ['src/gridstack.poly.js'],
41+
'dist/gridstack-poly.js': ['src/gridstack-poly.js'],
4242
'dist/jquery-ui.js': ['src/jquery-ui.js'],
4343
'dist/jquery-ui.min.js': ['src/jquery-ui.min.js'],
4444
}
@@ -49,14 +49,16 @@ module.exports = function(grunt) {
4949
options: {
5050
sourceMap: true,
5151
sourceMapName: 'dist/gridstack.min.map',
52-
preserveComments: 'some'
52+
output: {
53+
comments: 'some'
54+
}
5355
},
5456
dist: {
5557
files: {
5658
'dist/gridstack.min.js': ['src/gridstack.js'],
5759
'dist/gridstack.jQueryUI.min.js': ['src/gridstack.jQueryUI.js'],
58-
'dist/gridstack.poly.min.js': ['src/gridstack.poly.js'],
59-
'dist/gridstack.all.js': ['src/gridstack.poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
60+
'dist/gridstack-poly.min.js': ['src/gridstack-poly.js'],
61+
'dist/gridstack.all.js': ['src/gridstack-poly.js', 'src/gridstack.js', 'src/jquery-ui.js', 'src/gridstack.jQueryUI.js']
6062
}
6163
}
6264
},

‎README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Usage
4747

4848
* [jQuery](http://jquery.com) (>= 1.8)
4949
* `Array.prototype.find`, and `Number.isNaN()` for IE and older browsers.
50-
* Note: as of v0.5.4 We supply a separate `gridstack.poly.js` for that
50+
* Note: as of v0.5.4 We supply a separate `gridstack-poly.js` for that
5151
(part of `gridstack.all.js`) or you can look at other pollyfills
5252
([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)).
5353

@@ -62,17 +62,17 @@ Using gridstack.js with jQuery UI
6262
* Using CDN (minimized):
6363

6464
```html
65-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.min.css" />
66-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.all.js"></script>
65+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.min.css" />
66+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.all.js"></script>
6767
```
6868

6969
* Using CDN (debug):
7070

7171
```html
72-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.css" />
73-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.js"></script>
74-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/jquery-ui.js"></script>
75-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack.jQueryUI.js"></script>
72+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.css" />
73+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.js"></script>
74+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/jquery-ui.js"></script>
75+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack.jQueryUI.js"></script>
7676
```
7777

7878
* or local:
@@ -191,7 +191,7 @@ $('.grid-stack').gridstack( {column: N} );
191191

192192
2) include `gridstack-extra.css` if **N < 12** (else custom CSS - see next). Without these, things will not render/work correctly.
193193
```html
194-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@latest/dist/gridstack-extra.css"/>
194+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/gridstack@0.5.4/dist/gridstack-extra.css"/>
195195

196196
<div class="grid-stack grid-stack-N">...</div>
197197
```

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gridstack",
3-
"version": "0.5.4",
3+
"version": "0.5.4-dev",
44
"homepage": "https://github.com/gridstack/gridstack.js",
55
"authors": [
66
"Pavel Reznikov <pashka.reznikov@gmail.com>",

‎doc/CHANGES.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Change log
55
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
66
**Table of Contents** *generated with [DocToc](http://doctoc.herokuapp.com/)*
77

8+
- [v0.5.4-dev (upcoming changes)](#v054-dev-upcoming-changes)
89
- [v0.5.4 (2019-11-26)](#v054-2019-11-26)
910
- [v0.5.3 (2019-11-20)](#v053-2019-11-20)
1011
- [v0.5.2 (2019-11-13)](#v052-2019-11-13)
@@ -23,15 +24,19 @@ Change log
2324

2425
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
2526

27+
## v0.5.4-dev (upcoming changes)
28+
29+
- min files include rev number/license
30+
2631
## v0.5.4 (2019-11-26)
2732

2833
- 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)).
2934
- 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)).
30-
- 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)).
35+
- 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)).
3136
- 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
3237
([#1064](https://github.com/gridstack/gridstack.js/pull/1064)).
3338
- changed jquery dependency to lowest we can use (>=1.8) ([#629](https://github.com/gridstack/gridstack.js/issues/629)).
34-
- add advance demo from web site
39+
- add advance demo from web site ([#1073](https://github.com/gridstack/gridstack.js/issues/1073)).
3540

3641
## v0.5.3 (2019-11-20)
3742

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gridstack",
3-
"version": "0.5.4",
3+
"version": "0.5.4-dev",
44
"description": "gridstack.js is a jQuery plugin for widget layout",
55
"main": "dist/gridstack.js",
66
"repository": {

‎src/gridstack-extra.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*!
2+
* gridstack extra CSS for [1-11] columns (non default)
3+
* https://gridstackjs.com/
4+
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
5+
* gridstack.js may be freely distributed under the MIT license.
6+
*/
7+
18
$gridstack-columns: 12 !default;
29

310
@mixin grid-stack-items($gridstack-columns) {

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1+
/** gridstack.js 0.5.4-dev - IE and older browsers Polyfills for this library @preserve*/
12
/**
2-
* gridstack.js 0.5.4
33
* https://gridstackjs.com/
4-
* (c) 2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
4+
* (c) 2019 Alain Dumesny
55
* gridstack.js may be freely distributed under the MIT license.
6-
* @preserve
7-
*/
8-
9-
// IE and older browsers Polyfills for this library
6+
*/
107

118
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isNaN
129
Number.isNaN = Number.isNaN || function isNaN(input) {

‎src/gridstack.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for Gridstack 0.5.4
1+
// Type definitions for Gridstack 0.5.4-dev
22
// Project: https://gridstackjs.com/
33
// Definitions by: Pascal Senn <https://github.com/PascalSenn>
44
// Ricky Blankenaufulland <https://github.com/ZoolWay>

‎src/gridstack.jQueryUI.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
/** gridstack.js 0.5.4-dev - JQuery UI Drag&Drop plugin @preserve */
12
/**
2-
* gridstack.js 0.5.4
33
* https://gridstackjs.com/
44
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
55
* gridstack.js may be freely distributed under the MIT license.
6-
* @preserve
76
*/
87
(function(factory) {
98
if (typeof define === 'function' && define.amd) {

‎src/gridstack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* gridstack.js 0.5.4
2+
* gridstack.js 0.5.4-dev
33
* https://gridstackjs.com/
44
* (c) 2014-2019 Dylan Weiss, Alain Dumesny, Pavel Reznikov
55
* gridstack.js may be freely distributed under the MIT license.

0 commit comments

Comments
 (0)