Title: [107209] trunk/Source/WebCore
- Revision
- 107209
- Author
- [email protected]
- Date
- 2012-02-09 03:28:57 -0800 (Thu, 09 Feb 2012)
Log Message
Web Inspector: Scripts navigator fails to reopen previously closed script.
https://bugs.webkit.org/show_bug.cgi?id=78212
Reviewed by Pavel Feldman.
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._reset):
(WebInspector.ScriptsPanel.prototype._showFile):
(WebInspector.ScriptsPanel.prototype._editorClosed):
* inspector/front-end/TabbedEditorContainer.js:
(WebInspector.TabbedEditorContainer.prototype._tabClosed):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107208 => 107209)
--- trunk/Source/WebCore/ChangeLog 2012-02-09 11:21:46 UTC (rev 107208)
+++ trunk/Source/WebCore/ChangeLog 2012-02-09 11:28:57 UTC (rev 107209)
@@ -1,3 +1,17 @@
+2012-02-09 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Scripts navigator fails to reopen previously closed script.
+ https://bugs.webkit.org/show_bug.cgi?id=78212
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._reset):
+ (WebInspector.ScriptsPanel.prototype._showFile):
+ (WebInspector.ScriptsPanel.prototype._editorClosed):
+ * inspector/front-end/TabbedEditorContainer.js:
+ (WebInspector.TabbedEditorContainer.prototype._tabClosed):
+
2012-02-09 Shinya Kawanaka <[email protected]>
ASSERT_NO_EXCEPTION should be initialized with non-zero value.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (107208 => 107209)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-02-09 11:21:46 UTC (rev 107208)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2012-02-09 11:28:57 UTC (rev 107209)
@@ -404,7 +404,7 @@
this._debuggerResumed();
- delete this._curentUISourceCode;
+ delete this._currentUISourceCode;
this._editorContainer.reset();
this._updateScriptViewStatusBarItems();
@@ -475,9 +475,9 @@
return null;
var sourceFrame = this._getOrCreateSourceFrame(uiSourceCode);
- if (this._curentUISourceCode === uiSourceCode)
+ if (this._currentUISourceCode === uiSourceCode)
return sourceFrame;
- this._curentUISourceCode = uiSourceCode;
+ this._currentUISourceCode = uiSourceCode;
this._fileSelector.revealUISourceCode(uiSourceCode);
this._editorContainer.showFile(uiSourceCode);
@@ -629,6 +629,9 @@
{
var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
+ if (this._currentUISourceCode === uiSourceCode)
+ delete this._currentUISourceCode;
+
// We don't need to update file selector here regardless of whether useScriptsNavigator is set or not:
// SingleFileEditorContainer never dispatches EditorClosed, so no need to update ComboBoxFileSelector;
// ScriptsNavigator does not need to update on EditorClosed.
Modified: trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js (107208 => 107209)
--- trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js 2012-02-09 11:21:46 UTC (rev 107208)
+++ trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js 2012-02-09 11:28:57 UTC (rev 107209)
@@ -206,6 +206,7 @@
var uiSourceCode = this._files[tabId];
this._tabIds.remove(uiSourceCode);
delete this._files[tabId];
+ delete this._currentFile;
this.dispatchEventToListeners(WebInspector.EditorContainer.Events.EditorClosed, uiSourceCode);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes