From 29618dc9a319643a7f6a27f55435739f573541df Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Wed, 31 Jul 2013 17:49:16 -0400
Subject: add ambientVolume, fix what_suffix extend

---
 www/js/api.js     | 6 +-----
 www/js/html5ks.js | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'www')

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"
     };
-- 
cgit v1.2.3-70-g09d2