milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-12 14:55:45 -05:00
parent 9e1a2cf66a
commit 189942e289
298 changed files with 53049 additions and 5413 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.0.21",
"_release": "1.0.21",
"version": "1.0.24",
"_release": "1.0.24",
"_resolution": {
"type": "version",
"tag": "1.0.21",
"commit": "e341b097c05c31ec012e04dfbd0455ae9dfc4929"
"tag": "1.0.24",
"commit": "4b9b655cad98bd908e78352d5bbed028644505d4"
},
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3",

26
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -1123,7 +1123,7 @@
if (options.updateDateLastAccessed !== false) {
server.DateLastAccessed = new Date().getTime();
if (server.LastConnectionMode == ConnectionMode.Local) {
if (connectionMode == ConnectionMode.Local) {
server.DateLastLocalConnection = new Date().getTime();
}
}
@ -1466,6 +1466,17 @@
self.getRegistrationInfo = function (feature, apiClient) {
if (isConnectUserSupporter()) {
return new Promise(function (resolve, reject) {
resolve({
Name: feature,
IsRegistered: true,
IsTrial: false
});
});
}
return self.getAvailableServers().then(function (servers) {
var matchedServers = servers.filter(function (s) {
@ -1498,6 +1509,19 @@
});
};
function isConnectUserSupporter() {
if (self.isLoggedIntoConnect()) {
var connectUser = self.connectUser();
if (connectUser && connectUser.IsSupporter) {
return true;
}
}
return false;
}
function updateDateLastLocalConnection(serverId) {
var credentials = credentialProvider.credentials();