connect updates
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
|
||||
var promise1 = ApiClient.getInstalledPlugins();
|
||||
|
||||
var promise2 = ApiClient.getJSON("configurationpages?pageType=PluginConfiguration");
|
||||
var promise2 = ApiClient.getJSON(ApiClient.getUrl("dashboard/configurationpages") + "?pageType=PluginConfiguration");
|
||||
|
||||
$.when(promise1, promise2).done(function (response1, response2) {
|
||||
|
||||
|
||||
@@ -121,11 +121,6 @@ var Dashboard = {
|
||||
return address;
|
||||
},
|
||||
|
||||
changeServer: function () {
|
||||
|
||||
|
||||
},
|
||||
|
||||
getCurrentUserId: function () {
|
||||
|
||||
var autoLoginUserId = getParameterByName('u');
|
||||
@@ -156,7 +151,10 @@ var Dashboard = {
|
||||
|
||||
isConnectMode: function () {
|
||||
|
||||
return getWindowUrl().toLowerCase().indexOf('mediabrowser.tv') != -1;
|
||||
var url = getWindowUrl().toLowerCase();
|
||||
|
||||
return url.indexOf('mediabrowser.tv') != -1 ||
|
||||
url.indexOf('mediabrowser.github') != -1;
|
||||
},
|
||||
|
||||
logout: function (logoutWithServer) {
|
||||
@@ -556,6 +554,10 @@ var Dashboard = {
|
||||
html += '<p><a data-mini="true" data-role="button" href="mypreferencesdisplay.html?userId=' + user.localUser.Id + '" data-icon="gear">' + Globalize.translate('ButtonMyPreferences') + '</button></a>';
|
||||
}
|
||||
|
||||
if (Dashboard.isConnectMode()) {
|
||||
html += '<p><a data-mini="true" data-role="button" href="selectserver.html" data-icon="cloud">' + Globalize.translate('ButtonSelectServer') + '</button></a>';
|
||||
}
|
||||
|
||||
html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
|
||||
|
||||
html += '</form>';
|
||||
@@ -1178,7 +1180,7 @@ var Dashboard = {
|
||||
|
||||
},
|
||||
|
||||
isServerlessPage: function() {
|
||||
isServerlessPage: function () {
|
||||
var url = getWindowUrl().toLowerCase();
|
||||
return url.indexOf('connectlogin.html') != -1 || url.indexOf('selectserver.html') != -1;
|
||||
}
|
||||
@@ -1234,7 +1236,7 @@ var Dashboard = {
|
||||
var appName = "Dashboard";
|
||||
var appVersion = window.dashboardVersion;
|
||||
var deviceName = generateDeviceName();
|
||||
var deviceId = MediaBrowser.ApiClient.generateDeviceId();
|
||||
var deviceId = MediaBrowser.generateDeviceId();
|
||||
var credentialProvider = new MediaBrowser.CredentialProvider();
|
||||
|
||||
var capabilities = {
|
||||
|
||||
@@ -113,8 +113,9 @@
|
||||
onSaveComplete(page, user);
|
||||
});
|
||||
} else {
|
||||
ApiClient.createUser(user).done(function () {
|
||||
onSaveComplete(page, user);
|
||||
ApiClient.createUser(user).done(function (newUser) {
|
||||
Dashboard.navigate("useredit.html?userId=" + newUser.Id);
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user