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

Updates screen modal. #16324

Merged
merged 3 commits into from Aug 2, 2017
Merged

Updates screen modal. #16324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
343b391
Updates screen modal.
claudiulodro Aug 1, 2017
9b22463
Little cleanup
claudiulodro Aug 1, 2017
7c0afc1
Comments
claudiulodro Aug 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
125 changes: 109 additions & 16 deletions includes/admin/class-wc-admin-plugin-updates.php
View file
Open in desktop
Expand Up @@ -57,7 +57,19 @@ class WC_Admin_Plugin_Updates {
*/
public function __construct() {
add_filter( 'extra_plugin_headers', array( $this, 'enable_wc_plugin_headers' ) );
add_action( 'in_plugin_update_message-woocommerce/woocommerce.php', array( $this, 'in_plugin_update_message' ), 10, 2 );

$screen = get_current_screen();
if ( ! $screen ) {
return;
}

if ( 'plugins' === $screen->id ) {
add_action( 'in_plugin_update_message-woocommerce/woocommerce.php', array( $this, 'in_plugin_update_message' ), 10, 2 );
}

if ( 'update-core' === $screen->id ) {
add_action( 'admin_print_footer_scripts', array( $this, 'update_screen_modal' ) );
}
}

/**
Expand All @@ -73,7 +85,7 @@ public function enable_wc_plugin_headers( $headers ) {
}

/**
* Show plugin changes. Code adapted from W3 Total Cache.
* Show plugin changes on the plugins screen. Code adapted from W3 Total Cache.
*
* @param array $args
*/
Expand All @@ -93,33 +105,47 @@ public function in_plugin_update_message( $args, $response ) {

if ( ! empty( $this->major_untested_plugins ) ) {
$this->upgrade_notice .= $this->get_extensions_modal_warning();
add_action( 'admin_print_footer_scripts', array( $this, 'modal_js' ) );
add_action( 'admin_print_footer_scripts', array( $this, 'plugin_screen_modal_js' ) );
}

echo apply_filters( 'woocommerce_in_plugin_update_message', $this->upgrade_notice ? '</p>' . wp_kses_post( $this->upgrade_notice ) . '<p class="dummy">' : '' );
}

/**
* JS for the modal window.
* Show a warning message on the upgrades screen if the user tries to upgrade and has untested plugins.
*/
public function update_screen_modal() {
$updateable_plugins = get_plugin_updates();
if ( empty( $updateable_plugins['woocommerce/woocommerce.php'] )
|| empty( $updateable_plugins['woocommerce/woocommerce.php']->update )
|| empty( $updateable_plugins['woocommerce/woocommerce.php']->update->new_version ) ) {
return;
}

$this->new_version = wc_clean( $updateable_plugins['woocommerce/woocommerce.php']->update->new_version );
$this->major_untested_plugins = $this->get_untested_plugins( $this->new_version, 'major' );
if ( empty( $this->major_untested_plugins ) ) {
return;
}

echo $this->get_extensions_modal_warning();
$this->update_screen_modal_js();
}

/**
* Common JS for initializing and managing the modals.
*/
public function modal_js() {
protected function generic_modal_js() {
?>
<script>
( function( $ ) {
var $update_box = $( '#woocommerce-update' );
var $update_link = $update_box.find('a.update-link').first();

var update_url = $update_link.attr( 'href' );
var old_tb_position = false;

// Initialize thickbox.
$update_link.removeClass( 'update-link' );
$update_link.addClass( 'wc-thickbox' );
$update_link.attr( 'href', '#TB_inline?height=600&width=550&inlineId=wc_untested_extensions_modal' );
tb_init( '.wc-thickbox' );

// Set up a custom thickbox overlay.
$update_link.on( 'click', function( evt ) {
var old_tb_position = false;

// Make the WC thickboxes look good when opened.
$( '.wc-thickbox' ).on( 'click', function( evt ) {
var $overlay = $( '#TB_overlay' );
if ( ! $overlay.length ) {
$( 'body' ).append( '<div id="TB_overlay"></div><div id="TB_window" class="wc_untested_extensions_modal_container"></div>' );
Expand All @@ -144,6 +170,26 @@ public function modal_js() {
tb_position = old_tb_position;
}
});
})( jQuery );
</script>
<?php
}

/**
* JS for the modal window on the plugins screen.
*/
public function plugin_screen_modal_js() {
?>
<script>
( function( $ ) {
var $update_box = $( '#woocommerce-update' );
var $update_link = $update_box.find('a.update-link').first();
var update_url = $update_link.attr( 'href' );

// Set up thickbox.
$update_link.removeClass( 'update-link' );
$update_link.addClass( 'wc-thickbox' );
$update_link.attr( 'href', '#TB_inline?height=600&width=550&inlineId=wc_untested_extensions_modal' );

// Trigger the update if the user accepts the modal's warning.
$( '#wc_untested_extensions_modal .accept' ).on( 'click', function( evt ) {
Expand All @@ -162,6 +208,53 @@ public function modal_js() {
})( jQuery );
</script>
<?php
$this->generic_modal_js();
}

/**
* JS for the modal window on the updates screen.
*/
protected function update_screen_modal_js() {
?>
<script>
( function( $ ) {
var modal_dismissed = false;

// Show the modal if the WC upgrade checkbox is checked.
var show_modal_if_checked = function() {
if ( modal_dismissed ) {
return;
}
var $checkbox = $( 'input[value="woocommerce/woocommerce.php"]' );
if ( $checkbox.prop( 'checked' ) ) {
$( '#wc-upgrade-warning' ).click();
}
}

$( '#plugins-select-all, input[value="woocommerce/woocommerce.php"]' ).on( 'change', function() {
show_modal_if_checked();
} );

// Add a hidden thickbox link to use for bringing up the modal.
$('body').append( '<a href="#TB_inline?height=600&width=550&inlineId=wc_untested_extensions_modal" class="wc-thickbox" id="wc-upgrade-warning" style="display:none"></a>' );

// Don't show the modal again once it's been accepted.
$( '#wc_untested_extensions_modal .accept' ).on( 'click', function( evt ) {
evt.preventDefault();
modal_dismissed = true;
tb_remove();
});

// Uncheck the WC update checkbox if the modal is canceled.
$( '#wc_untested_extensions_modal .cancel a' ).on( 'click', function( evt ) {
evt.preventDefault();
$( 'input[value="woocommerce/woocommerce.php"]' ).prop( 'checked', false );
tb_remove();
});
})( jQuery );
</script>
<?php
$this->generic_modal_js();
}

/*
Expand Down
1 change: 1 addition & 0 deletions includes/admin/class-wc-admin.php
View file
Open in desktop
Expand Up @@ -101,6 +101,7 @@ public function conditional_includes() {
include( 'class-wc-admin-permalink-settings.php' );
break;
case 'plugins' :
case 'update-core' :
include( 'class-wc-admin-plugin-updates.php' );
break;
case 'users' :
Expand Down
1 change: 1 addition & 0 deletions includes/admin/views/html-notice-untested-extensions-modal.php
View file
Open in desktop
Expand Up @@ -44,5 +44,6 @@
</p>
</div>
<?php endif ?>
</div>
</div>
</div>