Changeset 112541 in webkit

Timestamp:

Mar 29, 2012 9:45:55 AM (12 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: SnippetsScriptMapping should process existing snippets on load.
​https://bugs.webkit.org/show_bug.cgi?id=82619

Reviewed by Pavel Feldman.

SnippetsScriptMapping now loads existing snippets on creation.
Otherwise scripts panel shows snippets created during current session only.
Drive-by ScriptsNavigator closure compilation fix.

• inspector/front-end/SnippetsModel.js:

(WebInspector.SnippetsModel.prototype.set get snippets):
(WebInspector.SnippetsScriptMapping):
(WebInspector.SnippetsScriptMapping.prototype._handleSnippetAdded):
(WebInspector.SnippetsScriptMapping.prototype._snippetAdded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ScriptsNavigator.js (modified) (2 diffs)
• inspector/front-end/SnippetsModel.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-29  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: SnippetsScriptMapping should process existing snippets on load.
+        https://bugs.webkit.org/show_bug.cgi?id=82619
+
+        Reviewed by Pavel Feldman.
+
+        SnippetsScriptMapping now loads existing snippets on creation.
+        Otherwise scripts panel shows snippets created during current session only.
+        Drive-by ScriptsNavigator closure compilation fix.
+
+        * inspector/front-end/SnippetsModel.js:
+        (WebInspector.SnippetsModel.prototype.set get snippets):
+        (WebInspector.SnippetsScriptMapping):
+        (WebInspector.SnippetsScriptMapping.prototype._handleSnippetAdded):
+        (WebInspector.SnippetsScriptMapping.prototype._snippetAdded):
+
 2012-03-29  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -357 +357 @@
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
+     * @param {function()=} callback
      */
     rename: function(uiSourceCode, callback)
@@ -384 +385 @@
         {
             WebInspector.markBeingEdited(scriptTreeElement.treeOutline.element, false);
-            callback();
+            if (callback)
+                callback();
         }
 

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

@@ -60 +60 @@
     },
 
+    /**
+     * @type {Array.<WebInspector.Snippet>}
+     */
+    get snippets()
+    {
+        var result = [];
+        for (var id in this._snippets)
+            result.push(this._snippets[id]);
+        return result;
+    },
+
     _loadSettings: function()
     {
@@ -278 +289 @@
     this._uiSourceCodeForSnippet = new Map();
 
-    WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetAdded, this._snippetAdded.bind(this));
+    WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetAdded, this._handleSnippetAdded.bind(this));
     WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetWillBeEvaluated, this._snippetWillBeEvaluated.bind(this));
     WebInspector.snippetsModel.addEventListener(WebInspector.SnippetsModel.EventTypes.SnippetRemoved, this._snippetRemoved.bind(this));
+    for (var i = 0; i < WebInspector.snippetsModel.snippets.length; ++i)
+        this._snippetAdded(WebInspector.snippetsModel.snippets[i]);
 }
 
@@ -369 +382 @@
      * @param {WebInspector.Event} event
      */
-    _snippetAdded: function(event)
+    _handleSnippetAdded: function(event)
     {
         var snippet = /** @type {WebInspector.Snippet} */ event.data;
+        this._snippetAdded(snippet);
+    },
+
+    /**
+     * @param {WebInspector.Snippet} snippet
+     */
+    _snippetAdded: function(snippet)
+    {
         var uiSourceCodeId = ""; // FIXME: to be implemented.
         var uiSourceCodeURL = ""; // FIXME: to be implemented.