Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

This commit is contained in:
Duncan Sommerville 2015-08-28 16:09:26 -04:00
parent 005eec5aa5 71f149f95f
commit 8a3f36dea3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -1267,11 +1267,13 @@ var AIRTIME = (function(AIRTIME){
mod.playlistResponse = function(json){
console.log(json);
if (json.error !== undefined || json.result != 0) {
if (json.error !== undefined ||
(json.result !== undefined && json.result != 0)) {
if (json.error) {
playlistError(json);
}
AIRTIME.playlist.replaceForm(json);
AIRTIME.playlist.init();
}
else {
setPlaylistContent(json);