Skip to content

Commit d859d78

Browse files
authored
Merge pull request #20775 from Snuffleupagus/hide-select-pages
Hide the "Select pages" label, in the thumbnails sidebar, when split-merge is disabled
2 parents 0c29cc5 + a0e70eb commit d859d78

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

web/app.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ const PDFViewerApplication = {
461461
foreground: AppOptions.get("pageColorsForeground"),
462462
}
463463
: null;
464+
const enableSplitMerge = AppOptions.get("enableSplitMerge");
464465

465466
let altTextManager;
466467
if (AppOptions.get("enableUpdatedAddImage")) {
@@ -599,7 +600,7 @@ const PDFViewerApplication = {
599600
pageColors,
600601
abortSignal,
601602
enableHWA,
602-
enableSplitMerge: AppOptions.get("enableSplitMerge"),
603+
enableSplitMerge,
603604
manageMenu: appConfig.viewsManager.manageMenu,
604605
addFileButton: appConfig.viewsManager.viewsManagerAddFileButton,
605606
});
@@ -761,6 +762,7 @@ const PDFViewerApplication = {
761762
elements: appConfig.viewsManager,
762763
eventBus,
763764
l10n,
765+
enableSplitMerge,
764766
});
765767
this.viewsManager.onToggled = this.forceRendering.bind(this);
766768
this.viewsManager.onUpdateThumbnails = () => {

web/views_manager.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ class ViewsManager extends Sidebar {
9898
},
9999
eventBus,
100100
l10n,
101+
enableSplitMerge = false,
101102
}) {
102103
super(
103104
{
@@ -142,6 +143,11 @@ class ViewsManager extends Sidebar {
142143

143144
this.eventBus = eventBus;
144145

146+
if (!enableSplitMerge) {
147+
viewsManagerStatus.hidden = true;
148+
}
149+
this._enableSplitMerge = enableSplitMerge;
150+
145151
this.menu = new Menu(
146152
viewsManagerSelectorOptions,
147153
viewsManagerSelectorButton,
@@ -252,7 +258,9 @@ class ViewsManager extends Sidebar {
252258
return;
253259
}
254260

255-
this.viewsManagerStatus.hidden = view !== SidebarView.THUMBS;
261+
if (this._enableSplitMerge) {
262+
this.viewsManagerStatus.hidden = view !== SidebarView.THUMBS;
263+
}
256264
this.viewsManagerAddFileButton.hidden = view !== SidebarView.THUMBS;
257265
this.viewsManagerCurrentOutlineButton.hidden = view !== SidebarView.OUTLINE;
258266
this.viewsManagerHeaderLabel.setAttribute(

0 commit comments

Comments
 (0)