merge hooks to add flush icon style and script (#326)

Author: stklcode

inc/class-cachify.php

@@ -116,9 +116,6 @@ public function __construct() {
 		/* Flush icon */
 		add_action( 'admin_bar_menu', array( __CLASS__, 'add_flush_icon' ), 90 );
 
-		/* Flush icon script */
-		add_action( 'admin_bar_menu', array( __CLASS__, 'add_flush_icon_script' ), 90 );
-
 		/* Flush REST endpoint */
 		add_action( 'rest_api_init', array( __CLASS__, 'add_flush_rest_endpoint' ) );
 
@@ -695,6 +692,22 @@ public static function add_flush_icon( $wp_admin_bar ) {
 		/* Enqueue style */
 		wp_enqueue_style( 'cachify-admin-bar-flush' );
 
+		/* Enqueue script */
+		wp_enqueue_script( 'cachify-admin-bar-flush' );
+
+		/* Localize script */
+		wp_localize_script(
+			'cachify-admin-bar-flush',
+			'cachify_admin_bar_flush_ajax_object',
+			array(
+				'url'              => esc_url_raw( rest_url( self::REST_NAMESPACE . '/' . self::REST_ROUTE_FLUSH ) ),
+				'nonce'            => wp_create_nonce( 'wp_rest' ),
+				'flushing'         => __( 'Flushing cache', 'cachify' ),
+				'flushed'          => __( 'Cache flushed successfully', 'cachify' ),
+				'dashicon_success' => self::get_dashicon_success_class(),
+			)
+		);
+
 		/* Print area for aria live updates */
 		echo '<span class="ab-aria-live-area screen-reader-text" aria-live="polite"></span>';
 		/* Check if the flush action was used without AJAX */
@@ -739,39 +752,6 @@ public static function get_dashicon_success_class() {
 		return 'dashicons-yes-alt';
 	}
 
-	/**
-	 * Add a script to query the REST endpoint and animate the flush icon in admin bar menu
-	 *
-	 * @hook  mixed  cachify_user_can_flush_cache ?
-	 *
-	 * @param object $wp_admin_bar Object of menu items.
-	 *
-	 * @since 2.4.0
-	 */
-	public static function add_flush_icon_script( $wp_admin_bar ) {
-		/* Quit */
-		if ( ! is_admin_bar_showing() || ! apply_filters( 'cachify_user_can_flush_cache', current_user_can( 'manage_options' ) ) ) {
-			return;
-		}
-
-		/* Enqueue script */
-		wp_enqueue_script( 'cachify-admin-bar-flush' );
-
-		/* Localize script */
-		wp_localize_script(
-			'cachify-admin-bar-flush',
-			'cachify_admin_bar_flush_ajax_object',
-			array(
-				'url'              => esc_url_raw( rest_url( self::REST_NAMESPACE . '/' . self::REST_ROUTE_FLUSH ) ),
-				'nonce'            => wp_create_nonce( 'wp_rest' ),
-				'flushing'         => __( 'Flushing cache', 'cachify' ),
-				'flushed'          => __( 'Cache flushed successfully', 'cachify' ),
-				'dashicon_success' => self::get_dashicon_success_class(),
-			)
-		);
-	}
-
-
 	/**
 	 * Registers an REST endpoint for the flush operation
 	 *