Compare commits

..

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

2 changed files with 14 additions and 14 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.3.3",
"type": "library", "type": "library",
"license": "MIT", "license": "MIT",
"authors": [ "authors": [

View file

@ -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,26 @@ 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; $response = is_wp_error( $response ) ? $response->get_error_message() : wp_remote_retrieve_response_code( $response );
} if ( is_int( $response ) ) {

set_transient( 'wp-dismiss-notice_jsurl', $response, WEEK_IN_SECONDS );
if ( '/vendor' !== $vendor_dir ) { }
$js_url = home_url( $composer_js_path );
} }
$js_url = ( 200 === (int) $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
); );