Repository: incubator-zeppelin Updated Branches: refs/heads/master 893b49b5c -> 74bab2e70
Hot fix grunt failure ### What is this PR for? This is a fix for grunt failure due to jshint warnings Grunt error: `src/app/notebook/paragraph/paragraph.controller.js line 117 col 80 Strings must use singlequote. line 2122 col 83 Expected '!==' and instead saw '!='.` ### What type of PR is it? Hot Fix ### What is the Jira issue? no ### How should this be tested? `cd zeppelin-web` and run `grunt` should build without any error/warning Author: Renjith Kamath <[email protected]> Closes #772 from r-kamath/fixGruntFailure and squashes the following commits: 24ef105 [Renjith Kamath] Fix grunt task order 9e70660 [Renjith Kamath] Hot fix grunt failure Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/74bab2e7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/74bab2e7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/74bab2e7 Branch: refs/heads/master Commit: 74bab2e7012aacb56887cfad9b12ccec25101a16 Parents: 893b49b Author: Renjith Kamath <[email protected]> Authored: Thu Mar 10 14:36:32 2016 +0530 Committer: Damien CORNEAU <[email protected]> Committed: Fri Mar 11 15:26:04 2016 +0900 ---------------------------------------------------------------------- zeppelin-web/Gruntfile.js | 10 +++------- .../src/app/notebook/paragraph/paragraph.controller.js | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/74bab2e7/zeppelin-web/Gruntfile.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js index b865f02..906c142 100644 --- a/zeppelin-web/Gruntfile.js +++ b/zeppelin-web/Gruntfile.js @@ -434,6 +434,7 @@ module.exports = function (grunt) { ]); grunt.registerTask('build', [ + 'newer:jshint', 'clean:dist', 'wiredep', 'useminPrepare', @@ -449,12 +450,7 @@ module.exports = function (grunt) { ]); grunt.registerTask('default', [ - 'newer:jshint', - /* - * Since we dont have test (or up to date) there is no reason to keep this task - * I am commented this, but can be changed in the future (if someone want to implement front tests). - 'test', - */ - 'build' + 'build', + 'test' ]); }; http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/74bab2e7/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index c96ee65..cb7265c 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -114,7 +114,7 @@ angular.module('zeppelinWebApp') $scope.appendTextOutput($scope.paragraph.result.msg); } - angular.element('#p' + $scope.paragraph.id + '_text').bind("mousewheel", function(e) { + angular.element('#p' + $scope.paragraph.id + '_text').bind('mousewheel', function(e) { $scope.keepScrollDown = false; }); @@ -2119,7 +2119,7 @@ angular.module('zeppelinWebApp') $scope.showScrollUpIcon = function(){ if(angular.element('#p' + $scope.paragraph.id + '_text')[0]){ - return angular.element('#p' + $scope.paragraph.id + '_text')[0].scrollTop != 0; + return angular.element('#p' + $scope.paragraph.id + '_text')[0].scrollTop !== 0; } return false;
