Changeset 35874 for trunk

Timestamp:

08/21/08 09:36:06 (3 months ago)

Author:

timothy@apple.com

Message:

After trying to add the expression, try again with quotes for
easier edition.

https://bugs.webkit.org/show_bug.cgi?id=20466

Reviewed by Tim Hatcher.

• page/inspector/ObjectPropertiesSection.js: Added an evaluateExpression function.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/ObjectPropertiesSection.js (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-21  Anthony Ricaud  <rik24d@gmail.com>
+
+        After trying to add the expression, try again with quotes for
+        easier edition.
+
+        https://bugs.webkit.org/show_bug.cgi?id=20466
+
+        Reviewed by Tim Hatcher.
+
+        * page/inspector/ObjectPropertiesSection.js: Added an
+        evaluateExpression function.
+
 2008-08-21  Anthony Ricaud  <rik24d@gmail.com>
 

trunk/WebCore/page/inspector/ObjectPropertiesSection.js

@@ -215 +215 @@
     },
 
+    evaluateExpression: function(expression)
+    {
+        // Evaluate in the currently selected call frame if the debugger is paused.
+        // Otherwise evaluate in against the inspected window.
+        if (WebInspector.panels.scripts.paused && this.treeOutline.section.editInSelectedCallFrameWhenPaused)
+            return WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false);
+        return InspectorController.inspectedWindow().eval(expression);
+    },
+
     applyExpression: function(expression, updateInterface)
     {
@@ -236 +245 @@
         }
 
-        // Surround the expression in parenthesis so the result of the eval is the result
-        // of the whole expression not the last potential sub-expression.
-        expression = "(" + expression + ")";
-
         try {
-            // Evaluate in the currently selected call frame if the debugger is paused.
-            // Otherwise evaluate in against the inspected window.
-            if (WebInspector.panels.scripts.paused && this.treeOutline.section.editInSelectedCallFrameWhenPaused)
-                var result = WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false);
-            else
-                var result = InspectorController.inspectedWindow().eval(expression);
+            // Surround the expression in parenthesis so the result of the eval is the result
+            // of the whole expression not the last potential sub-expression.
+            var result = this.evaluateExpression("(" + expression + ")");
 
             // Store the result in the property.
             this.parentObject[this.propertyName] = result;
         } catch(e) {
-            // The expression failed so don't change the value. So just update and return.
-            if (updateInterface)
-                this.update();
-            return;
+            try {
+                // Try to update as a string
+                var result = this.evaluateExpression("\"" + expression.escapeCharacters("\"") + "\"");
+
+                // Store the result in the property.
+                this.parentObject[this.propertyName] = result;
+            } catch(e) {
+                // The expression failed so don't change the value. So just update and return.
+                if (updateInterface)
+                    this.update();
+                return;
+            }
         }