<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2444] trunk: Fixing sidebar members and groups widget JS.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2444</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-25 12:32:11 +0000 (Mon, 25 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing sidebar members and groups widget JS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcorewidgetsphp">trunk/bp-core/bp-core-widgets.php</a></li>
<li><a href="#trunkbpcorejswidgetmembersjs">trunk/bp-core/js/widget-members.js</a></li>
<li><a href="#trunkbpgroupsbpgroupswidgetsphp">trunk/bp-groups/bp-groups-widgets.php</a></li>
<li><a href="#trunkbpgroupsjswidgetgroupsjs">trunk/bp-groups/js/widget-groups.js</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
<li><a href="#trunkbpthemesbpclassicstylecss">trunk/bp-themes/bp-classic/style.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultstylecss">trunk/bp-themes/bp-default/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> $parent_activity->content = str_replace( '<span class="time-since">%s</span>', '', $parent_activity->content );
</span><span class="cx">
</span><span class="cx"> /* Remove images */
</span><del>- $parent_activity->content = preg_replace('/<img[^>]*>/Ui', '', $parent_activity->content );
</del><ins>+ $parent_activity->content = preg_replace( '/<img[^>]*>/Ui', '', $parent_activity->content );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_activity_parent_content', $parent_activity->content );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-widgets.php (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-widgets.php 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-core/bp-core-widgets.php 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> parent::WP_Widget( false, $name = __( 'Members', 'buddypress' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_active_widget( false, false, $this->id_base ) )
</span><del>- wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );
</del><ins>+ wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget($args, $instance) {
</span></span></pre></div>
<a id="trunkbpcorejswidgetmembersjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/js/widget-members.js (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/js/widget-members.js 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-core/js/widget-members.js 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> jQuery(document).ready( function() {
</span><del>- jQuery("div#members-list-options a").live('click',
</del><ins>+ jQuery(".widget div#members-list-options a").live('click',
</ins><span class="cx"> function() {
</span><span class="cx"> jQuery('#ajax-loader-members').toggle();
</span><span class="cx">
</span><del>- jQuery("div#members-list-options a").removeClass("selected");
</del><ins>+ jQuery(".widget div#members-list-options a").removeClass("selected");
</ins><span class="cx"> jQuery(this).addClass('selected');
</span><span class="cx">
</span><span class="cx"> jQuery.post( ajaxurl, {
</span><span class="lines">@@ -29,19 +29,19 @@
</span><span class="cx"> response = response.split('[[SPLIT]]');
</span><span class="cx">
</span><span class="cx"> if ( response[0] != "-1" ) {
</span><del>- jQuery("ul#members-list").fadeOut(200,
</del><ins>+ jQuery(".widget ul#members-list").fadeOut(200,
</ins><span class="cx"> function() {
</span><del>- jQuery("ul#members-list").html(response[1]);
- jQuery("ul#members-list").fadeIn(200);
</del><ins>+ jQuery(".widget ul#members-list").html(response[1]);
+ jQuery(".widget ul#members-list").fadeIn(200);
</ins><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- jQuery("ul#members-list").fadeOut(200,
</del><ins>+ jQuery(".widget ul#members-list").fadeOut(200,
</ins><span class="cx"> function() {
</span><span class="cx"> var message = '<p>' + response[1] + '</p>';
</span><del>- jQuery("ul#members-list").html(message);
- jQuery("ul#members-list").fadeIn(200);
</del><ins>+ jQuery(".widget ul#members-list").html(message);
+ jQuery(".widget ul#members-list").fadeIn(200);
</ins><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-widgets.php (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-widgets.php 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-groups/bp-groups-widgets.php 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> parent::WP_Widget( false, $name = __( 'Groups', 'buddypress' ) );
</span><span class="cx">
</span><span class="cx"> if ( is_active_widget( false, false, $this->id_base ) )
</span><del>- wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery', 'jquery-livequery-pack') );
</del><ins>+ wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery') );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget($args, $instance) {
</span></span></pre></div>
<a id="trunkbpgroupsjswidgetgroupsjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/js/widget-groups.js (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/js/widget-groups.js 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-groups/js/widget-groups.js 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> jQuery(document).ready( function() {
</span><del>- jQuery("div#groups-list-options a").livequery('click',
- function() {
</del><ins>+ jQuery(".widget div#groups-list-options a").live('click',
+ function() {
</ins><span class="cx"> jQuery('#ajax-loader-groups').toggle();
</span><span class="cx">
</span><del>- jQuery("div#groups-list-options a").removeClass("selected");
</del><ins>+ jQuery(".widget div#groups-list-options a").removeClass("selected");
</ins><span class="cx"> jQuery(this).addClass('selected');
</span><span class="cx">
</span><span class="cx"> jQuery.post( ajaxurl, {
</span><span class="lines">@@ -14,11 +14,11 @@
</span><span class="cx"> 'filter': jQuery(this).attr('id')
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><del>- {
</del><ins>+ {
</ins><span class="cx"> jQuery('#ajax-loader-groups').toggle();
</span><span class="cx"> groups_wiget_response(response);
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> );
</span><span class="lines">@@ -29,19 +29,19 @@
</span><span class="cx"> response = response.split('[[SPLIT]]');
</span><span class="cx">
</span><span class="cx"> if ( response[0] != "-1" ) {
</span><del>- jQuery("ul#groups-list").fadeOut(200,
</del><ins>+ jQuery(".widget ul#groups-list").fadeOut(200,
</ins><span class="cx"> function() {
</span><del>- jQuery("ul#groups-list").html(response[1]);
- jQuery("ul#groups-list").fadeIn(200);
</del><ins>+ jQuery(".widget ul#groups-list").html(response[1]);
+ jQuery(".widget ul#groups-list").fadeIn(200);
</ins><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><del>- } else {
- jQuery("ul#groups-list").fadeOut(200,
</del><ins>+ } else {
+ jQuery(".widget ul#groups-list").fadeOut(200,
</ins><span class="cx"> function() {
</span><span class="cx"> var message = '<p>' + response[1] + '</p>';
</span><del>- jQuery("ul#groups-list").html(message);
- jQuery("ul#groups-list").fadeIn(200);
</del><ins>+ jQuery(".widget ul#groups-list").html(message);
+ jQuery(".widget ul#groups-list").fadeIn(200);
</ins><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-loader.php 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx"> Plugin URI: http://buddypress.org/download/
</span><span class="cx"> Description: BuddyPress will add social networking features to a new or existing WordPress MU installation.
</span><span class="cx"> Author: The BuddyPress Community
</span><del>-Version: 1.2-rare
</del><ins>+Version: 1.2-beta
</ins><span class="cx"> Author URI: http://buddypress.org/developers/
</span><span class="cx"> Site Wide Only: true
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define( 'BP_VERSION', '1.2-rare' );
</del><ins>+define( 'BP_VERSION', '1.2-beta' );
</ins><span class="cx">
</span><span class="cx"> /***
</span><span class="cx"> * This file will load in each BuddyPress component based on which
</span></span></pre></div>
<a id="trunkbpthemesbpclassicstylecss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-classic/style.css (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-classic/style.css 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-themes/bp-classic/style.css 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> Theme Name: BuddyPress Classic
</span><span class="cx"> Theme URI: http://buddypress.org/extend/themes/
</span><span class="cx"> Description: The original BuddyPress theme from version 1.1 and earlier.
</span><del>-Version: 1.2-rare
</del><ins>+Version: 1.2-beta
</ins><span class="cx"> Author: BuddyPress.org
</span><span class="cx"> Author URI: http://buddypress.org
</span><span class="cx"> Tags: buddypress, three-columns, white, orange
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#sidebar div.item-options {
</span><del>- margin: -10px -16px 0 -20px;
</del><ins>+ margin: -10px -20px 0 -19px;
</ins><span class="cx"> background: #f8f8f8;
</span><span class="cx"> padding: 5px 15px;
</span><span class="cx"> font-size: 11px;
</span><span class="lines">@@ -428,6 +428,10 @@
</span><span class="cx"> float: left;
</span><span class="cx"> margin: 5px 0 0 5px;
</span><span class="cx"> }
</span><ins>+ div.item-list-tabs#subnav ul li {
+ margin-top: 0;
+ }
+
</ins><span class="cx"> div.item-list-tabs ul li:first-child {
</span><span class="cx"> margin-left: 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -436,6 +440,10 @@
</span><span class="cx"> float: right;
</span><span class="cx"> margin: 7px 20px 0 0;
</span><span class="cx"> }
</span><ins>+ div.item-list-tabs#subnav ul li.last {
+ margin-top: 4px;
+ }
+
</ins><span class="cx"> div.item-list-tabs ul li.last select {
</span><span class="cx"> max-width: 175px;
</span><span class="cx"> }
</span><span class="lines">@@ -546,7 +554,7 @@
</span><span class="cx"> padding: 8px 15px;
</span><span class="cx"> }
</span><span class="cx"> div#item-body div.item-list-tabs + div div.pagination {
</span><del>- margin-top: -20px;
</del><ins>+ margin-top: -15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.pagination .pag-count {
</span><span class="lines">@@ -975,7 +983,7 @@
</span><span class="cx"> padding: 20px 0 0 0;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><del>- ul.activity-list li:first-child {
</del><ins>+ ul.activity-list > li:first-child {
</ins><span class="cx"> padding-top: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultstylecss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/style.css (2443 => 2444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/style.css 2010-01-25 07:52:07 UTC (rev 2443)
+++ trunk/bp-themes/bp-default/style.css 2010-01-25 12:32:11 UTC (rev 2444)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> Theme Name: BuddyPress Default
</span><span class="cx"> Theme URI: http://buddypress.org/extend/themes/
</span><span class="cx"> Description: The default theme for BuddyPress.
</span><del>-Version: 1.2-rare
</del><ins>+Version: 1.2-beta
</ins><span class="cx"> Author: BuddyPress.org
</span><span class="cx"> Author URI: http://buddypress.org
</span><span class="cx"> Tags: buddypress, two-columns, custom-header, white, blue
</span></span></pre>
</div>
</div>
</body>
</html>