summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2013-07-06 20:42:23 -0400
committerAlex Xu <alex_y_xu@yahoo.ca>2013-07-06 20:42:23 -0400
commitf0f6967a1b9782b4c21ec9cac39248ece5229962 (patch)
treed66a4eca39cf5b71ff8d4b88483540d8e278fd37
parentc191f104460a5b3f149863b2cdf9db3051f978c9 (diff)
downloadhtml5ks-f0f6967a1b9782b4c21ec9cac39248ece5229962.tar.xz
html5ks-f0f6967a1b9782b4c21ec9cac39248ece5229962.zip
do work
-rw-r--r--TODO4
-rw-r--r--www/css/index.css26
-rw-r--r--www/js/imachine.js5
3 files changed, 14 insertions, 21 deletions
diff --git a/TODO b/TODO
index 43f08ae..8c67fc8 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,11 @@
todo ordered by most to least important... ish
all of this should (read: must) be completed for a 1.0 release
-- menu
+- menu (doesn't work)
- show command
- redo images.js using json including ALL transitions
- transitions. ALL THE TRANSITIONS
-- ltr text reveal
+- ltr text reveal (for nvl too)
- wallodrugs
- fix cursor to apply to all document
- organize the CSS into a reasonable order
diff --git a/www/css/index.css b/www/css/index.css
index baa349e..d05e2f4 100644
--- a/www/css/index.css
+++ b/www/css/index.css
@@ -28,26 +28,16 @@ body {
cursor: url("../dump/ui/mousecursor.png"), default;
position: absolute;
}
-#container.scale, #bg.scale, #vid.scale {
+#container, #bg.scale, #vid.scale {
top: 50%;
left: 50%;
}
#container {
width: 800px;
height: 600px;
- left: 50%;
- top: 50%;
margin-top: -300px;
margin-left: -400px;
}
-@keyframes toright {
- from {
- left: -100px;
- }
- to {
- left: -190px;
- }
-}
#who {
color: black;
position: absolute;
@@ -103,14 +93,14 @@ h2 {
font: 20px/28px Playtime;
font-weight: bold;
}
-html.no-js #warn li:not(#js) { display: none; }
- #warn li#ie { display: none; }
-html.video #warn li#video { display: none; }
-html.audio #warn li#audio { display: none; }
-html.fontface #warn li#fontface { display: none; }
-html.csstransforms #warn li#csstransforms { display: none; }
+html.no-js #warn li:not(#js) { display: none; }
+ #warn li#ie { display: none; }
+html.video #warn li#video { display: none; }
+html.audio #warn li#audio { display: none; }
+html.fontface #warn li#fontface { display: none; }
+html.csstransforms #warn li#csstransforms { display: none; }
html.csstransitions #warn li#csstransitions { display: none; }
-html #warn li#html-svg-filter { display: none; }
+html #warn li#html-svg-filter { display: none; }
label {
display: block;
}
diff --git a/www/js/imachine.js b/www/js/imachine.js
index 1d539dd..a256019 100644
--- a/www/js/imachine.js
+++ b/www/js/imachine.js
@@ -21,6 +21,9 @@ html5ks.imachine = (function () {
case "undefined":
break;
case "string": // jump_out
+ if (!html5ks.data.imachine[inst]) {
+ throw new Error("label does not exist");
+ }
this.run(inst);
break;
case "object":
@@ -69,7 +72,7 @@ html5ks.imachine = (function () {
break;
default:
console.error("unknown imachine inst");
- console.error(inst);
+ console.log(inst);
}
}
}.bind(this);