From 23185273a6f4de246443f7120d2c3248c1187a08 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 4 Aug 2016 14:16:18 -0400
Subject: [PATCH] (css) Cleanup transition of event DnD ghosts

---
 .../js/Scheduler/sgCalendarGhost.directive.js   | 17 ++---------------
 .../scss/views/SchedulerUI.scss                 |  4 ----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
index dda0b2b71..58bf09cf0 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
@@ -83,13 +83,10 @@
 
       function updateGhost() {
         // From SOGoEventDragGhostController._updateGhosts
-        var showGhost, isRelative, currentDay, wasOtherBlock,
-            start, duration, durationLeft, maxDuration, enableTransition;
+        var showGhost, isRelative, currentDay,
+            start, duration, durationLeft, maxDuration;
 
         showGhost = false;
-        enableTransition = function() {
-          iElement.removeClass('sg-event--notransition');
-        };
 
         if (Calendar.$view && Calendar.$view.type == scrollViewCtrl.type) {
           // The view of the dragging block is the scrolling view of this ghost block
@@ -119,9 +116,6 @@
             if (!isRelative) {
               // Show start hour and set the vertical position
               scope.block.startHour = getStartTime(start);
-              wasOtherBlock = parseInt(iElement.css('top')) === 0;
-              if (wasOtherBlock)
-                iElement.addClass('sg-event--notransition');
               // Set the height
               if (Calendar.$view.quarterHeight) {
                 iElement.css('top', (start * Calendar.$view.quarterHeight) + 'px');
@@ -129,8 +123,6 @@
               }
               else
                 iElement.css('top', Calendar.$view.topOffset + 'px');
-              if (wasOtherBlock)
-                $timeout(enableTransition);
             }
             iElement.removeClass('fg-folder' + scope.block.component.pid);
             iElement.removeClass('sg-event--ghost--last');
@@ -149,15 +141,10 @@
               // The dragging event overlaps this current ghost's day
               showGhost = true;
               if (!isRelative) {
-                wasOtherBlock = parseInt(iElement.css('top')) !== 0;
-                if (wasOtherBlock)
-                  iElement.addClass('sg-event--notransition');
                 iElement.css('top', Calendar.$view.topOffset + 'px');
                 // Set the height
                 if (Calendar.$view.quarterHeight)
                   iElement.css('height', (duration * Calendar.$view.quarterHeight) + 'px');
-                if (wasOtherBlock)
-                  $timeout(enableTransition);
               }
               iElement.removeClass('sg-event--ghost--first');
               iElement.removeClass('sg-event--ghost--last');
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index 57b8ad0d9..7762fab0e 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -265,10 +265,6 @@ $quarter_height: 10px;
       $i: $i + 1;
     }
 
-    &--notransition {
-      transition: none;
-    }
-
     &--ghost {
       opacity: 1;
       left: $block_margin;