WORKING: remove all js from index.html

apache · Dec 28, 2016 · d715d2a · d715d2a
1 parent 71de16f
commit d715d2a
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 39 deletions.
diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js
@@ -602,7 +602,7 @@ module.exports = function(grunt) {
   grunt.registerTask('webpack', 'Prepare webpack build', function(target) {
     grunt.task.run([
       // 'clean:server',
-      'copy:webpack',
+      // 'copy:webpack',
       // 'copy:dev',
       // 'postcss',
     ]);

diff --git a/zeppelin-web/src/app/handsontable/handsonHelper.js b/zeppelin-web/src/app/handsontable/handsonHelper.js
@@ -13,7 +13,7 @@
  */
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * HandsonHelper class

diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js
@@ -13,6 +13,8 @@
  */
 'use strict';
 
+import zeppelin from '../../../zeppelin';
+
 (function() {
 
   angular.module('zeppelinWebApp').controller('ResultCtrl', ResultCtrl);

diff --git a/zeppelin-web/src/app/tabledata/columnselector.js b/zeppelin-web/src/app/tabledata/columnselector.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * select columns

diff --git a/zeppelin-web/src/app/tabledata/passthrough.js b/zeppelin-web/src/app/tabledata/passthrough.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * passthough the data

diff --git a/zeppelin-web/src/app/tabledata/pivot.js b/zeppelin-web/src/app/tabledata/pivot.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * pivot table data and return d3 chart data

diff --git a/zeppelin-web/src/app/tabledata/tabledata.js b/zeppelin-web/src/app/tabledata/tabledata.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * Create table data object from paragraph table type result

diff --git a/zeppelin-web/src/app/tabledata/transformation.js b/zeppelin-web/src/app/tabledata/transformation.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * Base class for visualization

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js b/zeppelin-web/src/app/visualization/builtins/visualization-areachart.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in area chart

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js b/zeppelin-web/src/app/visualization/builtins/visualization-barchart.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in bar char

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js b/zeppelin-web/src/app/visualization/builtins/visualization-linechart.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in line chart

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-nvd3chart.js b/zeppelin-web/src/app/visualization/builtins/visualization-nvd3chart.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in table format

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-piechart.js b/zeppelin-web/src/app/visualization/builtins/visualization-piechart.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in pie chart

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js b/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in scatter char

diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-table.js b/zeppelin-web/src/app/visualization/builtins/visualization-table.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../../zeppelin';
 
 /**
  * Visualize data in table format

diff --git a/zeppelin-web/src/app/visualization/visualization.js b/zeppelin-web/src/app/visualization/visualization.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-var zeppelin = zeppelin || {};
+import zeppelin from '../zeppelin';
 
 /**
  * Base class for visualization

diff --git a/zeppelin-web/src/app/zeppelin.js b/zeppelin-web/src/app/zeppelin.js
@@ -14,6 +14,10 @@
 
 'use strict';
 
- var zeppelin = {};
+// Used as globally shared variable in
+// `src/app/visualization/**/*js`
+// `src/app/tabledata/*.js`
+// `src/app/notebook/paragraph/result/result.controller.js`
+// see also: ProvidePlugin in webpack.config.js
 
- export default zeppelin;
+export default {};
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
@@ -167,20 +167,5 @@
     <script src="bower_components/ngclipboard/dist/ngclipboard.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
-    <!-- build:js({.tmp,src}) scripts/scripts.js -->
-    <script src="app/tabledata/tabledata.js"></script>
-    <script src="app/tabledata/transformation.js"></script>
-    <script src="app/tabledata/pivot.js"></script>
-    <script src="app/tabledata/passthrough.js"></script>
-    <script src="app/tabledata/columnselector.js"></script>
-    <script src="app/visualization/visualization.js"></script>
-    <script src="app/visualization/builtins/visualization-table.js"></script>
-    <script src="app/visualization/builtins/visualization-nvd3chart.js"></script>
-    <script src="app/visualization/builtins/visualization-barchart.js"></script>
-    <script src="app/visualization/builtins/visualization-piechart.js"></script>
-    <script src="app/visualization/builtins/visualization-areachart.js"></script>
-    <script src="app/visualization/builtins/visualization-linechart.js"></script>
-    <script src="app/visualization/builtins/visualization-scatterchart.js"></script>
-    <!-- endbuild -->
   </body>
 </html>
diff --git a/zeppelin-web/src/index.js b/zeppelin-web/src/index.js
@@ -1,8 +1,39 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import './app/app.js';
 import './app/app.controller.js';
 import './app/home/home.controller.js';
 import './app/handsontable/handsonHelper.js';
 import './app/notebook/notebook.controller.js';
+
+/** start: global variable `zeppelin` related files */
+import './app/tabledata/tabledata.js';
+import './app/tabledata/transformation.js';
+import './app/tabledata/pivot.js';
+import './app/tabledata/passthrough.js';
+import './app/tabledata/columnselector.js';
+import './app/visualization/visualization.js';
+import './app/visualization/builtins/visualization-table.js';
+import './app/visualization/builtins/visualization-nvd3chart.js';
+import './app/visualization/builtins/visualization-barchart.js';
+import './app/visualization/builtins/visualization-piechart.js';
+import './app/visualization/builtins/visualization-areachart.js';
+import './app/visualization/builtins/visualization-linechart.js';
+import './app/visualization/builtins/visualization-scatterchart.js';
+/** end: global variable `zeppelin` related files */
+
 import './app/jobmanager/jobmanager.controller.js';
 import './app/jobmanager/jobs/job.controller.js';
 import './app/jobmanager/jobmanager.filter.js';

diff --git a/zeppelin-web/webpack.config.js b/zeppelin-web/webpack.config.js
@@ -173,15 +173,12 @@ module.exports = function makeWebpackConfig () {
    * List: http://webpack.github.io/docs/list-of-plugins.html
    */
   config.plugins = [
+    // Enable global variable
+    new webpack.ProvidePlugin({
+      "zeppelin": "zeppelin"
+    })
   ];
 
-  /**
-   * ProvidePlugin: Used to define global variable `zeppelin`
-   */
-   var providePlugin = new webpack.ProvidePlugin({
-     "zeppelin": "zeppelin"
-   });
-
   // Skip rendering index.html in test mode
   if (!isTest) {
     // Reference: https://github.com/ampedandwired/html-webpack-plugin