Web Inspector: Avoid including ESLint until it is used
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Feb 2016 22:31:08 +0000 (22:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Feb 2016 22:31:08 +0000 (22:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=154196

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-02-12
Reviewed by Timothy Hatcher.

* Scripts/copy-user-interface-resources.pl:
Do not include ESLint in optimized output yet.

* UserInterface/Controllers/AnalyzerManager.js:
Do not reference `eslint` until we use it.

* UserInterface/Main.html:
Remove include to ESLint until we need it.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196512 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
Source/WebInspectorUI/UserInterface/Controllers/AnalyzerManager.js
Source/WebInspectorUI/UserInterface/Main.html

index c438053..8b1435e 100644 (file)
@@ -1,5 +1,21 @@
 2016-02-12  Joseph Pecoraro  <pecoraro@apple.com>
 
+        Web Inspector: Avoid including ESLint until it is used
+        https://bugs.webkit.org/show_bug.cgi?id=154196
+
+        Reviewed by Timothy Hatcher.
+
+        * Scripts/copy-user-interface-resources.pl:
+        Do not include ESLint in optimized output yet.
+
+        * UserInterface/Controllers/AnalyzerManager.js:
+        Do not reference `eslint` until we use it.
+
+        * UserInterface/Main.html:
+        Remove include to ESLint until we need it.
+
+2016-02-12  Joseph Pecoraro  <pecoraro@apple.com>
+
         Web Inspector: Tabs: Conflicts with multiple Formatters per SourceCode
         https://bugs.webkit.org/show_bug.cgi?id=144717
         <rdar://problem/20845163>
index 1334cf8..c3108b8 100755 (executable)
@@ -235,6 +235,9 @@ if ($shouldCombineMain) {
     # Remove Images/gtk on Mac and Windows builds.
     remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'gtk')) if defined $ENV{'MAC_OS_X_VERSION_MAJOR'} or defined $ENV{'OFFICIAL_BUILD'};
 
+    # Remove ESLint until needed: <https://webkit.org/b/136515> Web Inspector: JavaScript source text editor should have a linter
+    unlink $targetESLintJS;
+
     # Copy the Legacy directory.
     ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
 } else {
index 5268579..6666eb3 100644 (file)
@@ -117,4 +117,6 @@ WebInspector.AnalyzerManager = class AnalyzerManager extends WebInspector.Object
 };
 
 WebInspector.AnalyzerManager._typeAnalyzerMap = new Map;
-WebInspector.AnalyzerManager._typeAnalyzerMap.set(WebInspector.Resource.Type.Script, eslint);
+
+// <https://webkit.org/b/136515> Web Inspector: JavaScript source text editor should have a linter
+// WebInspector.AnalyzerManager._typeAnalyzerMap.set(WebInspector.Resource.Type.Script, eslint);
index 9e07913..f07f5d1 100644 (file)
     <script src="External/CodeMirror/xml.js"></script>
 
     <script src="External/Esprima/esprima.js"></script>
-    <script src="External/ESLint/eslint.js"></script>
 
     <script src="Base/WebInspector.js"></script>
     <script src="Protocol/InspectorFrontendHostStub.js"></script>