Changeset 8773

Timestamp:

08/09/2014 04:30:44 PM (12 years ago)

Author:

djpaul

Message:

Activity: Combine the @mentions enqueuing function.

Previously, there was a function for loading in both admin and frontend contexts.
I've combined the loading into one function which removes a bunch of duplicated logic, probably left over from an early approach at building the suggestions feature.

See #3278

File:

• trunk/src/bp-activity/bp-activity-cssjs.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-cssjs.php

@@ -21 +21 @@
         }
 
+        // Special handling for New/Edit screens in wp-admin
+        if ( is_admin() ) {
+                if (
+                        ! get_current_screen() ||
+                        ! in_array( get_current_screen()->base, array( 'page', 'post' ) ) ||
+                        ! post_type_supports( get_current_screen()->post_type, 'editor' ) ) {
+                        return;
+                }
+        }
+
+
         $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
@@ -35 +46 @@
 }
 add_action( 'bp_enqueue_scripts', 'bp_activity_mentions_script' );
-
-/**
- * Enqueue @mentions JS in wp-admin.
- *
- * @since BuddyPress (2.1)
- */
-function bp_activity_mentions_dashboard_script() {
-        if ( ! bp_activity_maybe_load_mentions_scripts() ) {
-                return;
-        }
-
-        // Special handling for New/Edit screens in wp-admin
-        if (
-                ! get_current_screen() ||
-                ! in_array( get_current_screen()->base, array( 'page', 'post' ) ) || 
-                ! post_type_supports( get_current_screen()->post_type, 'editor' ) ) {
-                return;
-        }
-
-        $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
-        wp_enqueue_script( 'bp-mentions', buddypress()->plugin_url . "bp-activity/js/mentions{$min}.js", array( 'jquery', 'jquery-atwho' ), bp_get_version(), true );
-        wp_enqueue_style( 'bp-mentions-css', buddypress()->plugin_url . "bp-activity/css/mentions{$min}.css", array(), bp_get_version() );
-
-        wp_style_add_data( 'bp-mentions-css', 'rtl', true );
-        if ( $min ) {
-                wp_style_add_data( 'bp-mentions-css', 'suffix', $min );
-        }
-
-        // Print a list of the current user's friends to the page for quicker @mentions lookups.
-        do_action( 'bp_activity_mentions_prime_results' );
-}
-add_action( 'bp_admin_enqueue_scripts', 'bp_activity_mentions_dashboard_script' );
+add_action( 'bp_admin_enqueue_scripts', 'bp_activity_mentions_script' );