Merge pull request #5456 from NodeBB/sounds-refactor

Sound system improvements
This commit is contained in:
Julian Lam
2017-02-21 16:14:58 -05:00
committed by GitHub
16 changed files with 338 additions and 260 deletions

View File

@@ -36,8 +36,8 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
$('.account').find('button[data-action="play"]').on('click', function (e) {
e.preventDefault();
var fileName = $(this).parent().parent().find('select').val();
sounds.playFile(fileName);
var soundName = $(this).parent().parent().find('select').val();
sounds.playSound(soundName);
});
toggleCustomRoute();
@@ -89,7 +89,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
}
}
sounds.reloadMapping();
sounds.loadMap();
if (requireReload && parseInt(app.user.uid, 10) === parseInt(ajaxify.data.theirid, 10)) {
app.alert({