<!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][4727] trunk: Fix oembed activity comments when posting with AJAX.</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/4727">4727</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-07-19 21:55:50 +0000 (Tue, 19 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix oembed activity comments when posting with AJAX. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3354">#3354</a>, props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4726 => 4727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-07-19 20:59:35 UTC (rev 4726)
+++ trunk/bp-core/bp-core-functions.php 2011-07-19 21:55:50 UTC (rev 4727)
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx"> $unknown_text = apply_filters( 'bp_core_time_since_unknown_text', __( 'sometime', 'buddypress' ) );
</span><span class="cx"> $right_now_text = apply_filters( 'bp_core_time_since_right_now_text', __( 'right now', 'buddypress' ) );
</span><span class="cx"> $ago_text = apply_filters( 'bp_core_time_since_ago_text', __( '%s ago', 'buddypress' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // array of time period chunks
</span><span class="cx"> $chunks = array(
</span><span class="cx"> array( 60 * 60 * 24 * 365 , __( 'year', 'buddypress' ), __( 'years', 'buddypress' ) ),
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> // Something went wrong with date calculation and we ended up with a negative date.
</span><span class="cx"> if ( 0 > $since ) {
</span><span class="cx"> $output = $unknown_text;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * We only want to output two chunks of time here, eg:
</span><span class="cx"> * x years, xx months
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx"> if ( empty( $bp->embed ) )
</span><span class="cx"> $bp->embed = new BP_Embed();
</span><span class="cx"> }
</span><del>-add_action( 'bp_init', 'bp_embed_init' );
</del><ins>+add_action( 'bp_init', 'bp_embed_init', 9 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * When switching from single to multisite we need to copy blog options to
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (4726 => 4727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2011-07-19 20:59:35 UTC (rev 4726)
+++ trunk/bp-themes/bp-default/_inc/global.js 2011-07-19 21:55:50 UTC (rev 4727)
</span><span class="lines">@@ -91,8 +91,16 @@
</span><span class="cx"> var l = jq("ul#activity-stream li.new-update .activity-content .activity-inner p").html();
</span><span class="cx"> var v = jq("ul#activity-stream li.new-update .activity-content .activity-header p a.view").attr('href');
</span><span class="cx">
</span><ins>+ var ltext = jq("ul#activity-stream li.new-update .activity-content .activity-inner p").text();
+
+ var u = '';
+ if ( ltext != '' )
+ u = l + '&middot; ';
+
+ u += '<a href="' + v + '" rel="nofollow">' + BP_DTheme.view + '</a>';
+
</ins><span class="cx"> jq("div#latest-update").slideUp(300,function(){
</span><del>- jq("div#latest-update").html('"' + l + '" &middot; <a href="' + v + '" rel="nofollow">View</a>');
</del><ins>+ jq("div#latest-update").html( u );
</ins><span class="cx"> jq("div#latest-update").slideDown(300);
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (4726 => 4727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2011-07-19 20:59:35 UTC (rev 4726)
+++ trunk/bp-themes/bp-default/functions.php 2011-07-19 21:55:50 UTC (rev 4727)
</span><span class="lines">@@ -144,7 +144,8 @@
</span><span class="cx"> 'show_all_comments' => __( 'Show all comments for this thread', 'buddypress' ),
</span><span class="cx"> 'show_all' => __( 'Show all', 'buddypress' ),
</span><span class="cx"> 'comments' => __( 'comments', 'buddypress' ),
</span><del>- 'close' => __( 'Close', 'buddypress' )
</del><ins>+ 'close' => __( 'Close', 'buddypress' ),
+ 'view' => __( 'View', 'buddypress' )
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> wp_localize_script( 'dtheme-ajax-js', 'BP_DTheme', $params );
</span><span class="lines">@@ -160,7 +161,7 @@
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_enqueue_styles() {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Default CSS
</span><span class="cx"> wp_enqueue_style( 'bp-default-main', get_template_directory_uri() . '/_inc/css/default.css', array(), BP_VERSION );
</span><span class="cx">
</span><span class="lines">@@ -515,11 +516,11 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_show_notice() {
</span><span class="cx"> global $pagenow;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Bail if bp-default theme was not just activated
</span><span class="cx"> if ( empty( $_GET['activated'] ) || ( 'themes.php' != $pagenow ) || !is_admin() )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div id="message" class="updated fade">
</span></span></pre>
</div>
</div>
</body>
</html>