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

consolidate connect calls

Browse source
This commit is contained in:
Luke Pulverenti 2014-09-14 14:47:48 -04:00
parent d9fa1cae1b
commit 598d0a5761
4 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
(function ($, window, document) { (function ($, window, document) {
var currentConnectInfo; var currentUser;
function loadUser(page, user, loggedInUser, connectInfo) { function loadUser(page, user, loggedInUser) {
currentConnectInfo = connectInfo; currentUser = user;
if (!loggedInUser.Configuration.IsAdministrator) { if (!loggedInUser.Configuration.IsAdministrator) {
@ -39,7 +39,7 @@
Dashboard.setPageTitle(user.Name || Globalize.translate('AddUser')); Dashboard.setPageTitle(user.Name || Globalize.translate('AddUser'));
$('#txtUserName', page).val(user.Name); $('#txtUserName', page).val(user.Name);
$('#txtConnectUserName', page).val(connectInfo.Username); $('#txtConnectUserName', page).val(currentUser.ConnectUserName);
$('#chkIsAdmin', page).checked(user.Configuration.IsAdministrator || false).checkboxradio("refresh"); $('#chkIsAdmin', page).checked(user.Configuration.IsAdministrator || false).checkboxradio("refresh");
$('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh"); $('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh");
@ -64,7 +64,7 @@
if (userId) { if (userId) {
var currentConnectUsername = currentConnectInfo.Username || ''; var currentConnectUsername = currentUser.ConnectUserName || '';
var enteredConnectUsername = $('#txtConnectUserName', page).val(); var enteredConnectUsername = $('#txtConnectUserName', page).val();
if (currentConnectUsername == enteredConnectUsername) { if (currentConnectUsername == enteredConnectUsername) {
@ -79,7 +79,7 @@
function updateConnectInfo(page, user) { function updateConnectInfo(page, user) {
var currentConnectUsername = currentConnectInfo.Username || ''; var currentConnectUsername = currentUser.ConnectUserName || '';
var enteredConnectUsername = $('#txtConnectUserName', page).val(); var enteredConnectUsername = $('#txtConnectUserName', page).val();
var linkUrl = ApiClient.getUrl('Users/' + user.Id + '/Connect/Link'); var linkUrl = ApiClient.getUrl('Users/' + user.Id + '/Connect/Link');
@ -209,33 +209,16 @@
return deferred.promise(); return deferred.promise();
} }
function getConnectUserInfo() {
var userId = getParameterByName("userId");
if (userId) {
return ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Connect/Info'));
}
var deferred = $.Deferred();
deferred.resolveWith(null, [[{}]]);
return deferred.promise();
}
function loadData(page) { function loadData(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var promise1 = getUser(); var promise1 = getUser();
var promise2 = Dashboard.getCurrentUser(); var promise2 = Dashboard.getCurrentUser();
var promise3 = getConnectUserInfo();
$.when(promise1, promise2, promise3).done(function (response1, response2, response3) { $.when(promise1, promise2).done(function (response1, response2) {
loadUser(page, response1[0] || response1, response2[0], response3[0]); loadUser(page, response1[0] || response1, response2[0]);
}); });
} }

11
dashboard-ui/scripts/userprofilespage.js
View file

@ -97,13 +97,10 @@
html += '<div class="cardImage" style="background-image:url(\'' + imgUrl + '\');">'; html += '<div class="cardImage" style="background-image:url(\'' + imgUrl + '\');">';
//if (plugin.isPremium) { if (user.ConnectUserId) {
// if (plugin.price > 0) { html += '<div class="playedIndicator"><div class="ui-icon-cloud ui-btn-icon-notext"></div></div>';
// html += "<div class='premiumBanner'><img src='css/images/supporter/premiumflag.png' /></div>"; }
// } else {
// html += "<div class='premiumBanner'><img src='css/images/supporter/supporterflag.png' /></div>";
// }
//}
html += "</div>"; html += "</div>";
// cardContent // cardContent

1
dashboard-ui/useredit.html
View file

@ -32,6 +32,7 @@
<div>${LabelConnectUserNameHelp}</div> <div>${LabelConnectUserNameHelp}</div>
<div style="margin-top: .75em;"><a href="http://mediabrowser.tv/connect" target="_blank">${ButtonLearnMoreAboutMediaBrowserConnect}</a></div> <div style="margin-top: .75em;"><a href="http://mediabrowser.tv/connect" target="_blank">${ButtonLearnMoreAboutMediaBrowserConnect}</a></div>
</div> </div>
<br/>
</li> </li>
<li id="fldIsAdmin" style="display: none;"> <li id="fldIsAdmin" style="display: none;">
<input type="checkbox" id="chkIsAdmin" name="chkIsAdmin" /> <input type="checkbox" id="chkIsAdmin" name="chkIsAdmin" />

2
dashboard-ui/userprofiles.html
View file

@ -23,7 +23,7 @@
</a>--> </a>-->
</div> </div>
</div> </div>
<div class="itemsContainer users" style="text-align:left;"> <div class="itemsContainer users" style="text-align:left;">
</div> </div>