<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4804] trunk: Removes ajax-loader spans from markup and ajax-loader triggers from bp-default JS.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/4804">4804</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-22 17:02:46 +0000 (Fri, 22 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removes ajax-loader spans from markup and ajax-loader triggers from bp-default JS. Replaces with .loader class when appropriate. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3349">#3349</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpblogsbpblogstemplatephp">trunk/bp-blogs/bp-blogs-template.php</a></li>
<li><a href="#trunkbpcorebpcorewidgetsphp">trunk/bp-core/bp-core-widgets.php</a></li>
<li><a href="#trunkbpcorejswidgetmembersdevjs">trunk/bp-core/js/widget-members.dev.js</a></li>
<li><a href="#trunkbpcorejswidgetmembersjs">trunk/bp-core/js/widget-members.js</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsfunctionsphp">trunk/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupswidgetsphp">trunk/bp-groups/bp-groups-widgets.php</a></li>
<li><a href="#trunkbpgroupsjswidgetgroupsdevjs">trunk/bp-groups/js/widget-groups.dev.js</a></li>
<li><a href="#trunkbpgroupsjswidgetgroupsjs">trunk/bp-groups/js/widget-groups.js</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkbpmessagesbpmessagestemplatephp">trunk/bp-messages/bp-messages-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultrtlcss">trunk/bp-themes/bp-default/_inc/css/default-rtl.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityactivityloopphp">trunk/bp-themes/bp-default/activity/activity-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-activity/bp-activity-filters.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> $id = !empty( $activities_template->activity->current_comment->id ) ? 'acomment-read-more-' . $activities_template->activity->current_comment->id : 'activity-read-more-' . bp_get_activity_id();
</span><span class="cx">
</span><span class="cx"> if ( strlen( $excerpt ) > $excerpt_length )
</span><del>- $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a>&nbsp;<span class="ajax-loader"></span></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '&hellip;' ), $id, bp_get_activity_thread_permalink(), $append_text );
</del><ins>+ $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '&hellip;' ), $id, bp_get_activity_thread_permalink(), $append_text );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_activity_truncate_entry', $excerpt, $text, $append_text );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-activity/bp-activity-template.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> $to_num = bp_core_number_format( ( $start_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $start_num + ( $activities_template->pag_num - 1 ) );
</span><span class="cx"> $total = bp_core_number_format( $activities_template->total_activity_count );
</span><span class="cx">
</span><del>- return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' &nbsp; <span class="ajax-loader"></span>';
</del><ins>+ return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_pagination_links() {
</span></span></pre></div>
<a id="trunkbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-template.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-template.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-blogs/bp-blogs-template.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -253,8 +253,7 @@
</span><span class="cx"> $to_num = bp_core_number_format( ( $start_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $start_num + ( $blogs_template->pag_num - 1 ) );
</span><span class="cx"> $total = bp_core_number_format( $blogs_template->total_blog_count );
</span><span class="cx">
</span><del>- echo sprintf( __( 'Viewing site %1$s to %2$s (of %3$s sites)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
- <span class="ajax-loader"></span><?php
</del><ins>+ echo sprintf( __( 'Viewing site %1$s to %2$s (of %3$s sites)', 'buddypress' ), $from_num, $to_num, $total );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blogs_pagination_links() {
</span></span></pre></div>
<a id="trunkbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-widgets.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-widgets.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-core/bp-core-widgets.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -51,8 +51,6 @@
</span><span class="cx"> | <a href="<?php echo site_url( bp_get_members_root_slug() ); ?>" id="popular-members" <?php if ( $instance['member_default'] == 'popular' ) : ?>class="selected"<?php endif; ?>><?php _e( 'Popular', 'buddypress' ) ?></a>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><del>-
- <span class="ajax-loader" id="ajax-loader-members"></span>
</del><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <ul id="members-list" class="item-list">
</span></span></pre></div>
<a id="trunkbpcorejswidgetmembersdevjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/js/widget-members.dev.js (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/js/widget-members.dev.js 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-core/js/widget-members.dev.js 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> jQuery(document).ready( function() {
</span><span class="cx"> jQuery(".widget div#members-list-options a").live('click',
</span><span class="cx"> function() {
</span><del>- jQuery('#ajax-loader-members').toggle();
</del><ins>+ var link = this;
+ jQuery(link).addClass('loading');
</ins><span class="cx">
</span><span class="cx"> jQuery(".widget div#members-list-options a").removeClass("selected");
</span><span class="cx"> jQuery(this).addClass('selected');
</span><span class="lines">@@ -15,7 +16,7 @@
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><span class="cx"> {
</span><del>- jQuery('#ajax-loader-members').toggle();
</del><ins>+ jQuery(link).removeClass('loading');
</ins><span class="cx"> member_wiget_response(response);
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorejswidgetmembersjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/js/widget-members.js (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/js/widget-members.js 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-core/js/widget-members.js 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -1 +1 @@
</span><del>-jQuery(document).ready(function(){jQuery(".widget div#members-list-options a").live("click",function(){jQuery("#ajax-loader-members").toggle();jQuery(".widget div#members-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_members",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-members").val(),"max-members":jQuery("input#members_widget_max").val(),filter:jQuery(this).attr("id")},function(a){jQuery("#ajax-loader-members").toggle();member_wiget_response(a)});return false})});function member_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#members-list").fadeOut(200,function(){jQuery(".widget ul#members-list").html(a[1]);jQuery(".widget ul#members-list").fadeIn(20
0)})}else{jQuery(".widget ul#members-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#members-list").html(b);jQuery(".widget ul#members-list").fadeIn(200)})}};
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(document).ready(function(){jQuery(".widget div#members-list-options a").live("click",function(){var a=this;jQuery(a).addClass("loading");jQuery(".widget div#members-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_members",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-members").val(),"max-members":jQuery("input#members_widget_max").val(),filter:jQuery(this).attr("id")},function(b){jQuery(a).removeClass("loading");member_wiget_response(b)});return false})});function member_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#members-list").fadeOut(200,function(){jQuery(".widget ul#members-list").html(a[1]);jQuery(".widget ul#members-list").fadeIn(200)})}e
lse{jQuery(".widget ul#members-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#members-list").html(b);jQuery(".widget ul#members-list").fadeIn(200)})}};
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-forums/bp-forums-template.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
</span><span class="cx"> $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (of %s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) . '<span class="ajax-loader"></span>' );
</del><ins>+ return apply_filters( 'bp_get_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (of %s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_edit_topic() {
</span><span class="lines">@@ -1227,9 +1227,6 @@
</span><span class="cx"> $total = bp_core_number_format( $topic_template->total_post_count );
</span><span class="cx">
</span><span class="cx"> echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %1$s to %2$s (%3$s total posts)', 'buddypress' ), $from_num, $to_num, $total ) );
</span><del>-?>
- <span class="ajax-loader"></span>
-<?php
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_the_topic_is_last_page() {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-functions.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-functions.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-groups/bp-groups-functions.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -123,7 +123,6 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( $notify_members ) {
</span><del>- require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
</del><span class="cx"> groups_notification_group_updated( $group->id );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -520,10 +519,6 @@
</span><span class="cx"> 'item_id' => $group_id
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Require the notifications code so email notifications can be set on
- // the 'bp_activity_posted_update' action.
- require( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
-
</del><span class="cx"> groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() );
</span><span class="cx"> do_action( 'bp_groups_posted_update', $content, $user_id, $group_id, $activity_id );
</span><span class="cx">
</span><span class="lines">@@ -773,8 +768,6 @@
</span><span class="cx"> if ( $requesting_user->save() ) {
</span><span class="cx"> $admins = groups_get_group_admins( $group_id );
</span><span class="cx">
</span><del>- require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
-
</del><span class="cx"> // Saved okay, now send the email notification
</span><span class="cx"> for ( $i = 0, $count = count( $admins ); $i < $count; ++$i )
</span><span class="cx"> groups_notification_new_membership_request( $requesting_user_id, $admins[$i]->user_id, $group_id, $requesting_user->id );
</span><span class="lines">@@ -818,7 +811,6 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Send a notification to the user.
</span><del>- require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
</del><span class="cx"> groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, true );
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_membership_accepted', $membership->user_id, $membership->group_id );
</span><span class="lines">@@ -831,7 +823,6 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Send a notification to the user.
</span><del>- require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
</del><span class="cx"> groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, false );
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_membership_rejected', $membership->user_id, $membership->group_id );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-groups/bp-groups-template.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx"> $to_num = bp_core_number_format( ( $start_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $start_num + ( $groups_template->pag_num - 1 ) );
</span><span class="cx"> $total = bp_core_number_format( $groups_template->total_group_count );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) . '<span class="ajax-loader"></span>' );
</del><ins>+ return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_groups_auto_join() {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-widgets.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-widgets.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-groups/bp-groups-widgets.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> <a href="<?php echo site_url( bp_get_groups_root_slug() ); ?>" id="newest-groups"<?php if ( $instance['group_default'] == 'newest' ) : ?> class="selected"<?php endif; ?>><?php _e("Newest", 'buddypress') ?></a> |
</span><span class="cx"> <a href="<?php echo site_url( bp_get_groups_root_slug() ); ?>" id="recently-active-groups"<?php if ( $instance['group_default'] == 'active' ) : ?> class="selected"<?php endif; ?>><?php _e("Active", 'buddypress') ?></a> |
</span><span class="cx"> <a href="<?php echo site_url( bp_get_groups_root_slug() ); ?>" id="popular-groups" <?php if ( $instance['group_default'] == 'popular' ) : ?> class="selected"<?php endif; ?>><?php _e("Popular", 'buddypress') ?></a>
</span><del>- <span class="ajax-loader" id="ajax-loader-groups"></span>
</del><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <ul id="groups-list" class="item-list">
</span></span></pre></div>
<a id="trunkbpgroupsjswidgetgroupsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/js/widget-groups.dev.js (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/js/widget-groups.dev.js 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-groups/js/widget-groups.dev.js 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> jQuery(document).ready( function() {
</span><span class="cx"> jQuery(".widget div#groups-list-options a").live('click',
</span><span class="cx"> function() {
</span><del>- jQuery('#ajax-loader-groups').toggle();
</del><ins>+ var link = this;
+ jQuery(link).addClass('loading');
</ins><span class="cx">
</span><span class="cx"> jQuery(".widget div#groups-list-options a").removeClass("selected");
</span><span class="cx"> jQuery(this).addClass('selected');
</span><span class="lines">@@ -15,7 +16,7 @@
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><span class="cx"> {
</span><del>- jQuery('#ajax-loader-groups').toggle();
</del><ins>+ jQuery(link).removeClass('loading');
</ins><span class="cx"> groups_wiget_response(response);
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsjswidgetgroupsjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/js/widget-groups.js (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/js/widget-groups.js 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-groups/js/widget-groups.js 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -1 +1 @@
</span><del>-jQuery(document).ready(function(){jQuery(".widget div#groups-list-options a").live("click",function(){jQuery("#ajax-loader-groups").toggle();jQuery(".widget div#groups-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_groups_list",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-groups").val(),max_groups:jQuery("input#groups_widget_max").val(),filter:jQuery(this).attr("id")},function(a){jQuery("#ajax-loader-groups").toggle();groups_wiget_response(a)});return false})});function groups_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#groups-list").fadeOut(200,function(){jQuery(".widget ul#groups-list").html(a[1]);jQuery(".widget ul#groups-list").fadeIn(200)})}else{jQuery(&
quot;.widget ul#groups-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#groups-list").html(b);jQuery(".widget ul#groups-list").fadeIn(200)})}};
</del><span class="cx">\ No newline at end of file
</span><ins>+jQuery(document).ready(function(){jQuery(".widget div#groups-list-options a").live("click",function(){var a=this;jQuery(a).addClass("loading");jQuery(".widget div#groups-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_groups_list",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-groups").val(),max_groups:jQuery("input#groups_widget_max").val(),filter:jQuery(this).attr("id")},function(b){jQuery(a).removeClass("loading");groups_wiget_response(b)});return false})});function groups_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#groups-list").fadeOut(200,function(){jQuery(".widget ul#groups-list").html(a[1]);jQuery(".widget ul#groups-list").fadeIn(200)})}else{jQuery("
;.widget ul#groups-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#groups-list").html(b);jQuery(".widget ul#groups-list").fadeIn(200)})}};
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-members/bp-members-template.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> else
</span><span class="cx"> $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_members_pagination_count', $pag . '<span class="ajax-loader"></span>' );
</del><ins>+ return apply_filters( 'bp_members_pagination_count', $pag );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_members_pagination_links() {
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-template.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-template.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-messages/bp-messages-template.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -339,8 +339,7 @@
</span><span class="cx"> $to_num = bp_core_number_format( ( $start_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $start_num + ( $messages_template->pag_num - 1 ) );
</span><span class="cx"> $total = bp_core_number_format( $messages_template->total_thread_count );
</span><span class="cx">
</span><del>- echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> &nbsp;
- <span class="ajax-loader"></span><?php
</del><ins>+ echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?><?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_messages_form_action() {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default-rtl.css (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -575,9 +575,6 @@
</span><span class="cx"> /*--------------------------------------------------------------
</span><span class="cx"> 5.3 - Ajax Loading
</span><span class="cx"> --------------------------------------------------------------*/
</span><del>-.ajax-loader {
- background-position: right center !important;
-}
</del><span class="cx"> a.loading {
</span><span class="cx"> background-position: 5% 50% !important;
</span><span class="cx"> padding-left: 25px !important;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -1480,11 +1480,6 @@
</span><span class="cx"> /*--------------------------------------------------------------
</span><span class="cx"> 6.3 - Ajax Loading
</span><span class="cx"> --------------------------------------------------------------*/
</span><del>-.ajax-loader {
- background: url( ../images/ajax-loader.gif ) center left no-repeat !important;
- display: none;
- padding: 8px 8px 3px 8px;
-}
</del><span class="cx"> a.loading,
</span><span class="cx"> input.loading {
</span><span class="cx"> background-image: url( ../images/ajax-loader.gif ) !important;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-themes/bp-default/_inc/global.js 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> var inner_class = type == 'acomment' ? 'acomment-content' : 'activity-inner';
</span><span class="cx"> var a_inner = jq('li#' + type + '-' + a_id + ' .' + inner_class + ':first' );
</span><del>- target.parent().children('.ajax-loader').show();
</del><ins>+ jq(target).addClass('loading');
</ins><span class="cx">
</span><span class="cx"> jq.post( ajaxurl, {
</span><span class="cx"> action: 'get_single_activity_content',
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityactivityloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/activity-loop.php (4803 => 4804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/activity-loop.php 2011-07-22 16:56:30 UTC (rev 4803)
+++ trunk/bp-themes/bp-default/activity/activity-loop.php 2011-07-22 17:02:46 UTC (rev 4804)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> <?php if ( bp_activity_has_more_items() ) : ?>
</span><span class="cx">
</span><span class="cx"> <li class="load-more">
</span><del>- <a href="#more"><?php _e( 'Load More', 'buddypress' ); ?></a> &nbsp; <span class="ajax-loader"></span>
</del><ins>+ <a href="#more"><?php _e( 'Load More', 'buddypress' ); ?></a>
</ins><span class="cx"> </li>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>