summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-10-20 07:23:12 -0400
committerAlex Xu <alex_y_xu@yahoo.ca>2014-10-20 07:23:12 -0400
commite4334416bc7f222a0bf1ca817892a43220da6fca (patch)
tree89bad097c087b6f59846370b3f2439825ae05d53 /www
parent254289e4d03046dbc0c9efb31cbf4d97639b44e9 (diff)
downloadhtml5ks-e4334416bc7f222a0bf1ca817892a43220da6fca.tar.xz
html5ks-e4334416bc7f222a0bf1ca817892a43220da6fca.zip
fix misc stuffHEADmaster
Diffstat (limited to 'www')
-rw-r--r--www/css/index.css8
-rw-r--r--www/index.html.dist4
-rw-r--r--www/js/api.js5
-rw-r--r--www/js/html5ks.js3
-rw-r--r--www/js/menu.js3
5 files changed, 11 insertions, 12 deletions
diff --git a/www/css/index.css b/www/css/index.css
index 9c8a62c..b4217f0 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -268,16 +268,16 @@ h2 {
display: none;
}
.no-webp #auto {
- background: url("dump/ui/sd-auto.png");
+ background: url("../dump/ui/sd-auto.png");
}
.webp #auto {
- background: url("dump/ui/sd-auto.webp");
+ background: url("../dump/ui/sd-auto.webp");
}
.no-webp #skip {
- background: url("dump/ui/sd-skip.png");
+ background: url("../dump/ui/sd-skip.png");
}
.webp #skip {
- background: url("dump/ui/sd-skip.webp");
+ background: url("../dump/ui/sd-skip.webp");
}
#choices {
left: 0;
diff --git a/www/index.html.dist b/www/index.html.dist
index 36fb5ba..66d75e0 100644
--- a/www/index.html.dist
+++ b/www/index.html.dist
@@ -53,8 +53,8 @@
</div>
<div id="choices" class="centered"></div>
<div id="centered" class="centered say"></div>
- <span class="status" id="auto" alt="Auto">
- <span class="status" id="skip" alt="Skip">
+ <span class="status" id="auto" alt="Auto"></span>
+ <span class="status" id="skip" alt="Skip"></span>
</div>
<div id="main-menu" style="display: none;">
<div id="main-menu-buttons">
diff --git a/www/js/api.js b/www/js/api.js
index e88ac91..0d64cc5 100644
--- a/www/js/api.js
+++ b/www/js/api.js
@@ -208,8 +208,7 @@ window.html5ks.api = {
console.debug(key, args);
if (obj[key]) return obj[key].apply(obj, args);
else {
- console.error("no such function " + n);
- debugger;
+ console.error("no such function " + key);
return when.resolve();
}
},
@@ -412,8 +411,6 @@ window.html5ks.api = {
chr = { name: who };
}
- this._lastchar = chr;
-
if (!extend && chr.what_prefix) {
what = chr.what_prefix + what;
}
diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 4113c1d..ffdf321 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -143,6 +143,9 @@ window.html5ks = {
},
initEvents: function () {
window.onresize = html5ks.scale;
+ this.elements.gray.addEventListener("click", function (e) {
+ e.stopPropagation();
+ }, false);
this.elements.container.addEventListener("click", function (e) {
if (html5ks.store.status === "scene") {
switch (e.button) {
diff --git a/www/js/menu.js b/www/js/menu.js
index 8539853..dc2b898 100644
--- a/www/js/menu.js
+++ b/www/js/menu.js
@@ -199,8 +199,7 @@ html5ks.menu = {
case false:
html5ks.api.window(html5ks.store.window);
html5ks.api.nvl(html5ks.store.nvl);
- html5ks.store.status = html5ks.store.status;
- /* falls through */
+ html5ks.store.status = "scene";
case "showImage":
this.elements.context.style.display = "none";
html5ks.elements.gray.style.display = "none";