Changeset 2477

Timestamp:

01/29/2010 03:56:45 PM (17 years ago)

Author:

apeatling

Message:

JS fixes for extensibility.

Location:

trunk/bp-themes/bp-default

Files:

• _inc/global.js (modified) (9 diffs)
• functions.php (modified) (1 diff)

trunk/bp-themes/bp-default/_inc/global.js

@@ -18 +18 @@
         /* Members */
         if ( j('div.members').length )
-                bp_filter_request( 'members', j.cookie('bp-members-filter'), j.cookie('bp-members-scope'), 'div.members' );
+                bp_filter_request( 'members', j.cookie('bp-members-filter'), j.cookie('bp-members-scope'), 'div.members', false, 1, j.cookie('bp-members-extras') );
 
         /* Groups */
         if ( j('div.groups').length )
-                bp_filter_request( 'groups', j.cookie('bp-groups-filter'), j.cookie('bp-groups-scope'), 'div.groups' );
+                bp_filter_request( 'groups', j.cookie('bp-groups-filter'), j.cookie('bp-groups-scope'), 'div.groups', false, 1, j.cookie('bp-groups-extras') );
 
         /* Blogs */
         if ( j('div.blogs').length )
-                bp_filter_request( 'blogs', j.cookie('bp-blogs-filter'), j.cookie('bp-blogs-scope'), 'div.blogs' );
+                bp_filter_request( 'blogs', j.cookie('bp-blogs-filter'), j.cookie('bp-blogs-scope'), 'div.blogs', false, 1, j.cookie('bp-blogs-extras') );
 
         /* Forums */
         if ( j('div.forums').length ) {
                 j('div#new-topic-post').hide();
-                bp_filter_request( 'forums', j.cookie('bp-forums-filter'), j.cookie('bp-forums-scope'), 'div.forums' );
+                bp_filter_request( 'forums', j.cookie('bp-forums-filter'), j.cookie('bp-forums-scope'), 'div.forums', false, 1, j.cookie('bp-forums-extras') );
         }
 
@@ -453 +453 @@
 
         j('span.highlight span').click( function() {
-                j('div.help').remove();
-                j(this).parent().after( '<div id="message" class="info help"><p>' + bp_mention_explain + '</p></div>' );
-                j('div.help').hide().slideDown(200);
+                if ( !j('div.help').length ) {
+                        j(this).parent().after( '<div id="message" class="info help"><p>' + bp_terms_mention_explain + '</p></div>' );
+                        j('div.help').hide().slideDown(200);
+                } else {
+                        j('div.help').hide().remove();
+                }
         })
 
@@ -462 +465 @@
         /* The search form on all directory pages */
         j('div.dir-search').click( function(event) {
+                if ( j(this).hasClass('no-ajax') )
+                        return false;
+
                 var target = j(event.target);
 
@@ -468 +474 @@
                         var object = css_id[0];
 
-                        bp_filter_request( object, j.cookie('bp-' + object + '-filter'), j.cookie('bp-' + object + '-scope') , 'div.' + object, target.parent().children('label').children('input').val(), 1 );
+                        bp_filter_request( object, j.cookie('bp-' + object + '-filter'), j.cookie('bp-' + object + '-scope') , 'div.' + object, target.parent().children('label').children('input').val(), 1, j.cookie('bp-' + object + '-extras') );
                 }
 
@@ -500 +506 @@
                         j('li#' + object + '-' + filter).addClass('selected');
 
-                        bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1 );
+                        bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, j.cookie('bp-' + object + '-extras') );
 
                         return false;
@@ -519 +525 @@
                 var search_terms = j("#" + object + "_search").val();
 
-                bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1 );
+                bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, j.cookie('bp-' + object + '-extras') );
 
                 return false;
@@ -548 +554 @@
                                 var page_number = Number( j(target).html() );
 
-                        bp_filter_request( object, j.cookie('bp-' + object + '-filter'), j.cookie('bp-' + object + '-scope'), 'div.' + object, j.cookie('bp-' + object + '-search-terms'), page_number );
+                        bp_filter_request( object, j.cookie('bp-' + object + '-filter'), j.cookie('bp-' + object + '-scope'), 'div.' + object, j.cookie('bp-' + object + '-search-terms'), page_number, j.cookie('bp-' + object + '-extras') );
 
                         return false;
@@ -581 +587 @@
         /* Clicking a forum tag */
         j('div#forum-directory-tags a').click( function() {
-                bp_filter_request( 'forums', 'tags', j.cookie('bp-forums-scope'), 'div.forums', j(this).html(), 1 );
+                bp_filter_request( 'forums', 'tags', j.cookie('bp-forums-scope'), 'div.forums', j(this).html(), 1, j.cookie('bp-forums-extras') );
                 return false;
         });
@@ -995 +1001 @@
         j.cookie( 'bp-' + object + '-page', page, null );
         j.cookie( 'bp-' + object + '-search-terms', search_terms, null );
+        j.cookie( 'bp-' + object + '-extras', extras, null );
 
         /* Set the correct selected nav and filter */

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

@@ -210 +210 @@
         var bp_terms_show_all = '<?php _e( "Show all", "buddypress" ) ?>';
         var bp_terms_comments = '<?php _e( "comments", "buddypress" ) ?>';
-        var bp_mention_explain = '<?php printf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_dtheme_firstname(bp_get_displayed_user_fullname()), bp_dtheme_firstname(bp_get_displayed_user_fullname()) ); ?>';
+        var bp_terms_close = '<?php _e( "Close", "buddypress" ) ?>';
+        var bp_terms_mention_explain = '<?php printf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", "buddypress" ), '@' . bp_get_displayed_user_username(), bp_dtheme_firstname(bp_get_displayed_user_fullname()), bp_dtheme_firstname(bp_get_displayed_user_fullname()) ); ?>';
         </script>
 <?php