Repository: zeppelin Updated Branches: refs/heads/master af3caf00a -> 584ed48a0
[ZEPPELIN-2046] The final output is a little inconsistent with the streaming output ### What is this PR for? he final output is not consistent with the streaming output. The final output has one extra blank lines between outputs. ### What type of PR is it? Bug Fix ### Todos * [x] - make streaming output and static output the same ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2046 ### How should this be tested? run ``` %sh echo hello && echo "" && sleep 1 && echo world && sleep 1 ``` and see if streaming output is the same to final output ### Screenshots (if appropriate) before  after  ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Lee moon soo <m...@apache.org> Closes #1975 from Leemoonsoo/output_append_fix and squashes the following commits: e883fdf [Lee moon soo] Make streaming output and static output the same Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/584ed48a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/584ed48a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/584ed48a Branch: refs/heads/master Commit: 584ed48a096a0ac6976b2ed2720cfd4fa4a419c4 Parents: af3caf0 Author: Lee moon soo <m...@apache.org> Authored: Mon Feb 6 08:54:03 2017 +0900 Committer: Lee moon soo <m...@apache.org> Committed: Wed Feb 8 09:38:34 2017 +0900 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/paragraph/paragraph.css | 4 ++++ .../src/app/notebook/paragraph/result/result.controller.js | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/584ed48a/zeppelin-web/src/app/notebook/paragraph/paragraph.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css index 961a5f0..89fab03 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css @@ -76,6 +76,10 @@ table.dataTable.table-condensed .sorting_desc:after { white-space:pre-wrap; /** to preserve white-space and newlines of result */ } +.plainTextContent div { + min-height:17px; +} + .graphContainer { position: relative; margin-bottom: 5px; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/584ed48a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js index 5757e1a..5f0ae00 100644 --- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js @@ -488,12 +488,8 @@ function ResultCtrl($scope, $rootScope, $route, $window, $routeParams, $location // pop all stacked data and append to the DOM while (textResultQueueForAppend.length > 0) { - const stacked = textResultQueueForAppend.pop(); - - const lines = stacked.split('\n'); - for (let i = 0; i < lines.length; i++) { - elem.append(angular.element('<div></div>').text(lines[i])); - } + const line = textResultQueueForAppend.pop(); + elem.append(angular.element('<div></div>').text(line)); if ($scope.keepScrollDown) { const doc = angular.element(`#${elemId}`);
