Skip to content
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

Jump to bottom

JITMs: display more relevant notices depending on the Jetpack dashboard screen you visit. #10889

Merged
merged 6 commits into from
Dec 21, 2018
Merged

JITMs: display more relevant notices depending on the Jetpack dashboard screen you visit. #10889

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f37e18
JITM: Refetch based on hash change
dereksmart Dec 7, 2018
b9a3ce5
restructure
dereksmart Dec 7, 2018
0b8f771
Add check for the content of the target DOM element
AnnaMag Dec 20, 2018
c0335a2
Fallback to the original message path on the main dashboard page
jeherve Dec 21, 2018
3fdcfc0
Make sure JITMs are only queried once when switching dash tabs.
jeherve Dec 21, 2018
80b457e
Make sure the JITMs can be displayed on any page, not just JPDash
jeherve Dec 21, 2018
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
70 changes: 48 additions & 22 deletions _inc/jetpack-jitm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,14 @@ jQuery( document ).ready( function( $ ) {
var $template = templates[ template ]( response );
$template.find( '.jitm-banner__dismiss' ).click( render( $template ) );

$el.replaceWith( $template );

// Add to Jetpack notices within the Jetpack settings app.
$template.prependTo( $( '#jp-admin-notices' ) );
if ( $( '#jp-admin-notices' ).length > 0 ) {
// Add to Jetpack notices within the Jetpack settings app.
$el.innerHTML = $template;
$template.prependTo( $( '#jp-admin-notices' ) );
} else {
// Replace placeholder div on other pages.
$el.replaceWith($template);
}

// Handle Module activation button if it exists.
$template.find( '#jitm-banner__activate a' ).click( function() {
Expand Down Expand Up @@ -126,29 +130,51 @@ jQuery( document ).ready( function( $ ) {
} );
};

$( '.jetpack-jitm-message' ).each( function() {
var $el = $( this );
var reFetch = function() {
$( '.jetpack-jitm-message' ).each( function() {
var $el = $( this );

var message_path = $el.data( 'message-path' );
var query = $el.data( 'query' );
var redirect = $el.data( 'redirect' );
var message_path = $el.data( 'message-path' );
var query = $el.data( 'query' );
var redirect = $el.data( 'redirect' );
var hash = location.hash;

$.get( window.jitm_config.api_root + 'jetpack/v4/jitm', {
message_path: message_path,
query: query,
_wpnonce: $el.data( 'nonce' )
} ).then( function( response ) {
if ( 'object' === typeof response && response['1'] ) {
response = [ response['1'] ];
hash = hash.replace( /#\//, '_' );
if ( '_dashboard' !== hash ) {
message_path = message_path.replace( 'toplevel_page_jetpack', 'toplevel_page_jetpack' + hash );
}

// properly handle the case of an empty array or no content set
if ( 0 === response.length || ! response[ 0 ].content ) {
return;
}
$.get( window.jitm_config.api_root + 'jetpack/v4/jitm', {
message_path: message_path,
query: query,
_wpnonce: $el.data( 'nonce' )
} ).then( function( response ) {
if ( 'object' === typeof response && response['1'] ) {
response = [ response['1'] ];
}

// for now, always take the first response
setJITMContent( $el, response[ 0 ], redirect );
// properly handle the case of an empty array or no content set
if ( 0 === response.length || ! response[ 0 ].content ) {
return;
}

// for now, always take the first response
setJITMContent( $el, response[ 0 ], redirect );
} );
} );
};

reFetch();

$( window ).bind( 'hashchange', function( e ) {
var newURL = e.originalEvent.newURL;

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