Changeset 122460 in webkit


Ignore:
Timestamp:
Jul 12, 2012 8:22:52 AM (12 years ago)
Author:
vsevik@chromium.org
Message:

Web Inspector: Revision history view should be updated when uiSourceCodes are removed or replaced.
https://bugs.webkit.org/show_bug.cgi?id=91095

Reviewed by Pavel Feldman.

RevisionHistoryView is now reset in WorkspaceReset event handler.
UISourceCodes are now removed from RevisionHistoryView when uiSourceCode is removed or replace.

  • inspector/front-end/RevisionHistoryView.js:

(WebInspector.RevisionHistoryView):
(WebInspector.RevisionHistoryView.prototype._clearHistory):
(WebInspector.RevisionHistoryView.prototype._uiSourceCodeRemoved):
(WebInspector.RevisionHistoryView.prototype._uiSourceCodeReplaced):

  • inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._reset):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r122459 r122460  
     12012-07-12  Vsevolod Vlasov  <vsevik@chromium.org>
     2
     3        Web Inspector: Revision history view should be updated when uiSourceCodes are removed or replaced.
     4        https://bugs.webkit.org/show_bug.cgi?id=91095
     5
     6        Reviewed by Pavel Feldman.
     7
     8        RevisionHistoryView is now reset in WorkspaceReset event handler.
     9        UISourceCodes are now removed from RevisionHistoryView when uiSourceCode is removed or replace.
     10
     11        * inspector/front-end/RevisionHistoryView.js:
     12        (WebInspector.RevisionHistoryView):
     13        (WebInspector.RevisionHistoryView.prototype._clearHistory):
     14        (WebInspector.RevisionHistoryView.prototype._uiSourceCodeRemoved):
     15        (WebInspector.RevisionHistoryView.prototype._uiSourceCodeReplaced):
     16        * inspector/front-end/ScriptsPanel.js:
     17        (WebInspector.ScriptsPanel.prototype._reset):
     18
    1192012-07-12  Dongwoo Im  <dw.im@samsung.com>
    220
  • trunk/Source/WebCore/inspector/front-end/RevisionHistoryView.js

    r122327 r122460  
    5656    WebInspector.workspace.uiSourceCodes().forEach(populateRevisions.bind(this));
    5757    WebInspector.workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeContentCommitted, this._revisionAdded, this);
     58    WebInspector.workspace.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeReplaced, this._uiSourceCodeReplaced, this);
     59    WebInspector.workspace.addEventListener(WebInspector.UISourceCodeProvider.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
     60    WebInspector.workspace.addEventListener(WebInspector.Workspace.Events.WorkspaceReset, this._reset.bind(this, false), this);
    5861
    5962    this._statusElement = document.createElement("span");
     
    7477}
    7578
    76 WebInspector.RevisionHistoryView.reset = function()
    77 {
    78     if (WebInspector.RevisionHistoryView._view)
    79         WebInspector.RevisionHistoryView._view._reset();
    80 }
    81 
    8279WebInspector.RevisionHistoryView.prototype = {
    8380    /**
     
    127124    _clearHistory: function(uiSourceCode)
    128125    {
    129         uiSourceCode.revertAndClearHistory(historyCleared.bind(this));
    130 
    131         function historyCleared()
    132         {
    133             var uiSourceCodeItem = this._uiSourceCodeItems.get(uiSourceCode);
    134             this._treeOutline.removeChild(uiSourceCodeItem);
    135             this._uiSourceCodeItems.remove(uiSourceCode);
    136         }
    137 
     126        uiSourceCode.revertAndClearHistory(this._removeUISourceCode.bind(this));
    138127    },
    139128
     
    164153            uiSourceCodeItem.expand();
    165154        }
     155    },
     156
     157    _uiSourceCodeRemoved: function(event)
     158    {
     159        var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
     160        this._removeUISourceCode(uiSourceCode);
     161    },
     162
     163    /**
     164     * @param {WebInspector.Event} event
     165     */
     166    _uiSourceCodeReplaced: function(event)
     167    {
     168        var oldUISourceCode = /** @type {WebInspector.UISourceCode} */ event.data.oldUISourceCode;
     169        var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data.uiSourceCode;
     170        this._removeUISourceCode(oldUISourceCode);
     171        this._revealUISourceCode(uiSourceCode);
     172    },
     173
     174    /**
     175     * @param {WebInspector.UISourceCode} uiSourceCode
     176     */
     177    _removeUISourceCode: function(uiSourceCode)
     178    {
     179        var uiSourceCodeItem = this._uiSourceCodeItems.get(uiSourceCode);
     180        this._treeOutline.removeChild(uiSourceCodeItem);
     181        this._uiSourceCodeItems.remove(uiSourceCode);
    166182    },
    167183
  • trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

    r121983 r122460  
    367367        if (!preserveItems && this.sidebarPanes.workers)
    368368            this.sidebarPanes.workers.reset();
    369         WebInspector.RevisionHistoryView.reset();
    370369
    371370        var uiSourceCodes = this._workspace.uiSourceCodes();
Note: See TracChangeset for help on using the changeset viewer.