Skip to content

Mobile panel toggle buttons #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Mobile panel toggle buttons #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7fd6e9c
trigger rightpanel with mobile footer moreinfo button
jamesmisson Feb 27, 2025
fc03b0d
Merge remote-tracking branch 'upstream/dev' into UX-mobile-moreinfo
jamesmisson Feb 27, 2025
3131b2b
Merge remote-tracking branch 'johnathan/dev' into mobile-trigger-more…
jamesmisson Feb 28, 2025
148200d
merge jonathan/dev
jamesmisson Feb 28, 2025
bf08f76
Merge pull request #3 from UniversalViewer/dev
LlGC-jop Mar 3, 2025
c96037b
Merge pull request #4 from jamesmisson/mobile-trigger-moreinfo
LlGC-jop Mar 3, 2025
aa94f0e
Commit from GitHub Actions (Lint code)
github-actions[bot] Mar 3, 2025
d29f0f7
left and right panel buttons in mobile footer
jamesmisson Mar 7, 2025
0a65921
tidy up whitespace
jamesmisson Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/content-handlers/iiif/BaseConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ export type FooterPanelContent = {
feedback: string;
fullScreen: string;
moreInfo: string;
toggleLeftPanel: string;
open: string;
share: string;
};
Expand Down
4 changes: 2 additions & 2 deletions src/content-handlers/iiif/IIIFEvents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export class IIIFEvents {
static HIDE_HELP_DIALOGUE: string = "hideHelpDialogue";
static HIDE_INFORMATION: string = "hideInformation";
static HIDE_LOGIN_DIALOGUE: string = "hideLoginDialogue";
static HIDE_MOREINFO_DIALOGUE: string = "hideMoreInfoDialogue";
static HIDE_MULTISELECT_DIALOGUE: string = "hideMultiSelectDialogue";
static HIDE_OVERLAY: string = "hideOverlay";
static HIDE_RESTRICTED_DIALOGUE: string = "hideRestrictedDialogue";
Expand Down Expand Up @@ -100,14 +99,15 @@ export class IIIFEvents {
static SHOW_LOGIN_DIALOGUE: string = "showLoginDialogue";
static SHOW_MESSAGE: string = "showMessage";
static MESSAGE_DISPLAYED: string = "messageDisplayed";
static SHOW_MOREINFO_DIALOGUE: string = "showMoreInfoDialogue";
static SHOW_MULTISELECT_DIALOGUE: string = "showMultiSelectDialogue";
static SHOW_OVERLAY: string = "showOverlay";
static SHOW_RESTRICTED_DIALOGUE: string = "showRestrictedDialogue";
static SHOW_SETTINGS_DIALOGUE: string = "showSettingsDialogue";
static SHOW_SHARE_DIALOGUE: string = "showShareDialogue";
static SHOW_TERMS_OF_USE: string = "showTermsOfUse";
static TARGET_CHANGE: string = "targetChange";
static TOGGLE_RIGHT_PANEL: string = "toggleRightPanel";
static TOGGLE_LEFT_PANEL: string = "toggleLeftPanel";
static THUMB_MULTISELECTED: string = "thumbMultiSelected";
static THUMB_SELECTED: string = "thumbSelected";
static TOGGLE_EXPAND_LEFT_PANEL: string = "toggleExpandLeftPanel";
Expand Down
1 change: 1 addition & 0 deletions src/content-handlers/iiif/extensions/uv-aleph-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"feedback": "Feedback",
"fullScreen": "Full Screen",
"moreInfo": "More Information",
"toggleLeftPanel": "Toggle Left Panel",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's a bug that this file is missing the shorthand variables for translations. This should probably be $toggleLeftPanel, and the other text should be converted as well (maybe that's a separate PR!).

"open": "Open",
"share": "Share"
}
Expand Down
3 changes: 2 additions & 1 deletion src/content-handlers/iiif/extensions/uv-av-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "$toggleLeftPanel"
}
},
"genericDialogue": {
Expand Down
3 changes: 2 additions & 1 deletion src/content-handlers/iiif/extensions/uv-default-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these other instances should be converted to use $toggleLeftPanel like the uv-av-extension.

}
},
"genericDialogue": {
Expand Down
9 changes: 0 additions & 9 deletions src/content-handlers/iiif/extensions/uv-ebook-extension/Extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { FooterPanel } from "../../modules/uv-shared-module/FooterPanel";
import { FooterPanel as MobileFooterPanel } from "../../modules/uv-ebookmobilefooterpanel-module/MobileFooter";
import { HeaderPanel } from "../../modules/uv-shared-module/HeaderPanel";
import { IEbookExtension } from "./IEbookExtension";
import { MoreInfoDialogue } from "../../modules/uv-dialogues-module/MoreInfoDialogue";
import { MoreInfoRightPanel } from "../../modules/uv-moreinforightpanel-module/MoreInfoRightPanel";
import { SettingsDialogue } from "./SettingsDialogue";
import { ShareDialogue } from "./ShareDialogue";
Expand All @@ -22,7 +21,6 @@ export default class Extension
implements IEbookExtension
{
$downloadDialogue: JQuery;
$moreInfoDialogue: JQuery;
$multiSelectDialogue: JQuery;
$settingsDialogue: JQuery;
$shareDialogue: JQuery;
Expand All @@ -32,7 +30,6 @@ export default class Extension
headerPanel: HeaderPanel<Config["modules"]["headerPanel"]>;
leftPanel: EbookLeftPanel;
mobileFooterPanel: MobileFooterPanel;
moreInfoDialogue: MoreInfoDialogue;
rightPanel: MoreInfoRightPanel;
settingsDialogue: SettingsDialogue;
shareDialogue: ShareDialogue;
Expand Down Expand Up @@ -90,12 +87,6 @@ export default class Extension
this.shell.$footerPanel.hide();
}

this.$moreInfoDialogue = $(
'<div class="overlay moreInfo" aria-hidden="true"></div>'
);
this.shell.$overlays.append(this.$moreInfoDialogue);
this.moreInfoDialogue = new MoreInfoDialogue(this.$moreInfoDialogue);

this.$shareDialogue = $(
'<div class="overlay share" aria-hidden="true"></div>'
);
Expand Down
3 changes: 2 additions & 1 deletion src/content-handlers/iiif/extensions/uv-ebook-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"genericDialogue": {
Expand Down
3 changes: 2 additions & 1 deletion src/content-handlers/iiif/extensions/uv-mediaelement-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"genericDialogue": {
Expand Down
9 changes: 0 additions & 9 deletions src/content-handlers/iiif/extensions/uv-model-viewer-extension/Extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { FooterPanel } from "../../modules/uv-shared-module/FooterPanel";
import { FooterPanel as MobileFooterPanel } from "../../modules/uv-modelviewermobilefooterpanel-module/MobileFooter";
import { HeaderPanel } from "../../modules/uv-shared-module/HeaderPanel";
import { HelpDialogue } from "../../modules/uv-dialogues-module/HelpDialogue";
import { MoreInfoDialogue } from "../../modules/uv-dialogues-module/MoreInfoDialogue";
import { MoreInfoRightPanel } from "../../modules/uv-moreinforightpanel-module/MoreInfoRightPanel";
import { SettingsDialogue } from "./SettingsDialogue";
import { ShareDialogue } from "./ShareDialogue";
Expand All @@ -26,7 +25,6 @@ export default class ModelViewerExtension extends BaseExtension<Config> {
$downloadDialogue: JQuery;
$shareDialogue: JQuery;
$helpDialogue: JQuery;
$moreInfoDialogue: JQuery;
$settingsDialogue: JQuery;
centerPanel: ModelViewerCenterPanel;
downloadDialogue: DownloadDialogue;
Expand All @@ -35,7 +33,6 @@ export default class ModelViewerExtension extends BaseExtension<Config> {
helpDialogue: HelpDialogue;
leftPanel: ContentLeftPanel;
mobileFooterPanel: FooterPanel<Config["modules"]["footerPanel"]>;
moreInfoDialogue: MoreInfoDialogue;
rightPanel: MoreInfoRightPanel;
settingsDialogue: SettingsDialogue;
shareDialogue: ShareDialogue;
Expand Down Expand Up @@ -98,12 +95,6 @@ export default class ModelViewerExtension extends BaseExtension<Config> {
this.shell.$footerPanel.hide();
}

this.$moreInfoDialogue = $(
'<div class="overlay moreInfo" aria-hidden="true"></div>'
);
this.shell.$overlays.append(this.$moreInfoDialogue);
this.moreInfoDialogue = new MoreInfoDialogue(this.$moreInfoDialogue);

this.$downloadDialogue = $(
'<div class="overlay download" aria-hidden="true"></div>'
);
Expand Down
3 changes: 2 additions & 1 deletion src/content-handlers/iiif/extensions/uv-model-viewer-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"genericDialogue": {
Expand Down
9 changes: 0 additions & 9 deletions src/content-handlers/iiif/extensions/uv-openseadragon-extension/Extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { FooterPanel } from "../../modules/uv-searchfooterpanel-module/FooterPan
import { HelpDialogue } from "../../modules/uv-dialogues-module/HelpDialogue";
import { IOpenSeadragonExtensionData } from "./IOpenSeadragonExtensionData";
import { Mode } from "./Mode";
import { MoreInfoDialogue } from "../../modules/uv-dialogues-module/MoreInfoDialogue";
import { MoreInfoRightPanel } from "../../modules/uv-moreinforightpanel-module/MoreInfoRightPanel";
import { MultiSelectDialogue } from "../../modules/uv-multiselectdialogue-module/MultiSelectDialogue";
import { MultiSelectionArgs } from "./MultiSelectionArgs";
Expand Down Expand Up @@ -60,7 +59,6 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
$downloadDialogue: JQuery;
$externalContentDialogue: JQuery;
$helpDialogue: JQuery;
$moreInfoDialogue: JQuery;
$multiSelectDialogue: JQuery;
$settingsDialogue: JQuery;
$shareDialogue: JQuery;
Expand All @@ -78,7 +76,6 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
leftPanel: ContentLeftPanel;
mobileFooterPanel: MobileFooterPanel;
mode: Mode;
moreInfoDialogue: MoreInfoDialogue;
multiSelectDialogue: MultiSelectDialogue;
previousAnnotationRect: AnnotationRect | null;
rightPanel: MoreInfoRightPanel;
Expand Down Expand Up @@ -551,12 +548,6 @@ export default class OpenSeadragonExtension extends BaseExtension<Config> {
this.shell.$overlays.append(this.$helpDialogue);
this.helpDialogue = new HelpDialogue(this.$helpDialogue);

this.$moreInfoDialogue = $(
'<div class="overlay moreInfo" aria-hidden="true"></div>'
);
this.shell.$overlays.append(this.$moreInfoDialogue);
this.moreInfoDialogue = new MoreInfoDialogue(this.$moreInfoDialogue);

this.$multiSelectDialogue = $(
'<div class="overlay multiSelect" aria-hidden="true"></div>'
);
Expand Down
1 change: 1 addition & 0 deletions src/content-handlers/iiif/extensions/uv-openseadragon-extension/config/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ type MobileFooterPanelOptions = FooterPanelOptions & {};
type MobileFooterPanelContent = FooterPanelContent & {
rotateRight: string;
moreInfo: string;
toggleLeftPanel: string;
zoomIn: string;
zoomOut: string;
};
Expand Down
9 changes: 6 additions & 3 deletions src/content-handlers/iiif/extensions/uv-openseadragon-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"genericDialogue": {
Expand Down Expand Up @@ -424,7 +425,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"settingsDialogue": {
Expand Down Expand Up @@ -538,7 +540,8 @@
"feedback": "$feedback",
"fullScreen": "$fullScreen",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"restrictedDialogue": {
Expand Down
3 changes: 2 additions & 1 deletion src/content-handlers/iiif/extensions/uv-pdf-extension/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
"fullScreen": "$fullScreen",
"moreInfo": "$moreInfo",
"open": "$open",
"share": "$share"
"share": "$share",
"toggleLeftPanel": "Toggle Left Panel"
}
},
"genericDialogue": {
Expand Down
119 changes: 0 additions & 119 deletions src/content-handlers/iiif/modules/uv-dialogues-module/MoreInfoDialogue.ts
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/content-handlers/iiif/modules/uv-osdmobilefooterpanel-module/MobileFooter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@ export class FooterPanel extends BaseFooterPanel<
<i class="uv-icon-rotate" aria-hidden="true"></i>${this.content.rotateRight}
</button>
`);
this.$options.prepend(this.$rotateButton);
this.$mainOptions.prepend(this.$rotateButton);

this.$zoomOutButton = $(`
<button class="btn imageBtn zoomOut" title="${this.content.zoomOut}">
<i class="uv-icon-zoom-out" aria-hidden="true"></i>${this.content.zoomOut}
</button>
`);
this.$options.prepend(this.$zoomOutButton);
this.$mainOptions.prepend(this.$zoomOutButton);

this.$zoomInButton = $(`
<button class="btn imageBtn zoomIn" title="${this.content.zoomIn}">
<i class="uv-icon-zoom-in" aria-hidden="true"></i>${this.content.zoomIn}
</button>
`);
this.$options.prepend(this.$zoomInButton);
this.$mainOptions.prepend(this.$zoomInButton);

this.$zoomInButton.onPressed(() => {
this.extensionHost.publish(OpenSeadragonExtensionEvents.ZOOM_IN);
Expand Down
Loading
Loading