Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 c2a4d76fc -> 381441e5b
ZEPPELIN-3521 Dynamic note form overlaps with paragraph content in iframe page
("Link this paragraph")
Dynamic note form overlaps with paragraph content in iframe page ("Link this
paragraph")
Bug Fix
https://issues.apache.org/jira/browse/ZEPPELIN-3521
Click on "Link this paragraph" from the paragraph menu to get paragraph in
iframe mode
***Before***
<img width="755" alt="before"
src="https://user-images.githubusercontent.com/2031306/40834926-c3783e22-65af-11e8-9ff1-39cb0ece60ff.png">
***After***
<img width="881" alt="after"
src="https://user-images.githubusercontent.com/2031306/40834928-c4c43a1a-65af-11e8-947d-093cfcde38ef.png">
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Renjith Kamath <[email protected]>
Closes #2996 from r-kamath/ZEPPELIN-3521 and squashes the following commits:
207a0d363 [Renjith Kamath] ZEPPELIN-3521 Dynamic note form overlaps with
paragraph content in iframe page ("Link this paragraph")
Change-Id: I3a4989dba9a19016ff5ef4806ec229ca428834db
(cherry picked from commit b8c6b5d57e1b6b594ddddfca092c90a120c3daad)
Signed-off-by: Prabhjyot Singh <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/381441e5
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/381441e5
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/381441e5
Branch: refs/heads/branch-0.8
Commit: 381441e5b43bc4ced608229dac7a784984c8217f
Parents: c2a4d76
Author: Renjith Kamath <[email protected]>
Authored: Fri Jun 1 15:24:59 2018 +0530
Committer: Prabhjyot Singh <[email protected]>
Committed: Tue Jun 5 15:19:52 2018 +0530
----------------------------------------------------------------------
zeppelin-web/src/app/notebook/notebook.controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/381441e5/zeppelin-web/src/app/notebook/notebook.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js
b/zeppelin-web/src/app/notebook/notebook.controller.js
index 6082a44..5135e1b 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -1504,7 +1504,7 @@ function NotebookCtrl($scope, $route, $routeParams,
$location, $rootScope,
});
$scope.isShowNoteForms = function() {
- if ($scope.note && !angular.equals({}, $scope.note.noteForms)) {
+ if ($scope.note && !_.isEmpty($scope.note.noteForms) &&
!$scope.paragraphUrl) {
return true;
}
return false;