Merge pull request #2201 from iAmShorty/mute-blocknotify

[UPDATE] mute blocknotify
This commit is contained in:
iAmShorty 2014-06-04 14:51:09 +02:00
commit fd8cd88b12
2 changed files with 40 additions and 6 deletions

View File

@ -37,6 +37,11 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<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>
</div> </div>
{/if} {/if}

View File

@ -3,10 +3,20 @@
<script> <script>
{literal} {literal}
$(document).ready(function(){ $(document).ready(function(){
var audioPath = "{/literal}{$PATH}{literal}/audio/";
var manifest = [ {id:"ding", src:"ding.ogg"} ]; var canCreateSoundJS = false;
createjs.Sound.alternateExtensionseExtensions = ["mp3"];
createjs.Sound.registerManifest(manifest, audioPath); // 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 // 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}"; var url_dashboard = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getdashboarddata&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}{literal}";
@ -165,7 +175,9 @@ $(document).ready(function(){
return; return;
} }
if (blocks[0].height > lastBlock) { if (blocks[0].height > lastBlock) {
createjs.Sound.play('ding'); if(canCreateSoundJS) {
createjs.Sound.play('ding');
}
lastBlock = blocks[0].height; lastBlock = blocks[0].height;
var table_content = '<tbody id="b-blocks">'; var table_content = '<tbody id="b-blocks">';
for (index = 0; index < blocks.length; ++index) { for (index = 0; index < blocks.length; ++index) {
@ -250,6 +262,23 @@ $(document).ready(function(){
} }
}); });
})(); })();
// Mute Button
$('#muteButton').click(function(){
if(muteFlag == 2) {
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');
} 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');
}
});
}); });
{/literal} {/literal}
</script> </script>