Skip to content

Fix: Prevent Adapt.on('popup:opened') listener leak in openPopup (fixes #345) #346

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

Open
oliverfoster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Prevent Adapt.on('popup:opened') listener leak in openPopup (fixes #345) #346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 11 additions & 6 deletions js/NarrativeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ class NarrativeView extends ComponentView {
this.onNavigationClicked = this.onNavigationClicked.bind(this);
this.openPopup = this.openPopup.bind(this);
this.onInview = this.onInview.bind(this);
this.onPopupOpened = this.onPopupOpened.bind(this);
}

preRender() {
this.listenTo(Adapt, {
'device:changed device:resize': this.reRender,
'notify:closed': this.closeNotify
'notify:closed': this.closeNotify,
'popup:opened': this.onPopupOpened
});
this.renderMode();

Expand Down Expand Up @@ -310,16 +312,19 @@ class NarrativeView extends ComponentView {
const title = currentItem.get('title') || currentItem.get('strapline') || defaultTitle;
const isAltTitle = Boolean(!currentItem.get('title'));

notify.popup({
this._popupView = notify.popup({
isAltTitle,
title,
body: currentItem.get('body')
});
this._popupActiveItem = currentItem;
}

Adapt.on('popup:opened', function() {
// Set the visited attribute for small and medium screen devices
currentItem.toggleVisited(true);
});
onPopupOpened($element) {
// Ignore popups that didn't originate from this narrative's openPopup
if (!this._popupView || !$element.closest(this._popupView.el).length) return;
// Set the visited attribute for small and medium screen devices
this._popupActiveItem.toggleVisited(true);
}

onNavigationClicked(e) {
Expand Down
Loading