From 104b76f52206bc206bc43b88e9042ff860ed4fd4 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Wed, 25 Aug 2021 14:01:12 +0300 Subject: [PATCH] Revert "Fix accessing playersettingsmenu, groupSelectionMenu & playback video (Audio, Subtitles)" This reverts commit 924e5bc7b9c3767819c359d2471a7da6a16d0976. --- src/components/playback/playersettingsmenu.js | 15 +++++---------- src/components/syncPlay/ui/groupSelectionMenu.js | 6 ++---- src/controllers/playback/video/index.js | 6 ++---- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js index f2fd6f4d8d..cc05d6e704 100644 --- a/src/components/playback/playersettingsmenu.js +++ b/src/components/playback/playersettingsmenu.js @@ -41,8 +41,7 @@ function showQualityMenu(player, btn) { return actionsheet.show({ items: menuItems, - positionTo: btn, - enableHistory: false + positionTo: btn }).then(function (id) { const bitrate = parseInt(id); if (bitrate !== selectedBitrate) { @@ -78,8 +77,7 @@ function showRepeatModeMenu(player, btn) { return actionsheet.show({ items: menuItems, - positionTo: btn, - enableHistory: false + positionTo: btn }).then(function (mode) { if (mode) { playbackManager.setRepeatMode(mode, player); @@ -140,8 +138,7 @@ function showAspectRatioMenu(player, btn) { return actionsheet.show({ items: menuItems, - positionTo: btn, - enableHistory: false + positionTo: btn }).then(function (id) { if (id) { playbackManager.setAspectRatio(id, player); @@ -163,8 +160,7 @@ function showPlaybackRateMenu(player, btn) { return actionsheet.show({ items: menuItems, - positionTo: btn, - enableHistory: false + positionTo: btn }).then(function (id) { if (id) { playbackManager.setPlaybackRate(id, player); @@ -241,8 +237,7 @@ function showWithUser(options, player, user) { return actionsheet.show({ items: menuItems, - positionTo: options.positionTo, - enableHistory: false + positionTo: options.positionTo }).then(function (id) { return handleSelectedOption(id, options, player); }); diff --git a/src/components/syncPlay/ui/groupSelectionMenu.js b/src/components/syncPlay/ui/groupSelectionMenu.js index 48c1327ea7..96a7310381 100644 --- a/src/components/syncPlay/ui/groupSelectionMenu.js +++ b/src/components/syncPlay/ui/groupSelectionMenu.js @@ -63,8 +63,7 @@ class GroupSelectionMenu { items: menuItems, positionTo: button, resolveOnClick: true, - border: true, - enableHistory: false + border: true }; actionsheet.show(menuOptions).then(function (id) { @@ -133,8 +132,7 @@ class GroupSelectionMenu { items: menuItems, positionTo: button, resolveOnClick: true, - border: true, - enableHistory: false + border: true }; actionsheet.show(menuOptions).then(function (id) { diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js index a30b2a74c3..6744d26d51 100644 --- a/src/controllers/playback/video/index.js +++ b/src/controllers/playback/video/index.js @@ -903,8 +903,7 @@ import { appRouter } from '../../../components/appRouter'; actionsheet.show({ items: menuItems, title: globalize.translate('Audio'), - positionTo: positionTo, - enableHistory: false + positionTo: positionTo }).then(function (id) { const index = parseInt(id); @@ -950,8 +949,7 @@ import { appRouter } from '../../../components/appRouter'; actionsheet.show({ title: globalize.translate('Subtitles'), items: menuItems, - positionTo: positionTo, - enableHistory: false + positionTo: positionTo }).then(function (id) { const index = parseInt(id);