[webkit-changes] [185271] trunk/Source/WebInspectorUI

Fri, 05 Jun 2015 15:59:35 -0700

Title: [185271] trunk/Source/WebInspectorUI
Revision
185271
Author
[email protected]
Date
2015-06-05 15:59:16 -0700 (Fri, 05 Jun 2015)

Log Message

REGRESSION (r185213): TypeError: undefined is not an object (evaluating 'WebInspector.clearLogOnReload.value')
https://bugs.webkit.org/show_bug.cgi?id=145695

Patch by Joseph Pecoraro <[email protected]> on 2015-06-05
Reviewed by Mark Lam.

Move and rename the clear log on reload setting property from
WebInspector (Main.js) to LogManager (shared with tests).

* UserInterface/Base/Main.js:
(WebInspector.loaded): Deleted.
* UserInterface/Controllers/LogManager.js:
(WebInspector.LogManager):
(WebInspector.LogManager.prototype._delayedMessagesCleared):
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype._sessionStarted):
(WebInspector.LogContentView.prototype._handleContextMenuEvent):
(WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (185270 => 185271)


--- trunk/Source/WebInspectorUI/ChangeLog	2015-06-05 22:33:23 UTC (rev 185270)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-06-05 22:59:16 UTC (rev 185271)
@@ -1,3 +1,23 @@
+2015-06-05  Joseph Pecoraro  <[email protected]>
+
+        REGRESSION (r185213): TypeError: undefined is not an object (evaluating 'WebInspector.clearLogOnReload.value')
+        https://bugs.webkit.org/show_bug.cgi?id=145695
+
+        Reviewed by Mark Lam.
+
+        Move and rename the clear log on reload setting property from
+        WebInspector (Main.js) to LogManager (shared with tests).
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.loaded): Deleted.
+        * UserInterface/Controllers/LogManager.js:
+        (WebInspector.LogManager):
+        (WebInspector.LogManager.prototype._delayedMessagesCleared):
+        * UserInterface/Views/LogContentView.js:
+        (WebInspector.LogContentView.prototype._sessionStarted):
+        (WebInspector.LogContentView.prototype._handleContextMenuEvent):
+        (WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting):
+
 2015-06-05  Nikita Vasilyev  <[email protected]>
 
         Web Inspector: [REGRESSION] Dashboard's resource count does not reset when main resource navigates

Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (185270 => 185271)


--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-06-05 22:33:23 UTC (rev 185270)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js	2015-06-05 22:59:16 UTC (rev 185271)
@@ -151,7 +151,6 @@
 
     this.showShadowDOMSetting = new WebInspector.Setting("show-shadow-dom", false);
     this.showReplayInterfaceSetting = new WebInspector.Setting("show-web-replay", false);
-    this.clearLogOnReload = new WebInspector.Setting("clear-log-on-reload", true);
 
     this.showJavaScriptTypeInformationSetting = new WebInspector.Setting("show-_javascript_-type-information", false);
     if (this.showJavaScriptTypeInformationSetting.value && window.RuntimeAgent && RuntimeAgent.enableTypeProfiler)

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js (185270 => 185271)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js	2015-06-05 22:33:23 UTC (rev 185270)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js	2015-06-05 22:59:16 UTC (rev 185271)
@@ -33,6 +33,8 @@
         this._clearMessagesRequested = false;
         this._isPageReload = false;
 
+        this.clearLogOnReloadSetting = new WebInspector.Setting("clear-log-on-reload", true);
+
         WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
     }
 
@@ -74,7 +76,7 @@
     {
         if (this._isPageReload) {
             this._isPageReload = false;
-            if (WebInspector.clearLogOnReload.value)
+            if (this.clearLogOnReloadSetting.value)
                 this.dispatchEventToListeners(WebInspector.LogManager.Event.Cleared);
         } else {
             // A frame navigated, console.clear() or command line clear() happened.

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (185270 => 185271)


--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js	2015-06-05 22:33:23 UTC (rev 185270)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js	2015-06-05 22:59:16 UTC (rev 185271)
@@ -310,7 +310,7 @@
 
     _sessionStarted: function(event)
     {
-        if (WebInspector.clearLogOnReload.value) {
+        if (WebInspector.logManager.clearLogOnReloadSetting.value) {
             this._reappendProvisionalMessages();
             return;
         }
@@ -351,7 +351,7 @@
         contextMenu.appendItem(WebInspector.UIString("Clear Log"), this._clearLog.bind(this));
         contextMenu.appendSeparator();
 
-        var clearLogOnReloadUIString = WebInspector.clearLogOnReload.value ? WebInspector.UIString("Keep Log on Reload") : WebInspector.UIString("Clear Log on Reload");
+        var clearLogOnReloadUIString = WebInspector.logManager.clearLogOnReloadSetting.value ? WebInspector.UIString("Keep Log on Reload") : WebInspector.UIString("Clear Log on Reload");
 
         contextMenu.appendItem(clearLogOnReloadUIString, this._toggleClearLogOnReloadSetting.bind(this));
 
@@ -643,7 +643,7 @@
 
     _toggleClearLogOnReloadSetting: function()
     {
-        WebInspector.clearLogOnReload.value = !WebInspector.clearLogOnReload.value;
+        WebInspector.logManager.clearLogOnReloadSetting.value = !WebInspector.logManager.clearLogOnReloadSetting.value;
     },
 
     _clearLog: function()

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to