<!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>[178970] trunk/Source/WebInspectorUI</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/178970">178970</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 16:44:45 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ResourceContentView.js incorrectly contains call to WebInspector.UIString with a variable parameter
https://bugs.webkit.org/show_bug.cgi?id=140268
Reviewed by Timothy Hatcher.
UIString no longer incorrectly used around variables. Drive-by fixes to prototype inheritance style.
Use of Promises corrected such that requesting content for a resource resolves rather than rejects if
a resource can't be found or has another error that isn't a web inspector error.
* Localizations/en.lproj/localizedStrings.js: Updated.
* UserInterface/Models/Resource.js: Change reject to resolve.
* UserInterface/Models/Script.js:
(WebInspector.Script.prototype.requestContentFromBackend): Proper use of Error object.
* UserInterface/Models/SourceCode.js: Use correct inheritance style.
* UserInterface/Views/ResourceContentView.js:
(WebInspector.ResourceContentView.prototype._contentAvailable): Handle error now that promise resolves.
(WebInspector.ResourceContentView.prototype._contentError): Remove incorrect use of UIString.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._contentAvailable): Handle error now that promise resolves.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourcejs">trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptjs">trunk/Source/WebInspectorUI/UserInterface/Models/Script.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodejs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-01-22 Jonathan Wells <jonowells@apple.com>
+
+ Web Inspector: ResourceContentView.js incorrectly contains call to WebInspector.UIString with a variable parameter
+ https://bugs.webkit.org/show_bug.cgi?id=140268
+
+ Reviewed by Timothy Hatcher.
+
+ UIString no longer incorrectly used around variables. Drive-by fixes to prototype inheritance style.
+ Use of Promises corrected such that requesting content for a resource resolves rather than rejects if
+ a resource can't be found or has another error that isn't a web inspector error.
+
+ * Localizations/en.lproj/localizedStrings.js: Updated.
+ * UserInterface/Models/Resource.js: Change reject to resolve.
+ * UserInterface/Models/Script.js:
+ (WebInspector.Script.prototype.requestContentFromBackend): Proper use of Error object.
+ * UserInterface/Models/SourceCode.js: Use correct inheritance style.
+ * UserInterface/Views/ResourceContentView.js:
+ (WebInspector.ResourceContentView.prototype._contentAvailable): Handle error now that promise resolves.
+ (WebInspector.ResourceContentView.prototype._contentError): Remove incorrect use of UIString.
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._contentAvailable): Handle error now that promise resolves.
+
</ins><span class="cx"> 2015-01-22 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Expected gutter highlight when selecting console input line, just like output line
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> localizedStrings["All Exceptions"] = "All Exceptions";
</span><span class="cx"> localizedStrings["All Uncaught Exceptions"] = "All Uncaught Exceptions";
</span><span class="cx"> localizedStrings["An error occured trying to\nread the %s table."] = "An error occured trying to\nread the %s table.";
</span><ins>+localizedStrings["An error occurred trying to load the resource."] = "An error occurred trying to load the resource.";
</ins><span class="cx"> localizedStrings["An unexpected error %s occurred."] = "An unexpected error %s occurred.";
</span><span class="cx"> localizedStrings["An unexpected error occurred."] = "An unexpected error occurred.";
</span><span class="cx"> localizedStrings["Angle"] = "Angle";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourcejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -186,6 +186,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.Resource.prototype = {
</span><span class="cx"> constructor: WebInspector.Resource,
</span><ins>+ __proto__: WebInspector.SourceCode.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -679,7 +680,7 @@
</span><span class="cx"> return WebInspector.SourceCode.prototype.requestContent.call(this);
</span><span class="cx">
</span><span class="cx"> if (this._failed)
</span><del>- return Promise.reject(new Error("An error occurred trying to load the resource."));
</del><ins>+ return Promise.resolve({ error: WebInspector.UIString("An error occurred trying to load the resource.") });
</ins><span class="cx">
</span><span class="cx"> if (!this._finishThenRequestContentPromise) {
</span><span class="cx"> var listener = new WebInspector.EventListener(this, true);
</span><span class="lines">@@ -714,5 +715,3 @@
</span><span class="cx"> cookie[WebInspector.Resource.MainResourceCookieKey] = this.isMainResource();
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.Resource.prototype.__proto__ = WebInspector.SourceCode.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Script.js (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Script.js 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.Script.prototype = {
</span><span class="cx"> constructor: WebInspector.Script,
</span><ins>+ __proto__: WebInspector.SourceCode.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -110,12 +111,12 @@
</span><span class="cx"> return this._scriptSyntaxTree;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- requestContentFromBackend: function(callback)
</del><ins>+ requestContentFromBackend: function()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._id) {
</span><span class="cx"> // There is no identifier to request content with. Return false to cause the
</span><span class="cx"> // pending callbacks to get null content.
</span><del>- return Promise.reject({ message: "There is no identifier to request content with." });
</del><ins>+ return Promise.reject(new Error("There is no identifier to request content with."));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return DebuggerAgent.getScriptSource.promise(this._id);
</span><span class="lines">@@ -212,5 +213,3 @@
</span><span class="cx"> this._scriptSyntaxTree = new WebInspector.ScriptSyntaxTree(sourceText, this);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.Script.prototype.__proto__ = WebInspector.SourceCode.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCode.js 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.SourceCode.prototype = {
</span><span class="cx"> constructor: WebInspector.SourceCode,
</span><ins>+ __proto__: WebInspector.Object.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -206,5 +207,3 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.SourceCode.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ResourceContentView.prototype = {
</span><span class="cx"> constructor: WebInspector.ResourceContentView,
</span><ins>+ __proto__: WebInspector.ContentView.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -88,6 +89,11 @@
</span><span class="cx">
</span><span class="cx"> _contentAvailable: function(parameters)
</span><span class="cx"> {
</span><ins>+ if (parameters.error) {
+ this._contentError({ message: parameters.error });
+ return;
+ }
+
</ins><span class="cx"> // Content is ready to show, call the public method now.
</span><span class="cx"> this.contentAvailable(parameters.content, parameters.base64Encoded);
</span><span class="cx"> },
</span><span class="lines">@@ -99,7 +105,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><del>- this.element.appendChild(WebInspector.createMessageTextView(WebInspector.UIString(error.message), true));
</del><ins>+ this.element.appendChild(WebInspector.createMessageTextView(error.message, true));
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _issueWasAdded: function(event)
</span><span class="lines">@@ -120,5 +126,3 @@
</span><span class="cx"> WebInspector.handlePossibleLinkClick(event, this.resource.parentFrame);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ResourceContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (178969 => 178970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-01-23 00:31:24 UTC (rev 178969)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2015-01-23 00:44:45 UTC (rev 178970)
</span><span class="lines">@@ -510,6 +510,10 @@
</span><span class="cx">
</span><span class="cx"> _contentAvailable: function(parameters)
</span><span class="cx"> {
</span><ins>+ // Return if resource is not available.
+ if (parameters.error)
+ return;
+
</ins><span class="cx"> var sourceCode = parameters.sourceCode;
</span><span class="cx"> var content = parameters.content;
</span><span class="cx"> var base64Encoded = parameters.base64Encoded;
</span></span></pre>
</div>
</div>
</body>
</html>