From af979faaf5ac486f8bfd13011cb908ba1415141f Mon Sep 17 00:00:00 2001
From: David Morse <david.morse@issinc.com>
Date: Mon, 18 May 2015 12:20:36 -0600
Subject: [PATCH] fix initialization of sticky layout.

---
 demos/sticky-postion.html | 25 ++++++++++++-------------
 src/jquery.gridster.js    | 13 ++++++-------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/demos/sticky-postion.html b/demos/sticky-postion.html
index 37bad54c6..28248dafb 100644
--- a/demos/sticky-postion.html
+++ b/demos/sticky-postion.html
@@ -17,19 +17,18 @@
 
 <div class="gridster">
     <ul>
-        <li data-row="1" data-col="1" data-sizex="1" data-sizey="1">0</li>
-        <li data-row="1" data-col="2" data-sizex="1" data-sizey="1">1</li>
-        <li data-row="1" data-col="3" data-sizex="1" data-sizey="1">2</li>
-        <li data-row="1" data-col="4" data-sizex="1" data-sizey="1">3</li>
-        <li data-row="2" data-col="1" data-sizex="1" data-sizey="1">4</li>
-        <li data-row="2" data-col="2" data-sizex="1" data-sizey="1">5</li>
-        <li data-row="2" data-col="3" data-sizex="1" data-sizey="1">6</li>
-        <li data-row="2" data-col="4" data-sizex="1" data-sizey="1">7</li>
-        <li data-row="3" data-col="1" data-sizex="1" data-sizey="1">8</li>
-        <li data-row="3" data-col="2" data-sizex="1" data-sizey="1">9</li>
-        <li data-row="3" data-col="3" data-sizex="1" data-sizey="1">10</li>
-        <li data-row="3" data-col="4" data-sizex="1" data-sizey="1">11</li>
-    </ul>
+    <ul class="task-card-list">
+        <li data-row="1" data-col="1" data-sizex="1" data-sizey="1" class="task-card">0</li>
+        <li data-row="1" data-col="2" data-sizex="1" data-sizey="1" class="task-card">1</li>
+        <li data-row="1" data-col="3" data-sizex="1" data-sizey="1" class="task-card">2</li>
+        <li data-row="1" data-col="4" data-sizex="1" data-sizey="1" class="task-card">3</li>
+        <li data-row="2" data-col="1" data-sizex="1" data-sizey="1" class="task-card">4</li>
+        <li data-row="2" data-col="3" data-sizex="1" data-sizey="2" class="task-card">5</li>
+        <li data-row="2" data-col="4" data-sizex="1" data-sizey="1" class="task-card">6</li>
+        <li data-row="3" data-col="1" data-sizex="1" data-sizey="1" class="task-card">7</li>
+        <li data-row="3" data-col="2" data-sizex="1" data-sizey="1" class="task-card">8</li>
+        <li data-row="3" data-col="4" data-sizex="1" data-sizey="1" class="task-card">9</li>
+		</ul>
 </div>
 
 
diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
index c85a965d9..cd54e471a 100755
--- a/src/jquery.gridster.js
+++ b/src/jquery.gridster.js
@@ -1203,7 +1203,7 @@
 		isDOM || ($el = wgd.el);
 
 		var empty_upper_row = this.can_go_widget_up(wgd);
-		if (empty_upper_row) {
+		if (this.shift_widgets_up && empty_upper_row) {
 			wgd.row = empty_upper_row;
 			$el.attr('data-row', empty_upper_row);
 			this.$el.trigger('gridster:positionchanged', [wgd]);
@@ -1572,16 +1572,15 @@
 		var col = this.placeholder_grid_data.col;
 		var row = this.placeholder_grid_data.row;
 
-		var widgetsIncell = this.get_widgets_at_cell(col,row);
+		this.set_cells_player_occupies(col, row);
+		this.$player.coords().grid.row = row;
+		this.$player.coords().grid.col = col;
+
+		var widgetsIncell = this.get_widgets_under_player();
 		if (widgetsIncell.length > 0) {
 			this.move_widget_down(widgetsIncell, this.placeholder_grid_data.size_y);
 		}
 
-		this.set_cells_player_occupies(col, row);
-
-		this.$player.coords().grid.row = row;
-		this.$player.coords().grid.col = col;
-
 		if (this.options.draggable.stop) {
 			this.options.draggable.stop.call(this, event, ui);
 		}