Release v0.6.5

DecksterTeam · Apr 6, 2015 · f8d3d2d · f8d3d2d
1 parent bbd9cd4
commit f8d3d2d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/dist/jquery.gridster.js b/dist/jquery.gridster.js
@@ -1373,10 +1373,11 @@
      *  representing the widget.
      * @param {Number} size_x The number of cols that will occupy the widget.
      * @param {Number} size_y The number of rows that will occupy the widget.
+     * @param {Number} col The column to resize the widget from.
      * @param {Function} [callback] Function executed when the widget is expanded.
      * @return {HTMLElement} Returns $widget.
      */
-    fn.expand_widget = function($widget, size_x, size_y, callback) {
+    fn.expand_widget = function($widget, size_x, size_y, col, callback) {
       var wgd = $widget.coords().grid;
       var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width);
       size_x =  size_x || Math.min(max_size_x, this.cols);
@@ -1386,7 +1387,7 @@
       $widget.attr('pre_expand_col', wgd.col);
       $widget.attr('pre_expand_sizex', wgd.size_x);
       $widget.attr('pre_expand_sizey', wgd.size_y);
-      var new_col = 1;
+      var new_col = col || 1;
 
       if (size_y > old_size_y) {
         this.add_faux_rows(Math.max(size_y - old_size_y, 0));

diff --git a/dist/jquery.gridster.min.js b/dist/jquery.gridster.min.js
diff --git a/dist/jquery.gridster.with-extras.js b/dist/jquery.gridster.with-extras.js
@@ -1373,10 +1373,11 @@
      *  representing the widget.
      * @param {Number} size_x The number of cols that will occupy the widget.
      * @param {Number} size_y The number of rows that will occupy the widget.
+     * @param {Number} col The column to resize the widget from.
      * @param {Function} [callback] Function executed when the widget is expanded.
      * @return {HTMLElement} Returns $widget.
      */
-    fn.expand_widget = function($widget, size_x, size_y, callback) {
+    fn.expand_widget = function($widget, size_x, size_y, col, callback) {
       var wgd = $widget.coords().grid;
       var max_size_x = Math.floor(($(window).width() - this.options.widget_margins[0] * 2) / this.min_widget_width);
       size_x =  size_x || Math.min(max_size_x, this.cols);
@@ -1386,7 +1387,7 @@
       $widget.attr('pre_expand_col', wgd.col);
       $widget.attr('pre_expand_sizex', wgd.size_x);
       $widget.attr('pre_expand_sizey', wgd.size_y);
-      var new_col = 1;
+      var new_col = col || 1;
 
       if (size_y > old_size_y) {
         this.add_faux_rows(Math.max(size_y - old_size_y, 0));

diff --git a/dist/jquery.gridster.with-extras.min.js b/dist/jquery.gridster.with-extras.min.js