Skip to content

Commit f8d3d2d

Browse files
author
floyd_hawkes
committed
Release v0.6.5
1 parent bbd9cd4 commit f8d3d2d

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

dist/jquery.gridster.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,10 +1373,11 @@
13731373
* representing the widget.
13741374
* @param {Number} size_x The number of cols that will occupy the widget.
13751375
* @param {Number} size_y The number of rows that will occupy the widget.
1376+
* @param {Number} col The column to resize the widget from.
13761377
* @param {Function} [callback] Function executed when the widget is expanded.
13771378
* @return {HTMLElement} Returns $widget.
13781379
*/
1379-
fn.expand_widget = function($widget, size_x, size_y, callback) {
1380+
fn.expand_widget = function($widget, size_x, size_y, col, callback) {
13801381
var wgd = $widget.coords().grid;
13811382
var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width);
13821383
size_x = size_x || Math.min(max_size_x, this.cols);
@@ -1386,7 +1387,7 @@
13861387
$widget.attr('pre_expand_col', wgd.col);
13871388
$widget.attr('pre_expand_sizex', wgd.size_x);
13881389
$widget.attr('pre_expand_sizey', wgd.size_y);
1389-
var new_col = 1;
1390+
var new_col = col || 1;
13901391

13911392
if (size_y > old_size_y) {
13921393
this.add_faux_rows(Math.max(size_y - old_size_y, 0));

dist/jquery.gridster.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.gridster.with-extras.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,10 +1373,11 @@
13731373
* representing the widget.
13741374
* @param {Number} size_x The number of cols that will occupy the widget.
13751375
* @param {Number} size_y The number of rows that will occupy the widget.
1376+
* @param {Number} col The column to resize the widget from.
13761377
* @param {Function} [callback] Function executed when the widget is expanded.
13771378
* @return {HTMLElement} Returns $widget.
13781379
*/
1379-
fn.expand_widget = function($widget, size_x, size_y, callback) {
1380+
fn.expand_widget = function($widget, size_x, size_y, col, callback) {
13801381
var wgd = $widget.coords().grid;
13811382
var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width);
13821383
size_x = size_x || Math.min(max_size_x, this.cols);
@@ -1386,7 +1387,7 @@
13861387
$widget.attr('pre_expand_col', wgd.col);
13871388
$widget.attr('pre_expand_sizex', wgd.size_x);
13881389
$widget.attr('pre_expand_sizey', wgd.size_y);
1389-
var new_col = 1;
1390+
var new_col = col || 1;
13901391

13911392
if (size_y > old_size_y) {
13921393
this.add_faux_rows(Math.max(size_y - old_size_y, 0));

dist/jquery.gridster.with-extras.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)