summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-01-29 17:57:22 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-01-29 17:57:36 -0500
commit6ca9552ac361d276ffdb3085eed10e513e8c6bf7 (patch)
tree4c8d4f9e1d4b7506cc6c90b0ad32a5964c9e3d1c
parent86b9f9a40a1549d275dc8a57bf192b97c6954eed (diff)
downloadhtml5ks-6ca9552ac361d276ffdb3085eed10e513e8c6bf7.tar.xz
html5ks-6ca9552ac361d276ffdb3085eed10e513e8c6bf7.zip
More stuff.
-rw-r--r--Makefile4
-rw-r--r--www/css/index.css4
-rw-r--r--www/js/html5ks.js6
-rw-r--r--www/warn.html2
4 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 139675c..7c5cb1f 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ $(DUMP)/ui/ctc_strip-0.png: $(CTC_ANIM_SRC)
$(CONVERT) "$<" -crop 16x16 $(patsubst %.png,%*.png,$<)
$(DUMP)/ui/ctc_strip-%.png: $(CTC_ANIM_SRC) $(DUMP)/ui/ctc_strip-0.png
- @touch "$@"
+ @touch -r "$(DUMP)/ui/ctc_strip-0.png" "$@"
$(DUMP)/ui/ctc_anim.png: $(CTC_ANIM_TMP)
$(APNGASM) "$@" $^ 3 100
@@ -144,4 +144,6 @@ watch:
# disable default rules, increases `make` speed by 3 seconds
.SUFFIXES:
+
+.INTERMEDIATE: $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
.PHONY: video audio images js jshint clean space watch
diff --git a/www/css/index.css b/www/css/index.css
index 1210e28..3b9a420 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -41,11 +41,11 @@ h2 {
/* interstitial */
#interstitial {
- visibility: hidden;
+ display: none;
cursor: auto;
}
html.no-js #interstitial {
- visibility: visible;
+ display: block;
}
#warn {
background-color: rgb(128, 128, 128);
diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 50555b3..ab5fcd4 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -29,7 +29,7 @@ window.html5ks = {
return v;
},
set: function (value) {
- v = '' + value;
+ v = value;
localStorage.persistent = JSON.stringify(html5ks.persistent);
},
enumerable: true
@@ -153,7 +153,7 @@ window.html5ks = {
for (var i = 0; i < warns.length; i++) {
var warn = warns[i];
if (window.getComputedStyle(warns[i]).getPropertyValue("display") !== "none") {
- warn.style.visibility = "visible";
+ warn.style.display = "block";
return true;
}
}
@@ -167,9 +167,9 @@ window.html5ks = {
if (!this.warnUnsupported()) {
this.start();
}
+ this.i18n.init();
this.api.init();
this.menu.init();
- this.i18n.init();
},
start: function () {
this.fetch("json", "script").then(function (d) {
diff --git a/www/warn.html b/www/warn.html
index 5c7c898..8601eb7 100644
--- a/www/warn.html
+++ b/www/warn.html
@@ -13,7 +13,7 @@
</p>
<p>FYI, this site sets a single anonymous cookie (warned=1) so that you won't have to keep seeing this page. It also sets localStorage to keep your settings and saves. The latter always stays on your computer and never goes anywhere. If you live in the EU, please don't sue me.</p>
<form method="GET" action="warned.ngx">
- <p><input type="checkbox" name="hdisable"><label for="hdisable">Disable adult content</label>
+ <p><input type="checkbox" name="hdisable" id="hdisable"><label for="hdisable">Disable adult content</label>
<br>
<input type="submit" value="Let's go!">
</form>