Title: [229686] trunk/Source/WebInspectorUI
- Revision
- 229686
- Author
- nvasil...@apple.com
- Date
- 2018-03-16 16:43:41 -0700 (Fri, 16 Mar 2018)
Log Message
Web Inspector: Elements: "Force Print Media Styles" should not persist across Web Inspector sessions
https://bugs.webkit.org/show_bug.cgi?id=183708
<rdar://problem/36452183>
Reviewed by Matt Baker.
* UserInterface/Base/Main.js:
(WI.loaded):
* UserInterface/Views/DOMTreeContentView.js:
(WI.DOMTreeContentView):
(WI.DOMTreeContentView.prototype._showPrintStylesChanged):
(WI.DOMTreeContentView.prototype._togglePrintStyles):
(WI.DOMTreeContentView.prototype._showPrintStylesSettingChanged): Deleted.
(WI.DOMTreeContentView.prototype._togglePrintStylesSetting): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (229685 => 229686)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-03-16 22:46:12 UTC (rev 229685)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-03-16 23:43:41 UTC (rev 229686)
@@ -1,3 +1,20 @@
+2018-03-16 Nikita Vasilyev <nvasil...@apple.com>
+
+ Web Inspector: Elements: "Force Print Media Styles" should not persist across Web Inspector sessions
+ https://bugs.webkit.org/show_bug.cgi?id=183708
+ <rdar://problem/36452183>
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Base/Main.js:
+ (WI.loaded):
+ * UserInterface/Views/DOMTreeContentView.js:
+ (WI.DOMTreeContentView):
+ (WI.DOMTreeContentView.prototype._showPrintStylesChanged):
+ (WI.DOMTreeContentView.prototype._togglePrintStyles):
+ (WI.DOMTreeContentView.prototype._showPrintStylesSettingChanged): Deleted.
+ (WI.DOMTreeContentView.prototype._togglePrintStylesSetting): Deleted.
+
2018-03-14 Devin Rousso <web...@devinrousso.com>
Web Inspector: Canvas: a recording initiated by the user should be shown immediately on completion
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (229685 => 229686)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-03-16 22:46:12 UTC (rev 229685)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-03-16 23:43:41 UTC (rev 229686)
@@ -179,9 +179,7 @@
if (this.showPaintRectsSetting.value && window.PageAgent && PageAgent.setShowPaintRects)
PageAgent.setShowPaintRects(true);
- this.showPrintStylesSetting = new WI.Setting("show-print-styles", false);
- if (this.showPrintStylesSetting.value && window.PageAgent)
- PageAgent.setEmulatedMedia("print");
+ this.printStylesEnabled = false;
// COMPATIBILITY (iOS 10.3): Network.setDisableResourceCaching did not exist.
this.resourceCachingDisabledSetting = new WI.Setting("disable-resource-caching", false);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (229685 => 229686)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2018-03-16 22:46:12 UTC (rev 229685)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2018-03-16 23:43:41 UTC (rev 229686)
@@ -49,11 +49,10 @@
this._showsShadowDOMButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
this._showShadowDOMSettingChanged();
- WI.showPrintStylesSetting.addEventListener(WI.Setting.Event.Changed, this._showPrintStylesSettingChanged, this);
this._showPrintStylesButtonNavigationItem = new WI.ActivateButtonNavigationItem("print-styles", WI.UIString("Force Print Media Styles"), WI.UIString("Use Default Media Styles"), "Images/Printer.svg", 16, 16);
- this._showPrintStylesButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePrintStylesSetting, this);
+ this._showPrintStylesButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePrintStyles, this);
this._showPrintStylesButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
- this._showPrintStylesSettingChanged();
+ this._showPrintStylesChanged();
this.element.classList.add("dom-tree");
this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
@@ -552,21 +551,22 @@
WI.showShadowDOMSetting.value = !WI.showShadowDOMSetting.value;
}
- _showPrintStylesSettingChanged(event)
+ _showPrintStylesChanged()
{
- this._showPrintStylesButtonNavigationItem.activated = WI.showPrintStylesSetting.value;
- }
+ this._showPrintStylesButtonNavigationItem.activated = WI.printStylesEnabled;
- _togglePrintStylesSetting(event)
- {
- WI.showPrintStylesSetting.value = !WI.showPrintStylesSetting.value;
-
- let mediaType = WI.showPrintStylesSetting.value ? "print" : "";
+ let mediaType = WI.printStylesEnabled ? "print" : "";
PageAgent.setEmulatedMedia(mediaType);
WI.cssStyleManager.mediaTypeChanged();
}
+ _togglePrintStyles(event)
+ {
+ WI.printStylesEnabled = !WI.printStylesEnabled;
+ this._showPrintStylesChanged();
+ }
+
_showSearchHighlights()
{
console.assert(this._searchIdentifier);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
