Changeset 7815

Timestamp:

11/01/2018 08:40:23 PM (8 years ago)

Author:

coffee2code

Message:

Developer: Centralize enqueuing of admin stylesheet.

Adds helper get_parsed_post_types_screen_ids().

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc

Files:

• admin.php (modified) (2 diffs)
• explanations.php (modified) (3 diffs)
• parsed-content.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/admin.php

@@ -22 +22 @@
          */
         public static function do_init() {
+                add_action( 'admin_enqueue_scripts', [ __CLASS__, 'admin_enqueue_scripts' ] );
+        
                 add_action( 'comment_author', [ __CLASS__, 'append_user_nicename' ], 10, 2 );
 
@@ -30 +32 @@
                         // Reset votes after editing a comment in the wp-admin.
                         add_filter( 'comment_edit_redirect',  [ __CLASS__, 'comment_edit_redirect'], 10, 2 );
+                }
+        }
+
+        /**
+         * Returns array of screen IDs for parsed post types.
+         *
+         * @access public
+         *
+         * @return array
+         */
+        public static function get_parsed_post_types_screen_ids() {
+                $screen_ids = [];
+                foreach ( DevHub\get_parsed_post_types() as $parsed_post_type ) {
+                        $screen_ids[] = $parsed_post_type;
+                        $screen_ids[] = "edit-{$parsed_post_type}";
+                }
+
+                return $screen_ids;
+        }
+
+        /**
+         * Enqueue JS and CSS on the edit screens for all parsed post types.
+         *
+         * @access public
+         */
+        public static function admin_enqueue_scripts() {
+                // By default, only enqueue on parsed post type screens.
+                $screen_ids = self::get_parsed_post_types_screen_ids();
+
+                /**
+                 * Filters whether or not admin.css should be enqueued.
+                 *
+                 * @param bool True if admin.css should be enqueued, false otherwise.
+                 */
+                if ( (bool) apply_filters( 'devhub-admin_enqueue_scripts', in_array( get_current_screen()->id, $screen_ids ) ) ) {
+                        wp_enqueue_style( 'wporg-admin', get_template_directory_uri() . '/stylesheets/admin.css', [], '20160630' );
                 }
         }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/explanations.php

@@ -61 +61 @@
 
                 // Script and styles.
+                add_filter( 'devhub-admin_enqueue_scripts', array( $this, 'admin_enqueue_base_scripts' ) );
                 add_action( 'admin_enqueue_scripts',   array( $this, 'admin_enqueue_scripts'  )        );
 
@@ -441 +442 @@
 
         /**
+         * Enables enqueuing of admin.css for explanation pages.
+         *
+         * @access public
+         *
+         * @param bool $do_enqueue Should admin.css be enqueued?
+         * @return bool True if admin.css should be enqueued, false otherwise.
+         */
+        public function admin_enqueue_base_scripts( $do_enqueue ) {
+                return $do_enqueue || in_array( get_current_screen()->id, $this->screen_ids  );
+        }
+
+        /**
          * Enqueue JS and CSS for all parsed post types and explanation pages.
          *
@@ -447 +460 @@
         public function admin_enqueue_scripts() {
 
-                $parsed_post_types = array();
-
-                foreach ( \DevHub\get_parsed_post_types() as $post_type ) {
-                        $parsed_post_types[] = $post_type;
-                        $parsed_post_types[] = "edit-{$post_type}";
-                }
+                $parsed_post_types_screen_ids = DevHub_Admin::get_parsed_post_types_screen_ids();
 
                 if ( in_array( get_current_screen()->id, array_merge(
-                                $parsed_post_types,
+                                $parsed_post_types_screen_ids,
                                 $this->screen_ids
                 ) ) ) {
-                        wp_enqueue_style( 'wporg-admin', get_template_directory_uri() . '/stylesheets/admin.css', array(), '20160630' );
                         wp_enqueue_script( 'wporg-explanations', get_template_directory_uri() . '/js/explanations.js', array( 'jquery', 'wp-util' ), '20160630', true );
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/parsed-content.php

@@ -164 +164 @@
                 // Only enqueue 'wporg-parsed-content' script and styles on Code Reference post type screens.
                 if ( in_array( get_current_screen()->id, $this->post_types ) ) {
-                        wp_enqueue_style( 'wporg-admin', get_template_directory_uri() . '/stylesheets/admin.css', array(), '20160630' );
                         wp_enqueue_script( 'wporg-parsed-content', get_template_directory_uri() . '/js/parsed-content.js', array( 'jquery', 'utils' ), '20150824', true );