Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into livyInterperter

Browse source
This commit is contained in:
Prabhjyot Singh 2016-04-11 12:33:07 +05:30
commit ff3c4eddef
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file

@ -167,7 +167,7 @@ angular.module('zeppelinWebApp')
angular.element('#p' + $scope.paragraph.id + '_text').bind('mousewheel', function(e) {
$scope.keepScrollDown = false;
});
$scope.flushStreamingOutput = true;
} else {
$timeout(retryRenderer, 10);
}
@ -445,13 +445,17 @@ angular.module('zeppelinWebApp')
$scope.$on('appendParagraphOutput', function(event, data) {
if ($scope.paragraph.id === data.paragraphId) {
if ($scope.flushStreamingOutput) {
$scope.clearTextOutput();
$scope.flushStreamingOutput = false;
}
$scope.appendTextOutput(data.data);
}
});
$scope.$on('updateParagraphOutput', function(event, data) {
if ($scope.paragraph.id === data.paragraphId) {
$scope.clearTextOutput(data.data);
$scope.clearTextOutput();
$scope.appendTextOutput(data.data);
}
});