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

update sort menu

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-10 03:01:25 -04:00
parent 9de658be0b
commit 22ef579fdb
6 changed files with 230 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

71
dashboard-ui/scripts/librarybrowser.js
View file

@ -2954,7 +2954,7 @@
showSortMenu: function (options) {
require(['dialogHelper', 'paper-radio-button', 'paper-radio-group'], function (dialogHelper) {
require(['dialogHelper', 'emby-radio'], function (dialogHelper) {
var dlg = dialogHelper.createDialog({
removeOnClose: true,
@ -2975,22 +2975,29 @@
html += Globalize.translate('HeaderSortBy');
html += '</h2>';
html += '<paper-radio-group class="groupSortBy" selected="' + (options.query.SortBy || '').replace(',', '_') + '">';
for (var i = 0, length = options.items.length; i < length; i++) {
var i, length;
var isChecked;
html += '<div>';
for (i = 0, length = options.items.length; i < length; i++) {
var option = options.items[i];
html += '<paper-radio-button class="menuSortBy" style="display:block;" data-id="' + option.id + '" name="' + option.id.replace(',', '_') + '">' + option.name + '</paper-radio-button>';
var radioValue = option.id.replace(',', '_');
isChecked = (options.query.SortBy || '').replace(',', '_') == radioValue ? ' checked' : '';
html += '<label class="block"><input type="radio" is="emby-radio" name="SortBy" data-id="' + option.id + '" value="' + radioValue + '" class="menuSortBy" ' + isChecked + ' /><span>' + option.name + '</span></label>';
}
html += '</paper-radio-group>';
html += '</div>';
html += '<h2 style="margin: 1em 0 .5em;">';
html += Globalize.translate('HeaderSortOrder');
html += '</h2>';
html += '<paper-radio-group class="groupSortOrder" selected="' + (options.query.SortOrder || 'Ascending') + '">';
html += '<paper-radio-button name="Ascending" style="display:block;" class="menuSortOrder block">' + Globalize.translate('OptionAscending') + '</paper-radio-button>';
html += '<paper-radio-button name="Descending" style="display:block;" class="menuSortOrder block">' + Globalize.translate('OptionDescending') + '</paper-radio-button>';
html += '</paper-radio-group>';
html += '<div>';
isChecked = options.query.SortOrder == 'Ascending' ? ' checked' : '';
html += '<label class="block"><input type="radio" is="emby-radio" name="SortOrder" value="Ascending" class="menuSortOrder" ' + isChecked + ' /><span>' + Globalize.translate('OptionAscending') + '</span></label>';
isChecked = options.query.SortOrder == 'Descending' ? ' checked' : '';
html += '<label class="block"><input type="radio" is="emby-radio" name="SortOrder" value="Descending" class="menuSortOrder" ' + isChecked + ' /><span>' + Globalize.translate('OptionDescending') + '</span></label>';
html += '</div>';
html += '</div>';
dlg.innerHTML = html;
@ -3002,31 +3009,43 @@
dialogHelper.open(dlg);
}, delay);
dlg.querySelector('.groupSortBy').addEventListener('iron-select', function () {
function onSortByChange() {
var newValue = this.value;
if (this.checked) {
var changed = options.query.SortBy != newValue;
var newValue = this.selected.replace('_', ',');
var changed = options.query.SortBy != newValue;
options.query.SortBy = newValue.replace('_', ',');
options.query.StartIndex = 0;
options.query.SortBy = newValue;
options.query.StartIndex = 0;
if (options.callback && changed) {
options.callback();
if (options.callback && changed) {
options.callback();
}
}
});
}
dlg.querySelector('.groupSortOrder').addEventListener('iron-select', function () {
var sortBys = dlg.querySelectorAll('.menuSortBy');
for (i = 0, length = sortBys.length; i < length; i++) {
sortBys[i].addEventListener('change', onSortByChange);
}
var newValue = this.selected;
var changed = options.query.SortOrder != newValue;
function onSortOrderChange() {
var newValue = this.value;
if (this.checked) {
var changed = options.query.SortOrder != newValue;
options.query.SortOrder = newValue;
options.query.StartIndex = 0;
options.query.SortOrder = newValue;
options.query.StartIndex = 0;
if (options.callback && changed) {
options.callback();
if (options.callback && changed) {
options.callback();
}
}
});
}
var sortOrders = dlg.querySelectorAll('.menuSortOrder');
for (i = 0, length = sortOrders.length; i < length; i++) {
sortOrders[i].addEventListener('change', onSortOrderChange);
}
});
},

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

@ -1170,39 +1170,53 @@ var Dashboard = {
return caps;
},
getDefaultImageQuality: function (imageType) {
var quality = 90;
var isBackdrop = imageType.toLowerCase() == 'backdrop';
if (isBackdrop) {
quality -= 10;
}
if (browserInfo.mobile) {
quality -= 20;
}
if (AppInfo.hasLowImageBandwidth) {
// The native app can handle a little bit more than safari
if (AppInfo.isNativeApp) {
quality -= 5;
} else {
quality -= 20;
}
}
return quality;
},
normalizeImageOptions: function (options) {
if (AppInfo.hasLowImageBandwidth) {
options.enableImageEnhancers = false;
}
var setQuality;
if (options.maxWidth) {
setQuality = true;
}
if (options.width) {
setQuality = true;
}
if (options.maxHeight) {
setQuality = true;
}
if (options.height) {
setQuality = true;
}
if (setQuality) {
var quality = 90;
if ((options.type || '').toLowerCase() == 'backdrop') {
quality -= 10;
}
if (browserInfo.mobile || browserInfo.tv) {
quality -= 30;
}
if (AppInfo.hasLowImageBandwidth) {
// The native app can handle a little bit more than safari
if (AppInfo.isNativeApp) {
//quality -= 5;
} else {
quality -= 15;
}
}
options.quality = quality;
}
},
loadExternalPlayer: function () {
@ -1545,7 +1559,6 @@ var AppInfo = {};
};
}
apiClient.getDefaultImageQuality = Dashboard.getDefaultImageQuality;
apiClient.normalizeImageOptions = Dashboard.normalizeImageOptions;
Events.off(apiClient, 'websocketmessage', Dashboard.onWebSocketMessageReceived);
@ -1881,8 +1894,6 @@ var AppInfo = {};
define("paper-button", ["html!" + bowerPath + "/paper-button/paper-button.html"]);
define("paper-icon-button", ["html!" + bowerPath + "/paper-icon-button/paper-icon-button.html"]);
define("paper-radio-group", ["html!" + bowerPath + "/paper-radio-group/paper-radio-group.html"]);
define("paper-radio-button", ['webcomponentsjs', "html!" + bowerPath + "/paper-radio-button/paper-radio-button.html"]);
define("paper-toggle-button", ['webcomponentsjs', "html!" + bowerPath + "/paper-toggle-button/paper-toggle-button.html"]);
define("paper-textarea", ['webcomponentsjs', "html!" + bowerPath + "/paper-input/paper-textarea.html"]);
@ -2179,6 +2190,7 @@ var AppInfo = {};
if (MainActivity.getChromeVersion() >= 48) {
define("audiorenderer", ["scripts/htmlmediarenderer"]);
//window.VlcAudio = true;
//define("audiorenderer", ["cordova/android/vlcplayer"]);
} else {
window.VlcAudio = true;