Repository: zeppelin Updated Branches: refs/heads/master c61e08de1 -> 8fbcc4543
[HFix] : Fix JS exception because of Zeppelin-2519 ### What is this PR for? Fix JS exception because of Zeppelin-2519. Added the missing dependency for scroll monitor before viewport. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2519 ### How should this be tested? Load a notebook and you should not see any exceptions in the dev console. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? * Is there breaking changes for older versions? * Does this needs documentation? Author: vipulm <[email protected]> Closes #2392 from vipul1409/ZEPPELIN-2519 and squashes the following commits: 817e6fa [vipulm] Fixing JS exception issue 7cf08a6 [vipulm] Merge branch 'master' into ZEPPELIN-2519 497413b [vipulm] Fixing build issues 21c03d6 [vipulm] Merging master and resolving conflicts b982db4 [vipulm] Trigger build 175dd17 [vipulm] Merge master 99b19a5 [vipulm] Move pacakg to npm d698d06 [vipulm] Add license file 7142578 [vipulm] Trigger notification 329e33a [vipulm] Disable watchers not in viewport Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8fbcc454 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8fbcc454 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8fbcc454 Branch: refs/heads/master Commit: 8fbcc454377dad67f47e6160c02c4375ae9e6cf5 Parents: c61e08d Author: vipulm <[email protected]> Authored: Fri Jun 2 17:05:47 2017 -0700 Committer: Lee moon soo <[email protected]> Committed: Sat Jun 3 13:01:19 2017 -0700 ---------------------------------------------------------------------- zeppelin-web/package.json | 3 ++- zeppelin-web/src/app/app.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8fbcc454/zeppelin-web/package.json ---------------------------------------------------------------------- diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index b6685b0..ec62003 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -28,7 +28,8 @@ "grunt-dom-munger": "^3.4.0", "headroom.js": "^0.9.3", "moment": "^2.18.1", - "moment-duration-format": "^1.3.0" + "moment-duration-format": "^1.3.0", + "scrollmonitor": "^1.2.3" }, "devDependencies": { "autoprefixer": "^6.5.4", http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8fbcc454/zeppelin-web/src/app/app.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js index f14766b..c6674f1 100644 --- a/zeppelin-web/src/app/app.js +++ b/zeppelin-web/src/app/app.js @@ -17,6 +17,8 @@ import 'headroom.js' import 'headroom.js/dist/angular.headroom' + +import 'scrollmonitor/scrollMonitor.js' import 'angular-viewport-watch/angular-viewport-watch.js' import 'angular-ui-grid/ui-grid.css'
