DevTools: fix changing of cursor while dragging

Source/devtools/front_end/ui/UIUtils.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 60 matching lines @@
     var targetDocument = event.target.ownerDocument;
 
     WebInspector._elementDraggingEventListener = elementDrag;
     WebInspector._elementEndDraggingEventListener = elementDragEnd;
     WebInspector._mouseOutWhileDraggingTargetDocument = targetDocument;
 
     targetDocument.addEventListener("mousemove", WebInspector._elementDragMove, true);
     targetDocument.addEventListener("mouseup", WebInspector._elementDragEnd, true);
     targetDocument.addEventListener("mouseout", WebInspector._mouseOutWhileDragging, true);
 
-    targetDocument.body.style.cursor = cursor;
-
+    var targetElement = /** @type {!Element} */ (event.target);
+    if (typeof cursor === "string") {
+        WebInspector._restoreCursorAfterDrag = restoreCursor.bind(null, targetElement.style.cursor);
+        targetElement.style.cursor = cursor;
+        document.body.style.cursor = cursor;
+    }
+    function restoreCursor(oldCursor)
+    {
+        targetDocument.body.style.removeProperty("cursor");
+        targetElement.style.cursor = oldCursor;

[vsevik, 2014/10/23 08:03:59]

Shouldn't this be behind if (oldcursor) ? 

+        WebInspector._restoreCursorAfterDrag = null;
+    }
     event.preventDefault();
 }
 
 WebInspector._mouseOutWhileDragging = function()
 {
     WebInspector._unregisterMouseOutWhileDragging();
     WebInspector._elementDraggingGlassPane = new WebInspector.GlassPane();
 }
 
 WebInspector._unregisterMouseOutWhileDragging = function()
@@ skipping 16 matching lines @@
 /**
  * @param {!Event} event
  */
 WebInspector._cancelDragEvents = function(event)
 {
     var targetDocument = event.target.ownerDocument;
     targetDocument.removeEventListener("mousemove", WebInspector._elementDragMove, true);
     targetDocument.removeEventListener("mouseup", WebInspector._elementDragEnd, true);
     WebInspector._unregisterMouseOutWhileDragging();
 
-    targetDocument.body.style.removeProperty("cursor");
+    if (WebInspector._restoreCursorAfterDrag)
+        WebInspector._restoreCursorAfterDrag();
 
     if (WebInspector._elementDraggingGlassPane)
         WebInspector._elementDraggingGlassPane.dispose();
 
     delete WebInspector._elementDraggingGlassPane;
     delete WebInspector._elementDraggingEventListener;
     delete WebInspector._elementEndDraggingEventListener;
 }
 
 /**
@@ skipping 941 matching lines @@
     __proto__: WebInspector.Object.prototype
 }
 
 WebInspector.initializeUIUtils = function()
 {
     window.addEventListener("focus", WebInspector._windowFocused, false);
     window.addEventListener("blur", WebInspector._windowBlurred, false);
     document.addEventListener("focus", WebInspector._focusChanged, true);
     document.addEventListener("blur", WebInspector._documentBlurred, true);
 }