From 5a1e76ea7279a3773c6d6acb21bfb077dee2df0b Mon Sep 17 00:00:00 2001 From: Renjith Kamath Date: Fri, 7 Aug 2015 16:42:54 +0530 Subject: [PATCH] ZEPPELIN-203 Cleanup jshint warnings --- zeppelin-web/.jshintrc | 5 ++- zeppelin-web/Gruntfile.js | 12 +++---- zeppelin-web/pom.xml | 3 +- zeppelin-web/src/app/app.controller.js | 2 +- .../src/app/notebook/notebook.controller.js | 17 ++++------ .../paragraph/paragraph.controller.js | 32 +++++++++++-------- 6 files changed, 37 insertions(+), 34 deletions(-) diff --git a/zeppelin-web/.jshintrc b/zeppelin-web/.jshintrc index 008037e9267..374aab426f9 100644 --- a/zeppelin-web/.jshintrc +++ b/zeppelin-web/.jshintrc @@ -20,6 +20,9 @@ "trailing": true, "smarttabs": true, "globals": { - "angular": false + "angular": false, + "_": false, + "jQuery": false, + "hljs": false } } diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js index eabe0fba09d..78a7ea1a4e4 100644 --- a/zeppelin-web/Gruntfile.js +++ b/zeppelin-web/Gruntfile.js @@ -255,19 +255,19 @@ module.exports = function (grunt) { uglify: { options: { mangle: { - screw_ie8: true + 'screw_ie8': true }, preserveComments: 'some', compress: { - screw_ie8: true, + 'screw_ie8': true, sequences: true, - dead_code: true, + 'dead_code': true, conditionals: true, booleans: true, unused: true, - if_return: true, - join_vars: true, - drop_console: true + 'if_return': true, + 'join_vars': true, + 'drop_console': true } } }, diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml index 316fae738b2..eb6915c1287 100644 --- a/zeppelin-web/pom.xml +++ b/zeppelin-web/pom.xml @@ -118,8 +118,7 @@ - - --no-color --force + --no-color diff --git a/zeppelin-web/src/app/app.controller.js b/zeppelin-web/src/app/app.controller.js index f2bf8ab0cfc..3f51330e315 100644 --- a/zeppelin-web/src/app/app.controller.js +++ b/zeppelin-web/src/app/app.controller.js @@ -31,7 +31,7 @@ angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootSc }); $rootScope.$on('setLookAndFeel', function(event, data) { - if (!event.defaultPrevented && data && data !== '' && data != $scope.looknfeel) { + if (!event.defaultPrevented && data && data !== '' && data !== $scope.looknfeel) { $scope.looknfeel = data; event.preventDefault(); } diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index 420435d28de..1129b87fc94 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -356,8 +356,11 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro var getInterpreterBindingsCallBack = function() { var selected = false; - for (var i in $scope.interpreterBindings) { - var setting = $scope.interpreterBindings[i]; + var key; + var setting; + + for (key in $scope.interpreterBindings) { + setting = $scope.interpreterBindings[key]; if (setting.selected) { selected = true; break; @@ -367,8 +370,8 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro if (!selected) { // make default selection var selectedIntp = {}; - for (var i in $scope.interpreterBindings) { - var setting = $scope.interpreterBindings[i]; + for (key in $scope.interpreterBindings) { + setting = $scope.interpreterBindings[key]; if (!selectedIntp[setting.group]) { setting.selected = true; selectedIntp[setting.group] = true; @@ -464,7 +467,6 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro } scope[varName] = data.angularObject.object; } - }); $scope.$on('angularObjectRemove', function(event, data) { @@ -483,9 +485,4 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro } }); - var isFunction = function(functionToCheck) { - var getType = {}; - return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]'; - }; - }); diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index afa3dbfd4df..f90622ffa56 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -424,11 +424,11 @@ angular.module('zeppelinWebApp') getCompletions : function(editor, session, pos, prefix, callback) { if (!$scope.editor.isFocused() ){ return;} - var pos = session.getTextRange(new Range(0, 0, pos.row, pos.column)).length; + pos = session.getTextRange(new Range(0, 0, pos.row, pos.column)).length; var buf = session.getValue(); - + websocketMsgSrv.completion($scope.paragraph.id, buf, pos); - + $scope.$on('completionList', function(event, data) { if (data.completions) { var completions = []; @@ -785,12 +785,14 @@ angular.module('zeppelinWebApp') } var d3g = []; + var xLabels; + var yLabels; if (type === 'scatterChart') { var scatterData = setScatterChart(data, refresh); - var xLabels = scatterData.xLabels; - var yLabels = scatterData.yLabels; + xLabels = scatterData.xLabels; + yLabels = scatterData.yLabels; d3g = scatterData.d3g; $scope.chart[type].xAxis.tickFormat(function(d) { @@ -846,7 +848,7 @@ angular.module('zeppelinWebApp') $scope.chart[type].yAxis.axisLabelDistance(50); } else if (type === 'lineChart' || type === 'stackedAreaChart') { var pivotdata = pivotDataToD3ChartFormat(p, false, true); - var xLabels = pivotdata.xLabels; + xLabels = pivotdata.xLabels; d3g = pivotdata.d3g; $scope.chart[type].xAxis.tickFormat(function(d) { if (xLabels[d] && (isNaN(parseFloat(xLabels[d])) || !isFinite(xLabels[d]))) { // to handle string type xlabel @@ -1229,7 +1231,7 @@ angular.module('zeppelinWebApp') var keys = $scope.paragraph.config.graph.keys; var groups = $scope.paragraph.config.graph.groups; - var values = $scope.paragraph.config.graph.values; + values = $scope.paragraph.config.graph.values; var valueOnly = (keys.length === 0 && groups.length === 0 && values.length > 0); var noKey = (keys.length === 0); var isMultiBarChart = (chartType === 'multiBarChart'); @@ -1280,9 +1282,11 @@ angular.module('zeppelinWebApp') // clear aggregation name, if possible var namesWithoutAggr = {}; + var colName; + var withoutAggr; // TODO - This part could use som refactoring - Weird if/else with similar actions and variable names - for (var colName in colNameIndex) { - var withoutAggr = colName.substring(0, colName.lastIndexOf('(')); + for (colName in colNameIndex) { + withoutAggr = colName.substring(0, colName.lastIndexOf('(')); if (!namesWithoutAggr[withoutAggr]) { namesWithoutAggr[withoutAggr] = 1; } else { @@ -1292,20 +1296,20 @@ angular.module('zeppelinWebApp') if (valueOnly) { for (var valueIndex = 0; valueIndex < d3g[0].values.length; valueIndex++) { - var colName = d3g[0].values[valueIndex].x; + colName = d3g[0].values[valueIndex].x; if (!colName) { continue; } - var withoutAggr = colName.substring(0, colName.lastIndexOf('(')); + withoutAggr = colName.substring(0, colName.lastIndexOf('(')); if (namesWithoutAggr[withoutAggr] <= 1 ) { d3g[0].values[valueIndex].x = withoutAggr; } } } else { for (var d3gIndex = 0; d3gIndex < d3g.length; d3gIndex++) { - var colName = d3g[d3gIndex].key; - var withoutAggr = colName.substring(0, colName.lastIndexOf('(')); + colName = d3g[d3gIndex].key; + withoutAggr = colName.substring(0, colName.lastIndexOf('(')); if (namesWithoutAggr[withoutAggr] <= 1 ) { d3g[d3gIndex].key = withoutAggr; } @@ -1314,7 +1318,7 @@ angular.module('zeppelinWebApp') // use group name instead of group.value as a column name, if there're only one group and one value selected. if (groups.length === 1 && values.length === 1) { for (d3gIndex = 0; d3gIndex < d3g.length; d3gIndex++) { - var colName = d3g[d3gIndex].key; + colName = d3g[d3gIndex].key; colName = colName.split('.')[0]; d3g[d3gIndex].key = colName; }