diff options
author | Alex Xu <alex_y_xu@yahoo.ca> | 2013-07-31 17:49:16 -0400 |
---|---|---|
committer | Alex Xu <alex_y_xu@yahoo.ca> | 2013-07-31 17:49:16 -0400 |
commit | 29618dc9a319643a7f6a27f55435739f573541df (patch) | |
tree | 2bc345fa5b7ba0e7edfec60e26c268af82751f01 /www | |
parent | 9d8168f54695807e28eafcc316d45e1379fc3ce5 (diff) | |
download | html5ks-29618dc9a319643a7f6a27f55435739f573541df.tar.xz html5ks-29618dc9a319643a7f6a27f55435739f573541df.zip |
add ambientVolume, fix what_suffix extend
Diffstat (limited to 'www')
-rw-r--r-- | www/js/api.js | 6 | ||||
-rw-r--r-- | www/js/html5ks.js | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/www/js/api.js b/www/js/api.js index 3a2c4f5..4454521 100644 --- a/www/js/api.js +++ b/www/js/api.js @@ -219,10 +219,6 @@ window.html5ks.api = { } el.style.display = "block"; } - deferred.resolve(); - }; - el.onerror = function () { - deferred.reject(); }; var nom = name; if (type && type !== "None") { @@ -339,7 +335,7 @@ window.html5ks.api = { if (!extend && char.what_prefix) { text = char.what_prefix + text; } - if ((!w || !w[1] || extend) && char.what_suffix) { + if ((!w || !w[1]) && !extend && char.what_suffix) { text = text + char.what_suffix; } diff --git a/www/js/html5ks.js b/www/js/html5ks.js index a611d42..a672dbb 100644 --- a/www/js/html5ks.js +++ b/www/js/html5ks.js @@ -18,6 +18,7 @@ window.html5ks = { textSpeed: 0.5, autoModeDelay: 0.2, musicVolume: 1, + ambientVolume: 1, soundVolume: 1, language: "en" }; |