gridster.js-rails 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 416287df3b47fc850ae26a9a6b47e3b9830417f3
-  data.tar.gz: 0d16fadd272a19263a10d829ef267eeba4da5b08
+  metadata.gz: 1aeb46f070b5f67aaa802bf6fbed5b6c629dec55
+  data.tar.gz: 5c0d1fd00e3c7347959087207cefcac36a703531
 SHA512:
-  metadata.gz: 9b1de84cec608241267a5d1c054f295b5a03cb6eb959d61e1da879c2197c05208599e219dcc686396b457907c197e47929740dfec60180ebb369ae1929c6a0ef
-  data.tar.gz: b34476d3df6219ff6e8fec402681055767ad17a52a525242c7db87a8009660a10b2beb0b52bf62df6acc67659275a6a4960f63bba3f0acd8b5859cb6f7925317
+  metadata.gz: b56f060fcaf94d825e61fbcde42221ff187b0b24679d2f4200d966809ab8167734f085c7f9e9bfaf5977279954e0c8f89f7fa9e0b3e9233cc8f92f642855485e
+  data.tar.gz: '0397ceaa0ddea9437783af3f746257c03a24a034249f0f43b25eef8bf954ab927037822a7a1536d57d26ee594b247cf574dbc64481c12fd0fd5a8fa348ebaade'

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="v0.7.0"></a>
+## v0.7.0 (2016-02-26)
+
+
+#### Bug Fixes
+
+* Apply fix from #22 to vertical positioning ([dfc64916](http://github.com/dsmorse/gridster.js/commit/dfc649168c5b6a2a230b90a47e19621a6937fc7c))
+* convert from JQury to DOM ([4936ef82](http://github.com/dsmorse/gridster.js/commit/4936ef82c04690fde118c3d54b798ceaf7c376e6))
+* **fn.generate_stylesheet:** only return new stylesheet if colWidth and this.$wrapper.width() are > 0 ([f513793a](http://github.com/dsmorse/gridster.js/commit/f513793a8c0ec63509f6296325a8a7a6e34179f5))
+* **gridster:** Add additiona error checking on widgets removal ([2b0f9963](http://github.com/dsmorse/gridster.js/commit/2b0f9963ef80c9acc6f66545eb53597836e2ebec))
+
 <a name="v0.6.10"></a>
 ### v0.6.10 (2015-05-31)
   * Add Ruby on Rails support 

data/README.md

@@ -28,6 +28,20 @@ As of result of the inactivity over the last year in the [Ducksboard](https://gi
 for current support.  He will GLADLY accept pull requests, and will be working to merge existing
 Pull Requests from Ducksboard repo.
 
+## Install with NPM
+
+This fork of Gridster can be installed via [NPM](https://npmjs.com/package/dsmorse-gridster);
+
+```
+npm install dsmorse-gridster
+```
+
+or to save.
+
+```
+npm install dsmorse-gridster --save
+```
+
 ## Ruby on Rails integration
 
 This artifact is published to [rubygems.org](https://rubygems.org/gems/gridster.js-rails) to be consumed by ruby on rails applications.

data/bower.json

@@ -1,9 +1,9 @@
 {
   "name": "gridster",
   "homepage": "dsmorse.github.io/gridster.js/",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "dependencies": {
-    "jquery": "^2.1.3"
+    "jquery": "2.1.3 - 3.99"
   },
   "devDependencies": {
     "requirejs": "^2.1.17",

data/lib/gridster.js-rails/version.rb

@@ -1,5 +1,5 @@
 module Gridster
   module Rails
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "gridster",
+  "name": "dsmorse-gridster",
   "title": "gridster.js",
   "description": "a drag-and-drop multi-column jQuery grid plugin",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "homepage": "https://dsmorse.github.io/gridster.js/",
   "author": {
     "name": "ducksboard"
@@ -32,7 +32,7 @@
     "grunt-contrib-cssmin": "~0.10.0",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-less": "^1.2.0",
-    "grunt-contrib-qunit": "^0.7.0",
+    "grunt-contrib-qunit": "^2.0.0",
     "grunt-contrib-uglify": "~0.6.0",
     "grunt-contrib-watch": "~0.6.1",
     "grunt-contrib-yuidoc": "~0.7.0",

data/vendor/assets/javascripts/jquery.collision.js

@@ -0,0 +1 @@
+/*! gridster.js - v0.8.0 - 2018-07-24 - * https://dsmorse.github.io/gridster.js/ - Copyright (c) 2018 ducksboard; Licensed MIT */ !function(a,b){"use strict";"object"==typeof exports?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define("gridster-collision",["jquery","gridster-coords"],b):a.GridsterCollision=b(a.$||a.jQuery,a.GridsterCoords)}(this,function(a,b){"use strict";function c(b,c,e){this.options=a.extend(d,e),this.$element=b,this.last_colliders=[],this.last_colliders_coords=[],this.set_colliders(c),this.init()}var d={colliders_context:document.body,overlapping_region:"C"};c.defaults=d;var e=c.prototype;return e.init=function(){this.find_collisions()},e.overlaps=function(a,b){var c=!1,d=!1;return(b.x1>=a.x1&&b.x1<=a.x2||b.x2>=a.x1&&b.x2<=a.x2||a.x1>=b.x1&&a.x2<=b.x2)&&(c=!0),(b.y1>=a.y1&&b.y1<=a.y2||b.y2>=a.y1&&b.y2<=a.y2||a.y1>=b.y1&&a.y2<=b.y2)&&(d=!0),c&&d},e.detect_overlapping_region=function(a,b){var c="",d="";return a.y1>b.cy&&a.y1<b.y2&&(c="N"),a.y2>b.y1&&a.y2<b.cy&&(c="S"),a.x1>b.cx&&a.x1<b.x2&&(d="W"),a.x2>b.x1&&a.x2<b.cx&&(d="E"),c+d||"C"},e.calculate_overlapped_area_coords=function(b,c){var d=Math.max(b.x1,c.x1),e=Math.max(b.y1,c.y1),f=Math.min(b.x2,c.x2),g=Math.min(b.y2,c.y2);return a({left:d,top:e,width:f-d,height:g-e}).coords().get()},e.calculate_overlapped_area=function(a){return a.width*a.height},e.manage_colliders_start_stop=function(b,c,d){for(var e=this.last_colliders_coords,f=0,g=e.length;g>f;f++)-1===a.inArray(e[f],b)&&c.call(this,e[f]);for(var h=0,i=b.length;i>h;h++)-1===a.inArray(b[h],e)&&d.call(this,b[h])},e.find_collisions=function(b){for(var c=this,d=this.options.overlapping_region,e=[],f=[],g=this.colliders||this.$colliders,h=g.length,i=c.$element.coords().update(b||!1).get();h--;){var j=c.$colliders?a(g[h]):g[h],k=j.isCoords?j:j.coords(),l=k.get(),m=c.overlaps(i,l);if(m){var n=c.detect_overlapping_region(i,l);if(n===d||"all"===d){var o=c.calculate_overlapped_area_coords(i,l),p=c.calculate_overlapped_area(o);if(0!==p){var q={area:p,area_coords:o,region:n,coords:l,player_coords:i,el:j};c.options.on_overlap&&c.options.on_overlap.call(this,q),e.push(k),f.push(q)}}}}return(c.options.on_overlap_stop||c.options.on_overlap_start)&&this.manage_colliders_start_stop(e,c.options.on_overlap_start,c.options.on_overlap_stop),this.last_colliders_coords=e,f},e.get_closest_colliders=function(a){var b=this.find_collisions(a);return b.sort(function(a,b){return"C"===a.region&&"C"===b.region?a.coords.y1<b.coords.y1||a.coords.x1<b.coords.x1?-1:1:(a.area<b.area,1)}),b},e.set_colliders=function(b){"string"==typeof b||b instanceof a?this.$colliders=a(b,this.options.colliders_context).not(this.$element):this.colliders=a(b)},a.fn.collision=function(a,b){return new c(this,a,b)},c});

data/vendor/assets/javascripts/jquery.coords.js

@@ -0,0 +1 @@
+/*! gridster.js - v0.8.0 - 2018-07-24 - * https://dsmorse.github.io/gridster.js/ - Copyright (c) 2018 ducksboard; Licensed MIT */ !function(a,b){"use strict";"object"==typeof exports?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define("gridster-coords",["jquery"],b):a.GridsterCoords=b(a.$||a.jQuery)}(this,function(a){"use strict";function b(b){return b[0]&&a.isPlainObject(b[0])?this.data=b[0]:this.el=b,this.isCoords=!0,this.coords={},this.init(),this}var c=b.prototype;return c.init=function(){this.set(),this.original_coords=this.get()},c.set=function(a,b){var c=this.el;if(c&&!a&&(this.data=c.offset(),this.data.width=c[0].scrollWidth,this.data.height=c[0].scrollHeight),c&&a&&!b){var d=c.offset();this.data.top=d.top,this.data.left=d.left}var e=this.data;return void 0===e.left&&(e.left=e.x1),void 0===e.top&&(e.top=e.y1),this.coords.x1=e.left,this.coords.y1=e.top,this.coords.x2=e.left+e.width,this.coords.y2=e.top+e.height,this.coords.cx=e.left+e.width/2,this.coords.cy=e.top+e.height/2,this.coords.width=e.width,this.coords.height=e.height,this.coords.el=c||!1,this},c.update=function(b){if(!b&&!this.el)return this;if(b){var c=a.extend({},this.data,b);return this.data=c,this.set(!0,!0)}return this.set(!0),this},c.get=function(){return this.coords},c.destroy=function(){this.el.removeData("coords"),delete this.el},a.fn.coords=function(){if(this.data("coords"))return this.data("coords");var a=new b(this);return this.data("coords",a),a},b});

data/vendor/assets/javascripts/jquery.draggable.js

@@ -0,0 +1 @@
+/*! gridster.js - v0.8.0 - 2018-07-24 - * https://dsmorse.github.io/gridster.js/ - Copyright (c) 2018 ducksboard; Licensed MIT */ !function(a,b){"use strict";"object"==typeof exports?module.exports=b(require("jquery")):"function"==typeof define&&define.amd?define("gridster-draggable",["jquery"],b):a.GridsterDraggable=b(a.$||a.jQuery)}(this,function(a){"use strict";function b(b,d){this.options=a.extend({},c,d),this.$document=a(document),this.$container=a(b),this.$scroll_container=this.options.scroll_container===window?a(window):this.$container.closest(this.options.scroll_container),this.is_dragging=!1,this.player_min_left=0+this.options.offset_left,this.player_min_top=0+this.options.offset_top,this.id=i(),this.ns=".gridster-draggable-"+this.id,this.init()}var c={items:"li",distance:1,limit:{width:!0,height:!1},offset_left:0,autoscroll:!0,ignore_dragging:["INPUT","TEXTAREA","SELECT","BUTTON"],handle:null,container_width:0,move_element:!0,helper:!1,remove_helper:!0},d=a(window),e={x:"left",y:"top"},f=!!("ontouchstart"in window),g=function(a){return a.charAt(0).toUpperCase()+a.slice(1)},h=0,i=function(){return++h+""};b.defaults=c;var j=b.prototype;return j.init=function(){var b=this.$container.css("position");this.calculate_dimensions(),this.$container.css("position","static"===b?"relative":b),this.disabled=!1,this.events(),d.bind(this.nsEvent("resize"),throttle(a.proxy(this.calculate_dimensions,this),200))},j.nsEvent=function(a){return(a||"")+this.ns},j.events=function(){this.pointer_events={start:this.nsEvent("touchstart")+" "+this.nsEvent("mousedown"),move:this.nsEvent("touchmove")+" "+this.nsEvent("mousemove"),end:this.nsEvent("touchend")+" "+this.nsEvent("mouseup")},this.$container.on(this.nsEvent("selectstart"),a.proxy(this.on_select_start,this)),this.$container.on(this.pointer_events.start,this.options.items,a.proxy(this.drag_handler,this)),this.$document.on(this.pointer_events.end,a.proxy(function(a){this.is_dragging=!1,this.disabled||(this.$document.off(this.pointer_events.move),this.drag_start&&this.on_dragstop(a))},this))},j.get_actual_pos=function(a){return a.position()},j.get_mouse_pos=function(a){if(a.originalEvent&&a.originalEvent.touches){var b=a.originalEvent;a=b.touches.length?b.touches[0]:b.changedTouches[0]}return{left:a.clientX,top:a.clientY}},j.get_offset=function(a){a.preventDefault();var b=this.get_mouse_pos(a),c=Math.round(b.left-this.mouse_init_pos.left),d=Math.round(b.top-this.mouse_init_pos.top),e=Math.round(this.el_init_offset.left+c-this.baseX+this.$scroll_container.scrollLeft()-this.scroll_container_offset_x),f=Math.round(this.el_init_offset.top+d-this.baseY+this.$scroll_container.scrollTop()-this.scroll_container_offset_y);return this.options.limit.width&&(e>this.player_max_left?e=this.player_max_left:e<this.player_min_left&&(e=this.player_min_left)),this.options.limit.height&&(f>this.player_max_top?f=this.player_max_top:f<this.player_min_top&&(f=this.player_min_top)),{position:{left:e,top:f},pointer:{left:b.left,top:b.top,diff_left:c+(this.$scroll_container.scrollLeft()-this.scroll_container_offset_x),diff_top:d+(this.$scroll_container.scrollTop()-this.scroll_container_offset_y)}}},j.get_drag_data=function(a){var b=this.get_offset(a);return b.$player=this.$player,b.$helper=this.helper?this.$helper:this.$player,b},j.set_limits=function(a){return a||(a=this.$container.width()),this.player_max_left=a-this.player_width+-this.options.offset_left,this.player_max_top=this.options.container_height-this.player_height+-this.options.offset_top,this.options.container_width=a,this},j.scroll_in=function(a,b){var c,d=e[a],f=50,h=30,i="scroll"+g(d),j="x"===a,k=j?this.scroller_width:this.scroller_height;c=this.$scroll_container===window?j?this.$scroll_container.width():this.$scroll_container.height():j?this.$scroll_container[0].scrollWidth:this.$scroll_container[0].scrollHeight;var l,m=j?this.$player.width():this.$player.height(),n=this.$scroll_container[i](),o=n,p=o+k,q=p-f,r=o+f,s=o+b.pointer[d],t=c-k+m;return s>=q&&(l=n+h,t>l&&(this.$scroll_container[i](l),this["scroll_offset_"+a]+=h)),r>=s&&(l=n-h,l>0&&(this.$scroll_container[i](l),this["scroll_offset_"+a]-=h)),this},j.manage_scroll=function(a){this.scroll_in("x",a),this.scroll_in("y",a)},j.calculate_dimensions=function(){this.scroller_height=this.$scroll_container.height(),this.scroller_width=this.$scroll_container.width()},j.drag_handler=function(b){if(!this.disabled&&(1===b.which||f)&&!this.ignore_drag(b)){var c=this,d=!0;return this.$player=a(b.currentTarget),this.el_init_pos=this.get_actual_pos(this.$player),this.mouse_init_pos=this.get_mouse_pos(b),this.offsetY=this.mouse_init_pos.top-this.el_init_pos.top,this.$document.on(this.pointer_events.move,function(a){var b=c.get_mouse_pos(a),e=Math.abs(b.left-c.mouse_init_pos.left),f=Math.abs(b.top-c.mouse_init_pos.top);return e>c.options.distance||f>c.options.distance?d?(d=!1,c.on_dragstart.call(c,a),!1):(c.is_dragging===!0&&c.on_dragmove.call(c,a),!1):!1}),f?void 0:!1}},j.on_dragstart=function(a){if(a.preventDefault(),this.is_dragging)return this;this.drag_start=this.is_dragging=!0;var b=this.$container.offset();return this.baseX=Math.round(b.left),this.baseY=Math.round(b.top),"clone"===this.options.helper?(this.$helper=this.$player.clone().appendTo(this.$container).addClass("helper"),this.helper=!0):this.helper=!1,this.scroll_container_offset_y=this.$scroll_container.scrollTop(),this.scroll_container_offset_x=this.$scroll_container.scrollLeft(),this.el_init_offset=this.$player.offset(),this.player_width=this.$player.width(),this.player_height=this.$player.height(),this.set_limits(this.options.container_width),this.options.start&&this.options.start.call(this.$player,a,this.get_drag_data(a)),!1},j.on_dragmove=function(a){var b=this.get_drag_data(a);this.options.autoscroll&&this.manage_scroll(b),this.options.move_element&&(this.helper?this.$helper:this.$player).css({position:"absolute",left:b.position.left,top:b.position.top});var c=this.last_position||b.position;return b.prev_position=c,this.options.drag&&this.options.drag.call(this.$player,a,b),this.last_position=b.position,!1},j.on_dragstop=function(a){var b=this.get_drag_data(a);return this.drag_start=!1,this.options.stop&&this.options.stop.call(this.$player,a,b),this.helper&&this.options.remove_helper&&this.$helper.remove(),!1},j.on_select_start=function(a){return this.disabled||this.ignore_drag(a)?void 0:!1},j.enable=function(){this.disabled=!1},j.disable=function(){this.disabled=!0},j.destroy=function(){this.disable(),this.$container.off(this.ns),this.$document.off(this.ns),d.off(this.ns),a.removeData(this.$container,"drag")},j.ignore_drag=function(b){return this.options.handle?!a(b.target).is(this.options.handle):a.isFunction(this.options.ignore_dragging)?this.options.ignore_dragging(b):this.options.resize?!a(b.target).is(this.options.items):a(b.target).is(this.options.ignore_dragging.join(", "))},a.fn.gridDraggable=function(a){return new b(this,a)},a.fn.dragg=function(c){return this.each(function(){a.data(this,"drag")||a.data(this,"drag",new b(this,c))})},b});

data/vendor/assets/javascripts/{jquery.gridster.js → jquery.dsmorse-gridster.js}

@@ -1,6 +1,6 @@
-/*! gridster.js - v0.7.0 - 2016-02-26
+/*! gridster.js - v0.8.0 - 2018-07-24
 * https://dsmorse.github.io/gridster.js/
-* Copyright (c) 2016 ducksboard; Licensed MIT */
+* Copyright (c) 2018 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {
 	'use strict';
@@ -471,7 +471,7 @@
     var defaults = {
         items: 'li',
         distance: 1,
-        limit: true,
+        limit: {width: true, height: false},
         offset_left: 0,
         autoscroll: true,
         ignore_dragging: ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON'], // or function
@@ -535,6 +535,7 @@
             $(window) : this.$container.closest(this.options.scroll_container);
         this.is_dragging = false;
         this.player_min_left = 0 + this.options.offset_left;
+		this.player_min_top = 0 + this.options.offset_top;
         this.id = uniqId();
         this.ns = '.gridster-draggable-' + this.id;
         this.init();
@@ -616,12 +617,19 @@
                              this.$scroll_container.scrollTop() -
                              this.scroll_container_offset_y);
 
-        if (this.options.limit) {
+        if (this.options.limit.width) {
             if (left > this.player_max_left) {
                 left = this.player_max_left;
             } else if(left < this.player_min_left) {
                 left = this.player_min_left;
             }
+		}
+		if (this.options.limit.height) {
+			if (top > this.player_max_top) {
+                top = this.player_max_top;
+            } else if (top < this.player_min_top) {
+                top = this.player_min_top;
+            }
         }
 
         return {
@@ -653,7 +661,9 @@
     fn.set_limits = function(container_width) {
         container_width || (container_width = this.$container.width());
         this.player_max_left = (container_width - this.player_width +
-            - this.options.offset_left);
+            -this.options.offset_left);
+        this.player_max_top = (this.options.container_height - this.player_height +
+            -this.options.offset_top);
 
         this.options.container_width = container_width;
 
@@ -793,6 +803,7 @@
         this.scroll_container_offset_x = this.$scroll_container.scrollLeft();
         this.el_init_offset = this.$player.offset();
         this.player_width = this.$player.width();
+		this.player_height = this.$player.height();
 
         this.set_limits(this.options.container_width);
 
@@ -929,6 +940,10 @@
 				extra_cols: 0,
 				min_cols: 1,
 				max_cols: Infinity,
+				limit: {
+				    width: true,
+				    height: false
+				},
 				min_rows: 1,
 				max_rows: 15,
 				autogenerate_stylesheet: true,
@@ -977,7 +992,8 @@
 					handle_class: 'gs-resize-handle',
 					max_size: [Infinity, Infinity],
 					min_size: [1, 1]
-				}
+				},
+				ignore_self_occupied: false
 			};
 
 	/**
@@ -1090,7 +1106,12 @@
 
 		this.generated_stylesheets = [];
 		this.$style_tags = $([]);
-
+		
+		if (typeof (this.options.limit) === typeof (true)) {
+		    console.log('limit: bool is deprecated, consider using limit: { width: boolean, height: boolean} instead');
+		    this.options.limit = { width: this.options.limit, height: this.options.limit };
+		}
+		
 		this.options.auto_init && this.init();
 	}
 
@@ -1311,6 +1332,10 @@
 
 		if (!col && !row) {
 			pos = this.next_position(size_x, size_y);
+			if(pos === false)
+		    {
+		        return false;
+		    }
 		} else {
 			pos = {
 				col: col,
@@ -1767,22 +1792,24 @@
 
 		this.update_widget_dimensions($widget, new_wgd);
 
-		if (empty_cols.length) {
-			var cols_to_remove_holes = [
-				empty_cols[0], new_wgd.row,
-				empty_cols[empty_cols.length - 1] - empty_cols[0] + 1,
-				Math.min(old_size_y, new_wgd.size_y),
-				$widget
-			];
+    if (this.options.shift_widgets_up) {
+			if (empty_cols.length) {
+				var cols_to_remove_holes = [
+					empty_cols[0], new_wgd.row,
+					empty_cols[empty_cols.length - 1] - empty_cols[0] + 1,
+					Math.min(old_size_y, new_wgd.size_y),
+					$widget
+				];
 
-			this.remove_empty_cells.apply(this, cols_to_remove_holes);
-		}
+				this.remove_empty_cells.apply(this, cols_to_remove_holes);
+			}
 
-		if (empty_rows.length) {
-			var rows_to_remove_holes = [
-				new_wgd.col, new_wgd.row, new_wgd.size_x, new_wgd.size_y, $widget
-			];
-			this.remove_empty_cells.apply(this, rows_to_remove_holes);
+			if (empty_rows.length) {
+				var rows_to_remove_holes = [
+					new_wgd.col, new_wgd.row, new_wgd.size_x, new_wgd.size_y, $widget
+				];
+				this.remove_empty_cells.apply(this, rows_to_remove_holes);
+			}
 		}
 
 		this.move_widget_up($widget);
@@ -2206,7 +2233,8 @@
 			offset_left: this.options.widget_margins[0],
 			offset_top: this.options.widget_margins[1],
 			container_width: (this.cols * this.min_widget_width) + ((this.cols + 1) * this.options.widget_margins[0]),
-			limit: true,
+			container_height: (this.rows * this.min_widget_height) + ((this.rows + 1) * this.options.widget_margins[0]),
+			limit: { width: this.options.limit.width, height: this.options.limit.height },
 			start: function (event, ui) {
 				self.$widgets.filter('.player-revert')
 						.removeClass('player-revert');
@@ -2247,7 +2275,7 @@
 			container_width: this.container_width,
 			move_element: false,
 			resize: true,
-			limit: this.options.max_cols !== Infinity,
+			limit: { width: this.options.max_cols !== Infinity || this.options.limit.width, height: this.options.max_rows !== Infinity || this.options.limit.height },
 			scroll_container: this.options.scroll_container,
 			start: $.proxy(this.on_start_resize, this),
 			stop: $.proxy(function (event, ui) {
@@ -2304,10 +2332,12 @@
 		this.player_grid_data = this.$player.coords().grid;
 		this.placeholder_grid_data = $.extend({}, this.player_grid_data);
 
-		this.set_dom_grid_height(this.$el.height() +
-		(this.player_grid_data.size_y * this.min_widget_height));
-
-		this.set_dom_grid_width(this.cols);
+		var highestRow = this.get_highest_occupied_cell().row;
+	    if ((highestRow + this.player_grid_data.size_y) <= this.options.max_rows)
+	    {
+	        this.set_dom_grid_height(this.$el.height() + (this.player_grid_data.size_y * this.min_widget_height));
+	    }
+	    this.set_dom_grid_width(this.cols);
 
 		var pgd_sizex = this.player_grid_data.size_x;
 		var cols_diff = this.cols - this.highest_col;
@@ -2435,23 +2465,27 @@
 		this.$changed = this.$changed.add(this.$player);
 
 	    //If widget has new position, clean previous grid
-		if (this.placeholder_grid_data.el.coords().grid.col !== this.placeholder_grid_data.col ||
-            this.placeholder_grid_data.el.coords().grid.row !== this.placeholder_grid_data.row) {
-		    this.update_widget_position(this.placeholder_grid_data.el.coords().grid, false);
-
-		    // move the cells down if there is an overlap and we are in static mode
-		    if (this.options.collision.wait_for_mouseup) {
-		        this.for_each_cell_occupied(this.placeholder_grid_data, function (tcol, trow) {
-		            if (this.is_widget(tcol, trow)) {
-		                // get number of cells to move
-		                var destinyRow = this.placeholder_grid_data.row + this.placeholder_grid_data.size_y;
+        var grid = this.placeholder_grid_data.el.coords().grid;
+        if (grid.col !== this.placeholder_grid_data.col || grid.row !== this.placeholder_grid_data.row) {
+            this.update_widget_position(grid, false);
+
+            // move the cells down if there is an overlap and we are in static mode
+            if (this.options.collision.wait_for_mouseup) {
+                this.for_each_cell_occupied(this.placeholder_grid_data, function (tcol, trow) {
+                    if (this.is_widget(tcol, trow)) {
+                        // get number of cells to move
+                        var destinyRow = this.placeholder_grid_data.row + this.placeholder_grid_data.size_y;
+
 		                var currentOverlappedRow = parseInt(this.gridmap[tcol][trow][0].getAttribute('data-row'));
 		                var cellsToMove = destinyRow - currentOverlappedRow;
-		                this.move_widget_down(this.is_widget(tcol, trow), cellsToMove);
-		            }
-		        });
-		    }
-		}
+		                var failed = !this.move_widget_down(this.is_widget(tcol, trow), cellsToMove);
+		                if (failed) {
+		                    this.set_placeholder(this.placeholder_grid_data.el.coords().grid.col, this.placeholder_grid_data.el.coords().grid.row);
+		                }
+                    }
+                });
+            }
+        }
 
 		this.cells_occupied_by_player = this.get_cells_occupied(this.placeholder_grid_data);
 
@@ -3231,9 +3265,7 @@
 	 */
 	fn.is_empty = function (col, row) {
 		if (typeof this.gridmap[col] !== 'undefined') {
-			if (typeof this.gridmap[col][row] !== 'undefined' &&
-					this.gridmap[col][row] === false
-			) {
+			if (!this.gridmap[col][row]) {
 				return true;
 			}
 			return false;
@@ -3301,7 +3333,15 @@
 			return false;
 		}
 
+		// Consider player cell as not occupied (i.e. awailable for swap) if it is occupied by player
+		if (this.is_player(col, row)) {
+			return false;
+		}
+
 		if (this.gridmap[col][row]) {
+			if(this.options.ignore_self_occupied) {		
+				return this.$player.data() !== $(this.gridmap[col][row]).data();		
+			}
 			return true;
 		}
 		return false;
@@ -3925,6 +3965,10 @@
 
 		el_grid_data = $widget.coords().grid;
 		actual_row = el_grid_data.row;
+		if (actual_row + ($widget.coords().grid.size_y - 1) + y_units > this.options.max_rows)
+		{
+		    return false;
+		}
 		moved = [];
 		y_diff = y_units;
 
@@ -3932,24 +3976,32 @@
 			return false;
 		}
 
+		this.failed = false;
 		if ($.inArray($widget, moved) === -1) {
 
 			var widget_grid_data = $widget.coords().grid;
 			var next_row = actual_row + y_units;
 			var $next_widgets = this.widgets_below($widget);
 
-			this.remove_from_gridmap(widget_grid_data);
+			//this.remove_from_gridmap(widget_grid_data);
 
-			$next_widgets.each($.proxy(function (i, widget) {
-				var $w = $(widget);
-				var wd = $w.coords().grid;
-				var tmp_y = this.displacement_diff(
-						wd, widget_grid_data, y_diff);
+            $next_widgets.each($.proxy(function (i, widget) {
+                if (this.failed !== true) {
+                    var $w = $(widget);
+                    var wd = $w.coords().grid;
+                    var tmp_y = this.displacement_diff(
+                            wd, widget_grid_data, y_diff);
 
-				if (tmp_y > 0) {
-					this.move_widget_down($w, tmp_y);
-				}
+                    if (tmp_y > 0) {
+                        this.failed = this.move_widget_down($w, tmp_y) === false;
+                    }
+                }
 			}, this));
+            if (this.failed)
+            {
+                return false;
+            }
+			this.remove_from_gridmap(widget_grid_data);
 
 			widget_grid_data.row = next_row;
 			this.update_widget_position(widget_grid_data, $widget);
@@ -3958,6 +4010,7 @@
 
 			moved.push($widget);
 		}
+		return true;
 	};
 
 
@@ -4976,7 +5029,7 @@
 	};
 
 	fn.get_num_widgets = function () {
-		return this.$widgets.size();
+		return this.$widgets.length;
 	};
 
 	/**
@@ -5010,6 +5063,34 @@
 			this.drag_api.set_limits((this.cols * this.min_widget_width) + ((this.cols + 1) * this.options.widget_margins[0]));
 		}
 	};
+	
+	fn.set_new_num_rows = function (rows) {
+	    var max_rows = this.options.max_rows;
+
+	    var actual_rows = this.$widgets.map(function () {
+	        return $(this).attr('data-row');
+	    }).get();
+
+	    actual_rows.length || (actual_rows = [0]);
+
+	    var min_rows = Math.max.apply(Math, actual_rows);
+
+	    this.rows = Math.max(min_rows, rows, this.options.min_rows);
+
+	    if (max_rows !== Infinity && (max_rows < min_rows || max_rows < this.rows)) {
+	        max_rows = this.rows;
+	    }
+	    this.min_rows = min_rows;
+	    this.max_rows = max_rows;
+	    this.options.max_rows = max_rows;
+	    var height = (this.rows * this.min_widget_height) + ((this.rows + 1) * this.options.widget_margins[1]);
+
+	    if (this.drag_api) {
+	        this.drag_api.options.container_height = height;
+	    }
+	    this.container_height = height;
+	    this.generate_faux_grid(this.rows, this.cols);
+	};
 
 
 	/**