Changeset 107384 in webkit


Ignore:
Timestamp:
Feb 10, 2012 1:34:33 AM (12 years ago)
Author:
vsevik@chromium.org
Message:

Web Inspector: FileSelector should not depend on DebuggerPresentationModel.
https://bugs.webkit.org/show_bug.cgi?id=78337

Reviewed by Pavel Feldman.

  • inspector/front-end/ScriptsNavigator.js:

(WebInspector.ScriptsNavigator):
(WebInspector.ScriptsNavigator.prototype._showScriptFoldersSettingChanged):
(WebInspector.ScriptsNavigator.prototype.reset):

  • inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._reset):
(WebInspector.ScriptsPanel.FileSelector.prototype.replaceUISourceCodes):
(WebInspector.ScriptsPanel.FileSelector.prototype.reset):
(WebInspector.ScriptsPanel.ComboBoxFileSelector):
(WebInspector.ScriptsPanel.ComboBoxFileSelector.prototype.reset):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r107382 r107384  
     12012-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
    1192012-02-10  Kentaro Hara  <haraken@chromium.org>
    220
  • trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js

    r107235 r107384  
    3232 * @constructor
    3333 */
    34 WebInspector.ScriptsNavigator = function(presentationModel)
     34WebInspector.ScriptsNavigator = function()
    3535{
    3636    WebInspector.Object.call(this);
     
    3838    this._tabbedPane = new WebInspector.TabbedPane();
    3939    this._tabbedPane.shrinkableTabs = true;
    40 
    41     this._presentationModel = presentationModel;
    4240
    4341    this._tabbedPane.element.id = "scripts-navigator-tabbed-pane";
     
    7270   
    7371    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);
    7772}
    7873
     
    229224        var uiSourceCodes = this._navigatorScriptsTree.scriptTreeElements();
    230225        uiSourceCodes = uiSourceCodes.concat(this._navigatorContentScriptsTree.scriptTreeElements());
    231         this._reset();
     226        this.reset();
    232227        for (var i = 0; i < uiSourceCodes.length; ++i)
    233228            this.addUISourceCode(uiSourceCodes[i]);
     
    236231    },
    237232   
    238     _reset: function()
     233    reset: function()
    239234    {
    240235        this._navigatorScriptsTree.stopSearch();
  • trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

    r107238 r107384  
    7171        this.editorView.show(this.splitView.mainElement);
    7272
    73         this._navigator = new WebInspector.ScriptsNavigator(this._presentationModel);
     73        this._navigator = new WebInspector.ScriptsNavigator();
    7474        this._navigatorView = this._navigator.view;
    7575        this._fileSelector = this._navigator;
     
    8686            this._toggleNavigator();
    8787    } else {
    88         this._fileSelector = new WebInspector.ScriptsPanel.ComboBoxFileSelector(this._presentationModel);
     88        this._fileSelector = new WebInspector.ScriptsPanel.ComboBoxFileSelector();
    8989        this._fileSelector.show(this.splitView.mainElement);
    9090
     
    409409
    410410        delete this._currentUISourceCode;
     411        this._fileSelector.reset();
    411412        this._editorContainer.reset();
    412413        this._updateScriptViewStatusBarItems();
     
    11751176     * @param {Array.<WebInspector.UISourceCode>} uiSourceCodeList
    11761177     */
    1177     replaceUISourceCodes: function(oldUISourceCodeList, uiSourceCodeList) { }
     1178    replaceUISourceCodes: function(oldUISourceCodeList, uiSourceCodeList) { },
     1179   
     1180    reset: function() { }
    11781181}
    11791182
     
    12421245 * @constructor
    12431246 */
    1244 WebInspector.ScriptsPanel.ComboBoxFileSelector = function(presentationModel)
     1247WebInspector.ScriptsPanel.ComboBoxFileSelector = function()
    12451248{
    12461249    WebInspector.Object.call(this);
    12471250    this.editorToolbar = this._createEditorToolbar();
    12481251   
    1249     this._presentationModel = presentationModel;
    12501252    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);
    12531253   
    12541254    this._backForwardList = [];
     
    13881388    },
    13891389   
    1390     _reset: function()
     1390    reset: function()
    13911391    {
    13921392        this._backForwardList = [];
Note: See TracChangeset for help on using the changeset viewer.