fix: rename liveReloadForce to livereloadForce

baumrock · May 8, 2024 · ee17e88 · ee17e88
1 parent 8404bc3
commit ee17e88
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 6 deletions.
diff --git a/RockFrontend.module.php b/RockFrontend.module.php
@@ -1646,7 +1646,7 @@ public function liveReloadMarkup(): string
     $file = $this->minifyFile($this->path . "livereload.js");
     $src = $this->url($file, true);
 
-    $force = (int)$this->wire->config->liveReloadForce;
+    $force = (int)$this->wire->config->livereloadForce;
     return "
       <script>
       var LiveReloadUrl = '{$this->wire->config->urls->root}';

diff --git a/livereload.js b/livereload.js
@@ -47,7 +47,7 @@ setTimeout(() => {
           setTimeout(() => {
             UIkit.notification({
               message:
-                "Unsaved changes prevent reload - use $config->liveReloadForce to force reload.",
+                "Unsaved changes prevent reload - use $config->livereloadForce to force reload.",
               status: "warning",
               pos: "top-center",
               timeout: 0,
@@ -59,7 +59,7 @@ setTimeout(() => {
           console.log("detected change - open panel prevents reload");
           UIkit.notification({
             message:
-              "Open panel prevents reload - use $config->liveReloadForce to force reload.",
+              "Open panel prevents reload - use $config->livereloadForce to force reload.",
             status: "warning",
             pos: "top-center",
             timeout: 0,

diff --git a/livereload.min.js b/livereload.min.js
@@ -1,3 +1,60 @@
-setTimeout(()=>{let isModal=!!document.querySelector("body.modal");if(isModal)return;let reloading=!1;if(window.self!==window.top)return;let redirecttimeout=0;let evtSource;let startStream=function(){let url=LiveReloadUrl+"?rockfrontend-livereload="+LiveReloadSecret;evtSource=new EventSource(url,{withCredentials:!0});evtSource.onmessage=function(event){let changed=event.data;if(!changed)return;if(reloading)return;if(document.hidden)return;console.log(changed);if(LiveReloadForce){document.querySelectorAll(".InputfieldStateChanged").forEach((input)=>{input.classList.remove("InputfieldStateChanged")})}else{if(document.querySelectorAll(".InputfieldStateChanged").length){console.log("detected change - unsaved changes prevent reload");setTimeout(()=>{UIkit.notification({message:"Unsaved changes prevent reload - use $config->liveReloadForce to force reload.",status:"warning",pos:"top-center",timeout:0,})},200);return}
-if(document.querySelectorAll("#pw-panel-shade").length){console.log("detected change - open panel prevents reload");UIkit.notification({message:"Open panel prevents reload - use $config->liveReloadForce to force reload.",status:"warning",pos:"top-center",timeout:0,});return}}
-let cnt=localStorage.getItem("livereload-count")||0;localStorage.setItem("livereload-count",++cnt);console.log("detected change - reloading "+cnt);reloading=!0;setTimeout(()=>{document.location.reload(!0)},redirecttimeout)}};startStream();console.log("RockFrontend is listening for file changes...")},1000)
+setTimeout(() => {
+  let isModal = !!document.querySelector("body.modal");
+  if (isModal) return;
+  let reloading = !1;
+  if (window.self !== window.top) return;
+  let redirecttimeout = 0;
+  let evtSource;
+  let startStream = function () {
+    let url = LiveReloadUrl + "?rockfrontend-livereload=" + LiveReloadSecret;
+    evtSource = new EventSource(url, { withCredentials: !0 });
+    evtSource.onmessage = function (event) {
+      let changed = event.data;
+      if (!changed) return;
+      if (reloading) return;
+      if (document.hidden) return;
+      console.log(changed);
+      if (LiveReloadForce) {
+        document
+          .querySelectorAll(".InputfieldStateChanged")
+          .forEach((input) => {
+            input.classList.remove("InputfieldStateChanged");
+          });
+      } else {
+        if (document.querySelectorAll(".InputfieldStateChanged").length) {
+          console.log("detected change - unsaved changes prevent reload");
+          setTimeout(() => {
+            UIkit.notification({
+              message:
+                "Unsaved changes prevent reload - use $config->livereloadForce to force reload.",
+              status: "warning",
+              pos: "top-center",
+              timeout: 0,
+            });
+          }, 200);
+          return;
+        }
+        if (document.querySelectorAll("#pw-panel-shade").length) {
+          console.log("detected change - open panel prevents reload");
+          UIkit.notification({
+            message:
+              "Open panel prevents reload - use $config->livereloadForce to force reload.",
+            status: "warning",
+            pos: "top-center",
+            timeout: 0,
+          });
+          return;
+        }
+      }
+      let cnt = localStorage.getItem("livereload-count") || 0;
+      localStorage.setItem("livereload-count", ++cnt);
+      console.log("detected change - reloading " + cnt);
+      reloading = !0;
+      setTimeout(() => {
+        document.location.reload(!0);
+      }, redirecttimeout);
+    };
+  };
+  startStream();
+  console.log("RockFrontend is listening for file changes...");
+}, 1000);