Changeset 116848 in webkit

Timestamp:

May 12, 2012 4:09:27 AM (12 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: shrink SourceFrame editing API to two methods (was 4).
​https://bugs.webkit.org/show_bug.cgi?id=86288

Reviewed by Yury Semikhatsky.

Used specific workflow in two SourceFrame implementations.

• inspector/front-end/JavaScriptSourceFrame.js:

(WebInspector.JavaScriptSourceFrame.prototype.commitEditing):
(WebInspector.JavaScriptSourceFrame.prototype.afterTextChanged):
(WebInspector.JavaScriptSourceFrame.prototype._didEditContent):

• inspector/front-end/ResourceView.js:

(WebInspector.EditableResourceSourceFrame.prototype.commitEditing.callbackWrapper):
(WebInspector.EditableResourceSourceFrame.prototype.commitEditing):

• inspector/front-end/SourceFrame.js:

(WebInspector.SourceFrame.prototype.commitEditing):
(WebInspector.TextViewerDelegateForSourceFrame.prototype.commitEditing):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/JavaScriptSourceFrame.js (modified) (3 diffs)
• inspector/front-end/ResourceView.js (modified) (4 diffs)
• inspector/front-end/SourceFrame.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-12  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: shrink SourceFrame editing API to two methods (was 4).
+        https://bugs.webkit.org/show_bug.cgi?id=86288
+
+        Reviewed by Yury Semikhatsky.
+
+        Used specific workflow in two SourceFrame implementations.
+
+        * inspector/front-end/JavaScriptSourceFrame.js:
+        (WebInspector.JavaScriptSourceFrame.prototype.commitEditing):
+        (WebInspector.JavaScriptSourceFrame.prototype.afterTextChanged):
+        (WebInspector.JavaScriptSourceFrame.prototype._didEditContent):
+        * inspector/front-end/ResourceView.js:
+        (WebInspector.EditableResourceSourceFrame.prototype.commitEditing.callbackWrapper):
+        (WebInspector.EditableResourceSourceFrame.prototype.commitEditing):
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype.commitEditing):
+        (WebInspector.TextViewerDelegateForSourceFrame.prototype.commitEditing):
+
 2012-05-11  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -109 +109 @@
     },
 
-    editContent: function(newContent, callback)
+    /**
+     * @param {string} text 
+     */
+    commitEditing: function(text)
     {
         this._editingContent = true;
-        WebInspector.DebuggerResourceBinding.setScriptSource(this._uiSourceCode, newContent, callback);
+        WebInspector.DebuggerResourceBinding.setScriptSource(this._uiSourceCode, text, this._didEditContent.bind(this, text));
     },
 
@@ -174 +177 @@
             this._setScriptSourceIsDirty(true);
         else
-            this.didEditContent(null, this._originalContent);
+            this._didEditContent(this._originalContent, null);
     },
 
@@ -201 +204 @@
     },
 
-    didEditContent: function(error, content)
+    _didEditContent: function(content, error)
     {
         delete this._editingContent;
 
-        WebInspector.SourceFrame.prototype.didEditContent.call(this, error, content);
-        if (error)
-            return;
+        if (error) {
+            WebInspector.log(error, WebInspector.ConsoleMessage.MessageLevel.Error, true);
+            return;
+        }
 
         this._originalContent = content;

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

@@ -133 +133 @@
 
 WebInspector.EditableResourceSourceFrame.prototype = {
+    /**
+     * @return {boolean}
+     */
     canEditSource: function()
     {
@@ -139 +142 @@
     },
 
-    editContent: function(newText, callback)
+    /**
+     * @param {string} text
+     */
+    commitEditing: function(text)
     {
         this._clearIncrementalUpdateTimer();
@@ -146 +152 @@
         function callbackWrapper(text)
         {
-            callback(text);
             delete this._settingContent;
+            this.dispatchEventToListeners(WebInspector.EditableResourceSourceFrame.Events.TextEdited, this);
         }
-        this.resource.setContent(newText, majorChange, callbackWrapper.bind(this));
-    },
-
+        this.resource.setContent(text, majorChange, callbackWrapper.bind(this));
+    },
+    
     afterTextChanged: function(oldRange, newRange)
     {
@@ -177 +183 @@
     },
 
-    didEditContent: function(error, content)
-    {
-        WebInspector.SourceFrame.prototype.didEditContent.call(this, error, content);
-        this.dispatchEventToListeners(WebInspector.EditableResourceSourceFrame.Events.TextEdited, this);
-    },
-
     isDirty: function()
     {

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

@@ -517 +517 @@
     },
 
+    /**
+     * @return {boolean}
+     */
     canEditSource: function()
     {
@@ -522 +525 @@
     },
 
-    commitEditing: function()
-    {
-        function callback(error)
-        {
-            this.didEditContent(error, this._textModel.text);
-        }
-        this.editContent(this._textModel.text, callback.bind(this));
-    },
-
-    didEditContent: function(error, content)
-    {
-        if (error) {
-            WebInspector.log(error, WebInspector.ConsoleMessage.MessageLevel.Error, true);
-            return;
-        }
-    },
-
-    editContent: function(newContent, callback)
+    /**
+     * @param {string} text 
+     */
+    commitEditing: function(text)
     {
     }
@@ -569 +558 @@
     commitEditing: function()
     {
-        this._sourceFrame.commitEditing();
+        this._sourceFrame.commitEditing(this._sourceFrame._textModel.text);
     },