Added retro-compatibility with web-greeter

JezerM · Jan 17, 2022 · 010b9c8 · 010b9c8
1 parent bfdd0c1
commit 010b9c8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/themes/dracula/js/backgrounds.js b/themes/dracula/js/backgrounds.js
@@ -67,10 +67,15 @@ class Backgrounds {
       const path = this._backgroundImages[i];
       let button = this._createImage(path);
       button.addEventListener("click", () => {
-        nody_greeter.broadcast({
-          type: "change-background",
-          path,
-        });
+        if (window.nody_greeter) {
+          nody_greeter.broadcast({
+            type: "change-background",
+            path,
+          });
+        } else {
+          this._backgroundPath = path;
+          this._updateBackgroundImages();
+        }
       });
       this._backgroundsList.appendChild(button);
     }

diff --git a/themes/dracula/js/index.js b/themes/dracula/js/index.js
@@ -47,15 +47,10 @@ async function initGreeter() {
 
   brightness = new Brightness();
 
-  if (!nody_greeter.window_metadata.is_primary) {
+  if (window.nody_greeter && !window.nody_greeter.window_metadata.is_primary) {
     // Hide login elements on non-primary screen
     document.querySelector("#screen").classList.add("hide");
   }
 }
 
-if (window._ready_event === undefined) {
-  _ready_event = new Event("GreeterReady");
-  window.dispatchEvent(_ready_event);
-}
-
 window.addEventListener("GreeterReady", initGreeter);
diff --git a/themes/gruvbox/js/index.js b/themes/gruvbox/js/index.js
@@ -49,17 +49,12 @@ async function initGreeter() {
     document.querySelector("#lock-label").classList.remove("hide");
   }
 
-  if (!nody_greeter.window_metadata.is_primary) {
+  if (window.nody_greeter && !window.nody_greeter.window_metadata.is_primary) {
     // Hide login elements on non-primary screen
     document.querySelector("#screen").classList.add("hide");
   }
 }
 
 const notGreeter = false;
 
-if (window._ready_event === undefined) {
-  _ready_event = new Event("GreeterReady");
-  window.dispatchEvent(_ready_event);
-}
-
 window.addEventListener("GreeterReady", initGreeter);
diff --git a/ts/browser.ts b/ts/browser.ts
@@ -212,7 +212,7 @@ class Browser {
         if (w.is_primary) {
           w.window.focus();
         }
-        logger.debug("Nody Greeter started win");
+        logger.debug("Nody Greeter started win: " + w.meta.id);
       });
       w.window.webContents.on("devtools-opened", () => {
         w.window.webContents.devToolsWebContents.focus();