Changeset 197073 in webkit

Timestamp:

Feb 25, 2016, 1:45:15 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196852 - Web Inspector: Color picker in Visual Styles sidebar should not default to zero alpha
​https://bugs.webkit.org/show_bug.cgi?id=154474
<rdar://problem/24750217>

Patch by Devin Rousso <Devin Rousso> on 2016-02-19
Reviewed by Timothy Hatcher.

• UserInterface/Views/InlineSwatch.js:

(WebInspector.InlineSwatch.prototype._fallbackValue):
Changed the fallback value for color from transparent to white so that
the color picker starts out with an alpha value of 1.

(WebInspector.InlineSwatch.prototype._handleContextMenuEvent):
Prevents context menu events from having an effect if there is no value
for them to modify.

Location:

releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/InlineSwatch.js (modified) (2 diffs)

releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-02-19  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: Color picker in Visual Styles sidebar should not default to zero alpha
+        https://bugs.webkit.org/show_bug.cgi?id=154474
+        <rdar://problem/24750217>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/InlineSwatch.js:
+        (WebInspector.InlineSwatch.prototype._fallbackValue):
+        Changed the fallback value for color from transparent to white so that
+        the color picker starts out with an alpha value of 1.
+
+        (WebInspector.InlineSwatch.prototype._handleContextMenuEvent):
+        Prevents context menu events from having an effect if there is no value
+        for them to modify.
+
 2016-02-18  Devin Rousso  <dcrousso+webkit@gmail.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/InlineSwatch.js

@@ -90 +90 @@
             return WebInspector.Gradient.fromString("linear-gradient(transparent, transparent)");
         case WebInspector.InlineSwatch.Type.Color:
-            return WebInspector.Color.fromString("transparent");
+            return WebInspector.Color.fromString("white");
         default:
             return null;
@@ -162 +162 @@
     _handleContextMenuEvent(event)
     {
+        if (!this._value)
+            return;
+
         let contextMenu = WebInspector.ContextMenu.createFromEvent(event);