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

Timestamp:

10/07/2008 07:16:51 AM (18 years ago)

Author:

apeatling

Message:

Bug fixes:

• Fixed group avatar upload issues
• Fixed validation on group name/desc/news
• Fixed support for ​https://
• Base support for upcoming home theme and widgets
• Re-factored JS and CSS inclusion with wp_enqueue_script/styles

File:

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

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

@@ -10 +10 @@
  */
 function bp_core_add_js() {
-        echo '<script type="text/javascript">var ajaxurl = "' . get_option('siteurl') . '/wp-admin/admin-ajax.php";</script>';
-        echo "<script type='text/javascript' src='" . get_option('siteurl') . "/wp-includes/js/jquery/jquery.js?ver=1.2.3'></script>";
-        echo "
-                <script type='text/javascript' src='" . get_option('siteurl') . "/wp-content/mu-plugins/bp-core/js/jquery/jquery.livequery.pack.js'></script>";
+        wp_enqueue_script( 'jquery' );
+        wp_enqueue_script( 'jquery-livequery-pack', site_url() . "/wp-content/mu-plugins/bp-core/js/jquery/jquery.livequery.pack.js", 'jquery' );
+        wp_enqueue_script( 'bp-general-js', site_url() . '/wp-content/mu-plugins/bp-core/js/general.js' );
+}
+add_action( 'template_redirect', 'bp_core_add_js' );
 
-        echo '<script src="' . get_option('siteurl') . '/wp-content/mu-plugins/bp-core/js/general.js" type="text/javascript"></script>';
+/**
+ * bp_core_add_ajax_js()
+ *
+ * Add the reference to ajaxurl used by all ajax functionality in BuddyPress.
+ * 
+ * @package BuddyPress Core
+ * @uses get_option() Selects a site setting from the DB.
+ */
+function bp_core_add_ajax_js() {
+        echo '<script type="text/javascript">var ajaxurl = "' . site_url() . '/wp-admin/admin-ajax.php";</script>';
 }
-add_action( 'wp_head', 'bp_core_add_js' );
+add_action( 'wp_head', 'bp_core_add_ajax_js' );
 
 /**
@@ -28 +38 @@
  */
 function bp_core_add_css() {
-        if ( bp_core_user_has_home() && is_user_logged_in() )
-                echo '<link rel="stylesheet" href="' . get_option('siteurl') . '/wp-content/mu-plugins/bp-core/css/admin-bar.css" type="text/css" />';
+        if ( is_user_logged_in() ) {
+                wp_enqueue_style( 'bp-admin-bar', site_url() . '/wp-content/mu-plugins/bp-core/css/admin-bar.css' );
+                wp_print_styles();
+        }
 }
 add_action( 'wp_head', 'bp_core_add_css' );
 
+
+/**
+ * bp_core_add_admin_js()
+ *
+ * Add the JS needed for all components in the admin area.
+ * 
+ * @package BuddyPress Core
+ * @uses get_option() Selects a site setting from the DB.
+ */
 function bp_core_add_admin_js() {
         if ( strpos( $_GET['page'], 'bp-core' ) !== false ) {
-                wp_enqueue_script( 'bp-account-admin-js', get_option('siteurl') . '/wp-content/mu-plugins/bp-core/js/account-admin.js' );
+                wp_enqueue_script( 'bp-account-admin-js', site_url() . '/wp-content/mu-plugins/bp-core/js/account-admin.js' );
         }
-}
-add_action( 'admin_menu', 'bp_core_add_admin_js' );
-
-function bp_core_enqueue_admin_js() {
+        
         if ( strpos( $_GET['page'], 'bp-core/admin-mods' ) !== false ) {
                 wp_enqueue_script('password-strength-meter');
@@ -46 +64 @@
 
         if ( strpos( $_GET['page'], 'bp-core/homebase-creation' ) !== false ) {
+                wp_enqueue_script('prototype');
+                wp_enqueue_script('scriptaculous-root');
+                wp_enqueue_script('cropper');
                 add_action( 'admin_head', 'bp_core_add_cropper_js' );
         }
 }
-add_action( 'admin_menu', 'bp_core_enqueue_admin_js' );
+add_action( 'admin_menu', 'bp_core_add_admin_js' );
 
-function bp_core_enqueue_admin_css() {
+
+/**
+ * bp_core_add_admin_css()
+ *
+ * Add the CSS needed for all components in the admin area.
+ * 
+ * @package BuddyPress Core
+ * @uses get_option() Selects a site setting from the DB.
+ */
+function bp_core_add_admin_css() {
         if ( strpos( $_GET['page'], 'bp-core/homebase-creation' ) !== false ) {
-                wp_enqueue_style( 'bp-core-home-base-css', get_option('siteurl') . '/wp-content/mu-plugins/bp-core/css/home-base.css' );
+                wp_enqueue_style( 'bp-core-home-base-css', site_url() . '/wp-content/mu-plugins/bp-core/css/home-base.css' );
         }
 }
-add_action( 'admin_menu', 'bp_core_enqueue_admin_css' );
+add_action( 'admin_menu', 'bp_core_add_admin_css' );
+
+
+/**
+ * bp_core_add_cropper_js()
+ *
+ * Adds the JS needed for general avatar cropping.
+ * 
+ * @package BuddyPress Core
+ */
+function bp_core_add_cropper_js() { 
+?>
+        <script type="text/javascript">
+                function cropAndContinue() {
+                        jQuery('#avatar_v1').slideUp();
+                        jQuery('#avatar_v2').slideDown('normal', function(){
+                                v2Cropper();
+                        });
+                }
+
+                function v1Cropper() {
+                        v1Crop = new Cropper.ImgWithPreview( 
+                                'crop-v1-img',
+                                { 
+                                        ratioDim: { x: <?php echo round(CORE_AVATAR_V1_W / CORE_AVATAR_V1_H, 5); ?>, y: 1 },
+                                        minWidth:   <?php echo CORE_AVATAR_V1_W; ?>,
+                                        minHeight:  <?php echo CORE_AVATAR_V1_H; ?>,
+                                        prevWidth:  <?php echo CORE_AVATAR_V1_W; ?>,
+                                        prevHeight: <?php echo CORE_AVATAR_V1_H; ?>,
+                                        onEndCrop: onEndCropv1,
+                                        previewWrap: 'crop-preview-v1'
+                                }
+                        );
+                }
+
+                function onEndCropv1(coords, dimensions) {
+                        jQuery('#v1_x1').val(coords.x1);
+                        jQuery('#v1_y1').val(coords.y1);
+                        jQuery('#v1_x2').val(coords.x2);
+                        jQuery('#v1_y2').val(coords.y2);
+                        jQuery('#v1_w').val(dimensions.width);
+                        jQuery('#v1_h').val(dimensions.height);
+                }
+
+                <?php if (CORE_AVATAR_V2_W !== false && CORE_AVATAR_V2_H !== false) { ?>
+                function v2Cropper() {
+                        v1Crop = new Cropper.ImgWithPreview( 
+                                'crop-v2-img',
+                                { 
+                                        ratioDim: { x: <?php echo round(CORE_AVATAR_V2_W / CORE_AVATAR_V2_H, 5); ?>, y: 1 },
+                                        minWidth:   <?php echo CORE_AVATAR_V2_W; ?>,
+                                        minHeight:  <?php echo CORE_AVATAR_V2_H; ?>,
+                                        prevWidth:  <?php echo CORE_AVATAR_V2_W; ?>,
+                                        prevHeight: <?php echo CORE_AVATAR_V2_H; ?>,
+                                        onEndCrop: onEndCropv2,
+                                        previewWrap: 'crop-preview-v2'
+                                }
+                        );
+                }
+                <?php } ?>
+
+                function onEndCropv2(coords, dimensions) {
+                        jQuery('#v2_x1').val(coords.x1);
+                        jQuery('#v2_y1').val(coords.y1);
+                        jQuery('#v2_x2').val(coords.x2);
+                        jQuery('#v2_y2').val(coords.y2);
+                        jQuery('#v2_w').val(dimensions.width);
+                        jQuery('#v2_h').val(dimensions.height);
+                }
+        </script>
+<?php
+}