aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/common/banner.gifbin0 -> 96319 bytes
-rw-r--r--views/loader.html11
-rw-r--r--views/script/core_viewer.js1
-rw-r--r--views/script/loader_global.js96
4 files changed, 70 insertions, 38 deletions
diff --git a/views/common/banner.gif b/views/common/banner.gif
new file mode 100644
index 0000000..e65d463
--- /dev/null
+++ b/views/common/banner.gif
Binary files differ
diff --git a/views/loader.html b/views/loader.html
index c1db38b..9e100bb 100644
--- a/views/loader.html
+++ b/views/loader.html
@@ -21,15 +21,12 @@
}
</script>
- <div style="display:flex;align-items:center;justify-content:center;inset: 0;height: 100%;">
- <img src="../logo/vendor.png" id="vendor" style="width:128px;transform: scale(1);transition: transform 200ms;">
+ <img id="imgpreload" src="common/banner.gif" style="height:100%;width:auto;opacity:0;position:fixed;pointer-events:none;">
+ <div style="display:flex;align-items:center;justify-content:center;inset: 0;height: 100%;background:#fed1ae;overflow:hidden;">
+ <img id="banner" src="../logo/itch/banner.jpg" style="height:100%;width:auto;">
</div>
<script>
- if (native) {
- document.write(`<div style="position: fixed;bottom: 20px;right: 20px;font-size: 12px;padding: 10px 20px;background: lightblue;border-radius: 5px;transition: all 200ms;" id="updates">${lang.updates.wait}</div>`);
- } else {
- document.write(`<div style="position: fixed;bottom: 20px;right: 20px;font-size: 12px;padding: 10px 20px;background: black;border: 1px solid white;border-radius: 5px;transition: all 200ms;color:white;" id="updates">Kartik <b>Mobile</b></div>`);
- }
+ document.write(`<div style="position: fixed;bottom: 20px;right: 20px;font-size: 12px;padding: 10px 20px;background: lightblue;border-radius: 5px;transition: all 200ms;display:none;" id="updates">${lang.updates.wait}</div>`);
</script>
<div id="warning" style="opacity:0;transition:opacity 200ms;position: fixed;background: darkred;color: white;padding: 20px 10px;max-width: 40vw;text-align: center;border-radius: 10px;left: 20vw;top: 30vh;"><h2><script>document.write(lang.updates.warn[0]);</script></h2><p><script>document.write(lang.updates.warn[1]);</script></p></div>
diff --git a/views/script/core_viewer.js b/views/script/core_viewer.js
index d22ada9..389bf41 100644
--- a/views/script/core_viewer.js
+++ b/views/script/core_viewer.js
@@ -1,6 +1,7 @@
const webview = document.getElementById('wb');
webview.addEventListener('dom-ready', () => {
+ document.getElementById('dummyloader').style.display = "none";
require('@electron/remote').getCurrentWindow().log(" * " + webview.getURL());
try {
if (require('@electron/remote').getCurrentWindow().debug) {
diff --git a/views/script/loader_global.js b/views/script/loader_global.js
index 67016d9..6bde06c 100644
--- a/views/script/loader_global.js
+++ b/views/script/loader_global.js
@@ -2,8 +2,6 @@ window.addEventListener('load', () => {
setTimeout(() => {
if (native) {
setTimeout(() => {
- document.getElementById('vendor').style.transform = "scale(3)";
- new Audio("../sfx/intro.mp3").play();
setTimeout(() => {
if (native) {global.$ = require('jquery');} else {var script = document.createElement('script');script.src = '../webinit/jquery.js';script.type = 'text/javascript';document.getElementsByTagName('head')[0].appendChild(script);}
$("#progress").fadeOut(500);
@@ -27,46 +25,75 @@ window.addEventListener('load', () => {
}
}
setTimeout(() => {
- $("body").fadeOut(500);
- setTimeout(() => {
- info("LoadWindow", "Switching control to MenuWindow");
- location.href = "intro.html";
- }, 1000)
- }, 3000);
+ document.getElementById('banner').style.width = "380px";
+ document.getElementById('banner').style.height = "auto";
+ document.getElementById('banner').src = "common/banner.gif";
+ introsfx = new Audio("../sfx/newintro.mp3");
+ introsfx.play()
+ introsfx.onended = () => {
+ $("body").fadeOut(500);
+ setTimeout(() => {
+ info("LoadWindow", "Switching control to MenuWindow");
+ location.href = "intro.html";
+ }, 1000)
+ }
+ }, 2000)
}).catch((e) => {
console.warn(e);
document.getElementById('updates').style.backgroundColor = "lightcoral";
document.getElementById('updates').innerText = lang.updates.error;
setTimeout(() => {
- $("body").fadeOut(500);
- setTimeout(() => {
- info("LoadWindow", "Switching control to MenuWindow");
- location.href = "intro.html";
- }, 1000)
- }, 3000);
+ document.getElementById('banner').style.width = "380px";
+ document.getElementById('banner').style.height = "auto";
+ document.getElementById('banner').src = "common/banner.gif";
+ introsfx = new Audio("../sfx/newintro.mp3");
+ introsfx.play()
+ introsfx.onended = () => {
+ $("body").fadeOut(500);
+ setTimeout(() => {
+ info("LoadWindow", "Switching control to MenuWindow");
+ location.href = "intro.html";
+ }, 1000)
+ }
+ }, 2000)
});
}).catch((e) => {
console.warn(e);
document.getElementById('updates').style.backgroundColor = "lightcoral";
document.getElementById('updates').innerText = lang.updates.error;
setTimeout(() => {
- $("body").fadeOut(500);
- setTimeout(() => {
- info("LoadWindow", "Switching control to MenuWindow");
- location.href = "intro.html";
- }, 1000)
- }, 3000);
+ document.getElementById('banner').style.width = "380px";
+ document.getElementById('banner').style.height = "auto";
+ document.getElementById('banner').src = "common/banner.gif";
+ introsfx = new Audio("../sfx/newintro.mp3");
+ introsfx.play()
+ introsfx.onended = () => {
+ $("body").fadeOut(500);
+ setTimeout(() => {
+ info("LoadWindow", "Switching control to MenuWindow");
+ location.href = "intro.html";
+ }, 1000)
+ }
+ }, 2000)
});
}).catch((e) => {
console.warn(e);
document.getElementById('updates').style.backgroundColor = "lightcoral";
document.getElementById('updates').innerText = lang.updates.error;
setTimeout(() => {
- setTimeout(() => {
- info("LoadWindow", "Switching control to MenuWindow");
- location.href = "intro.html";
- }, 1000)
- }, 3000);
+ document.getElementById('banner').style.width = "380px";
+ document.getElementById('banner').style.height = "auto";
+ document.getElementById('banner').src = "common/banner.gif";
+ introsfx = new Audio("../sfx/newintro.mp3");
+ introsfx.play()
+ introsfx.onended = () => {
+ $("body").fadeOut(500);
+ setTimeout(() => {
+ info("LoadWindow", "Switching control to MenuWindow");
+ location.href = "intro.html";
+ }, 1000)
+ }
+ }, 2000)
});
}, 2000)
}, 3000)
@@ -74,12 +101,19 @@ window.addEventListener('load', () => {
} else {
if (native) {global.$ = require('jquery');} else {var script = document.createElement('script');script.src = '../webinit/jquery.js';script.type = 'text/javascript';document.getElementsByTagName('head')[0].appendChild(script);}
setTimeout(() => {
- $("body").fadeOut(500);
- setTimeout(() => {
- info("LoadWindow", "Switching control to MenuWindow");
- location.href = "intro.html";
- }, 1000)
- }, 8000);
+ document.getElementById('banner').style.width = "380px";
+ document.getElementById('banner').style.height = "auto";
+ document.getElementById('banner').src = "common/banner.gif";
+ introsfx = new Audio("../sfx/newintro.mp3");
+ introsfx.play()
+ introsfx.onended = () => {
+ $("body").fadeOut(500);
+ setTimeout(() => {
+ info("LoadWindow", "Switching control to MenuWindow");
+ location.href = "intro.html";
+ }, 1000)
+ }
+ }, 5000)
}
}, 2000)
})
© Floofi Systems, Some rights reserved. Powered by cgit.