Changeset 121955 in webkit

Timestamp:

Jul 6, 2012 5:14:24 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Implement snippets removing.
​https://bugs.webkit.org/show_bug.cgi?id=90674

Reviewed by Pavel Feldman.

• inspector/front-end/NavigatorView.js:

(WebInspector.NavigatorView.prototype.rename.afterEditing):

• inspector/front-end/ScriptsNavigator.js:

(WebInspector.ScriptsNavigator.prototype.removeUISourceCode):
(WebInspector.SnippetsNavigatorView.prototype._handleRemoveSnippet):

• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._addUISourceCode):
(WebInspector.ScriptsPanel.prototype._uiSourceCodeRemoved):
(WebInspector.ScriptsPanel.prototype._revealExecutionLine):

• inspector/front-end/TabbedEditorContainer.js:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/NavigatorView.js (modified) (4 diffs)
• inspector/front-end/ScriptsNavigator.js (modified) (2 diffs)
• inspector/front-end/ScriptsPanel.js (modified) (3 diffs)
• inspector/front-end/TabbedEditorContainer.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-06  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Implement snippets removing.
+        https://bugs.webkit.org/show_bug.cgi?id=90674
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/NavigatorView.js:
+        (WebInspector.NavigatorView.prototype.rename.afterEditing):
+        * inspector/front-end/ScriptsNavigator.js:
+        (WebInspector.ScriptsNavigator.prototype.removeUISourceCode):
+        (WebInspector.SnippetsNavigatorView.prototype._handleRemoveSnippet):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._addUISourceCode):
+        (WebInspector.ScriptsPanel.prototype._uiSourceCodeRemoved):
+        (WebInspector.ScriptsPanel.prototype._revealExecutionLine):
+        * inspector/front-end/TabbedEditorContainer.js:
+
 2012-07-06  'Pavel Feldman'  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/NavigatorView.js

@@ -162 +162 @@
             if (this._lastSelectedUISourceCode === oldUISourceCode)
                 selected = true;
-            this._removeUISourceCode(oldUISourceCode);
+            this.removeUISourceCode(oldUISourceCode);
         }
 
@@ -186 +186 @@
      * @param {WebInspector.UISourceCode} uiSourceCode
      */
-    _removeUISourceCode: function(uiSourceCode)
+    removeUISourceCode: function(uiSourceCode)
     {
         var treeElement = this._scriptTreeElementsByUISourceCode.get(uiSourceCode);
@@ -253 +253 @@
 
         // Tree outline should be marked as edited as well as the tree element to prevent search from starting.
-        WebInspector.markBeingEdited(scriptTreeElement.treeOutline.element, true);
+        var treeOutlineElement = scriptTreeElement.treeOutline.element
+        WebInspector.markBeingEdited(treeOutlineElement, true);
 
         function commitHandler(element, newTitle, oldTitle)
@@ -274 +275 @@
         function afterEditing(committed)
         {
-            WebInspector.markBeingEdited(scriptTreeElement.treeOutline.element, false);
+            WebInspector.markBeingEdited(treeOutlineElement, false);
             if (callback)
                 callback(committed);

trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js

@@ -99 +99 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
+     */
+    removeUISourceCode: function(uiSourceCode)
+    {
+        this._snippetsNavigatorViewForUISourceCode(uiSourceCode).removeUISourceCode(uiSourceCode);
+    },
+
+    /**
+     * @param {WebInspector.UISourceCode} uiSourceCode
      * @return {boolean}
      */
@@ -254 +262 @@
     _handleRemoveSnippet: function(uiSourceCode, event)
     {
-        // FIXME: To be implemented.
+        if (!uiSourceCode.isSnippet)
+            return;
+        var snippetJavaScriptSource = /** @type {WebInspector.SnippetJavaScriptSource} */ uiSourceCode;
+        WebInspector.scriptSnippetModel.deleteScriptSnippet(snippetJavaScriptSource);
     },
 

trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -257 +257 @@
     {
         this._navigator.addUISourceCode(uiSourceCode);
-        this._editorContainer.uiSourceCodeAdded(uiSourceCode);
+        this._editorContainer.addUISourceCode(uiSourceCode);
     },
 
@@ -263 +263 @@
     {
         var uiSourceCode = /** @type {WebInspector.UISourceCode} */ event.data;
+        this._editorContainer.removeUISourceCode(uiSourceCode);
+        this._navigator.removeUISourceCode(uiSourceCode);
         this._removeSourceFrame(uiSourceCode);
     },
@@ -543 +545 @@
     {
         // Some scripts (anonymous and snippets evaluations) are not added to files select by default.
-        this._editorContainer.uiSourceCodeAdded(uiLocation.uiSourceCode);
+        this._editorContainer.addUISourceCode(uiLocation.uiSourceCode);
         var sourceFrame = this._showFile(uiLocation.uiSourceCode);
         sourceFrame.revealLine(uiLocation.lineNumber);

trunk/Source/WebCore/inspector/front-end/TabbedEditorContainer.js

@@ -191 +191 @@
      * @param {WebInspector.UISourceCode} uiSourceCode
      */
-    uiSourceCodeAdded: function(uiSourceCode)
+    addUISourceCode: function(uiSourceCode)
     {
         if (this._userSelectedFiles || this._loadedURLs[uiSourceCode.url])
@@ -207 +207 @@
             this._innerShowFile(uiSourceCode, false);
     },
-    
+
+    /**
+     * @param {WebInspector.UISourceCode} uiSourceCode
+     */
+    removeUISourceCode: function(uiSourceCode)
+    {
+        var tabId = this._tabIds.get(uiSourceCode);
+        if (tabId)
+            this._tabbedPane.closeTab(tabId);
+    },
+
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
@@ -273 +283 @@
         uiSourceCode.addEventListener(WebInspector.UISourceCode.Events.ContentChanged, this._uiSourceCodeContentChanged, this);
         return tabId;
-    },
-
-    /**
-     * @param {WebInspector.UISourceCode} uiSourceCode
-     */
-    _removeFileTab: function(uiSourceCode)
-    {
-        var tabId = this._tabIds.get(uiSourceCode);
-
-        if (tabId)
-            this._tabbedPane.closeTab(tabId);
     },