From 51c023279576b78d8f61886991a50c10609b72df Mon Sep 17 00:00:00 2001 From: abose Date: Thu, 15 Oct 2015 17:02:12 +0530 Subject: [PATCH] Code cleanup, raising events when panel is shown/hidden. --- src/extensions/default/NoDistractions/main.js | 2 +- src/utils/Resizer.js | 4 +-- src/view/WorkspaceManager.js | 26 +++++++++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/extensions/default/NoDistractions/main.js b/src/extensions/default/NoDistractions/main.js index ff81743ddfa..0f311f16a4b 100644 --- a/src/extensions/default/NoDistractions/main.js +++ b/src/extensions/default/NoDistractions/main.js @@ -134,7 +134,7 @@ define(function (require, exports, module) { _updateCheckedState(); }); - WorkspaceManager.on("workspaceUpdateLayout", _updateLayout); + WorkspaceManager.on(WorkspaceManager.EVENT_WORKSPACE_PANEL_SHOWN, _updateLayout); /** * Register the Commands , add the Menu Items and key bindings diff --git a/src/utils/Resizer.js b/src/utils/Resizer.js index cc10fcc2dc4..a586079ebb3 100644 --- a/src/utils/Resizer.js +++ b/src/utils/Resizer.js @@ -62,7 +62,7 @@ define(function (require, exports, module) { // Load dependent modules var AppInit = require("utils/AppInit"), EventDispatcher = require("utils/EventDispatcher"), - viewUtils = require("utils/ViewUtils"), + ViewUtils = require("utils/ViewUtils"), PreferencesManager = require("preferences/PreferencesManager"); var $mainView; @@ -536,7 +536,7 @@ define(function (require, exports, module) { // The main toolbar is only collapsible. if ($("#main-toolbar").hasClass("collapsible") && PreferencesManager.get(PREFS_PURE_CODE)) { - viewUtils.hideMainToolBar(); + ViewUtils.hideMainToolBar(); } }); diff --git a/src/view/WorkspaceManager.js b/src/view/WorkspaceManager.js index 59e1dea3f7c..854eb2f3b29 100644 --- a/src/view/WorkspaceManager.js +++ b/src/view/WorkspaceManager.js @@ -42,6 +42,10 @@ define(function (require, exports, module) { EventDispatcher = require("utils/EventDispatcher"), Resizer = require("utils/Resizer"); + //constants + var EVENT_WORKSPACE_UPDATE_LAYOUT = "workspaceUpdateLayout", + EVENT_WORKSPACE_PANEL_SHOWN = "workspacePanelShown", + EVENT_WORKSPACE_PANEL_HIDDEN = "workspacePanelHidden"; /** * The ".content" vertical stack (editor + all header/footer panels) @@ -114,7 +118,7 @@ define(function (require, exports, module) { $editorHolder.height(editorAreaHeight); // affects size of "not-editor" placeholder as well // Resize editor to fill the space - exports.trigger("workspaceUpdateLayout", editorAreaHeight, refreshHint); + exports.trigger(EVENT_WORKSPACE_UPDATE_LAYOUT, editorAreaHeight, refreshHint); } @@ -189,6 +193,7 @@ define(function (require, exports, module) { */ Panel.prototype.show = function () { Resizer.show(this.$panel[0]); + exports.trigger(EVENT_WORKSPACE_PANEL_SHOWN, this.panelID); }; /** @@ -196,6 +201,7 @@ define(function (require, exports, module) { */ Panel.prototype.hide = function () { Resizer.hide(this.$panel[0]); + exports.trigger(EVENT_WORKSPACE_PANEL_HIDDEN, this.panelID); }; /** @@ -204,9 +210,9 @@ define(function (require, exports, module) { */ Panel.prototype.setVisible = function (visible) { if (visible) { - Resizer.show(this.$panel[0]); + this.show(); } else { - Resizer.hide(this.$panel[0]); + this.hide(); } }; @@ -227,6 +233,7 @@ define(function (require, exports, module) { updateResizeLimits(); // initialize panel's max size panelIDMap[id] = new Panel($panel, minSize); + panelIDMap[id].panelID = id; return panelIDMap[id]; } @@ -290,9 +297,12 @@ define(function (require, exports, module) { EventDispatcher.makeEventDispatcher(exports); // Define public API - exports.createBottomPanel = createBottomPanel; - exports.recomputeLayout = recomputeLayout; - exports.getAllPanelIDs = getAllPanelIDs; - exports.getPanelForID = getPanelForID; - exports._setMockDOM = _setMockDOM; + exports.createBottomPanel = createBottomPanel; + exports.recomputeLayout = recomputeLayout; + exports.getAllPanelIDs = getAllPanelIDs; + exports.getPanelForID = getPanelForID; + exports._setMockDOM = _setMockDOM; + exports.EVENT_WORKSPACE_UPDATE_LAYOUT = EVENT_WORKSPACE_UPDATE_LAYOUT; + exports.EVENT_WORKSPACE_PANEL_SHOWN = EVENT_WORKSPACE_PANEL_SHOWN; + exports.EVENT_WORKSPACE_PANEL_HIDDEN = EVENT_WORKSPACE_PANEL_HIDDEN; });