Changeset 3389 for branches/plugin/bbp-themes/bbp-twentyten/functions.php

Timestamp:

08/07/2011 05:15:27 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Move bbp-twentyten JS and ajax into proper hook. Make topic.js aware that favorites can be disabled.

File:

• branches/plugin/bbp-themes/bbp-twentyten/functions.php (modified) (5 diffs)

branches/plugin/bbp-themes/bbp-twentyten/functions.php

@@ -35 +35 @@
 function bbp_twentyten_enqueue_styles () {
 
+    $version = 20110807;
+
     // Right to left
     if ( is_rtl() ) {
 
         // TwentyTen
-        wp_enqueue_style( 'twentyten',     get_template_directory_uri() . '/style.css', '',          20100503, 'screen' );
-        wp_enqueue_style( 'twentyten-rtl', get_template_directory_uri() . '/rtl.css',   'twentyten', 20100503, 'screen' );
+        wp_enqueue_style( 'twentyten',     get_template_directory_uri() . '/style.css', '',          $version, 'screen' );
+        wp_enqueue_style( 'twentyten-rtl', get_template_directory_uri() . '/rtl.css',   'twentyten', $version, 'screen' );
 
         // bbPress specific
-        wp_enqueue_style( 'bbp-twentyten-bbpress', get_stylesheet_directory_uri() . '/css/bbpress-rtl.css', 'twentyten-rtl', 20100503, 'screen' );
+        wp_enqueue_style( 'bbp-twentyten-bbpress', get_stylesheet_directory_uri() . '/css/bbpress-rtl.css', 'twentyten-rtl', $version, 'screen' );
 
     // Left to right
@@ -49 +51 @@
 
         // TwentyTen
-        wp_enqueue_style( 'twentyten', get_template_directory_uri() . '/style.css', '', 20100503, 'screen' );
+        wp_enqueue_style( 'twentyten', get_template_directory_uri() . '/style.css', '', $version, 'screen' );
 
         // bbPress specific
-        wp_enqueue_style( 'bbp-twentyten-bbpress', get_stylesheet_directory_uri() . '/css/bbpress.css', 'twentyten', 20100503, 'screen' );
+        wp_enqueue_style( 'bbp-twentyten-bbpress', get_stylesheet_directory_uri() . '/css/bbpress.css', 'twentyten', $version, 'screen' );
     }
 }
@@ -70 +72 @@
  */
 function bbp_twentyten_enqueue_scripts () {
+
+    $version = 20110807;
+
     if ( bbp_is_single_topic() )
-        wp_enqueue_script( 'bbp_topic', get_stylesheet_directory_uri() . '/js/topic.js', array( 'wp-lists' ), '20101202' );
+        wp_enqueue_script( 'bbp_topic', get_stylesheet_directory_uri() . '/js/topic.js', array( 'wp-lists' ), $version );
 
     if ( bbp_is_single_user_edit() )
         wp_enqueue_script( 'user-profile' );
 }
-add_action( 'bbp_setup_theme_compat', 'bbp_twentyten_enqueue_scripts' );
+add_action( 'bbp_enqueue_scripts', 'bbp_twentyten_enqueue_scripts' );
 endif;
 
@@ -139 +144 @@
         'currentUserId' => $user_id,
         'topicId'       => bbp_get_topic_id(),
-        'favoritesLink' => bbp_get_favorites_permalink( $user_id ),
-        'isFav'         => (int) bbp_is_user_favorite( $user_id ),
-        'favLinkYes'    => __( 'favorites',                                         'bbpress' ),
-        'favLinkNo'     => __( '?',                                                 'bbpress' ),
-        'favYes'        => __( 'This topic is one of your %favLinkYes% [%favDel%]', 'bbpress' ),
-        'favNo'         => __( '%favAdd% (%favLinkNo%)',                            'bbpress' ),
-        'favDel'        => __( '×',                                           'bbpress' ),
-        'favAdd'        => __( 'Add this topic to your favorites',                  'bbpress' )
     );
 
+    // Favorites
+    if ( bbp_is_favorites_active() ) {
+        $localizations['favoritesActive'] = 1;
+        $localizations['favoritesLink']   = bbp_get_favorites_permalink( $user_id );
+        $localizations['isFav']           = (int) bbp_is_user_favorite( $user_id );
+        $localizations['favLinkYes']      = __( 'favorites',                                         'bbpress' );
+        $localizations['favLinkNo']       = __( '?',                                                 'bbpress' );
+        $localizations['favYes']          = __( 'This topic is one of your %favLinkYes% [%favDel%]', 'bbpress' );
+        $localizations['favNo']           = __( '%favAdd% (%favLinkNo%)',                            'bbpress' );
+        $localizations['favDel']          = __( '×',                                           'bbpress' );
+        $localizations['favAdd']          = __( 'Add this topic to your favorites',                  'bbpress' );
+    } else {
+        $localizations['favoritesActive'] = 0;
+    }
+
+    // Subscriptions
     if ( bbp_is_subscriptions_active() ) {
         $localizations['subsActive']   = 1;
@@ -161 +174 @@
     wp_localize_script( 'bbp_topic', 'bbpTopicJS', $localizations );
 }
-add_filter( 'bbp_setup_theme_compat', 'bbp_twentyten_topic_script_localization' );
+add_filter( 'bbp_enqueue_scripts', 'bbp_twentyten_topic_script_localization' );
 endif;