<!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][4473] branches/1.2: Backport r4349 and r4450 to 1.2 branch, for jQuery 1.6.1.</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>4473</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-06-07 18:44:08 +0000 (Tue, 07 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Backport r4349 and r4450 to 1.2 branch, for jQuery 1.6.1.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpthemesbpdefault_incglobaljs">branches/1.2/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#branches12readmetxt">branches/1.2/readme.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/_inc/global.js (4472 => 4473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/_inc/global.js 2011-06-07 16:30:19 UTC (rev 4472)
+++ branches/1.2/bp-themes/bp-default/_inc/global.js 2011-06-07 18:44:08 UTC (rev 4473)
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx">
</span><span class="cx"> form.children().each( function() {
</span><span class="cx"> if ( jq.nodeName(this, "textarea") || jq.nodeName(this, "input") )
</span><del>- jq(this).attr( 'disabled', 'disabled' );
</del><ins>+ jq(this).prop( 'disabled', true );
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> jq( 'form#' + form.attr('id') + ' span.ajax-loader' ).show();
</span><span class="cx">
</span><span class="cx"> /* Remove any errors */
</span><span class="cx"> jq('div.error').remove();
</span><del>- button.attr('disabled','disabled');
</del><ins>+ button.prop('disabled', true);
</ins><span class="cx">
</span><span class="cx"> /* Default POST values */
</span><span class="cx"> var object = '';
</span><span class="lines">@@ -72,14 +72,14 @@
</span><span class="cx">
</span><span class="cx"> form.children().each( function() {
</span><span class="cx"> if ( jq.nodeName(this, "textarea") || jq.nodeName(this, "input") )
</span><del>- jq(this).attr( 'disabled', '' );
</del><ins>+ jq(this).prop( 'disabled', false );
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /* Check for errors and append if found. */
</span><span class="cx"> if ( response[0] + response[1] == '-1' ) {
</span><span class="cx"> form.prepend( response.substr( 2, response.length ) );
</span><span class="cx"> jq( 'form#' + form.attr('id') + ' div.error').hide().fadeIn( 200 );
</span><del>- button.attr("disabled", '');
</del><ins>+ button.prop("disabled", false);
</ins><span class="cx"> } else {
</span><span class="cx"> if ( 0 == jq("ul.activity-list").length ) {
</span><span class="cx"> jq("div.error").slideUp(100).remove();
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> jq("textarea#whats-new").val('');
</span><span class="cx">
</span><span class="cx"> /* Re-enable the submit button after 8 seconds. */
</span><del>- setTimeout( function() { button.attr("disabled", ''); }, 8000 );
</del><ins>+ setTimeout( function() { button.prop("disabled", false); }, 8000 );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> /* Check for errors and append if found. */
</span><span class="cx"> if ( response[0] + response[1] == '-1' ) {
</span><span class="cx"> form.append( response.substr( 2, response.length ) ).hide().fadeIn( 200 );
</span><del>- target.attr("disabled", '');
</del><ins>+ target.prop("disabled", false);
</ins><span class="cx"> } else {
</span><span class="cx"> form.fadeOut( 200,
</span><span class="cx"> function() {
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
</span><span class="cx">
</span><span class="cx"> /* Re-enable the submit button after 5 seconds. */
</span><del>- setTimeout( function() { target.attr("disabled", ''); }, 5000 );
</del><ins>+ setTimeout( function() { target.prop("disabled", false); }, 5000 );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx">
</span><span class="cx"> var friend_id = jq(this).val();
</span><span class="cx">
</span><del>- if ( jq(this).attr('checked') == true )
</del><ins>+ if ( jq(this).prop('checked') == true )
</ins><span class="cx"> var friend_action = 'invite';
</span><span class="cx"> else
</span><span class="cx"> var friend_action = 'uninvite';
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx"> {
</span><span class="cx"> jq('.ajax-loader').toggle();
</span><span class="cx"> jq('#friend-list li#uid-' + friend_id).remove();
</span><del>- jq('#invite-list input#f-' + friend_id).attr('checked', false);
</del><ins>+ jq('#invite-list input#f-' + friend_id).prop('checked', false);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -824,7 +824,7 @@
</span><span class="cx"> }).mouseout( function() {
</span><span class="cx"> jq(this).removeClass('over');
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> jq('body#bp-default table.zebra tbody tr:odd').addClass('alt');
</span><span class="cx">
</span><span class="cx"> jq('div.message-box').each( function(i) {
</span><span class="lines">@@ -1054,7 +1054,7 @@
</span><span class="cx"> jq.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
</span><span class="cx">
</span><span class="cx"> if ( null != jq.cookie('bp-activity-filter') && jq('#activity-filter-select').length )
</span><del>- jq('#activity-filter-select select option[value=' + jq.cookie('bp-activity-filter') + ']').attr( 'selected', 'selected' );
</del><ins>+ jq('#activity-filter-select select option[value="' + jq.cookie('bp-activity-filter') + '"]').prop( 'selected', true );
</ins><span class="cx">
</span><span class="cx"> /* Activity Tab Set */
</span><span class="cx"> if ( null != jq.cookie('bp-activity-scope') && jq('div.activity-type-tabs').length ) {
</span><span class="lines">@@ -1069,7 +1069,7 @@
</span><span class="cx"> function bp_init_objects(objects) {
</span><span class="cx"> jq(objects).each( function(i) {
</span><span class="cx"> if ( null != jq.cookie('bp-' + objects[i] + '-filter') && jq('li#' + objects[i] + '-order-select select').length )
</span><del>- jq('li#' + objects[i] + '-order-select select option[value=' + jq.cookie('bp-' + objects[i] + '-filter') + ']').attr( 'selected', 'selected' );
</del><ins>+ jq('li#' + objects[i] + '-order-select select option[value="' + jq.cookie('bp-' + objects[i] + '-filter') + '"]').prop( 'selected', true );
</ins><span class="cx">
</span><span class="cx"> if ( null != jq.cookie('bp-' + objects[i] + '-scope') && jq('div.' + objects[i]).length ) {
</span><span class="cx"> jq('div.item-list-tabs li').each( function() {
</span><span class="lines">@@ -1102,7 +1102,7 @@
</span><span class="cx"> });
</span><span class="cx"> jq('div.item-list-tabs li#' + object + '-' + scope + ', div.item-list-tabs#object-nav li.current').addClass('selected');
</span><span class="cx"> jq('div.item-list-tabs li.selected').addClass('loading');
</span><del>- jq('div.item-list-tabs select option[value=' + filter + ']').attr( 'selected', 'selected' );
</del><ins>+ jq('div.item-list-tabs select option[value="' + filter + '"]').prop( 'selected', true );
</ins><span class="cx">
</span><span class="cx"> if ( 'friends' == object )
</span><span class="cx"> object = 'members';
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx"> /* Set the correct selected nav and filter */
</span><span class="cx"> jq('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
</span><span class="cx"> jq('div#object-nav.item-list-tabs li.selected, div.activity-type-tabs li.selected').addClass('loading');
</span><del>- jq('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
</del><ins>+ jq('#activity-filter-select select option[value="' + filter + '"]').prop( 'selected', true );
</ins><span class="cx">
</span><span class="cx"> /* Reload the activity stream based on the selection */
</span><span class="cx"> jq('.widget_bp_activity_widget h2 span.ajax-loader').show();
</span></span></pre></div>
<a id="branches12readmetxt"></a>
<div class="modfile"><h4>Modified: branches/1.2/readme.txt (4472 => 4473)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/readme.txt 2011-06-07 16:30:19 UTC (rev 4472)
+++ branches/1.2/readme.txt 2011-06-07 18:44:08 UTC (rev 4473)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> === Plugin Name ===
</span><span class="cx"> Contributors: apeatling, johnjamesjacoby, MrMaz, DJPaul, boonebgorges
</span><span class="cx"> Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
</span><del>-Requires at least: 3.1
</del><ins>+Requires at least: 3.2
</ins><span class="cx"> Tested up to: 3.1
</span><span class="cx"> Stable tag: 1.2.8
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>