Changeset 107384 in webkit
- Timestamp:
- Feb 10, 2012 1:34:33 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r107382 r107384 1 2012-02-10 Vsevolod Vlasov <vsevik@chromium.org> 2 3 Web Inspector: FileSelector should not depend on DebuggerPresentationModel. 4 https://bugs.webkit.org/show_bug.cgi?id=78337 5 6 Reviewed by Pavel Feldman. 7 8 * inspector/front-end/ScriptsNavigator.js: 9 (WebInspector.ScriptsNavigator): 10 (WebInspector.ScriptsNavigator.prototype._showScriptFoldersSettingChanged): 11 (WebInspector.ScriptsNavigator.prototype.reset): 12 * inspector/front-end/ScriptsPanel.js: 13 (WebInspector.ScriptsPanel.prototype._reset): 14 (WebInspector.ScriptsPanel.FileSelector.prototype.replaceUISourceCodes): 15 (WebInspector.ScriptsPanel.FileSelector.prototype.reset): 16 (WebInspector.ScriptsPanel.ComboBoxFileSelector): 17 (WebInspector.ScriptsPanel.ComboBoxFileSelector.prototype.reset): 18 1 19 2012-02-10 Kentaro Hara <haraken@chromium.org> 2 20 -
trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js
r107235 r107384 32 32 * @constructor 33 33 */ 34 WebInspector.ScriptsNavigator = function( presentationModel)34 WebInspector.ScriptsNavigator = function() 35 35 { 36 36 WebInspector.Object.call(this); … … 38 38 this._tabbedPane = new WebInspector.TabbedPane(); 39 39 this._tabbedPane.shrinkableTabs = true; 40 41 this._presentationModel = presentationModel;42 40 43 41 this._tabbedPane.element.id = "scripts-navigator-tabbed-pane"; … … 72 70 73 71 WebInspector.settings.showScriptFolders.addChangeListener(this._showScriptFoldersSettingChanged.bind(this)); 74 75 WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasDisabled, this._reset, this);76 this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.DebuggerReset, this._reset, this);77 72 } 78 73 … … 229 224 var uiSourceCodes = this._navigatorScriptsTree.scriptTreeElements(); 230 225 uiSourceCodes = uiSourceCodes.concat(this._navigatorContentScriptsTree.scriptTreeElements()); 231 this. _reset();226 this.reset(); 232 227 for (var i = 0; i < uiSourceCodes.length; ++i) 233 228 this.addUISourceCode(uiSourceCodes[i]); … … 236 231 }, 237 232 238 _reset: function()233 reset: function() 239 234 { 240 235 this._navigatorScriptsTree.stopSearch(); -
trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js
r107238 r107384 71 71 this.editorView.show(this.splitView.mainElement); 72 72 73 this._navigator = new WebInspector.ScriptsNavigator( this._presentationModel);73 this._navigator = new WebInspector.ScriptsNavigator(); 74 74 this._navigatorView = this._navigator.view; 75 75 this._fileSelector = this._navigator; … … 86 86 this._toggleNavigator(); 87 87 } else { 88 this._fileSelector = new WebInspector.ScriptsPanel.ComboBoxFileSelector( this._presentationModel);88 this._fileSelector = new WebInspector.ScriptsPanel.ComboBoxFileSelector(); 89 89 this._fileSelector.show(this.splitView.mainElement); 90 90 … … 409 409 410 410 delete this._currentUISourceCode; 411 this._fileSelector.reset(); 411 412 this._editorContainer.reset(); 412 413 this._updateScriptViewStatusBarItems(); … … 1175 1176 * @param {Array.<WebInspector.UISourceCode>} uiSourceCodeList 1176 1177 */ 1177 replaceUISourceCodes: function(oldUISourceCodeList, uiSourceCodeList) { } 1178 replaceUISourceCodes: function(oldUISourceCodeList, uiSourceCodeList) { }, 1179 1180 reset: function() { } 1178 1181 } 1179 1182 … … 1242 1245 * @constructor 1243 1246 */ 1244 WebInspector.ScriptsPanel.ComboBoxFileSelector = function( presentationModel)1247 WebInspector.ScriptsPanel.ComboBoxFileSelector = function() 1245 1248 { 1246 1249 WebInspector.Object.call(this); 1247 1250 this.editorToolbar = this._createEditorToolbar(); 1248 1251 1249 this._presentationModel = presentationModel;1250 1252 WebInspector.settings.showScriptFolders.addChangeListener(this._showScriptFoldersSettingChanged.bind(this)); 1251 WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasDisabled, this._reset, this);1252 this._presentationModel.addEventListener(WebInspector.DebuggerPresentationModel.Events.DebuggerReset, this._reset, this);1253 1253 1254 1254 this._backForwardList = []; … … 1388 1388 }, 1389 1389 1390 _reset: function()1390 reset: function() 1391 1391 { 1392 1392 this._backForwardList = [];
Note: See TracChangeset
for help on using the changeset viewer.