<!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>[175850] 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/175850">175850</a></dd>
<dt>Author</dt> <dd>jonowells@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 20:58:25 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Update Esprima, remove WebInspector.Esprima global.
https://bugs.webkit.org/show_bug.cgi?id=138579
Reviewed by Timothy Hatcher.
Update esprima.js file to be unchanged by removing WebInspector.Esprima global object. Move esprima.js include
so that all external libraries load before the WebInspector namespace is declared in the combined Main.js.
* UserInterface/External/Esprima/esprima.js: File updated, no changes made.
* UserInterface/Main.html: esprima.js script tag moved up with other externals.
* UserInterface/Models/ScriptSyntaxTree.js: WebInspector.Esprima changed to esprima
(WebInspector.ScriptSyntaxTree):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceExternalEsprimaesprimajs">trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (175849 => 175850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-11-11 04:32:16 UTC (rev 175849)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-11-11 04:58:25 UTC (rev 175850)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-11-10 Jonathan Wells <jonowells@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Update Esprima, remove WebInspector.Esprima global.
+ https://bugs.webkit.org/show_bug.cgi?id=138579
+
+ Reviewed by Timothy Hatcher.
+
+ Update esprima.js file to be unchanged by removing WebInspector.Esprima global object. Move esprima.js include
+ so that all external libraries load before the WebInspector namespace is declared in the combined Main.js.
+
+ * UserInterface/External/Esprima/esprima.js: File updated, no changes made.
+ * UserInterface/Main.html: esprima.js script tag moved up with other externals.
+ * UserInterface/Models/ScriptSyntaxTree.js: WebInspector.Esprima changed to esprima
+ (WebInspector.ScriptSyntaxTree):
+
+2014-11-10 Jonathan Wells <jonowells@apple.com>
+
</ins><span class="cx"> Web Inspector: Add infrastructure for eslint based static analyzer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137890
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceExternalEsprimaesprimajs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js (175849 => 175850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js 2014-11-11 04:32:16 UTC (rev 175849)
+++ trunk/Source/WebInspectorUI/UserInterface/External/Esprima/esprima.js 2014-11-11 04:58:25 UTC (rev 175850)
</span><span class="lines">@@ -31,14 +31,34 @@
</span><span class="cx"> THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// WebKit Modifications:
-// - The only edit made to this file is the use 'WebInspector.Esprima' as the 'exports' object for esprima.
-// The code that determines the context esprima is loaded in (node.js, the browser, etc.) has been replaced with a reference to 'WebInspector.Esprima'.
-WebInspector.Esprima = {};
</del><ins>+/*jslint bitwise:true plusplus:true */
+/*global esprima:true, define:true, exports:true, window: true,
+throwErrorTolerant: true,
+throwError: true, generateStatement: true, peek: true,
+parseAssignmentExpression: true, parseBlock: true, parseExpression: true,
+parseFunctionDeclaration: true, parseFunctionExpression: true,
+parseFunctionSourceElements: true, parseVariableIdentifier: true,
+parseLeftHandSideExpression: true,
+parseUnaryExpression: true,
+parseStatement: true, parseSourceElement: true */
</ins><span class="cx">
</span><del>-(function (exports) {
</del><ins>+(function (root, factory) {
</ins><span class="cx"> 'use strict';
</span><span class="cx">
</span><ins>+ // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js,
+ // Rhino, and plain browser loading.
+
+ /* istanbul ignore next */
+ if (typeof define === 'function' && define.amd) {
+ define(['exports'], factory);
+ } else if (typeof exports !== 'undefined') {
+ factory(exports);
+ } else {
+ factory((root.esprima = {}));
+ }
+}(this, function (exports) {
+ 'use strict';
+
</ins><span class="cx"> var Token,
</span><span class="cx"> TokenName,
</span><span class="cx"> FnExprTokens,
</span><span class="lines">@@ -3732,4 +3752,5 @@
</span><span class="cx"> return types;
</span><span class="cx"> }());
</span><span class="cx">
</span><del>-})(WebInspector.Esprima);
</del><ins>+}));
+/* vim: set sw=4 ts=4 et tw=80 : */
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (175849 => 175850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-11-11 04:32:16 UTC (rev 175849)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-11-11 04:58:25 UTC (rev 175850)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> <script src="External/CodeMirror/sql.js"></script>
</span><span class="cx"> <script src="External/CodeMirror/xml.js"></script>
</span><span class="cx">
</span><ins>+ <script src="External/Esprima/esprima.js"></script>
</ins><span class="cx"> <script src="External/ESLint/eslint.js"></script>
</span><span class="cx">
</span><span class="cx"> <script src="Base/WebInspector.js"></script>
</span><span class="lines">@@ -176,8 +177,6 @@
</span><span class="cx"> <script src="Base/URLUtilities.js"></script>
</span><span class="cx"> <script src="Base/Utilities.js"></script>
</span><span class="cx">
</span><del>- <script src="External/Esprima/esprima.js"></script>
-
</del><span class="cx"> <script src="Protocol/ApplicationCacheObserver.js"></script>
</span><span class="cx"> <script src="Protocol/CSSObserver.js"></script>
</span><span class="cx"> <script src="Protocol/ConsoleObserver.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (175849 => 175850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2014-11-11 04:32:16 UTC (rev 175849)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2014-11-11 04:58:25 UTC (rev 175850)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> this._script = script;
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- var esprimaSyntaxTree = WebInspector.Esprima.parse(sourceText, {range: true});
</del><ins>+ var esprimaSyntaxTree = esprima.parse(sourceText, {range: true});
</ins><span class="cx"> this._syntaxTree = this._createInternalSyntaxTree(esprimaSyntaxTree);
</span><span class="cx"> this._parsedSuccessfully = true;
</span><span class="cx"> } catch (error) {
</span></span></pre>
</div>
</div>
</body>
</html>