<!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][6552] trunk/bp-templates/bp-legacy/js/buddypress.js: Activity (ajax|bp-legacy):</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/6552">6552</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-01 01:33:05 +0000 (Sat, 01 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Activity (ajax|bp-legacy):
* When creating new activity stream comments, do not hide the node before fading in.
* Fixes flickering when posting new activity stream content.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacyjsbuddypressjs">trunk/bp-templates/bp-legacy/js/buddypress.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/js/buddypress.js (6551 => 6552)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/js/buddypress.js        2012-12-01 01:21:17 UTC (rev 6551)
+++ trunk/bp-templates/bp-legacy/js/buddypress.js        2012-12-01 01:33:05 UTC (rev 6552)
</span><span class="lines">@@ -201,10 +201,10 @@
</span><span class="cx">                         function(response) {
</span><span class="cx">                                 target.removeClass('loading');
</span><span class="cx">
</span><del>-                                target.fadeOut( 100, function() {
</del><ins>+                                target.fadeOut( 200, function() {
</ins><span class="cx">                                         jq(this).html(response);
</span><span class="cx">                                         jq(this).attr('title', 'fav' == type ? BP_DTheme.remove_fav : BP_DTheme.mark_as_fav);
</span><del>-                                        jq(this).fadeIn(100);
</del><ins>+                                        jq(this).fadeIn(200);
</ins><span class="cx">                                 });
</span><span class="cx">
</span><span class="cx">                                 if ( 'fav' == type ) {
</span><span class="lines">@@ -415,6 +415,7 @@
</span><span class="cx">                         /* Hide any error messages */
</span><span class="cx">                         jq( '#' + form.attr('id') + ' div.error').hide();
</span><span class="cx">                         target.addClass('loading').prop('disabled', true);
</span><ins>+                        content.addClass('loading').prop('disabled', true);
</ins><span class="cx">
</span><span class="cx">                         var ajaxdata = {
</span><span class="cx">                                 action: 'new_activity_comment',
</span><span class="lines">@@ -431,38 +432,37 @@
</span><span class="cx">                                 ajaxdata['_bp_as_nonce_' + comment_id] = ak_nonce;
</span><span class="cx">                         }
</span><span class="cx">
</span><del>-                        jq.post( ajaxurl, ajaxdata,
-                                function(response)
-                                {
-                                        target.removeClass('loading');
</del><ins>+                        jq.post( ajaxurl, ajaxdata, function(response) {
+                                target.removeClass('loading');
+                                content.removeClass('loading');
</ins><span class="cx">
</span><del>-                                        /* Check for errors and append if found. */
-                                        if ( response[0] + response[1] == '-1' ) {
-                                                form.append( response.substr( 2, response.length ) ).hide().fadeIn( 200 );
-                                        } else {
-                                                form.fadeOut( 200,
-                                                        function() {
-                                                                if ( 0 == form.parent().children('ul').length ) {
-                                                                        if ( form.parent().hasClass('activity-comments') )
-                                                                                form.parent().prepend('<ul></ul>');
-                                                                        else
-                                                                                form.parent().append('<ul></ul>');
-                                                                }
-
-                                                                form.parent().children('ul').append(response).hide().fadeIn( 200 );
-                                                                form.children('textarea').val('');
-                                                                form.parent().parent().addClass('has-comments');
</del><ins>+                                /* Check for errors and append if found. */
+                                if ( response[0] + response[1] == '-1' ) {
+                                        form.append( response.substr( 2, response.length ) ).fadeIn( 200 );
+                                } else {
+                                        form.fadeOut( 200, function() {
+                                                if ( 0 == form.parent().children('ul').length ) {
+                                                        if ( form.parent().hasClass('activity-comments') ) {
+                                                                form.parent().prepend('<ul></ul>');
+                                                        } else {
+                                                                form.parent().append('<ul></ul>');
</ins><span class="cx">                                                         }
</span><del>-                                                        );
-                                                jq( '#' + form.attr('id') + ' textarea').val('');
</del><ins>+                                                }
</ins><span class="cx">
</span><del>-                                                /* Increase the "Reply (X)" button count */
-                                                jq('#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
-                                        }
</del><ins>+                                                form.parent().children('ul').append(response).fadeIn( 200 );
+                                                form.children('textarea').val('');
+                                                form.parent().parent().addClass('has-comments');
+                                        } );
+                                        jq( '#' + form.attr('id') + ' textarea').val('');
</ins><span class="cx">
</span><del>-                                        jq(target).prop("disabled", false);
-                                });
</del><ins>+                                        /* Increase the "Reply (X)" button count */
+                                        jq('#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
+                                }
</ins><span class="cx">
</span><ins>+                                jq(target).prop("disabled", false);
+                                jq(content).prop("disabled", false);
+                        });
+
</ins><span class="cx">                         return false;
</span><span class="cx">                 }
</span><span class="cx">
</span><span class="lines">@@ -493,8 +493,7 @@
</span><span class="cx">                                 '_wpnonce': nonce,
</span><span class="cx">                                 'id': comment_id
</span><span class="cx">                         },
</span><del>-                        function(response)
-                        {
</del><ins>+                        function(response) {
</ins><span class="cx">                                 /* Check for errors and append if found. */
</span><span class="cx">                                 if ( response[0] + response[1] == '-1' ) {
</span><span class="cx">                                         comment_li.prepend( response.substr( 2, response.length ) ).hide().fadeIn( 200 );
</span></span></pre>
</div>
</div>
</body>
</html>