Changeset 215357 in webkit

Timestamp:

Apr 13, 2017 9:47:19 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: No context menu available via ENABLE_INSPECTOR_SERVER
​https://bugs.webkit.org/show_bug.cgi?id=170705

Patch by Ross Kirsling <Ross Kirsling> on 2017-04-13
Reviewed by Joseph Pecoraro.

Reintroduce old SoftContextMenu class (removed in r157278) and apply various fixes:

• Remove legacy globals and prototype extensions.
• Align JS/CSS style with current front-end code.
• Update UI and fix UX to replicate the macOS native context menu.

• Scripts/copy-user-interface-resources.pl:

Add copyright line for Sony Interactive Entertainment.

• UserInterface/Base/InspectorFrontendHostStub.js:

(WebInspector.InspectorFrontendHostStub.prototype.showContextMenu):
Use SoftContextMenu.

• UserInterface/Main.html:

Include SoftContextMenu.

• UserInterface/Views/SoftContextMenu.css: Added.

(.soft-context-menu-glass-pane):
(.soft-context-menu):
(.soft-context-menu > .item):
(.soft-context-menu > .item.disabled):
(.soft-context-menu > .item.highlighted):
(.soft-context-menu > .item > .checkmark):
(.soft-context-menu > .item > .label):
(.soft-context-menu > .item > .submenu-arrow):
(.soft-context-menu > .separator):
(.soft-context-menu > .separator > .line):

• UserInterface/Views/SoftContextMenu.js: Added.

(WebInspector.SoftContextMenu):
(WebInspector.SoftContextMenu.prototype.show):
(WebInspector.SoftContextMenu.prototype._consumeEvent):
(WebInspector.SoftContextMenu.prototype._parentGlassPaneElement):
(WebInspector.SoftContextMenu.prototype._createMenuItem):
(WebInspector.SoftContextMenu.prototype._createSeparator):
(WebInspector.SoftContextMenu.prototype._repositionMenuOnScreen):
(WebInspector.SoftContextMenu.prototype._showSubMenu):
(WebInspector.SoftContextMenu.prototype._hideSubMenu):
(WebInspector.SoftContextMenu.prototype._menuItemContextMenu):
(WebInspector.SoftContextMenu.prototype._menuItemMouseDown):
(WebInspector.SoftContextMenu.prototype._menuItemMouseUp):
(WebInspector.SoftContextMenu.prototype._menuItemMouseOver):
(WebInspector.SoftContextMenu.prototype._menuItemMouseOut):
(WebInspector.SoftContextMenu.prototype._menuKeyDown):
(WebInspector.SoftContextMenu.prototype._glassPaneMouseDown):
(WebInspector.SoftContextMenu.prototype._focus):
(WebInspector.SoftContextMenu.prototype._triggerAction):
(WebInspector.SoftContextMenu.prototype._highlightMenuItem):
(WebInspector.SoftContextMenu.prototype._highlightPrevious):
(WebInspector.SoftContextMenu.prototype._highlightNext):
(WebInspector.SoftContextMenu.prototype._discardMenu):
(WebInspector.SoftContextMenu.prototype._discardSubMenus):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Scripts/copy-user-interface-resources.pl (modified) (1 diff)
• UserInterface/Base/InspectorFrontendHostStub.js (modified) (1 diff)
• UserInterface/Main.html (modified) (2 diffs)
• UserInterface/Views/SoftContextMenu.css (added)
• UserInterface/Views/SoftContextMenu.js (added)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-04-13  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Web Inspector: No context menu available via ENABLE_INSPECTOR_SERVER
+        https://bugs.webkit.org/show_bug.cgi?id=170705
+
+        Reviewed by Joseph Pecoraro.
+
+        Reintroduce old SoftContextMenu class (removed in r157278) and apply various fixes:
+        - Remove legacy globals and prototype extensions.
+        - Align JS/CSS style with current front-end code.
+        - Update UI and fix UX to replicate the macOS native context menu.
+
+        * Scripts/copy-user-interface-resources.pl:
+        Add copyright line for Sony Interactive Entertainment.
+        
+        * UserInterface/Base/InspectorFrontendHostStub.js:
+        (WebInspector.InspectorFrontendHostStub.prototype.showContextMenu):
+        Use SoftContextMenu.
+        
+        * UserInterface/Main.html:
+        Include SoftContextMenu.
+
+        * UserInterface/Views/SoftContextMenu.css: Added.
+        (.soft-context-menu-glass-pane):
+        (.soft-context-menu):
+        (.soft-context-menu > .item):
+        (.soft-context-menu > .item.disabled):
+        (.soft-context-menu > .item.highlighted):
+        (.soft-context-menu > .item > .checkmark):
+        (.soft-context-menu > .item > .label):
+        (.soft-context-menu > .item > .submenu-arrow):
+        (.soft-context-menu > .separator):
+        (.soft-context-menu > .separator > .line):
+
+        * UserInterface/Views/SoftContextMenu.js: Added.
+        (WebInspector.SoftContextMenu):
+        (WebInspector.SoftContextMenu.prototype.show):
+        (WebInspector.SoftContextMenu.prototype._consumeEvent):
+        (WebInspector.SoftContextMenu.prototype._parentGlassPaneElement):
+        (WebInspector.SoftContextMenu.prototype._createMenuItem):
+        (WebInspector.SoftContextMenu.prototype._createSeparator):
+        (WebInspector.SoftContextMenu.prototype._repositionMenuOnScreen):
+        (WebInspector.SoftContextMenu.prototype._showSubMenu):
+        (WebInspector.SoftContextMenu.prototype._hideSubMenu):
+        (WebInspector.SoftContextMenu.prototype._menuItemContextMenu):
+        (WebInspector.SoftContextMenu.prototype._menuItemMouseDown):
+        (WebInspector.SoftContextMenu.prototype._menuItemMouseUp):
+        (WebInspector.SoftContextMenu.prototype._menuItemMouseOver):
+        (WebInspector.SoftContextMenu.prototype._menuItemMouseOut):
+        (WebInspector.SoftContextMenu.prototype._menuKeyDown):
+        (WebInspector.SoftContextMenu.prototype._glassPaneMouseDown):
+        (WebInspector.SoftContextMenu.prototype._focus):
+        (WebInspector.SoftContextMenu.prototype._triggerAction):
+        (WebInspector.SoftContextMenu.prototype._highlightMenuItem):
+        (WebInspector.SoftContextMenu.prototype._highlightPrevious):
+        (WebInspector.SoftContextMenu.prototype._highlightNext):
+        (WebInspector.SoftContextMenu.prototype._discardMenu):
+        (WebInspector.SoftContextMenu.prototype._discardSubMenus):
+
 2017-04-13  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

@@ -108 +108 @@
  * Copyright (C) 2015 Tobias Reiss <tobi+webkit@basecode.de>
  * Copyright (C) 2015-2016 Devin Rousso <dcrousso+webkit@gmail.com>. All rights reserved.
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/Source/WebInspectorUI/UserInterface/Base/InspectorFrontendHostStub.js

@@ -165 +165 @@
         showContextMenu: function(event, menuObject)
         {
+            new WebInspector.SoftContextMenu(menuObject).show(event);
         },
 

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -158 +158 @@
     <link rel="stylesheet" href="Views/SidebarPanel.css">
     <link rel="stylesheet" href="Views/Slider.css">
+    <link rel="stylesheet" href="Views/SoftContextMenu.css">
     <link rel="stylesheet" href="Views/SourceCodeTextEditor.css">
     <link rel="stylesheet" href="Views/SpringEditor.css">
@@ -660 +661 @@
     <script src="Views/Sidebar.js"></script>
     <script src="Views/Slider.js"></script>
+    <script src="Views/SoftContextMenu.js"></script>
     <script src="Views/SourceCodeTextEditor.js"></script>
     <script src="Views/SourceCodeTimelineTimelineDataGridNode.js"></script>