Changeset 2077 for trunk/bp-core/bp-core-cssjs.php

Timestamp:

11/02/2009 07:54:21 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-core/bp-core-cssjs.php (modified) (11 diffs)

trunk/bp-core/bp-core-cssjs.php

@@ -5 +5 @@
  *
  * Add the CSS needed for the admin bar on blogs (other than the root) and in the admin area.
- * 
+ *
  * @package BuddyPress Core
  * @uses get_option() Selects a site setting from the DB.
@@ -11 +11 @@
 function bp_core_add_admin_bar_css() {
         global $current_blog;
-        
+
         if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
                 return false;
@@ -32 +32 @@
  *
  * Add the minor JS needed for the admin bar.
- * 
+ *
  * @package BuddyPress Core
  * @uses get_option() Selects a site setting from the DB.
@@ -46 +46 @@
  *
  * Add a hover-able icon to the "BuddyPress" wp-admin area menu.
- * 
+ *
  * @package BuddyPress Core
  */
@@ -60 +60 @@
 }
 add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
-        
+
 function bp_core_confirmation_js() {
 ?>
@@ -72 +72 @@
  *
  * Makes sure the jQuery jCrop library is loaded.
- * 
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_jquery_cropper() {
         wp_enqueue_script( 'jcrop', array( 'jquery' ) );
-        add_action( 'wp_head', 'bp_core_add_cropper_inline_js' ); 
-        add_action( 'wp_head', 'bp_core_add_cropper_inline_css' ); 
+        add_action( 'wp_head', 'bp_core_add_cropper_inline_js' );
+        add_action( 'wp_head', 'bp_core_add_cropper_inline_css' );
 }
 
@@ -85 +85 @@
  *
  * Adds the inline JS needed for the cropper to work on a per-page basis.
- * 
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_cropper_inline_js() {
         global $bp;
-        
+
         $image = apply_filters( 'bp_inline_cropper_image', getimagesize( $bp->avatar_admin->image->dir ) );
 
-        $aspect_ratio = 1; 
-        
+        $aspect_ratio = 1;
+
         /* Calculate Aspect Ratio */
-        if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) ) 
+        if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
              $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );
 ?>
@@ -131 +131 @@
                                 });
                         }
-                }       
+                }
         </script>
 <?php
@@ -140 +140 @@
  *
  * Adds the inline CSS needed for the cropper to work on a per-page basis.
- * 
+ *
  * @package BuddyPress Core
  */
@@ -166 +166 @@
  *
  * Adds AJAX target URL so themes can access the WordPress AJAX functionality.
- * 
+ *
  * @package BuddyPress Core
  */
 function bp_core_add_ajax_url_js() {
         global $bp;
-        
-        echo 
+
+        echo
 '<script type="text/javascript">var ajaxurl = "' . $bp->root_domain . str_replace( 'index.php', 'wp-load.php', $_SERVER['SCRIPT_NAME'] ) . '";</script>
 ';
@@ -182 +182 @@
  *
  * Overrides the theme's admin bar CSS to hide the adminbar if disabled.
- * 
+ *
  * @package BuddyPress Core
  */
-function bp_core_override_adminbar_css() { 
+function bp_core_override_adminbar_css() {
         if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
         ?>