deblan/gridstack.js
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #492 from troolee/develop

Browse source 
0.2.6-dev
This commit is contained in:
Pavel Reznikov 2016-08-09 18:59:22 -07:00 committed by GitHub
parent f0c76130e7 9a9e8ece7e
commit 47fbdd1ff3
8 changed files with 57 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -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.

8
bower.json
View file

@ -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",

36
dist/gridstack.js vendored
View file

@ -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) {

4
dist/gridstack.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/gridstack.min.map vendored
View file

File diff suppressed because one or more lines are too long

8
package.json
View file

@ -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",

4
spec/utils-spec.js
View file

@ -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);
});
});

36
src/gridstack.js
View file

@ -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) {