From 2eb36710e2c056cd2c0a0620e3a22378bf270f51 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 22 Oct 2015 11:28:08 +0200 Subject: [PATCH] remove sortable from media grid until we find a way to save sort order --- .../components/umbmediagrid.directive.js | 14 -------------- .../src/less/components/umb-media-grid.less | 6 ------ .../src/views/components/umb-media-grid.html | 2 +- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js index e2df254a48..df9eb2f46e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js @@ -12,20 +12,6 @@ var itemMaxWidth = 300; var itemMaxHeight = 300; - scope.mediaItemsSortingOptions = { - distance: 10, - tolerance: "pointer", - opacity: 0.7, - scroll: true, - cursor: "move", - zIndex: 6000, - placeholder: "umb-media-grid__placeholder", - start: function(e, ui) { - ui.placeholder.height(ui.item.height()); - ui.placeholder.width(ui.item.width()); - } - }; - function activate() { scope.mediaItems = []; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less index a4dbaf5440..03283ac0c3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less @@ -125,9 +125,3 @@ animation-duration: 0.2s; animation-timing-function: ease-in-out; } - -.umb-media-grid__placeholder { - background: @grayLighter; - border: 2px dashed @grayLight; - box-sizing: border-box; -} diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html index 7671178663..b36d7c1946 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-media-grid.html @@ -1,4 +1,4 @@ -
+