some fuckery to get dev branch working
This commit is contained in:
56
loader.html
Normal file → Executable file
56
loader.html
Normal file → Executable file
@ -16,15 +16,6 @@
|
||||
<script src="/js/main.js"></script>
|
||||
<script>
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
<<<<<<< HEAD
|
||||
if (document.location.hash) {
|
||||
let game = JSON.parse(decodeURIComponent(atob(document.location.hash.substring(1))));
|
||||
document.getElementById("gameFrame").setAttribute("src", `/semag/${game[0]}/index.html`);
|
||||
document.getElementById("gameImage").setAttribute("src", `/semag/${game[0]}/${decodeURIComponent(game[1])}`);
|
||||
document.getElementById("gameName").innerText = game[2];
|
||||
localStorage.setItem("selenite.lastGame", document.location.hash.substring(1))
|
||||
document.location.hash = '';
|
||||
=======
|
||||
if (location.search != "") {
|
||||
let items = {};
|
||||
location.search.substr(1).split("&").forEach((e)=>{
|
||||
@ -34,24 +25,12 @@
|
||||
document.getElementById("gameImage").setAttribute("src", `/semag/${items.dir}/${items.img}`);
|
||||
document.getElementById("gameName").innerText = decodeURIComponent(items.title);
|
||||
console.log(items);
|
||||
>>>>>>> c2041b6 (first dev commit)
|
||||
} else if(localStorage.getItem("selenite.lastGame")) {
|
||||
let game = JSON.parse(decodeURIComponent(atob(localStorage.getItem("selenite.lastGame"))));
|
||||
document.getElementById("gameFrame").setAttribute("src", `/semag/${game[0]}/index.html`);
|
||||
document.getElementById("gameImage").setAttribute("src", `/semag/${game[0]}/${decodeURIComponent(game[1])}`);
|
||||
document.getElementById("gameName").innerText = game[2];
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
document.getElementById("fullscreen").addEventListener("click", () => {
|
||||
|
||||
})
|
||||
});
|
||||
</script>
|
||||
|
||||
<link rel="stylesheet" href="/style.css" />
|
||||
<link rel="manifest" href="/manifest.json" />
|
||||
|
||||
=======
|
||||
// document.getElementById("fullscreen").addEventListener("click", () => {
|
||||
|
||||
// })
|
||||
@ -61,44 +40,10 @@
|
||||
<link rel="stylesheet" href="/css/main.css" />
|
||||
<link rel="stylesheet" href="/css/pages.css" />
|
||||
<link rel="stylesheet" href="/css/loader.css" />
|
||||
>>>>>>> c2041b6 (first dev commit)
|
||||
<!-- seo + other things -->
|
||||
<title>Selenite</title>
|
||||
<link rel="icon" href="/favicon.ico" />
|
||||
</head>
|
||||
<<<<<<< HEAD
|
||||
<alerts> </alerts>
|
||||
<body>
|
||||
<header>
|
||||
<a href="/index.html">Home</a>
|
||||
<a href="/bookmarklets.html">Bookmarklets</a>
|
||||
<a href="/projects.html">Games</a>
|
||||
<a href="/apps.html">Apps</a>
|
||||
<a href="/settings.html">Settings</a>
|
||||
<a id="blank" href="#">Open Blank</a>
|
||||
<a href="/u/" class="usericon"><img src="/img/user.svg" /></a>
|
||||
</header>
|
||||
<main>
|
||||
<div id="gamecontainer">
|
||||
<iframe id="gameFrame" allow="fullscreen" sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-scripts allow-same-origin"></iframe>
|
||||
<div id="infobox">
|
||||
<img id="gameImage" src="favicon.png" />
|
||||
<h2 id="gameName">Selenite</h2>
|
||||
<div class="opposite">
|
||||
<img class="button" id="fullscreen" src="/img/fullscreen.svg">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
<footer class="noscroll">
|
||||
<a href="gitlab.com/skysthelimit.dev/selenite">Source</a>
|
||||
<a href="https://discord.gg/7jyufnwJNf">Discord</a>
|
||||
<a href="/suggest.html">Suggestions & Bugs</a>
|
||||
<a href="/contact.html">Contact</a>
|
||||
<a href="/support.html">Donate</a>
|
||||
<a href="/about.html">About</a>
|
||||
</footer>
|
||||
=======
|
||||
<body>
|
||||
<div id="gamecontainer">
|
||||
<iframe id="gameFrame" allow="fullscreen" sandbox="allow-downloads allow-forms allow-modals allow-pointer-lock allow-scripts allow-same-origin"></iframe>
|
||||
@ -110,6 +55,5 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
>>>>>>> c2041b6 (first dev commit)
|
||||
</body>
|
||||
</html>
|
||||
|
Reference in New Issue
Block a user