mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-29 21:55:12 -05:00
parent 4e2fad92dd
commit a27fab2c31
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/scripts/chromecast.js
View file

@ -34,7 +34,7 @@
'IDLE': 0,
'ACTIVE': 1,
'WARNING': 2,
'ERROR': 3,
'ERROR': 3
};
/**
@ -52,10 +52,11 @@
};
var applicationID = "2D4B1DA3";
var messageNamespace = 'urn:x-cast:com.connectsdk';
//var applicationID = "F4EB2E8E";
//var messageNamespace = 'urn:x-cast:com.google.cast.mediabrowser.v3';
// This is the beta version used for testing new changes
//applicationID = '27C4EB5B';
var messageNamespace = 'urn:x-cast:com.connectsdk';
var CastPlayer = function () {

7
dashboard-ui/scripts/indexpage.js
View file

@ -95,9 +95,10 @@
elem.innerHTML = '';
var deferred = DeferredBuilder.Deferred();
deferred.resolve();
return deferred.promise();
return new Promise(function (resolve, reject) {
resolve();
});
}
}

2
dashboard-ui/scripts/useredit.js
View file

@ -115,7 +115,7 @@
Dashboard.alert({
message: Globalize.translate('ErrorAddingEmbyConnectAccount')
message: Globalize.translate('ErrorAddingEmbyConnectAccount', 'apps@emby.media')
});
});