Compare commits

..

No commits in common. "main" and "0.2.6" have entirely different histories.
main ... 0.2.6

3 changed files with 13 additions and 16 deletions

View file

@ -1,7 +1,7 @@
{ {
"name": "afragen/wp-dismiss-notice", "name": "afragen/wp-dismiss-notice",
"description": "Library for time dismissible WordPress admin notices.", "description": "Library for time dismissible WordPress admin notices.",
"version": "0.3.7", "version": "0.2.6",
"type": "library", "type": "library",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [

View file

@ -23,7 +23,7 @@
option_name = attr_value.join('-'); option_name = attr_value.join('-');


data = { data = {
'action': 'wp_dismiss_notice', 'action': 'dismiss_admin_notice',
'option_name': option_name, 'option_name': option_name,
'dismissible_length': dismissible_length, 'dismissible_length': dismissible_length,
'nonce': window.wp_dismiss_notice.nonce 'nonce': window.wp_dismiss_notice.nonce

View file

@ -16,7 +16,7 @@ class WP_Dismiss_Notice {
*/ */
public static function init() { public static function init() {
add_action( 'admin_enqueue_scripts', [ __CLASS__, 'load_script' ] ); add_action( 'admin_enqueue_scripts', [ __CLASS__, 'load_script' ] );
add_action( 'wp_ajax_wp_dismiss_notice', [ __CLASS__, 'dismiss_admin_notice' ] ); add_action( 'wp_ajax_dismiss_admin_notice', [ __CLASS__, 'dismiss_admin_notice' ] );
} }


/** /**
@ -28,9 +28,6 @@ class WP_Dismiss_Notice {
return; return;
} }


$js_url = plugins_url( 'js/dismiss-notice.js', __FILE__, 'wp-dismiss-notice' );
$version = json_decode( file_get_contents( __DIR__ . '/composer.json' ) )->version;

/** /**
* Filter composer.json vendor directory. * Filter composer.json vendor directory.
* Some people don't use the standard vendor directory. * Some people don't use the standard vendor directory.
@ -39,23 +36,23 @@ class WP_Dismiss_Notice {
*/ */
$vendor_dir = apply_filters( 'dismiss_notice_vendor_dir', '/vendor' ); $vendor_dir = apply_filters( 'dismiss_notice_vendor_dir', '/vendor' );
$composer_js_path = untrailingslashit( $vendor_dir ) . '/afragen/wp-dismiss-notice/js/dismiss-notice.js'; $composer_js_path = untrailingslashit( $vendor_dir ) . '/afragen/wp-dismiss-notice/js/dismiss-notice.js';
$plugin_js_url = plugins_url( 'js/dismiss-notice.js', __FILE__, 'wp-dismiss-notice' );


$theme_js_url = get_theme_file_uri( $composer_js_path ); // Test to get correct URL for JS.
$theme_js_file = parse_url( $theme_js_url, PHP_URL_PATH ); $response = get_transient( 'wp-dismiss-notice_jsurl' );

if ( ! $response ) {
if ( file_exists( ABSPATH . $theme_js_file ) ) { $response = wp_remote_head( $plugin_js_url );
$js_url = $theme_js_url; set_transient( 'wp-dismiss-notice_jsurl', $response, WEEK_IN_SECONDS );
}

if ( '/vendor' !== $vendor_dir ) {
$js_url = home_url( $composer_js_path );
} }
$js_url = ( 200 === wp_remote_retrieve_response_code( $response ) ) || is_wp_error( $response )
? $plugin_js_url
: get_stylesheet_directory_uri() . $composer_js_path;


wp_enqueue_script( wp_enqueue_script(
'dismissible-notices', 'dismissible-notices',
$js_url, $js_url,
[ 'jquery', 'common' ], [ 'jquery', 'common' ],
$version, false,
true true
); );