Changeset 246176 in webkit
- Timestamp:
- Jun 6, 2019 4:28:34 PM (5 years ago)
- Location:
- trunk/Source/WebInspectorUI
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebInspectorUI/ChangeLog
r246124 r246176 1 2019-06-06 Devin Rousso <drousso@apple.com> 2 3 Web Inspector: Elements: print/rulers/compositing/paint navigation items shouldn't be visible if the inspected target doesn't have a PageAgent 4 https://bugs.webkit.org/show_bug.cgi?id=198410 5 6 Reviewed by Timothy Hatcher. 7 8 * UserInterface/Views/DOMTreeContentView.js: 9 (WI.DOMTreeContentView): 10 (WI.DOMTreeContentView.prototype.get navigationItems): 11 (WI.DOMTreeContentView.prototype._showRulersChanged): 12 1 13 == Rolled over to ChangeLog-2019-06-05 == -
trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js
r244327 r246176 32 32 super(representedObject); 33 33 34 this._compositingBordersButtonNavigationItem = new WI.ActivateButtonNavigationItem("layer-borders", WI.UIString("Show compositing borders"), WI.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13); 35 this._compositingBordersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this); 36 this._compositingBordersButtonNavigationItem.enabled = !!PageAgent.getCompositingBordersVisible; 37 this._compositingBordersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 38 39 WI.settings.showPaintRects.addEventListener(WI.Setting.Event.Changed, this._showPaintRectsSettingChanged, this); 40 this._paintFlashingButtonNavigationItem = new WI.ActivateButtonNavigationItem("paint-flashing", WI.UIString("Enable paint flashing"), WI.UIString("Disable paint flashing"), "Images/Paint.svg", 16, 16); 41 this._paintFlashingButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this); 42 this._paintFlashingButtonNavigationItem.enabled = !!PageAgent.setShowPaintRects; 43 this._paintFlashingButtonNavigationItem.activated = PageAgent.setShowPaintRects && WI.settings.showPaintRects.value; 44 this._paintFlashingButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 34 if (InspectorBackend.domains.Page) { 35 this._compositingBordersButtonNavigationItem = new WI.ActivateButtonNavigationItem("layer-borders", WI.UIString("Show compositing borders"), WI.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13); 36 this._compositingBordersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this); 37 this._compositingBordersButtonNavigationItem.enabled = !!PageAgent.getCompositingBordersVisible; 38 this._compositingBordersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 39 } 40 41 if (InspectorBackend.domains.Page) { 42 WI.settings.showPaintRects.addEventListener(WI.Setting.Event.Changed, this._showPaintRectsSettingChanged, this); 43 this._paintFlashingButtonNavigationItem = new WI.ActivateButtonNavigationItem("paint-flashing", WI.UIString("Enable paint flashing"), WI.UIString("Disable paint flashing"), "Images/Paint.svg", 16, 16); 44 this._paintFlashingButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this); 45 this._paintFlashingButtonNavigationItem.enabled = !!PageAgent.setShowPaintRects; 46 this._paintFlashingButtonNavigationItem.activated = PageAgent.setShowPaintRects && WI.settings.showPaintRects.value; 47 this._paintFlashingButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 48 } 45 49 46 50 WI.settings.showShadowDOM.addEventListener(WI.Setting.Event.Changed, this._showShadowDOMSettingChanged, this); … … 50 54 this._showShadowDOMSettingChanged(); 51 55 52 this._showPrintStylesButtonNavigationItem = new WI.ActivateButtonNavigationItem("print-styles", WI.UIString("Force Print Media Styles"), WI.UIString("Use Default Media Styles"), "Images/Printer.svg", 16, 16); 53 this._showPrintStylesButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePrintStyles, this); 54 this._showPrintStylesButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 55 this._showPrintStylesChanged(); 56 57 WI.settings.showRulers.addEventListener(WI.Setting.Event.Changed, this._showRulersChanged, this); 58 this._showRulersButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-rulers", WI.UIString("Show Rulers"), WI.UIString("Hide Rulers"), "Images/Rulers.svg", 16, 16); 59 this._showRulersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleShowRulers, this); 60 this._showRulersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 61 this._showRulersChanged(); 56 if (InspectorBackend.domains.Page) { 57 this._showPrintStylesButtonNavigationItem = new WI.ActivateButtonNavigationItem("print-styles", WI.UIString("Force Print Media Styles"), WI.UIString("Use Default Media Styles"), "Images/Printer.svg", 16, 16); 58 this._showPrintStylesButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePrintStyles, this); 59 this._showPrintStylesButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 60 this._showPrintStylesChanged(); 61 } 62 63 // COMPATIBILITY (iOS 11.3) 64 if (InspectorBackend.domains.Page && InspectorBackend.domains.Page.setShowRulers) { 65 WI.settings.showRulers.addEventListener(WI.Setting.Event.Changed, this._showRulersChanged, this); 66 this._showRulersButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-rulers", WI.UIString("Show Rulers"), WI.UIString("Hide Rulers"), "Images/Rulers.svg", 16, 16); 67 this._showRulersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleShowRulers, this); 68 this._showRulersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low; 69 this._showRulersChanged(); 70 } 62 71 63 72 this.element.classList.add("dom-tree"); … … 107 116 get navigationItems() 108 117 { 109 let items = [this._showPrintStylesButtonNavigationItem, this._showsShadowDOMButtonNavigationItem]; 118 let items = []; 119 120 if (this._showPrintStylesButtonNavigationItem) 121 items.push(this._showPrintStylesButtonNavigationItem); 122 123 items.push(this._showsShadowDOMButtonNavigationItem); 110 124 111 125 if (this._forceAppearanceButtonNavigationItem) 112 items.unshift(this._forceAppearanceButtonNavigationItem); 113 114 // COMPATIBILITY (iOS 11.3) 115 if (window.PageAgent && PageAgent.setShowRulers) 116 items.unshift(this._showRulersButtonNavigationItem); 117 118 if (!WI.settings.experimentalEnableLayersTab.value) 119 items.push(this._compositingBordersButtonNavigationItem, this._paintFlashingButtonNavigationItem); 126 items.push(this._forceAppearanceButtonNavigationItem); 127 128 if (this._showRulersButtonNavigationItem) 129 items.unshift(this._showRulersButtonNavigationItem); 130 131 if (!WI.settings.experimentalEnableLayersTab.value) { 132 if (this._compositingBordersButtonNavigationItem) 133 items.push(this._compositingBordersButtonNavigationItem); 134 135 if (this._paintFlashingButtonNavigationItem) 136 items.push(this._paintFlashingButtonNavigationItem); 137 } 120 138 121 139 return items; … … 691 709 _showRulersChanged() 692 710 { 711 console.assert(PageAgent.setShowRulers); 712 693 713 this._showRulersButtonNavigationItem.activated = WI.settings.showRulers.value; 694 695 // COMPATIBILITY (iOS 11.3)696 if (!PageAgent.setShowRulers)697 return;698 714 699 715 PageAgent.setShowRulers(this._showRulersButtonNavigationItem.activated);
Note: See TracChangeset
for help on using the changeset viewer.