1 files changed, 68 insertions, 44 deletions
diff --git a/extensions/44/vertical-workspaces/lib/messageTray.js b/extensions/44/vertical-workspaces/lib/messageTray.js
index b35541a..ef7a51b 100644
--- a/extensions/44/vertical-workspaces/lib/messageTray.js
+++ b/extensions/44/vertical-workspaces/lib/messageTray.js
@@ -10,58 +10,82 @@
 
 'use strict';
 
-const { Clutter } = imports.gi;
-const Me = imports.misc.extensionUtils.getCurrentExtension();
+const Clutter = imports.gi.Clutter;
+
 const Main = imports.ui.main;
 
+let Me;
 let opt;
-let _firstRun = true;
-
-function update(reset = false) {
-    opt = Me.imports.lib.settings.opt;
-    const moduleEnabled = opt.get('messageTrayModule', true);
-    reset = reset || !moduleEnabled;
 
-    // don't even touch this module if disabled
-    if (_firstRun && reset)
-        return;
+var MessageTrayModule = class {
+    constructor(me) {
+        Me = me;
+        opt = Me.opt;
 
-    _firstRun = false;
+        this._firstActivation = true;
+        this.moduleEnabled = false;
+    }
 
-    if (reset) {
+    cleanGlobals() {
+        Me = null;
         opt = null;
-        setNotificationPosition(1);
-        return;
     }
 
-    setNotificationPosition(opt.NOTIFICATION_POSITION);
-}
+    update(reset) {
+        this.moduleEnabled = opt.get('messageTrayModule');
+        const conflict = false;
+
+        reset = reset || !this.moduleEnabled || conflict;
+
+        // don't touch the original code if module disabled
+        if (reset && !this._firstActivation) {
+            this._disableModule();
+        } else if (!reset) {
+            this._firstActivation = false;
+            this._activateModule();
+        }
+        if (reset && this._firstActivation)
+            console.debug('  MessageTrayModule - Keeping untouched');
+    }
+
+    _activateModule() {
+        this._setNotificationPosition(opt.NOTIFICATION_POSITION);
+
+        console.debug('  MessageTrayModule - Activated');
+    }
+
+    _disableModule() {
+        this._setNotificationPosition(1);
+
+        console.debug('  MessageTrayModule - Disabled');
+    }
 
-function setNotificationPosition(position) {
-    switch (position) {
-    case 0:
-        Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.START;
-        Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.START;
-        break;
-    case 1:
-        Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.CENTER;
-        Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.START;
-        break;
-    case 2:
-        Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.END;
-        Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.START;
-        break;
-    case 3:
-        Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.START;
-        Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.END;
-        break;
-    case 4:
-        Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.CENTER;
-        Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.END;
-        break;
-    case 5:
-        Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.END;
-        Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.END;
-        break;
+    _setNotificationPosition(position) {
+        switch (position) {
+        case 0:
+            Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.START;
+            Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.START;
+            break;
+        case 1:
+            Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.CENTER;
+            Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.START;
+            break;
+        case 2:
+            Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.END;
+            Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.START;
+            break;
+        case 3:
+            Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.START;
+            Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.END;
+            break;
+        case 4:
+            Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.CENTER;
+            Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.END;
+            break;
+        case 5:
+            Main.messageTray._bannerBin.x_align = Clutter.ActorAlign.END;
+            Main.messageTray._bannerBin.y_align = Clutter.ActorAlign.END;
+            break;
+        }
     }
-}
+};