Implement consistent enable/disable methods for overrides

Author: mzur

[email protected]/extension.js

@@ -7,14 +7,16 @@ export default class WsmatrixExtension extends Extension {
         let settings = this.getSettings();
         let keybindings = this.getSettings(this.metadata['keybindings-schema']);
         this.overrideWorkspace = new WorkspaceManagerOverride(settings, keybindings);
+        this.overrideWorkspace.enable();
         this.overrideOverview = new OverviewManager(settings);
+        this.overrideOverview.enable();
     }
 
     disable() {
-        this.overrideWorkspace.destroy();
+        this.overrideWorkspace.disable();
         this.overrideWorkspace = null;
 
-        this.overrideOverview.destroy();
+        this.overrideOverview.disable();
         this.overrideOverview = null;
     }
 }

[email protected]/overview/overviewManager.js

@@ -8,12 +8,12 @@ import {PACKAGE_VERSION} from 'resource:///org/gnome/shell/misc/config.js';
 export default class OverviewManager {
     constructor(settings) {
         this._settings = settings;
-        this._initOverrides()
-            .then(this._handleShowOverviewGridChanged.bind(this))
-            .catch(e => console.error(e));
+    }
 
-        // this._handleShowOverviewGridChanged();
+    async enable() {
         this._connectSettings();
+        await this._initOverrides();
+        this._handleShowOverviewGridChanged();
     }
 
     // This can be moved to the constructor again if there is no need for the conditional
@@ -63,7 +63,7 @@ export default class OverviewManager {
         this._overrides.forEach(o => o.disable());
     }
 
-    destroy() {
+    disable() {
         this.restore();
         this._disconnectSettings();
     }

[email protected]/workspacePopup/workspaceManagerOverride.js

@@ -36,13 +36,14 @@ export default class WorkspaceManagerOverride {
         this._keybindings = keybindings;
         this._overviewKeybindingActions = {};
         this.monitors = [];
-        this._initOverrides()
-            .then(this._overrideOriginalProperties.bind(this))
-            .catch(e => console.error(e));
+    }
+
+    async enable() {
+        await this._initOverrides()
 
         this._overrideDynamicWorkspaces();
         this._overrideKeybindingHandlers();
-        // this._overrideOriginalProperties();
+        this._overrideOriginalProperties();
         this._handleNumberOfWorkspacesChanged();
         this._handleMultiMonitorChanged();
         this._handleWraparoundModeChanged();
@@ -69,7 +70,7 @@ export default class WorkspaceManagerOverride {
         }
     }
 
-    destroy() {
+    disable() {
         this._destroyWorkspaceSwitcherPopup();
         this._restoreLayout();
         this._restoreKeybindingHandlers();