Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fully reload page when entering or leaving '#premium' tab in Settings

Browse Source 
[MAILPOET-2431]
This commit is contained in:
Jan Jakeš
2019-12-10 11:34:06 +01:00
committed by Jack Kitterhing
parent 7112836fad
commit b088dd8dcc
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
assets/js/src/settings/tabs.js
View File

@@ -69,6 +69,11 @@ if (jQuery('#mailpoet_settings').length > 0) {
jQuery('.mailpoet_settings_submit').show();
}
// add 'nav-tab-reload' to all tabs when on '#premium'
if (tab === 'premium') {
jQuery('.nav-tab-wrapper .nav-tab').addClass('nav-tab-reload');
}
MailPoet.trackEvent(
'User has clicked a tab in Settings',
{
@@ -79,7 +84,26 @@ if (jQuery('#mailpoet_settings').length > 0) {
},
}))();
// force full reload when going from/to '#premium' page
window.addEventListener('hashchange', function hashchange(e) {
e.preventDefault();
const oldHash = e.oldURL.split('#')[1] || null;
const newHash = e.newURL.split('#')[1] || null;
if (oldHash === 'premium' || newHash === 'premium') {
window.location.reload();
}
});
jQuery(document).ready(function ready() {
if (!Backbone.History.started) Backbone.history.start();
// force full tab reload for tabs with 'nav-tab-reload' class
jQuery('.nav-tab').click(function click(e) {
if (e.target.classList.contains('nav-tab-reload')) {
e.preventDefault();
window.history.replaceState(null, null, e.target.href);
window.location.reload();
}
});
});
}

2
views/settings.html
View File

@@ -22,7 +22,7 @@
<a class="nav-tab" href="#woocommerce" data-automation-id="woocommerce_settings_tab"><%= __('WooCommerce') %></a>
<% endif %>
<a class="nav-tab" href="#advanced" data-automation-id="settings-advanced-tab"><%= __('Advanced') %></a>
<a class="nav-tab" href="#premium" data-automation-id="activation_settings_tab"><%= __('Key Activation') %></a>
<a class="nav-tab nav-tab-reload" href="#premium" data-automation-id="activation_settings_tab"><%= __('Key Activation') %></a>
</h2>
<!-- sending method -->