cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

post release housecleaning

Browse Source
This commit is contained in:
Luke Pulverenti 2015-04-01 00:23:34 -04:00
parent 69083dde3b
commit 240a0fe22f
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard-ui/scripts/supporterpage.js
View File

@ -43,10 +43,10 @@
return $(".radioDonationType:checked", page).val(); return $(".radioDonationType:checked", page).val();
} }
var lifeTimeAmount = 40; var lifeTimeAmount = 59;
var dailyAmount = 1; var dailyAmount = 1;
var monthlyAmount = 4; var monthlyAmount = 4;
var yearlyAmount = 28; var yearlyAmount = 32;
function getDonationAmount(page) { function getDonationAmount(page) {
var type = getDonationType(page); var type = getDonationType(page);

28
dashboard-ui/scripts/userlibraryaccess.js
View File

@ -14,12 +14,7 @@
var id = 'mediaFolder' + i; var id = 'mediaFolder' + i;
var isChecked; var isChecked = user.Policy.EnableAllFolders || user.Policy.EnabledFolders.indexOf(folder.Id) != -1;
if (user.Policy.BlockedMediaFolders != null) {
isChecked = user.Policy.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Policy.BlockedMediaFolders.indexOf(folder.Name) == -1;
} else {
isChecked = user.Policy.EnableAllFolders || user.Policy.EnabledFolders.indexOf(folder.Id) != -1;
}
var checkedAttribute = isChecked ? ' checked="checked"' : ''; var checkedAttribute = isChecked ? ' checked="checked"' : '';
html += '<input class="chkFolder" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />'; html += '<input class="chkFolder" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
@ -30,11 +25,7 @@
$('.folderAccess', page).html(html).trigger('create'); $('.folderAccess', page).html(html).trigger('create');
if (user.Policy.BlockedMediaFolders != null) { $('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change');
$('#chkEnableAllFolders', page).checked(user.Policy.BlockedMediaFolders.length == 0).checkboxradio('refresh').trigger('change');
} else {
$('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change');
}
} }
function loadChannels(page, user, channels) { function loadChannels(page, user, channels) {
@ -51,12 +42,7 @@
var id = 'channels' + i; var id = 'channels' + i;
var isChecked; var isChecked = user.Policy.EnableAllChannels || user.Policy.EnabledChannels.indexOf(folder.Id) != -1;
if (user.Policy.BlockedChannels != null) {
isChecked = user.Policy.BlockedChannels.indexOf(folder.Id) == -1;
} else {
isChecked = user.Policy.EnableAllChannels || user.Policy.EnabledChannels.indexOf(folder.Id) != -1;
}
var checkedAttribute = isChecked ? ' checked="checked"' : ''; var checkedAttribute = isChecked ? ' checked="checked"' : '';
html += '<input class="chkChannel" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />'; html += '<input class="chkChannel" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
@ -73,11 +59,7 @@
$('.channelAccessContainer', page).hide(); $('.channelAccessContainer', page).hide();
} }
if (user.Policy.BlockedChannels != null) { $('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).checkboxradio('refresh').trigger('change');
$('#chkEnableAllChannels', page).checked(user.Policy.BlockedChannels.length == 0).checkboxradio('refresh').trigger('change');
} else {
$('#chkEnableAllChannels', page).checked(user.Policy.EnableAllChannels).checkboxradio('refresh').trigger('change');
}
} }
function loadDevices(page, user, devices) { function loadDevices(page, user, devices) {
@ -140,7 +122,6 @@
return this.getAttribute('data-id'); return this.getAttribute('data-id');
}).get(); }).get();
user.Policy.BlockedMediaFolders = null;
user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked(); user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked();
user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? user.Policy.EnabledChannels = user.Policy.EnableAllChannels ?
@ -150,7 +131,6 @@
return this.getAttribute('data-id'); return this.getAttribute('data-id');
}).get(); }).get();
user.Policy.BlockedChannels = null;
user.Policy.EnableAllDevices = $('#chkEnableAllDevices', page).checked(); user.Policy.EnableAllDevices = $('#chkEnableAllDevices', page).checked();
user.Policy.EnabledDevices = user.Policy.EnableAllDevices ? user.Policy.EnabledDevices = user.Policy.EnableAllDevices ?