summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-01-14 09:53:31 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-01-14 09:53:31 -0500
commit8ccc464b0de39e7fc73b3c3e50f80f6c2452c8fe (patch)
tree6cb9dff87cbcc04e4d47293a942c0bbbb9691289 /www
parentfcde5bf01f7cd7029cfabd929483a72ba669039a (diff)
downloadhtml5ks-8ccc464b0de39e7fc73b3c3e50f80f6c2452c8fe.tar.xz
html5ks-8ccc464b0de39e7fc73b3c3e50f80f6c2452c8fe.zip
More stuff.
Diffstat (limited to 'www')
-rw-r--r--www/js/api.js3
-rw-r--r--www/js/html5ks.js4
-rw-r--r--www/js/imachine.js1
3 files changed, 2 insertions, 6 deletions
diff --git a/www/js/api.js b/www/js/api.js
index 8afa4a6..833b120 100644
--- a/www/js/api.js
+++ b/www/js/api.js
@@ -24,7 +24,7 @@ window.html5ks.api = new (function () {
switch (audio.volume) {
case 0:
audio.pause();
- // break;
+ /* falls through */
case 1:
clearInterval(this._fading);
}
@@ -389,7 +389,6 @@ window.html5ks.api = new (function () {
},
say: function (chrName, str, extend) {
- if (extend) debugger;
var deferred = when.defer(),
chr = typeof chrName === "string" ? html5ks.data.characters[chrName] : chrName,
w = /{w=?(\d*\.\d*)?}(.*)/.exec(str);
diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 8c2c679..e1c0bd7 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -1,8 +1,4 @@
"use strict";
-console = console || {
- log: function () {},
- error: alert
-};
window.html5ks = {
data: {},
persistent: {},
diff --git a/www/js/imachine.js b/www/js/imachine.js
index ba2894e..7a1f7de 100644
--- a/www/js/imachine.js
+++ b/www/js/imachine.js
@@ -36,6 +36,7 @@ html5ks.imachine = new (function () {
break;
case "iscene":
this.scene_register(inst[1]);
+ /* falls through */
case "act_op":
switch (inst[1]) {
case "op_vid1":