Changeset 2277

Timestamp:

01/12/2016 04:36:29 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Budgets: Move payment-request script enqueing into module.

Since it's not shared across modules, it should live in the Payment Requests module.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes

Files:

• payment-request.php (modified) (2 diffs)
• wordcamp-budgets.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php

@@ -12 +12 @@
         add_action( 'init',                   array( __CLASS__, 'register_post_statuses' ) );
         add_action( 'add_meta_boxes',         array( $this, 'init_meta_boxes' ) );
+        add_action( 'admin_enqueue_scripts',  array( $this, 'enqueue_assets' ), 11 );
 
         // Miscellaneous
@@ -169 +170 @@
         add_meta_box( 'wcp_log', __( 'Log', 'wordcamporg' ), array( $this, 'render_log_metabox' ),
             self::POST_TYPE, 'normal', 'high' );
+    }
+
+    /**
+     * Enqueue scripts and stylesheets
+     */
+    public function enqueue_assets() {
+        global $post;
+
+        // Register our assets
+        wp_register_script(
+            'payment-requests',
+            plugins_url( 'javascript/payment-requests.js', __DIR__ ),
+            array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
+            WordCamp_Budgets::VERSION,
+            true
+        );
+
+        wp_register_script(
+            'wcp-attached-files',
+            plugins_url( 'javascript/attached-files.js', __DIR__ ),
+            array( 'payment-requests', 'backbone', 'wp-util' ),
+            WordCamp_Budgets::VERSION,
+            true
+        );
+
+        // Enqueue our assets if they're needed on the current screen
+        $current_screen = get_current_screen();
+
+        if ( 'wcp_payment_request' !== $current_screen->id ) {
+            return;
+        }
+
+        wp_enqueue_script( 'payment-requests' );
+        wp_enqueue_style(  'wordcamp-budgets' );
+
+        if ( isset( $post->ID ) ) {
+            wp_enqueue_media( array( 'post' => $post->ID ) );
+            wp_enqueue_script( 'wcp-attached-files' );
+        }
+
+        wp_localize_script(
+            'payment-requests',
+            'wcpLocalizedStrings',      // todo merge into paymentRequests var
+            array(
+                'uploadModalTitle'  => __( 'Attach Supporting Documentation', 'wordcamporg' ),
+                'uploadModalButton' => __( 'Attach Files', 'wordcamporg' ),
+            )
+        );
     }
 

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php

@@ -11 +11 @@
      */
     public function __construct() {
-        add_action( 'admin_enqueue_scripts',  array( $this, 'enqueue_assets' ), 11 );
+        add_action( 'admin_enqueue_scripts',  array( $this, 'enqueue_common_assets' ), 11 );
     }
 
     /**
-     * Enqueue scripts and stylesheets
+     * Enqueue scripts and stylesheets common to all modules
      */
-    public function enqueue_assets( $hook ) {
-        global $post;
-
+    public function enqueue_common_assets() {
         // todo setup grunt to concat/minify js and css?
-
-        // Register our assets
-        wp_register_script(
-            'payment-requests',
-            plugins_url( 'javascript/payment-requests.js', __DIR__ ),
-            array( 'jquery', 'jquery-ui-datepicker', 'media-upload', 'media-views' ),
-            self::VERSION,
-            true
-        );
-
-        wp_register_script(
-            'wcp-attached-files',
-            plugins_url( 'javascript/attached-files.js', __DIR__ ),
-            array( 'payment-requests', 'backbone', 'wp-util' ),
-            self::VERSION,
-            true
-        );
 
         // Let's still include our .css file even if these are unavailable.
@@ -51 +32 @@
             self::VERSION
         );
-
-        // Enqueue our assets if they're needed on the current screen
-        $current_screen = get_current_screen();
-
-        if ( in_array( $current_screen->id, array( 'edit-wcp_payment_request', 'wcp_payment_request' ) ) ) {
-            wp_enqueue_script( 'payment-requests' );
-            wp_enqueue_style( 'wordcamp-budgets' );
-
-            if ( in_array( $current_screen->id, array( 'wcp_payment_request' ) ) && isset( $post->ID ) ) {
-                wp_enqueue_media( array( 'post' => $post->ID ) );
-                wp_enqueue_script( 'wcp-attached-files' );
-            }
-
-            wp_localize_script(
-                'payment-requests',
-                'wcpLocalizedStrings',      // todo merge into wordcampBudgets var
-                array(
-                    'uploadModalTitle'  => __( 'Attach Supporting Documentation', 'wordcamporg' ),
-                    'uploadModalButton' => __( 'Attach Files', 'wordcamporg' ),
-                )
-            );
-        }
     }