From 329e33a27b28b494f739c0d569bb4ea752e9044a Mon Sep 17 00:00:00 2001 From: vipulm Date: Tue, 9 May 2017 20:59:21 +0530 Subject: [PATCH 1/7] Disable watchers not in viewport --- zeppelin-web/bower.json | 3 ++- zeppelin-web/src/app/app.js | 1 + zeppelin-web/src/app/notebook/notebook.html | 3 ++- zeppelin-web/src/index.html | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 690cd155190..6acdc9870af 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -35,7 +35,8 @@ "select2": "^4.0.3", "github-markdown-css": "^2.4.0", "MathJax": "2.7.0", - "ngclipboard": "^1.1.1" + "ngclipboard": "^1.1.1", + "angular-viewport-watch": "^0.1.35" }, "devDependencies": { "angular-mocks": "1.5.7" diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js index fc5ffbdbe09..541b9429794 100644 --- a/zeppelin-web/src/app/app.js +++ b/zeppelin-web/src/app/app.js @@ -37,6 +37,7 @@ const requiredModules = [ 'focus-if', 'ngResource', 'ngclipboard', + 'angularViewportWatch' ] // headroom should not be used for CI, since we have to execute some integration tests. diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 293e2c2bd6c..63ef98b94d3 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -112,7 +112,8 @@

Note Permissions (Only note owners can change)

ng-controller="ParagraphCtrl" ng-init="init(currentParagraph, note)" ng-class="columnWidthClass(currentParagraph.config.colWidth)" - style="margin: 0; padding: 0;"> + style="margin: 0; padding: 0;" + viewport-watch>

+

diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index 003ad5be569..3ca9ae4a417 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -173,6 +173,8 @@ + + From 71425782202f57a41b41f743f6e2c0c3b1b526e8 Mon Sep 17 00:00:00 2001 From: vipulm Date: Tue, 9 May 2017 22:46:17 +0530 Subject: [PATCH 2/7] Trigger notification From d698d066d186b9c3c2b0b469632c4cadf5360320 Mon Sep 17 00:00:00 2001 From: vipulm Date: Wed, 10 May 2017 11:48:34 +0530 Subject: [PATCH 3/7] Add license file --- zeppelin-distribution/src/bin_license/LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index d9410936371..f43649195f5 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -271,6 +271,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) Unirest 1.4.9 (com.mashape.unirest:unirest-java:1.4.9 - https://github.com/Mashape/unirest-java) (The MIT License) ngclipboard v1.1.1 (https://github.com/sachinchoolur/ngclipboard) - https://github.com/sachinchoolur/ngclipboard/blob/1.1.1/LICENSE (The MIT License) headroom.js 0.9.3 (https://github.com/WickyNilliams/headroom.js) - https://github.com/WickyNilliams/headroom.js/blob/master/LICENSE + (The MIT License) angular-viewport-watch 0.135 (https://github.com/wix/angular-viewport-watch) - https://github.com/wix/angular-viewport-watch/blob/master/LICENSE ======================================================================== BSD-style licenses From 99b19a5ee018d47bc7d076f6688ef102918debc6 Mon Sep 17 00:00:00 2001 From: vipulm Date: Thu, 11 May 2017 11:21:00 +0530 Subject: [PATCH 4/7] Move pacakg to npm --- zeppelin-web/bower.json | 3 +-- zeppelin-web/package.json | 1 + zeppelin-web/src/index.html | 2 -- zeppelin-web/src/index.js | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 6acdc9870af..690cd155190 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -35,8 +35,7 @@ "select2": "^4.0.3", "github-markdown-css": "^2.4.0", "MathJax": "2.7.0", - "ngclipboard": "^1.1.1", - "angular-viewport-watch": "^0.1.35" + "ngclipboard": "^1.1.1" }, "devDependencies": { "angular-mocks": "1.5.7" diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index e25254eb687..4227a7ebc57 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -22,6 +22,7 @@ "test": "karma start karma.conf.js" }, "dependencies": { + "angular-viewport-watch": "github:shahata/angular-viewport-watch", "grunt-angular-templates": "^0.5.7", "grunt-dom-munger": "^3.4.0", "headroom.js": "^0.9.3" diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index 3ca9ae4a417..003ad5be569 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -173,8 +173,6 @@ - - diff --git a/zeppelin-web/src/index.js b/zeppelin-web/src/index.js index 314be64dabf..443b65c349d 100644 --- a/zeppelin-web/src/index.js +++ b/zeppelin-web/src/index.js @@ -12,6 +12,7 @@ * limitations under the License. */ +import 'angular-viewport-watch/angular-viewport-watch.js' import './app/app.js' import './app/app.controller.js' import './app/home/home.controller.js' From b982db4915176b718f561838c3a7163831367408 Mon Sep 17 00:00:00 2001 From: vipulm Date: Fri, 19 May 2017 11:14:48 +0530 Subject: [PATCH 5/7] Trigger build From 497413b0225c06a6b893466c391be7ed47b71d5a Mon Sep 17 00:00:00 2001 From: vipulm Date: Sun, 21 May 2017 09:56:57 +0530 Subject: [PATCH 6/7] Fixing build issues --- zeppelin-web/src/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js index ab9355ade0a..f14766b970c 100644 --- a/zeppelin-web/src/app/app.js +++ b/zeppelin-web/src/app/app.js @@ -41,7 +41,7 @@ const requiredModules = [ 'focus-if', 'ngResource', 'ngclipboard', - 'angularViewportWatch' + 'angularViewportWatch', 'ui.grid', 'ui.grid.exporter', 'ui.grid.edit', 'ui.grid.rowEdit', From 817e6fa0e7abea355b9c3ac44462ab895c4be1cf Mon Sep 17 00:00:00 2001 From: vipulm Date: Fri, 2 Jun 2017 17:05:47 -0700 Subject: [PATCH 7/7] Fixing JS exception issue --- zeppelin-web/package.json | 3 ++- zeppelin-web/src/app/app.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index b6685b00b9c..ec620037936 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", diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js index f14766b970c..c6674f139d5 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'