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

Merge pull request #2660 from grafixeyehero/Enable-history-dialog-hash

Browse Source 
Fix browser history for dialog
This commit is contained in:
Bill Thornton 2021-07-30 23:05:50 -07:00 committed by GitHub
commit 01572df641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/dialogHelper/dialogHelper.js
View File

@ -379,7 +379,7 @@ import '../../assets/css/scrollstyles.scss';
dlg.setAttribute('data-lockscroll', 'true'); dlg.setAttribute('data-lockscroll', 'true');
} }
if (options.enableHistory === true) { if (options.enableHistory !== false) {
dlg.setAttribute('data-history', 'true'); dlg.setAttribute('data-history', 'true');
} }

15
src/components/playback/playersettingsmenu.js
View File

@ -41,7 +41,8 @@ function showQualityMenu(player, btn) {
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: btn positionTo: btn,
enableHistory: false
}).then(function (id) { }).then(function (id) {
const bitrate = parseInt(id); const bitrate = parseInt(id);
if (bitrate !== selectedBitrate) { if (bitrate !== selectedBitrate) {
@ -77,7 +78,8 @@ function showRepeatModeMenu(player, btn) {
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: btn positionTo: btn,
enableHistory: false
}).then(function (mode) { }).then(function (mode) {
if (mode) { if (mode) {
playbackManager.setRepeatMode(mode, player); playbackManager.setRepeatMode(mode, player);
@ -138,7 +140,8 @@ function showAspectRatioMenu(player, btn) {
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: btn positionTo: btn,
enableHistory: false
}).then(function (id) { }).then(function (id) {
if (id) { if (id) {
playbackManager.setAspectRatio(id, player); playbackManager.setAspectRatio(id, player);
@ -160,7 +163,8 @@ function showPlaybackRateMenu(player, btn) {
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: btn positionTo: btn,
enableHistory: false
}).then(function (id) { }).then(function (id) {
if (id) { if (id) {
playbackManager.setPlaybackRate(id, player); playbackManager.setPlaybackRate(id, player);
@ -237,7 +241,8 @@ function showWithUser(options, player, user) {
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: options.positionTo positionTo: options.positionTo,
enableHistory: false
}).then(function (id) { }).then(function (id) {
return handleSelectedOption(id, options, player); return handleSelectedOption(id, options, player);
}); });

6
src/components/syncPlay/ui/groupSelectionMenu.js
View File

@ -63,7 +63,8 @@ class GroupSelectionMenu {
items: menuItems, items: menuItems,
positionTo: button, positionTo: button,
resolveOnClick: true, resolveOnClick: true,
border: true border: true,
enableHistory: false
}; };
actionsheet.show(menuOptions).then(function (id) { actionsheet.show(menuOptions).then(function (id) {
@ -132,7 +133,8 @@ class GroupSelectionMenu {
items: menuItems, items: menuItems,
positionTo: button, positionTo: button,
resolveOnClick: true, resolveOnClick: true,
border: true border: true,
enableHistory: false
}; };
actionsheet.show(menuOptions).then(function (id) { actionsheet.show(menuOptions).then(function (id) {

6
src/controllers/playback/video/index.js
View File

@ -903,7 +903,8 @@ import { appRouter } from '../../../components/appRouter';
actionsheet.show({ actionsheet.show({
items: menuItems, items: menuItems,
title: globalize.translate('Audio'), title: globalize.translate('Audio'),
positionTo: positionTo positionTo: positionTo,
enableHistory: false
}).then(function (id) { }).then(function (id) {
const index = parseInt(id); const index = parseInt(id);
@ -949,7 +950,8 @@ import { appRouter } from '../../../components/appRouter';
actionsheet.show({ actionsheet.show({
title: globalize.translate('Subtitles'), title: globalize.translate('Subtitles'),
items: menuItems, items: menuItems,
positionTo: positionTo positionTo: positionTo,
enableHistory: false
}).then(function (id) { }).then(function (id) {
const index = parseInt(id); const index = parseInt(id);