<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35874] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/35874">35874</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2008-08-21 09:36:06 -0700 (Thu, 21 Aug 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageinspectorObjectPropertiesSectionjs">trunk/WebCore/page/inspector/ObjectPropertiesSection.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (35873 => 35874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-08-21 16:33:17 UTC (rev 35873)
+++ trunk/WebCore/ChangeLog        2008-08-21 16:36:06 UTC (rev 35874)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2008-08-21  Anthony Ricaud  &lt;rik24d@gmail.com&gt;
</span><span class="cx"> 
</span><ins>+        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  &lt;rik24d@gmail.com&gt;
+
</ins><span class="cx">         Perform Inspector searches on search event to clear results when
</span><span class="cx">         clicking the cross to empty it. Delete the lastQuery when the field
</span><span class="cx">         is emptied in order to perform the search if exactly the same query
</span></span></pre></div>
<a id="trunkWebCorepageinspectorObjectPropertiesSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/inspector/ObjectPropertiesSection.js (35873 => 35874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/inspector/ObjectPropertiesSection.js        2008-08-21 16:33:17 UTC (rev 35873)
+++ trunk/WebCore/page/inspector/ObjectPropertiesSection.js        2008-08-21 16:36:06 UTC (rev 35874)
</span><span class="lines">@@ -214,6 +214,15 @@
</span><span class="cx">         this.editingEnded(context);
</span><span class="cx">     },
</span><span class="cx"> 
</span><ins>+    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 &amp;&amp; this.treeOutline.section.editInSelectedCallFrameWhenPaused)
+            return WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false);
+        return InspectorController.inspectedWindow().eval(expression);
+    },
+
</ins><span class="cx">     applyExpression: function(expression, updateInterface)
</span><span class="cx">     {
</span><span class="cx">         var expressionLength = expression.trimWhitespace().length;
</span><span class="lines">@@ -235,25 +244,26 @@
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        // 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 = &quot;(&quot; + expression + &quot;)&quot;;
-
</del><span class="cx">         try {
</span><del>-            // Evaluate in the currently selected call frame if the debugger is paused.
-            // Otherwise evaluate in against the inspected window.
-            if (WebInspector.panels.scripts.paused &amp;&amp; this.treeOutline.section.editInSelectedCallFrameWhenPaused)
-                var result = WebInspector.panels.scripts.evaluateInSelectedCallFrame(expression, false);
-            else
-                var result = InspectorController.inspectedWindow().eval(expression);
</del><ins>+            // 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(&quot;(&quot; + expression + &quot;)&quot;);
</ins><span class="cx"> 
</span><span class="cx">             // Store the result in the property.
</span><span class="cx">             this.parentObject[this.propertyName] = result;
</span><span class="cx">         } catch(e) {
</span><del>-            // The expression failed so don't change the value. So just update and return.
-            if (updateInterface)
-                this.update();
-            return;
</del><ins>+            try {
+                // Try to update as a string
+                var result = this.evaluateExpression(&quot;\&quot;&quot; + expression.escapeCharacters(&quot;\&quot;&quot;) + &quot;\&quot;&quot;);
+
+                // 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;
+            }
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (updateInterface) {
</span></span></pre>
</div>
</div>

</body>
</html>