Changeset 3527

Timestamp:

12/11/2010 10:41:14 PM (16 years ago)

Author:

djpaul

Message:

Load javascript in the init action. Fixes #2942

File:

• trunk/bp-themes/bp-default/functions.php (modified) (2 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -81 +81 @@
         //End of changeable header section
 
-        // Load the javascript for the theme
+        // Register buttons for the relevant component templates
+        // Friends button
+        if ( bp_is_active( 'friends' ) )
+                add_action( 'bp_member_header_actions',    'bp_add_friend_button' );
+
+        // Activity button
+        if ( bp_is_active( 'activity' ) )
+                add_action( 'bp_member_header_actions',    'bp_send_public_message_button' );
+
+        // Messages button
+        if ( bp_is_active( 'messages' ) )
+                add_action( 'bp_member_header_actions',    'bp_send_private_message_button' );
+
+        // Group buttons
+        if ( bp_is_active( 'groups' ) ) {
+                add_action( 'bp_group_header_actions',     'bp_group_join_button' );
+                add_action( 'bp_group_header_actions',     'bp_group_new_topic_button' );
+                add_action( 'bp_directory_groups_actions', 'bp_group_join_button' );
+        }
+
+        // Blog button
+        if ( bp_is_active( 'blogs' ) )
+                add_action( 'bp_directory_blogs_actions',  'bp_blogs_visit_blog_button' );
+}
+add_action( 'after_setup_theme', 'bp_dtheme_setup' );
+endif;
+
+/**
+ * Enqueue theme javascript safely after the 'init' action, per WordPress Codex.
+ *
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @see http://codex.wordpress.org/Function_Reference/wp_enqueue_script
+ * @since 1.3
+ */
+function bp_dtheme_enqueue_scripts() {
+        global $bp;
+
         wp_enqueue_script( 'dtheme-ajax-js', get_template_directory_uri() . '/_inc/global.js', array( 'jquery' ) );
 
@@ -99 +135 @@
 
         wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );
-
-        // Register buttons for the relevant component templates
-        // Friends button
-        if ( bp_is_active( 'friends' ) )
-                add_action( 'bp_member_header_actions',    'bp_add_friend_button' );
-
-        // Activity button
-        if ( bp_is_active( 'activity' ) )
-                add_action( 'bp_member_header_actions',    'bp_send_public_message_button' );
-
-        // Messages button
-        if ( bp_is_active( 'messages' ) )
-                add_action( 'bp_member_header_actions',    'bp_send_private_message_button' );
-
-        // Group buttons
-        if ( bp_is_active( 'groups' ) ) {
-                add_action( 'bp_group_header_actions',     'bp_group_join_button' );
-                add_action( 'bp_group_header_actions',     'bp_group_new_topic_button' );
-                add_action( 'bp_directory_groups_actions', 'bp_group_join_button' );
-        }
-
-        // Blog button
-        if ( bp_is_active( 'blogs' ) )
-                add_action( 'bp_directory_blogs_actions',  'bp_blogs_visit_blog_button' );
-}
-add_action( 'after_setup_theme', 'bp_dtheme_setup' );
-endif;
+}
+add_action( 'wp_enqueue_scripts', 'bp_dtheme_enqueue_scripts' );
 
 if ( !function_exists( 'bp_dtheme_admin_header_style' ) ) :