Skip to content

Commit

Permalink
Merge pull request #634 from radiolips/feature/remove-ui-update-deps
Browse files Browse the repository at this point in the history
Update dev-dependencies. Remove checks for $.ui (unnecessary with new…
  • Loading branch information
radiolips committed Apr 20, 2017
2 parents 21080f1 + 36fea94 commit a7fd507
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 67 deletions.
2 changes: 1 addition & 1 deletion dist/gridstack-extra.min.css

Large diffs are not rendered by default.

26 changes: 3 additions & 23 deletions dist/gridstack.all.js

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions dist/gridstack.jQueryUI.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions dist/gridstack.js
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,6 @@
};

GridStack.prototype._prepareElementsByNode = function(el, node) {
if (typeof $.ui === 'undefined') {
return;
}
var self = this;

var cellWidth;
Expand Down Expand Up @@ -1337,7 +1334,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null || typeof $.ui === 'undefined') {
if (typeof node == 'undefined' || node === null) {
return;
}

Expand All @@ -1357,7 +1354,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null || typeof $.ui === 'undefined') {
if (typeof node == 'undefined' || node === null) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion dist/gridstack.min.css

Large diffs are not rendered by default.

20 changes: 2 additions & 18 deletions dist/gridstack.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/gridstack.min.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@
"doctoc": "^1.0.0",
"grunt": "^0.4.5",
"grunt-cli": "^1.2.0",
"grunt-contrib-connect": "^0.11.2",
"grunt-contrib-copy": "^0.8.2",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^2.1.0",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-uglify": "^0.11.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-contrib-uglify": "^2.3.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-doctoc": "^0.1.1",
"grunt-jscs": "^2.8.0",
"grunt-protractor-runner": "^3.2.0",
"grunt-jscs": "^3.0.1",
"grunt-protractor-runner": "^5.0.0",
"grunt-protractor-webdriver": "^0.2.5",
"grunt-sass": "^1.1.0",
"grunt-sass": "^2.0.0",
"jasmine-core": "^2.4.1",
"karma": "^1.1.2",
"karma-coverage": "^1.1.1",
Expand Down
7 changes: 2 additions & 5 deletions src/gridstack.js
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,6 @@
};

GridStack.prototype._prepareElementsByNode = function(el, node) {
if (typeof $.ui === 'undefined') {
return;
}
var self = this;

var cellWidth;
Expand Down Expand Up @@ -1337,7 +1334,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null || typeof $.ui === 'undefined') {
if (typeof node == 'undefined' || node === null) {
return;
}

Expand All @@ -1357,7 +1354,7 @@
el.each(function(index, el) {
el = $(el);
var node = el.data('_gridstack_node');
if (typeof node == 'undefined' || node === null || typeof $.ui === 'undefined') {
if (typeof node == 'undefined' || node === null) {
return;
}

Expand Down

0 comments on commit a7fd507

Please sign in to comment.