Skip to content

JITM: Prevent the activation page from displaying the JP License Activation JITM. #27959

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
kraftbj merged 4 commits into from
Jan 22, 2023
Merged

JITM: Prevent the activation page from displaying the JP License Activation JITM. #27959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd87640
[not verified] Fix JP License Activation JITM to not display in Activ…
jkguidaven Dec 15, 2022
16c6d11
[not verified] changelog
jkguidaven Dec 15, 2022
c304d7d
[not verified] Remove logic for filtering notice within jitm package …
jkguidaven Jan 16, 2023
5fd2ec5
[not verified] Fixup changelog description and package version.
jkguidaven Jan 16, 2023
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
4 changes: 4 additions & 0 deletions projects/packages/jitm/changelog/hide-jitm-license-key-activation
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Prevent the activation page from displaying the JP License Activation JITM.
2 changes: 1 addition & 1 deletion projects/packages/jitm/src/class-jitm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
class JITM {

const PACKAGE_VERSION = '2.2.37';
const PACKAGE_VERSION = '2.2.38-alpha';

/**
* The configuration method that is called from the jetpack-config package.
Expand Down
14 changes: 11 additions & 3 deletions projects/packages/jitm/src/js/jetpack-jitm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,14 @@ jQuery( document ).ready( function ( $ ) {
var hash = location.hash;

hash = hash.replace( /#\//, '_' );
if ( '_dashboard' !== hash ) {

// We always include the hash if this is My Jetpack page
if ( message_path.includes( 'jetpack_page_my-jetpack' )) {
message_path = message_path.replace(
'jetpack_page_my-jetpack',
'jetpack_page_my-jetpack' + hash
);
} else if ( '_dashboard' !== hash ) {
message_path = message_path.replace(
'toplevel_page_jetpack',
'toplevel_page_jetpack' + hash
Expand Down Expand Up @@ -256,9 +263,10 @@ jQuery( document ).ready( function ( $ ) {
reFetch();

$( window ).on( 'hashchange', function ( e ) {
var newURL = e.originalEvent.newURL;
const newURL = e.originalEvent.newURL;
const isJetpackPage = newURL.indexOf( 'jetpack#/' ) >= 0 || newURL.indexOf( 'my-jetpack' ) >= 0;

if ( newURL.indexOf( 'jetpack#/' ) >= 0 ) {
if ( isJetpackPage ) {
var jitm_card = document.querySelector( '.jitm-card' );
if ( jitm_card ) {
jitm_card.remove();
Expand Down