<!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][12521] trunk/src/bp-activity/admin/js/admin.js: Admin: fix some JS Coding standards into the Activity screen script</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12521">12521</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12521","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-01-16 06:45:34 +0000 (Thu, 16 Jan 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Admin: fix some JS Coding standards into the Activity screen script
Props passoniate
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8205">#8205</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivityadminjsadminjs">trunk/src/bp-activity/admin/js/admin.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivityadminjsadminjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/admin/js/admin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/admin/js/admin.js 2020-01-13 20:33:40 UTC (rev 12520)
+++ trunk/src/bp-activity/admin/js/admin.js 2020-01-16 06:45:34 UTC (rev 12521)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Activity reply object for the activity index screen
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Activity reply object for the activity index screen.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $(document).on( 'click', '#bp-activities-container a.cancel', activityReply.close );
</span><span class="cx" style="display: block; padding: 0 10px"> $(document).on( 'click', '#bp-activities-container a.save', activityReply.send );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Close textarea on escape
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Close textarea on escape.
</ins><span class="cx" style="display: block; padding: 0 10px"> $(document).on( 'keyup', '#bp-activities:visible', function( e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 27 === e.which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> activityReply.close();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> open : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hide the container row, and move it to the new location
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hide the container row, and move it to the new location.
</ins><span class="cx" style="display: block; padding: 0 10px"> var box = $( '#bp-activities-container' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> $( this ).parents( 'tr' ).after( box );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,13 +49,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> close : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hide the container row
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hide the container row.
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#bp-activities-container').fadeOut( '200', function () {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Empty and unfocus the text area
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Empty and unfocus the text area.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-activities' ).val( '' ).blur();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove any error message and disable the spinner
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any error message and disable the spinner.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-replysubmit .error' ).html( '' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-replysubmit .waiting' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,27 +69,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> send : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hide any existing error message, and show the loading spinner
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hide any existing error message, and show the loading spinner.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-replysubmit .error' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-replysubmit .waiting' ).show();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Grab the nonce
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Grab the nonce.
</ins><span class="cx" style="display: block; padding: 0 10px"> var reply = {};
</span><span class="cx" style="display: block; padding: 0 10px"> reply['_ajax_nonce-bp-activity-admin-reply'] = $( '#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]' ).val();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the rest of the data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get the rest of the data.
</ins><span class="cx" style="display: block; padding: 0 10px"> reply.action = 'bp-activity-admin-reply';
</span><span class="cx" style="display: block; padding: 0 10px"> reply.content = $( '#bp-activities' ).val();
</span><span class="cx" style="display: block; padding: 0 10px"> reply.parent_id = $( '#bp-activities-container' ).prev().data( 'parent_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> reply.root_id = $( '#bp-activities-container' ).prev().data( 'root_id' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make the AJAX call
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make the AJAX call.
</ins><span class="cx" style="display: block; padding: 0 10px"> $.ajax({
</span><span class="cx" style="display: block; padding: 0 10px"> data : reply,
</span><span class="cx" style="display: block; padding: 0 10px"> type : 'POST',
</span><span class="cx" style="display: block; padding: 0 10px"> url : ajaxurl,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Callbacks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Callbacks.
</ins><span class="cx" style="display: block; padding: 0 10px"> error : function( r ) { activityReply.error( r ); },
</span><span class="cx" style="display: block; padding: 0 10px"> success : function( r ) { activityReply.show( r ); }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * send() error message handler
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * send() error message handler.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * send() success handler
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * send() success handler.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> show : function ( xml ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var bg, id, response;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Handle any errors in the response
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle any errors in the response.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( typeof( xml ) === 'string' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> activityReply.error( { 'responseText': xml } );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,17 +139,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Close and reset the reply row, and add the new Activity item into the list.
</span><span class="cx" style="display: block; padding: 0 10px"> $('#bp-activities-container').fadeOut( '200', function () {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Empty and unfocus the text area
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Empty and unfocus the text area.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-activities' ).val( '' ).blur();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove any error message and disable the spinner
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove any error message and disable the spinner.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-replysubmit .error' ).html( '' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-replysubmit .waiting' ).hide();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Insert new activity item
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Insert new activity item.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp-activities-container' ).before( response.data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get background colour and animate the flash
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Get background colour and animate the flash.
</ins><span class="cx" style="display: block; padding: 0 10px"> id = $( '#activity-' + response.id );
</span><span class="cx" style="display: block; padding: 0 10px"> bg = id.closest( '.widefat' ).css( 'backgroundColor' );
</span><span class="cx" style="display: block; padding: 0 10px"> id.animate( { 'backgroundColor': '#CEB' }, 300 ).animate( { 'backgroundColor': bg }, 300 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,10 +158,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $(document).ready( function () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Create the Activity reply object after domready event
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create the Activity reply object after domready event.
</ins><span class="cx" style="display: block; padding: 0 10px"> activityReply.init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // On the edit screen, unload the close/open toggle js for the action & content metaboxes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // On the edit screen, unload the close/open toggle js for the action & content metaboxes.
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '#bp_activity_action h3, #bp_activity_content h3' ).unbind( 'click' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // redo the post box toggles to reset the one made by comment.js in favor
</span></span></pre>
</div>
</div>
</body>
</html>