Repository: incubator-zeppelin Updated Branches: refs/heads/master eebae39a2 -> d9aaf3570
ZEPPELIN-284 Set run notebook button as disables instead of hiding it (when note is running) Author: Damien Corneau <[email protected]> Closes #287 from corneadoug/fix/ZEPPELIN-284 and squashes the following commits: c9c09a8 [Damien Corneau] Remove annoying ace log in console c98300d [Damien Corneau] ZEPPELIN-284 - Disable run note button instead of hiding it Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/d9aaf357 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/d9aaf357 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/d9aaf357 Branch: refs/heads/master Commit: d9aaf35700b161c30e09499b5b1a87522da69f9d Parents: eebae39 Author: Damien Corneau <[email protected]> Authored: Mon Sep 7 18:22:55 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Wed Sep 9 07:35:59 2015 -0700 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/notebook.html | 16 ++++++++-------- .../app/notebook/paragraph/paragraph.controller.js | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d9aaf357/zeppelin-web/src/app/notebook/notebook.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 5079685..bfb26da 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -22,38 +22,38 @@ limitations under the License. <button type="button" class="btn btn-default btn-xs" ng-click="runNote()" - ng-if="!isNoteRunning()" + ng-class="{'disabled':isNoteRunning()}" tooltip-placement="top" tooltip="Run all the notes"> <i class="icon-control-play"></i> - </button> - + </button> <button type="button" class="btn btn-default btn-xs" ng-click="toggleAllEditor()" ng-hide="viewOnly" tooltip-placement="top" tooltip="Show/hide the code"> <i ng-class="editorToggled ? 'fa icon-size-fullscreen' :'fa icon-size-actual'"></i></button> - <button type="button" class="btn btn-default btn-xs" ng-click="toggleAllTable()" ng-hide="viewOnly" tooltip-placement="top" tooltip="Show/hide the output"> - <i ng-class="tableToggled ? 'fa icon-notebook' : 'fa icon-book-open'"></i></button> - + <i ng-class="tableToggled ? 'fa icon-notebook' : 'fa icon-book-open'"></i> + </button> <button type="button" class="btn btn-default btn-xs" ng-click="removeNote(note.id)" ng-hide="viewOnly" tooltip-placement="top" tooltip="Remove the notebook"> - <i class="icon-trash"></i></button> + <i class="icon-trash"></i> + </button> <button type="button" class="btn btn-default btn-xs" ng-hide="viewOnly" tooltip-placement="top" tooltip="Clone the notebook" data-toggle="modal" data-target="#noteNameModal" data-clone="true" > - <i class="fa fa-copy"></i></button> + <i class="fa fa-copy"></i> + </button> </span> <span ng-hide="viewOnly"> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/d9aaf357/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index c1cd48b..5a0da48 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -438,6 +438,7 @@ angular.module('zeppelinWebApp') var Range = ace.require('ace/range').Range; $scope.editor = _editor; + _editor.$blockScrolling = Infinity; if (_editor.container.id !== '{{paragraph.id}}_editor') { $scope.editor.renderer.setShowGutter($scope.paragraph.config.lineNumbers); $scope.editor.setShowFoldWidgets(false);
