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

connect updates

Browse source
This commit is contained in:
Luke Pulverenti 2014-10-26 23:06:01 -04:00
parent b12f43a584
commit b96c70cb0a
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,7 @@
var promise1 = ApiClient.getInstalledPlugins(); 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) { $.when(promise1, promise2).done(function (response1, response2) {

16
dashboard-ui/scripts/site.js
View file

@ -121,11 +121,6 @@ var Dashboard = {
return address; return address;
}, },
changeServer: function () {
},
getCurrentUserId: function () { getCurrentUserId: function () {
var autoLoginUserId = getParameterByName('u'); var autoLoginUserId = getParameterByName('u');
@ -156,7 +151,10 @@ var Dashboard = {
isConnectMode: function () { 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) { 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>'; 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 += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
html += '</form>'; html += '</form>';
@ -1234,7 +1236,7 @@ var Dashboard = {
var appName = "Dashboard"; var appName = "Dashboard";
var appVersion = window.dashboardVersion; var appVersion = window.dashboardVersion;
var deviceName = generateDeviceName(); var deviceName = generateDeviceName();
var deviceId = MediaBrowser.ApiClient.generateDeviceId(); var deviceId = MediaBrowser.generateDeviceId();
var credentialProvider = new MediaBrowser.CredentialProvider(); var credentialProvider = new MediaBrowser.CredentialProvider();
var capabilities = { var capabilities = {

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

@ -113,8 +113,9 @@
onSaveComplete(page, user); onSaveComplete(page, user);
}); });
} else { } else {
ApiClient.createUser(user).done(function () { ApiClient.createUser(user).done(function (newUser) {
onSaveComplete(page, user); Dashboard.navigate("useredit.html?userId=" + newUser.Id);
}); });
} }
} }

2
dashboard-ui/selectserver.html
View file

@ -4,7 +4,7 @@
<title>${TitleMediaBrowser}</title> <title>${TitleMediaBrowser}</title>
</head> </head>
<body> <body>
<div id="selectServerPage" data-role="page" class="page libraryPage" data-theme="b"> <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b">
<div data-role="content"> <div data-role="content">

8
dashboard-ui/thirdparty/apiclient/device.js vendored
View file

@ -1,6 +1,10 @@
(function (store) { if (!window.MediaBrowser) {
window.MediaBrowser = {};
}
MediaBrowser.ApiClient.generateDeviceId = function () { (function (store) {
MediaBrowser.generateDeviceId = function () {
var keys = []; var keys = [];