Changeset 2423

Timestamp:

01/24/2010 02:38:08 PM (16 years ago)

Author:

apeatling

Message:

Ajax loader and activity stream ajax minor fixes.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (5 diffs)
• bp-themes/bp-default/_inc/css/default.css (modified) (2 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (7 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -485 +485 @@
                         $link = $bp->displayed_user->domain . $user_nav_item['link'];
 
-                echo apply_filters( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], '<li id="' . $user_nav_item['css_id'] . '-personal" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item );
+                echo apply_filters( 'bp_get_displayed_user_nav_' . $user_nav_item['css_id'], '<li id="' . $user_nav_item['css_id'] . '-personal-li" ' . $selected . '><a id="user-' . $user_nav_item['css_id'] . '" href="' . $link . '">' . $user_nav_item['name'] . '</a></li>', &$user_nav_item );
         }
 }

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -166 +166 @@
 add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
 
-function bp_dtheme_activity_loop( $type = 'all', $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
+function bp_dtheme_activity_loop( $scope = 'all', $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
         global $bp;
 
@@ -174 +174 @@
                         $query_string = 'user_id=' . $bp->displayed_user->id;
                 } else {
-                        /* Make sure a type is set. */
-                        if ( empty($type) )
+                        /* Make sure a scope is set. */
+                        if ( empty($scope) )
                                 $type = 'all';
 
                         $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
 
-                        switch ( $type ) {
+                        switch ( $scope ) {
                                 case 'friends':
                                         $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
@@ -229 +229 @@
 
                 /* Add the comments param */
-                if ( $bp->displayed_user->id || 'atme' == $type )
+                if ( $bp->displayed_user->id || 'atme' == $scope )
                         $query_string .= '&display_comments=stream';
                 else
@@ -243 +243 @@
         $query_string = implode( '&', $new_args ) . '&page=' . $page;
 
-        $bp->ajax_querystring = apply_filters( 'bp_dtheme_ajax_querystring_activity_filter', $query_string, $type );
+        $bp->ajax_querystring = apply_filters( 'bp_dtheme_ajax_querystring_activity_filter', $query_string, $scope );
         $result['query_string'] = $bp->ajax_querystring;
         $result['feed_url'] = apply_filters( 'bp_dtheme_ajax_feed_url', $feed_url );
@@ -257 +257 @@
 
 function bp_dtheme_ajax_widget_filter() {
-        bp_dtheme_activity_loop( $_POST['type'], $_POST['filter'] );
+        bp_dtheme_activity_loop( $_POST['scope'], $_POST['filter'] );
 }
 add_action( 'wp_ajax_activity_widget_filter', 'bp_dtheme_ajax_widget_filter' );

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -604 +604 @@
 }
 
-/* > AJAX Loaders
--------------------------------------------------------------- */
-
-.ajax-loader {
-        background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
-        padding: 8px;
-        display: none;
-}
-
-a.loading {
-        background-image: url( ../images/ajax-loader.gif );
-        background-position: 95% 50%;
-        padding-right: 25px;
-        background-repeat: no-repeat;
-}
-
 /* > Buttons
 -------------------------------------------------------------- */
@@ -666 +650 @@
         }
 
+/* > AJAX Loaders
+-------------------------------------------------------------- */
+
+.ajax-loader {
+        background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
+        padding: 8px;
+        display: none;
+}
+
+a.loading {
+        background-image: url( ../images/ajax-loader.gif ) !important;
+        background-position: 95% 50% !important;
+        background-repeat: no-repeat !important;
+        padding-right: 25px !important;
+}
+
 /* > Input Forms
 -------------------------------------------------------------- */

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

@@ -8 +8 @@
         /* Activity */
         if ( j('div.activity').length && !j('div.activity').hasClass('no-ajax') )
-                bp_activity_request( j.cookie('bp-activity-type'), j.cookie('bp-activity-filter') );
+                bp_activity_request( j.cookie('bp-activity-scope'), j.cookie('bp-activity-filter') );
 
         /* Members */
@@ -104 +104 @@
 
                 /* Activity Stream Tabs */
-                var type = target.attr('id').substr( 9, target.attr('id').length );
+                var scope = target.attr('id').substr( 9, target.attr('id').length );
                 var filter = j("#activity-filter-select select").val();
 
-                if ( type == 'atme' )
+                if ( scope == 'atme' )
                         j( 'li#' + target.attr('id') + ' a strong' ).remove();
 
-                bp_activity_request(type, filter, target);
+                bp_activity_request(scope, filter, target);
 
                 return false;
@@ -120 +120 @@
 
                 if ( !selected_tab.length )
-                        var type = 'all';
+                        var scope = 'all';
                 else
-                        var type = selected_tab.attr('id').substr( 9, selected_tab.attr('id').length );
+                        var scope = selected_tab.attr('id').substr( 9, selected_tab.attr('id').length );
 
                 var filter = j(this).val();
 
-                bp_activity_request(type, filter);
+                bp_activity_request(scope, filter);
 
                 return false;
@@ -245 +245 @@
 
         /* Activity Loop Requesting */
-        function bp_activity_request(type, filter) {
-                if ( null == type )
-                        var type = 'all';
+        function bp_activity_request(scope, filter) {
+                if ( null == scope )
+                        var scope = 'all';
 
                 if ( null == filter )
@@ -253 +253 @@
 
                 /* Save the type and filter to a session cookie */
-                j.cookie( 'bp-activity-type', type, null );
+                j.cookie( 'bp-activity-scope', scope, null );
                 j.cookie( 'bp-activity-filter', filter, null );
                 j.cookie( 'bp-activity-oldestpage', 1 );
@@ -261 +261 @@
                         j(this).removeClass('selected');
                 });
-                j('li#activity-' + type + ', div.item-list-tabs li.current').addClass('selected');
+                j('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
                 j('div.item-list-tabs li.selected').addClass('loading');
                 j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
@@ -272 +272 @@
                         'cookie': encodeURIComponent(document.cookie),
                         '_wpnonce_activity_filter': j("input#_wpnonce_activity_filter").val(),
-                        'type': type,
+                        'scope': scope,
                         'filter': filter
                 },