From 835902950339c30f98502905708bfcdf058aa4c9 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 10 Feb 2016 15:54:25 +0000 Subject: [PATCH] Improve drop zones and feel of dragging in file tree --- .../controllers/FileTreeRootFolderController.coffee | 2 ++ .../public/coffee/ide/file-tree/directives/draggable.coffee | 1 - .../public/coffee/ide/file-tree/directives/droppable.coffee | 1 + services/web/public/stylesheets/app/editor/file-tree.less | 6 ++++-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/web/public/coffee/ide/file-tree/controllers/FileTreeRootFolderController.coffee b/services/web/public/coffee/ide/file-tree/controllers/FileTreeRootFolderController.coffee index e6aab26f48..34576c205b 100644 --- a/services/web/public/coffee/ide/file-tree/controllers/FileTreeRootFolderController.coffee +++ b/services/web/public/coffee/ide/file-tree/controllers/FileTreeRootFolderController.coffee @@ -11,4 +11,6 @@ define [ for dropped_entity in entities ide.fileTreeManager.moveEntity(dropped_entity, rootFolder) $scope.$digest() + # clear highlight explicitly + $('.file-tree-inner .droppable-hover').removeClass('droppable-hover') ] diff --git a/services/web/public/coffee/ide/file-tree/directives/draggable.coffee b/services/web/public/coffee/ide/file-tree/directives/draggable.coffee index ea9d3ff19e..8b37c9957e 100644 --- a/services/web/public/coffee/ide/file-tree/directives/draggable.coffee +++ b/services/web/public/coffee/ide/file-tree/directives/draggable.coffee @@ -9,7 +9,6 @@ define [ element.draggable delay: 250 opacity: 0.7 - helper: "clone" scroll: true helper: scope.$eval(attrs.draggableHelper) } \ No newline at end of file diff --git a/services/web/public/coffee/ide/file-tree/directives/droppable.coffee b/services/web/public/coffee/ide/file-tree/directives/droppable.coffee index 890e345c23..7815a60d64 100644 --- a/services/web/public/coffee/ide/file-tree/directives/droppable.coffee +++ b/services/web/public/coffee/ide/file-tree/directives/droppable.coffee @@ -9,6 +9,7 @@ define [ element.droppable greedy: true hoverClass: "droppable-hover" + tolerance: "pointer" accept: attrs.accept drop: scope.$eval(attrs.onDropCallback) } \ No newline at end of file diff --git a/services/web/public/stylesheets/app/editor/file-tree.less b/services/web/public/stylesheets/app/editor/file-tree.less index 573a69aee1..6f70c3299f 100644 --- a/services/web/public/stylesheets/app/editor/file-tree.less +++ b/services/web/public/stylesheets/app/editor/file-tree.less @@ -24,6 +24,8 @@ aside#file-tree { font-size: 0.8rem; margin: 0; padding: (@line-height-computed / 4) 0; + overflow-x: hidden; + height: 100%; ul { margin-left: (@line-height-computed / 2); @@ -46,7 +48,7 @@ aside#file-tree { line-height: 1.6; } &.droppable-hover { - background-color: @file-tree-droppable-background-color; + background-color: fade(@file-tree-droppable-background-color, 60%); } } @@ -121,7 +123,7 @@ aside#file-tree { } ul.droppable-hover { - background-color: @file-tree-droppable-background-color; + background-color: fade(@file-tree-droppable-background-color, 60%); } }