Skip to content

[4.0] Showon init only once, public method Joomla.Showon.initialise() #32069

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
wilsonge merged 3 commits into from
Jan 27, 2021
Merged

[4.0] Showon init only once, public method Joomla.Showon.initialise() #32069

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5fbb64
Showon init only once, public method Joomla.Showon.initilise()
Fedik Jan 17, 2021
1e2b0dd
type
Fedik Jan 17, 2021
e28aae0
jscs
Fedik Jan 18, 2021
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
21 changes: 17 additions & 4 deletions build/media_source/system/js/showon.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
if (this.showonFields.length) {
// @todo refactor this, dry
this.showonFields.forEach((field) => {
// Set up only once
if (field.hasAttribute('data-showon-initialised')) {
Copy link
Contributor

@dgrammatiko dgrammatiko Jan 17, 2021

Choose a reason for hiding this comment

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

Can we change this to field.dataset.hasOwnProperty('showonInitialised')

Copy link
Member Author

@Fedik Fedik Jan 17, 2021

Choose a reason for hiding this comment

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

in the end it the same, but use the attribute is more clear for "visual debuging" ;)

return;
}
field.setAttribute('data-showon-initialised', '');
Copy link
Contributor

@dgrammatiko dgrammatiko Jan 17, 2021

Choose a reason for hiding this comment

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

field.dataset.showonInitialised = '';


const jsondata = field.getAttribute('data-showon') || '';
const showonData = JSON.parse(jsondata);
let localFields;
Expand Down Expand Up @@ -204,12 +210,20 @@
}
}

// Provide a public API
window.Joomla = window.Joomla || {};

if (!Joomla.Showon) {
Joomla.Showon = {
initialise: (container) => new Showon(container),
};
}

/**
* Initialize 'showon' feature at an initial page load
*/
document.addEventListener('DOMContentLoaded', () => {
// eslint-disable-next-line no-new
new Showon(document);
Joomla.Showon.initialise(document);
});

/**
Expand All @@ -229,7 +243,6 @@
});
}

// eslint-disable-next-line no-new
new Showon(target);
Joomla.Showon.initialise(target);
});
})(document);