Changeset 373 for trunk/bp-messages/bp-messages-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-messages/bp-messages-cssjs.php (modified) (3 diffs)

trunk/bp-messages/bp-messages-cssjs.php

@@ -1 +1 @@
 <?php
 
-function messages_add_js() {
+function messages_add_tinymce() {
         global $bp;
         
         if ( ( $bp['current_component'] == $bp['messages']['slug'] && $bp['current_action'] == 'compose' ) || ( $bp['current_component'] == $bp['messages']['slug'] && $bp['current_action'] == 'view' ) ) {
                 echo '
-                        <script type="text/javascript" src="' . get_option('siteurl') . '/wp-includes/js/tinymce/tiny_mce.js"></script>
+                        <script type="text/javascript" src="' . site_url() . '/wp-includes/js/tinymce/tiny_mce.js"></script>
                                 <script type="text/javascript">
                                         <!--
@@ -19 +19 @@
                                         theme_advanced_resize_horizontal : false,
                                         theme_advanced_buttons1:"bold,italic,strikethrough,|,bullist,numlist,blockquote,|,justifyleft,justifycenter,justifyright,|,link,unlink,image,wp_more,|,fullscreen,wp_adv",theme_advanced_buttons2:"formatselect,underline,justifyfull,forecolor,|,pastetext,pasteword,removeformat,|,media,charmap,|,outdent,indent,|,undo,redo,wp_help",theme_advanced_buttons3:"",
-                                        content_css : "' . get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css",
+                                        content_css : "' . site_url() . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css",
                                         mode : "exact",
                                         elements : "message_content",
@@ -30 +30 @@
         }
         
-        if ( strpos( $_GET['page'], 'messages' ) !== false || $bp['current_component'] == $bp['messages']['slug'] ) {
-                echo '
-                        <script src="' . get_option('siteurl') . '/wp-content/mu-plugins/bp-messages/js/general.js" type="text/javascript"></script>';
-        }
 }
-add_action( 'wp_head', 'messages_add_js' );
-//add_action( 'admin_menu', 'messages_add_js' );
+add_action( 'wp_head', 'messages_add_tinymce' );
+
+function messages_add_js() {
+        global $bp;
+        
+        if ( $bp['current_component'] == $bp['messages']['slug'] )
+                wp_enqueue_script( 'bp-messages-js', site_url() . '/wp-content/mu-plugins/bp-messages/js/general.js' );
+}
+add_action( 'template_redirect', 'messages_add_js' );
 
 ?>