Skip to content

Commit

Permalink
update dist
Browse files Browse the repository at this point in the history
  • Loading branch information
vieron committed Mar 26, 2014
1 parent 69fcfe4 commit a4f3baf
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion dist/jquery.gridster.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! gridster.js - v0.5.1 - 2014-03-13
/*! gridster.js - v0.5.1 - 2014-03-26
* http://gridster.net/
* Copyright (c) 2014 ducksboard; Licensed MIT */

Expand Down
8 changes: 6 additions & 2 deletions dist/jquery.gridster.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! gridster.js - v0.5.1 - 2014-03-13
/*! gridster.js - v0.5.1 - 2014-03-26
* http://gridster.net/
* Copyright (c) 2014 ducksboard; Licensed MIT */

Expand Down Expand Up @@ -415,7 +415,7 @@
limit: true,
offset_left: 0,
autoscroll: true,
ignore_dragging: ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON'],
ignore_dragging: ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON'], // or function
handle: null,
container_width: 0, // 0 == auto
move_element: true,
Expand Down Expand Up @@ -788,6 +788,10 @@
return !$(event.target).is(this.options.handle);
}

if ($.isFunction(this.options.ignore_dragging)) {
return this.options.ignore_dragging(event);
}

return $(event.target).is(this.options.ignore_dragging.join(', '));
};

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

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

4 changes: 2 additions & 2 deletions dist/jquery.gridster.min.js

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions dist/jquery.gridster.with-extras.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! gridster.js - v0.5.1 - 2014-03-13
/*! gridster.js - v0.5.1 - 2014-03-26
* http://gridster.net/
* Copyright (c) 2014 ducksboard; Licensed MIT */

Expand Down Expand Up @@ -415,7 +415,7 @@
limit: true,
offset_left: 0,
autoscroll: true,
ignore_dragging: ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON'],
ignore_dragging: ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON'], // or function
handle: null,
container_width: 0, // 0 == auto
move_element: true,
Expand Down Expand Up @@ -788,6 +788,10 @@
return !$(event.target).is(this.options.handle);
}

if ($.isFunction(this.options.ignore_dragging)) {
return this.options.ignore_dragging(event);
}

return $(event.target).is(this.options.ignore_dragging.join(', '));
};

Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.gridster.with-extras.min.js

Large diffs are not rendered by default.

0 comments on commit a4f3baf

Please sign in to comment.