Repository: incubator-zeppelin Updated Branches: refs/heads/master 8243140bd -> edb0a0f48
ZEPPELIN213: Notebook toggleAllTable and toggleAllEditor does not mat⦠This fix match the notebook buttons (code & output) behavior to the paragraph behavior (code & output). BEFORE:  AFTER:  Author: cto <[email protected]> This patch had conflicts when merged, resolved by Committer: Lee moon soo <[email protected]> Closes #195 from eranwitkon/master and squashes the following commits: 32b0754 [cto] ZEPPELIN213: Notebook toggleAllTable and toggleAllEditor does not match paragraph button Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/edb0a0f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/edb0a0f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/edb0a0f4 Branch: refs/heads/master Commit: edb0a0f48c1daf86cf0b41468bc5e7be612e69c7 Parents: 8243140 Author: cto <[email protected]> Authored: Sun Aug 9 23:34:00 2015 +0300 Committer: Lee moon soo <[email protected]> Committed: Mon Aug 10 22:29:46 2015 -0700 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/notebook.controller.js | 8 ++++---- zeppelin-web/src/app/notebook/notebook.html | 2 +- zeppelin-web/src/index.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/edb0a0f4/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 1129b87..32ff305 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -79,9 +79,9 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro $scope.toggleAllEditor = function() { if ($scope.editorToggled) { - $scope.$broadcast('closeEditor'); - } else { $scope.$broadcast('openEditor'); + } else { + $scope.$broadcast('closeEditor'); } $scope.editorToggled = !$scope.editorToggled; }; @@ -96,9 +96,9 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', function($scope, $ro $scope.toggleAllTable = function() { if ($scope.tableToggled) { - $scope.$broadcast('closeTable'); - } else { $scope.$broadcast('openTable'); + } else { + $scope.$broadcast('closeTable'); } $scope.tableToggled = !$scope.tableToggled; }; http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/edb0a0f4/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 3d965ec..d09744e 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -32,7 +32,7 @@ limitations under the License. ng-click="toggleAllEditor()" ng-hide="viewOnly" tooltip-placement="top" tooltip="Show/hide the code"> - <i ng-class="editorToggled ? 'fa icon-size-actual' : 'fa icon-size-fullscreen'"></i></button> + <i ng-class="editorToggled ? 'fa icon-size-fullscreen' :'fa icon-size-actual'"></i></button> <button type="button" class="btn btn-default btn-xs" http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/edb0a0f4/zeppelin-web/src/index.html ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index a4e2f89..554034f 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -108,7 +108,7 @@ limitations under the License. <script src="bower_components/angular-xeditable/dist/js/xeditable.js"></script> <script src="bower_components/highlightjs/highlight.pack.js"></script> <script src="bower_components/lodash/lodash.js"></script> - <script src="bower_components/angular-filter/dist/angular-filter.js"></script> + <script src="bower_components/angular-filter/dist/angular-filter.min.js"></script> <!-- endbower --> <!-- endbuild --> <!-- build:js({.tmp,src}) scripts/scripts.js -->
