From 2130cecacedbbe29826565ce17b1099886ea95ef Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sun, 16 Dec 2018 16:03:22 -0600 Subject: [PATCH] Panel collapse fixes --- app/assets/javascripts/app/controllers/notes.js | 4 ++-- app/assets/javascripts/app/controllers/tags.js | 4 ++-- .../javascripts/app/directives/views/panelResizer.js | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/app/controllers/notes.js b/app/assets/javascripts/app/controllers/notes.js index 194771af9..de50ed575 100644 --- a/app/assets/javascripts/app/controllers/notes.js +++ b/app/assets/javascripts/app/controllers/notes.js @@ -66,8 +66,8 @@ angular.module('app') let width = authManager.getUserPrefValue("notesPanelWidth"); if(width) { this.panelController.setWidth(width); - if(this.panelController.isCollapsed) { - $rootScope.$broadcast("panel-resized", {panel: "notes", collapsed: this.panelController.isCollapsed}) + if(this.panelController.isCollapsed()) { + $rootScope.$broadcast("panel-resized", {panel: "notes", collapsed: this.panelController.isCollapsed()}) } } } diff --git a/app/assets/javascripts/app/controllers/tags.js b/app/assets/javascripts/app/controllers/tags.js index dc808b43f..4d6daa3a7 100644 --- a/app/assets/javascripts/app/controllers/tags.js +++ b/app/assets/javascripts/app/controllers/tags.js @@ -47,8 +47,8 @@ angular.module('app') let width = authManager.getUserPrefValue("tagsPanelWidth"); if(width) { this.panelController.setWidth(width); - if(this.panelController.isCollapsed) { - $rootScope.$broadcast("panel-resized", {panel: "tags", collapsed: this.panelController.isCollapsed}) + if(this.panelController.isCollapsed()) { + $rootScope.$broadcast("panel-resized", {panel: "tags", collapsed: this.panelController.isCollapsed()}) } } } diff --git a/app/assets/javascripts/app/directives/views/panelResizer.js b/app/assets/javascripts/app/directives/views/panelResizer.js index 492c2084f..0be60fffa 100644 --- a/app/assets/javascripts/app/directives/views/panelResizer.js +++ b/app/assets/javascripts/app/directives/views/panelResizer.js @@ -56,16 +56,19 @@ class PanelResizer { // Handle Double Click Event var widthBeforeLastDblClick = 0; resizerColumn.ondblclick = () => { - var collapsed = $scope.isCollapsed(); $timeout(() => { - if(collapsed) { + var preClickCollapseState = $scope.isCollapsed(); + if(preClickCollapseState) { $scope.setWidth(widthBeforeLastDblClick || $scope.defaultWidth); } else { widthBeforeLastDblClick = lastWidth; $scope.setWidth(minWidth); } + $scope.finishSettingWidth(); - $scope.onResizeFinish()(lastWidth, lastLeft, $scope.isAtMaxWidth(), collapsed); + + var newCollapseState = !preClickCollapseState; + $scope.onResizeFinish()(lastWidth, lastLeft, $scope.isAtMaxWidth(), newCollapseState); }) }