Skip to content

Correctly export function for toggling scroll view #11103

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

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Correctly export function for toggling scroll view #11103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e1eb96
Correctly export function for toggling scroll view
cderv Oct 18, 2024
d9d50dc
Use class and method for clean JS code for toggling scroll view
cderv Oct 18, 2024
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
2 changes: 1 addition & 1 deletion src/resources/formats/revealjs/plugins/menu/quarto-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ window.RevealMenuToolHandlers = {
PdfExport.togglePdfExport();
}),
toggleScrollView: revealMenuToolHandler(function() {
Reveal.getPlugin("quarto-support").toggleScrollView(Reveal)();
Reveal.getPlugin("quarto-support").toggleScrollView();
})
};
34 changes: 21 additions & 13 deletions src/resources/formats/revealjs/plugins/support/support.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,36 +345,42 @@ window.QuartoSupport = function () {
}
}

// FIXME: Possibly remove this wrapper when upstream trigger is fixed
// FIXME: Possibly remove this wrapper class when upstream trigger is fixed
// https://github.com/hakimel/reveal.js/issues/3688
// Currently, scrollActivationWidth needs to be unset for toggle to work
function toggleScrollViewWrapper(deck) {
let oldscrollActivationWidth;
return () => {
if (deck.isScrollView() === true) {
deck.configure({scrollActivationWidth: oldscrollActivationWidth});
deck.toggleScrollView(false);
} else if (deck.isScrollView() === false) {
oldscrollActivationWidth = deck.getConfig()['scrollActivationWidth'];
deck.configure({scrollActivationWidth: null});
deck.toggleScrollView(true);
class ScrollViewToggler {
constructor(deck) {
this.deck = deck;
this.oldScrollActivationWidth = deck.getConfig()['scrollActivationWidth'];
}

toggleScrollViewWrapper() {
if (this.deck.isScrollView() === true) {
this.deck.configure({ scrollActivationWidth: this.oldScrollActivationWidth });
this.deck.toggleScrollView(false);
} else if (this.deck.isScrollView() === false) {
this.deck.configure({ scrollActivationWidth: null });
this.deck.toggleScrollView(true);
}
}
}

let scrollViewToggler;

function installScollViewKeyBindings(deck) {
var config = deck.getConfig();
var shortcut = config.scrollViewShortcut || 'R';
Reveal.addKeyBinding({
keyCode: shortcut.toUpperCase().charCodeAt( 0 ),
key: shortcut.toUpperCase(),
description: 'Scroll View Mode'
}, toggleScrollViewWrapper(deck) );
}, () => { scrollViewToggler.toggleScrollViewWrapper() } );
}

return {
id: "quarto-support",
init: function (deck) {
scrollViewToggler = new ScrollViewToggler(deck);
controlsAuto(deck);
previewLinksAuto(deck);
fixupForPrint(deck);
Expand All @@ -392,6 +398,8 @@ window.QuartoSupport = function () {
cleanEmptyAutoGeneratedContent(deck);
},
// Export for adding in menu
toggleScrollView: toggleScrollViewWrapper,
toggleScrollView: function() {
scrollViewToggler.toggleScrollViewWrapper();
}
};
};
Loading