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

restore music alphabet pickers

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-08 10:35:52 -04:00
parent a61e96accb
commit 467dc13089
14 changed files with 93 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -9,7 +9,20 @@
var mediaElement;
var self = this;
function hideStatusBar() {
if (options.type == 'video' && window.StatusBar) {
StatusBar.hide();
}
}
function showStatusBar() {
if (options.type == 'video' && window.StatusBar) {
StatusBar.show();
}
}
function onEnded() {
showStatusBar();
$(self).trigger('ended');
}
@ -66,6 +79,7 @@
var errorCode = this.error ? this.error.code : '';
Logger.log('Media element error code: ' + errorCode);
showStatusBar();
$(self).trigger('error');
}
@ -142,6 +156,8 @@
function onOneVideoPlaying() {
hideStatusBar();
var requiresNativeControls = !self.enableCustomVideoControls();
if (requiresNativeControls) {
@ -553,6 +569,10 @@
self.enableCustomVideoControls = function () {
if (AppInfo.isNativeApp && $.browser.safari) {
return true;
}
return self.canAutoPlayVideo() && !$.browser.mobile;
};

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

@ -100,12 +100,9 @@
if (AppInfo.isNativeApp) {
cacheDuration = 300000;
}
else if ($.browser.ipad || $.browser.iphone || $.browser.android) {
} else if ($.browser.ipad || $.browser.iphone || $.browser.android) {
cacheDuration = 10000;
}
else {
} else {
cacheDuration = 60000;
}
@ -237,8 +234,7 @@
if ($.browser.safari) {
tabs.noBar = true;
}
else {
} else {
LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages);
}
@ -269,8 +265,8 @@
var delay = LibraryBrowser.animatePaperTabs() ? 500 : 0;
setTimeout(function () {
$(pgs).trigger('tabchange');
LibraryBrowser.fixAlphabetPicker(pages);
}, delay);
});
@ -281,6 +277,20 @@
}
},
fixAlphabetPicker: function (parent) {
if (!$.browser.android || !AppInfo.isNativeApp) {
return;
}
var pickers = parent.querySelectorAll('.alphabetPicker');
for (var i = 0, length = pickers.length; i < length; i++) {
var picker = pickers[i];
picker.classList.add('hide');
picker.classList.remove('hide');
}
},
onTabbedpagebeforeshow: function () {
var page = this;

8
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -654,7 +654,7 @@
// Embedding onclicks due to issues not firing in cordova safari
html += '<paper-icon-button icon="audiotrack" class="mediaButton videoAudioButton" onclick="MediaPlayer.showAudioTracksFlyout();"></paper-icon-button>';
html += '<paper-icon-button icon="subtitles" class="mediaButton videoSubtitleButton" onclick="MediaPlayer.showSubtitleMenu();"></paper-icon-button>';
html += '<paper-icon-button icon="closed-caption" class="mediaButton videoSubtitleButton" onclick="MediaPlayer.showSubtitleMenu();"></paper-icon-button>';
html += '<paper-icon-button icon="settings" class="mediaButton videoQualityButton" onclick="MediaPlayer.showQualityFlyout();"></paper-icon-button>';
@ -679,7 +679,7 @@
html += '<paper-icon-button icon="skip-next" class="nextTrackButton mediaButton videoTrackControl hide" onclick="MediaPlayer.nextTrack();"></paper-icon-button>';
html += '<paper-slider pin step=".1" min="0" max="100" value="0" class="videoPositionSlider" style="width:300px;vertical-align:middle;margin-left:-1em;"></paper-slider>';
html += '<paper-slider pin step=".1" min="0" max="100" value="0" class="videoPositionSlider"></paper-slider>';
html += '<div class="currentTime">--:--</div>';
@ -953,10 +953,10 @@
var requiresNativeControls = !mediaRenderer.enableCustomVideoControls();
if (requiresNativeControls) {
if (requiresNativeControls || AppInfo.isNativeApp) {
$('#video-fullscreenButton', videoControls).hide();
} else {
$('#video-fullscreenButton', videoControls).show();
$('#video-fullscreenButton', videoControls).hide();
}
if (AppInfo.hasPhysicalVolumeButtons) {

4
dashboard-ui/scripts/movies.js
View file

@ -133,7 +133,7 @@
lazy: true,
cardLayout: true,
showDetailsMenu: true
});
});re
}
else if (view == "Timeline") {
html = LibraryBrowser.getPosterViewHtml({
@ -168,7 +168,7 @@
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
getPageData().view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page);
reloadItems(page, viewPanel);
});
// On callback make sure to set StartIndex = 0

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

@ -183,7 +183,7 @@
reloadItems(tabContent, viewPanel);
});
$('.alphabetPicker', this).on('alphaselect', function (e, character) {
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery();

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

@ -183,7 +183,7 @@
reloadItems(tabContent, viewPanel);
});
$('.alphabetPicker', this).on('alphaselect', function (e, character) {
$('.alphabetPicker', tabContent).on('alphaselect', function (e, character) {
var query = getQuery();

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

@ -1763,7 +1763,7 @@ var AppInfo = {};
AppInfo.enableUserImage = true;
AppInfo.hasPhysicalVolumeButtons = isCordova || isMobile;
AppInfo.hasPhysicalVolumeButtons = true;
AppInfo.enableBackButton = isIOS && (window.navigator.standalone || AppInfo.isNativeApp);
AppInfo.supportsFullScreen = isCordova && isAndroid;