auto position item if it has collision when adding a new item.

tiberiuzuld · Jul 27, 2016 · d8cd214 · d8cd214
1 parent 0c81555
commit d8cd214
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/dist/gridster.js b/dist/gridster.js
@@ -874,8 +874,10 @@
       if (angular.isUndefined(item.x) || angular.isUndefined(item.y)) {
         vm.autoPositionItem(item);
       } else if (vm.checkCollision(item)) {
-        $log.warn('Can\'t be placed in the bounds of the dashboard!', item);
-        return;
+        item.x = undefined;
+        item.y = undefined;
+        $log.warn('Can\'t be placed in the bounds of the dashboard, trying to auto position!', item);
+        vm.autoPositionItem(item);
       }
       vm.grid.push(item);
       vm.calculateLayout();

diff --git a/dist/scripts/app.js b/dist/scripts/app.js
@@ -34,7 +34,7 @@
       {cols: 1, rows: 1, y: 0, x: 4},
       {cols: 1, rows: 1, y: 0, x: 5},
       {cols: 2, rows: 1, y: 1, x: 0},
-      {cols: 1, rows: 1, y: 1, x: 4},
+      {cols: 1, rows: 1, y: undefined, x: undefined},
       {cols: 1, rows: 2, y: 1, x: 5},
       {cols: 1, rows: 3, y: 2, x: 0},
       {cols: 2, rows: 1, y: 2, x: 1},

diff --git a/src/app/index.controller.js b/src/app/index.controller.js
@@ -27,7 +27,7 @@
       {cols: 1, rows: 1, y: 0, x: 4},
       {cols: 1, rows: 1, y: 0, x: 5},
       {cols: 2, rows: 1, y: 1, x: 0},
-      {cols: 1, rows: 1, y: 1, x: 4},
+      {cols: 1, rows: 1, y: undefined, x: undefined},
       {cols: 1, rows: 2, y: 1, x: 5},
       {cols: 1, rows: 3, y: 2, x: 0},
       {cols: 2, rows: 1, y: 2, x: 1},

diff --git a/src/gridster2/gridster.controller.js b/src/gridster2/gridster.controller.js
@@ -86,8 +86,10 @@
       if (angular.isUndefined(item.x) || angular.isUndefined(item.y)) {
         vm.autoPositionItem(item);
       } else if (vm.checkCollision(item)) {
-        $log.warn('Can\'t be placed in the bounds of the dashboard!', item);
-        return;
+        item.x = undefined;
+        item.y = undefined;
+        $log.warn('Can\'t be placed in the bounds of the dashboard, trying to auto position!', item);
+        vm.autoPositionItem(item);
       }
       vm.grid.push(item);
       vm.calculateLayout();