From 80909ef2db877516718488ebd5e3e644bdde5dd4 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Wed, 4 Jun 2014 14:45:51 +0200
Subject: [PATCH] [UPDATE] change loading behavior, check if soundjs can be
 executed

---
 .../bootstrap/dashboard/blocks/default.tpl    |  6 +++--
 templates/bootstrap/dashboard/js/api.tpl      | 27 +++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/templates/bootstrap/dashboard/blocks/default.tpl b/templates/bootstrap/dashboard/blocks/default.tpl
index 376e9d08..dabd89d9 100644
--- a/templates/bootstrap/dashboard/blocks/default.tpl
+++ b/templates/bootstrap/dashboard/blocks/default.tpl
@@ -37,8 +37,10 @@
           </tbody>
         </table>
       </div>
-      <div class="panel-footer text-right">
-        <button id="muteButton" type="button" class="btn-xs btn-success"><i class="fa fa-volume-up"></i></button>
+      <div id="togglesound" class="togglesound">
+        <div class="panel-footer text-right">
+          <button id="muteButton" type="button" class="btn-xs btn-success"><i class="fa fa-volume-up"></i></button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/templates/bootstrap/dashboard/js/api.tpl b/templates/bootstrap/dashboard/js/api.tpl
index f2c2b7f3..91891fe1 100644
--- a/templates/bootstrap/dashboard/js/api.tpl
+++ b/templates/bootstrap/dashboard/js/api.tpl
@@ -3,11 +3,20 @@
 <script>
 {literal}
 $(document).ready(function(){
-  var audioPath = "{/literal}{$PATH}{literal}/audio/";
-  var manifest = [ {id:"ding", src:"ding.ogg"} ];
-  var muteFlag = 1;
-  createjs.Sound.alternateExtensionseExtensions = ["mp3"];
-  createjs.Sound.registerManifest(manifest, audioPath);
+
+  var canCreateSoundJS = false;
+
+  // check if the default plugins can be loaded, if not, disable button and don't load soundjs
+  if (!createjs.Sound.initializeDefaultPlugins()) {
+    $('#togglesound').hide();
+  } else {
+    var audioPath = "{/literal}{$PATH}{literal}/audio/";
+    var manifest = [ {id:"ding", src:"ding.ogg"} ];
+    var muteFlag = 1;
+    createjs.Sound.alternateExtensionseExtensions = ["mp3"];
+    createjs.Sound.registerManifest(manifest, audioPath);
+    canCreateSoundJS = true;
+  }
 
   // Ajax API URL
   var url_dashboard = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getdashboarddata&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}{literal}";
@@ -166,7 +175,9 @@ $(document).ready(function(){
       return;
     }
     if (blocks[0].height > lastBlock) {
-      createjs.Sound.play('ding');
+      if(canCreateSoundJS) { 
+        createjs.Sound.play('ding');
+      }
       lastBlock = blocks[0].height;
       var table_content = '<tbody id="b-blocks">';
       for (index = 0; index < blocks.length; ++index) {
@@ -258,12 +269,12 @@ $(document).ready(function(){
       muteFlag = 1;
       createjs.Sound.setMute(false);
       $(this).toggleClass("btn-xs btn-danger").toggleClass("btn-xs btn-success");
-      //$(this).find($(".fa")).removeClass('fa-volume-off').addClass('fa-volume-up');
+      $(this).find($(".fa")).removeClass('fa-volume-off').addClass('fa-volume-up');
     } else {
       muteFlag = 2;
       createjs.Sound.setMute(true);
       $(this).toggleClass("btn-xs btn-success").toggleClass("btn-xs btn-danger");
-      //$(this).find($(".fa")).removeClass('fa-volume-up').addClass('fa-volume-off');
+      $(this).find($(".fa")).removeClass('fa-volume-up').addClass('fa-volume-off');
     }
   });