Changeset 8378

Timestamp:

05/04/2014 05:18:57 PM (12 years ago)

Author:

djpaul

Message:

Javascript: first pass at improvements for jshint

See #5613

Location:

trunk/src

Files:

• bp-activity/admin/js/admin.js (modified) (7 diffs)
• bp-core/js/confirm.js (modified) (1 diff)
• bp-core/js/widget-members.js (modified) (3 diffs)
• bp-friends/js/widget-friends.js (modified) (3 diffs)
• bp-groups/admin/js/admin.js (modified) (2 diffs)
• bp-groups/js/widget-groups.js (modified) (3 diffs)
• bp-members/admin/js/admin.js (modified) (1 diff)
• bp-templates/bp-legacy/js/buddypress.js (modified) (100 diffs)
• bp-xprofile/admin/js/admin.js (modified) (13 diffs)

trunk/src/bp-activity/admin/js/admin.js

@@ +1 @@
+/* global bp_activity_admin_vars, postboxes, wpAjax */
 (function( $ ) {
 
@@ -20 +21 @@
                 // Close textarea on escape
                 $(document).on( 'keyup', '#bp-activities:visible', function( e ) {
-                        if ( 27 == e.which ) {
+                        if ( 27 === e.which ) {
                                 activityReply.close();
                         }
@@ -31 +32 @@
          * @since BuddyPress (1.6)
          */
-        open : function( e ) {
+        open : function() {
                 // Hide the container row, and move it to the new location
                 var box = $( '#bp-activities-container' ).hide();
@@ -48 +49 @@
          * @since BuddyPress (1.6)
          */
-        close : function( e ) {
+        close : function() {
                 // Hide the container row
-                $('#bp-activities-container').fadeOut( '200', function () { 
+                $('#bp-activities-container').fadeOut( '200', function () {
 
                         // Empty and unfocus the text area
@@ -68 +69 @@
          * @since BuddyPress (1.6)
          */
-        send : function( e ) {
+        send : function() {
                 // Hide any existing error message, and show the loading spinner
                 $( '#bp-replysubmit .error' ).hide();
@@ -124 +125 @@
 
                 // Handle any errors in the response
-                if ( typeof( xml ) == 'string' ) {
+                if ( typeof( xml ) === 'string' ) {
                         activityReply.error( { 'responseText': xml } );
                         return false;
@@ -137 +138 @@
 
                 // Close and reset the reply row, and add the new Activity item into the list.
-                $('#bp-activities-container').fadeOut( '200', function () { 
+                $('#bp-activities-container').fadeOut( '200', function () {
 
                         // Empty and unfocus the text area

trunk/src/bp-core/js/confirm.js

@@ +1 @@
+/* jshint devel: true */
+/* global BP_Confirm */
+
 jQuery( document ).ready( function() {
         jQuery( 'a.confirm').click( function() {
-                if ( confirm( BP_Confirm.are_you_sure ) )
-                        return true; else return false;
+                if ( confirm( BP_Confirm.are_you_sure ) ) {
+                        return true;
+                } else {
+                        return false;
+                }
         });
 });

trunk/src/bp-core/js/widget-members.js

@@ -1 +1 @@
 jQuery(document).ready( function() {
-        jQuery(".widget div#members-list-options a").on('click',
+        jQuery('.widget div#members-list-options a').on('click',
                 function() {
                         var link = this;
                         jQuery(link).addClass('loading');
 
-                        jQuery(".widget div#members-list-options a").removeClass("selected");
+                        jQuery('.widget div#members-list-options a').removeClass('selected');
                         jQuery(this).addClass('selected');
 
@@ -11 +11 @@
                                 action: 'widget_members',
                                 'cookie': encodeURIComponent(document.cookie),
-                                '_wpnonce': jQuery("input#_wpnonce-members").val(),
-                                'max-members': jQuery("input#members_widget_max").val(),
+                                '_wpnonce': jQuery('input#_wpnonce-members').val(),
+                                'max-members': jQuery('input#members_widget_max').val(),
                                 'filter': jQuery(this).attr('id')
                         },
@@ -30 +30 @@
         response = response.split('[[SPLIT]]');
 
-        if ( response[0] != "-1" ) {
-                jQuery(".widget ul#members-list").fadeOut(200,
+        if ( response[0] !== '-1' ) {
+                jQuery('.widget ul#members-list').fadeOut(200,
                         function() {
-                                jQuery(".widget ul#members-list").html(response[1]);
-                                jQuery(".widget ul#members-list").fadeIn(200);
+                                jQuery('.widget ul#members-list').html(response[1]);
+                                jQuery('.widget ul#members-list').fadeIn(200);
                         }
                 );
 
         } else {
-                jQuery(".widget ul#members-list").fadeOut(200,
+                jQuery('.widget ul#members-list').fadeOut(200,
                         function() {
                                 var message = '<p>' + response[1] + '</p>';
-                                jQuery(".widget ul#members-list").html(message);
-                                jQuery(".widget ul#members-list").fadeIn(200);
+                                jQuery('.widget ul#members-list').html(message);
+                                jQuery('.widget ul#members-list').fadeIn(200);
                         }
                 );

trunk/src/bp-friends/js/widget-friends.js

@@ -1 +1 @@
 jQuery(document).ready( function() {
-        jQuery(".widget div#friends-list-options a").on('click',
+        jQuery('.widget div#friends-list-options a').on('click',
                 function() {
                         var link = this;
                         jQuery(link).addClass('loading');
 
-                        jQuery(".widget div#friends-list-options a").removeClass("selected");
+                        jQuery('.widget div#friends-list-options a').removeClass('selected');
                         jQuery(this).addClass('selected');
 
@@ -11 +11 @@
                                 action: 'widget_friends',
                                 'cookie': encodeURIComponent(document.cookie),
-                                '_wpnonce': jQuery("input#_wpnonce-friends").val(),
-                                'max-friends': jQuery("input#friends_widget_max").val(),
+                                '_wpnonce': jQuery('input#_wpnonce-friends').val(),
+                                'max-friends': jQuery('input#friends_widget_max').val(),
                                 'filter': jQuery(this).attr('id')
                         },
@@ -30 +30 @@
         response = response.split('[[SPLIT]]');
 
-        if ( response[0] != "-1" ) {
-                jQuery(".widget ul#friends-list").fadeOut(200,
+        if ( response[0] !== '-1' ) {
+                jQuery('.widget ul#friends-list').fadeOut(200,
                         function() {
-                                jQuery(".widget ul#friends-list").html(response[1]);
-                                jQuery(".widget ul#friends-list").fadeIn(200);
+                                jQuery('.widget ul#friends-list').html(response[1]);
+                                jQuery('.widget ul#friends-list').fadeIn(200);
                         }
                 );
 
         } else {
-                jQuery(".widget ul#friends-list").fadeOut(200,
+                jQuery('.widget ul#friends-list').fadeOut(200,
                         function() {
                                 var message = '<p>' + response[1] + '</p>';
-                                jQuery(".widget ul#friends-list").html(message);
-                                jQuery(".widget ul#friends-list").fadeIn(200);
+                                jQuery('.widget ul#friends-list').html(message);
+                                jQuery('.widget ul#friends-list').fadeIn(200);
                         }
                 );

trunk/src/bp-groups/admin/js/admin.js

@@ +1 @@
+/* global BP_Group_Admin, group_id, isRtl */
+
 (function($) {
         function add_member_to_list( e, ui ) {
@@ -39 +41 @@
                 });
 
-                window.onbeforeunload = function(e) {
+                window.onbeforeunload = function() {
                         if ( window.warn_on_leave ) {
                                 return BP_Group_Admin.warn_on_leave;

trunk/src/bp-groups/js/widget-groups.js

@@ -1 +1 @@
 jQuery(document).ready( function() {
-        jQuery(".widget div#groups-list-options a").on('click',
+        jQuery('.widget div#groups-list-options a').on('click',
                 function() {
                         var link = this;
                         jQuery(link).addClass('loading');
 
-                        jQuery(".widget div#groups-list-options a").removeClass("selected");
+                        jQuery('.widget div#groups-list-options a').removeClass('selected');
                         jQuery(this).addClass('selected');
 
@@ -11 +11 @@
                                 action: 'widget_groups_list',
                                 'cookie': encodeURIComponent(document.cookie),
-                                '_wpnonce': jQuery("input#_wpnonce-groups").val(),
-                                'max_groups': jQuery("input#groups_widget_max").val(),
+                                '_wpnonce': jQuery('input#_wpnonce-groups').val(),
+                                'max_groups': jQuery('input#groups_widget_max').val(),
                                 'filter': jQuery(this).attr('id')
                         },
@@ -30 +30 @@
         response = response.split('[[SPLIT]]');
 
-        if ( response[0] != "-1" ) {
-                jQuery(".widget ul#groups-list").fadeOut(200,
+        if ( response[0] !== '-1' ) {
+                jQuery('.widget ul#groups-list').fadeOut(200,
                         function() {
-                                jQuery(".widget ul#groups-list").html(response[1]);
-                                jQuery(".widget ul#groups-list").fadeIn(200);
+                                jQuery('.widget ul#groups-list').html(response[1]);
+                                jQuery('.widget ul#groups-list').fadeIn(200);
                         }
                 );
 
         } else {
-                jQuery(".widget ul#groups-list").fadeOut(200,
+                jQuery('.widget ul#groups-list').fadeOut(200,
                         function() {
                                 var message = '<p>' + response[1] + '</p>';
-                                jQuery(".widget ul#groups-list").html(message);
-                                jQuery(".widget ul#groups-list").fadeIn(200);
+                                jQuery('.widget ul#groups-list').html(message);
+                                jQuery('.widget ul#groups-list').fadeIn(200);
                         }
                 );

trunk/src/bp-members/admin/js/admin.js

@@ +1 @@
+/* exported clear */
+
 ( function( $ ) {
         // Profile Visibility Settings

trunk/src/bp-templates/bp-legacy/js/buddypress.js

@@ -13 +13 @@
 
         /* Hide Forums Post Form */
-        if ( '-1' == window.location.search.indexOf('new') && jq('div.forums').length )
+        if ( '-1' === window.location.search.indexOf('new') && jq('div.forums').length ) {
                 jq('#new-topic-post').hide();
-        else
+        } else {
                 jq('#new-topic-post').show();
+        }
 
         /* Activity filter and scope set */
         bp_init_activity();
 
+        var objects  = [ 'members', 'groups', 'blogs', 'forums', 'group_members' ],
+                $whats_new = jq('#whats-new');
+
         /* Object filter and scope set. */
-        var objects = [ 'members', 'groups', 'blogs', 'forums', 'group_members' ];
         bp_init_objects( objects );
 
         /* @mention Compose Scrolling */
-        var $whats_new = jq('#whats-new');
         if ( jq.query.get('r') && $whats_new.length ) {
                 jq('#whats-new-options').animate({
                         height:'40px'
                 });
-                jq("#whats-new-form textarea").animate({
+                jq('#whats-new-form textarea').animate({
                         height:'50px'
                 });
@@ -38 +40 @@
                         easing:'easeOutQuad'
                 } );
-                var whats_new_content = $whats_new.val();
-                $whats_new.val('').focus().val(whats_new_content);
+                $whats_new.val('').focus().val( $whats_new.val() );
         }
 
@@ -46 +47 @@
         /* Textarea focus */
         $whats_new.focus( function(){
-                jq("#whats-new-options").animate({
+                jq('#whats-new-options').animate({
                         height:'40px'
                 });
-                jq("#whats-new-form textarea").animate({
+                jq('#whats-new-form textarea').animate({
                         height:'50px'
                 });
-                jq("#aw-whats-new-submit").prop("disabled", false);
-
-                var $whats_new_form = jq("form#whats-new-form");
-                if ( $whats_new_form.hasClass("submitted") ) {
-                        $whats_new_form.removeClass("submitted");
+                jq('#aw-whats-new-submit').prop('disabled', false);
+
+                var $whats_new_form = jq('form#whats-new-form'),
+                        $activity_all = jq( '#activity-all' );
+
+                if ( $whats_new_form.hasClass('submitted') ) {
+                        $whats_new_form.removeClass('submitted');
                 }
 
                 // Return to the 'All Members' tab and 'Everything' filter,
                 // to avoid inconsistencies with the heartbeat integration
-                var $activity_all = jq( '#activity-all' );
                 if ( $activity_all.length  ) {
                         if ( ! $activity_all.hasClass( 'selected' ) ) {
                                 // reset to everyting
                                 jq( '#activity-filter-select select' ).val( '-1' );
-                                $activity_all.children( 'a' ).trigger( "click" );
-                        } else if ( '-1' != jq( '#activity-filter-select select' ).val() ) {
+                                $activity_all.children( 'a' ).trigger( 'click' );
+                        } else if ( '-1' !== jq( '#activity-filter-select select' ).val() ) {
                                 jq( '#activity-filter-select select' ).val( '-1' );
                                 jq( '#activity-filter-select select' ).trigger( 'change' );
@@ -76 +78 @@
         /* On blur, shrink if it's empty */
         $whats_new.blur( function(){
-                if ( document.activeElement != this ) {
+                if ( document.activeElement !== this ) {
                         if (!this.value.match(/\S+/)) {
-                                this.value = "";
-                                jq("#whats-new-options").animate({
+                                this.value = '';
+                                jq('#whats-new-options').animate({
                                         height:'40px'
                                 });
-                                jq("form#whats-new-form textarea").animate({
+                                jq('form#whats-new-form textarea').animate({
                                         height:'20px'
                                 });
-                                jq("#aw-whats-new-submit").prop("disabled", true);
+                                jq('#aw-whats-new-submit').prop('disabled', true);
                         }
                 }
@@ -91 +93 @@
 
         /* New posts */
-        jq("#aw-whats-new-submit").on( 'click', function() {
-                var last_date_recorded = 0;
-                var button = jq(this);
-                var form = button.closest("form#whats-new-form");
+        jq('#aw-whats-new-submit').on( 'click', function() {
+                var last_date_recorded = 0,
+                        button = jq(this),
+                        form   = button.closest('form#whats-new-form');
 
                 form.children().each( function() {
-                        if ( jq.nodeName(this, "textarea") || jq.nodeName(this, "input") )
+                        if ( jq.nodeName(this, 'textarea') || jq.nodeName(this, 'input') ) {
                                 jq(this).prop( 'disabled', true );
+                        }
                 });
 
@@ -105 +108 @@
                 button.addClass('loading');
                 button.prop('disabled', true);
-                form.addClass("submitted");
+                form.addClass('submitted');
 
                 /* Default POST values */
-                var object = '';
-                var item_id = jq("#whats-new-post-in").val();
-                var content = jq("#whats-new").val();
-                var firstrow = jq( '#buddypress ul.activity-list li' ).first();
-                var activity_row = firstrow;
-                var timestamp = null;
+                object = '';
+                item_id = jq('#whats-new-post-in').val();
+                content = jq('#whats-new').val();
+                firstrow = jq( '#buddypress ul.activity-list li' ).first();
+                activity_row = firstrow;
+                timestamp = null;
 
                 // Checks if at least one activity exists
@@ -124 +127 @@
                         timestamp = activity_row.prop( 'class' ).match( /date-recorded-([0-9]+)/ );
                 }
-                
-                if ( timestamp ) {
+
+                if ( timestamp ) {
                         last_date_recorded = timestamp[1];
                 }
@@ -131 +134 @@
                 /* Set object for non-profile posts */
                 if ( item_id > 0 ) {
-                        object = jq("#whats-new-post-object").val();
+                        object = jq('#whats-new-post-object').val();
                 }
 
@@ -137 +140 @@
                         action: 'post_update',
                         'cookie': bp_get_cookies(),
-                        '_wpnonce_post_update': jq("#_wpnonce_post_update").val(),
+                        '_wpnonce_post_update': jq('#_wpnonce_post_update').val(),
                         'content': content,
                         'object': object,
@@ -147 +150 @@
 
                         form.children().each( function() {
-                                if ( jq.nodeName(this, "textarea") || jq.nodeName(this, "input") ) {
+                                if ( jq.nodeName(this, 'textarea') || jq.nodeName(this, 'input') ) {
                                         jq(this).prop( 'disabled', false );
                                 }
@@ -153 +156 @@
 
                         /* Check for errors and append if found. */
-                        if ( response[0] + response[1] == '-1' ) {
+                        if ( response[0] + response[1] === '-1' ) {
                                 form.prepend( response.substr( 2, response.length ) );
                                 jq( '#' + form.attr('id') + ' div.error').hide().fadeIn( 200 );
                         } else {
-                                if ( 0 == jq("ul.activity-list").length ) {
-                                        jq("div.error").slideUp(100).remove();
-                                        jq("#message").slideUp(100).remove();
-                                        jq("div.activity").append( '<ul id="activity-stream" class="activity-list item-list">' );
+                                if ( 0 === jq('ul.activity-list').length ) {
+                                        jq('div.error').slideUp(100).remove();
+                                        jq('#message').slideUp(100).remove();
+                                        jq('div.activity').append( '<ul id="activity-stream" class="activity-list item-list">' );
                                 }
 
-                                if ( firstrow.hasClass( 'load-newest' ) )
+                                if ( firstrow.hasClass( 'load-newest' ) ) {
                                         firstrow.remove();
-
-                                jq("#activity-stream").prepend(response);
-
-                                if ( ! last_date_recorded )
-                                        jq("#activity-stream li:first").addClass('new-update just-posted');
-
-                                if ( 0 != jq("#latest-update").length ) {
-                                        var l = jq("#activity-stream li.new-update .activity-content .activity-inner p").html();
-                                        var v = jq("#activity-stream li.new-update .activity-content .activity-header p a.view").attr('href');
-
-                                        var ltext = jq("#activity-stream li.new-update .activity-content .activity-inner p").text();
-
-                                        var u = '';
-                                        if ( ltext != '' )
+                                }
+
+                                jq('#activity-stream').prepend(response);
+
+                                if ( ! last_date_recorded ) {
+                                        jq('#activity-stream li:first').addClass('new-update just-posted');
+                                }
+
+                                if ( 0 !== jq('#latest-update').length ) {
+                                        var l   = jq('#activity-stream li.new-update .activity-content .activity-inner p').html(),
+                                                v     = jq('#activity-stream li.new-update .activity-content .activity-header p a.view').attr('href').
+                                                ltext = jq('#activity-stream li.new-update .activity-content .activity-inner p').text(),
+                                                u     = '';
+
+                                        if ( ltext !== '' ) {
                                                 u = l + ' ';
+                                        }
 
                                         u += '<a href="' + v + '" rel="nofollow">' + BP_DTheme.view + '</a>';
 
-                                        jq("#latest-update").slideUp(300,function(){
-                                                jq("#latest-update").html( u );
-                                                jq("#latest-update").slideDown(300);
+                                        jq('#latest-update').slideUp(300,function(){
+                                                jq('#latest-update').html( u );
+                                                jq('#latest-update').slideDown(300);
                                         });
                                 }
 
-                                jq("li.new-update").hide().slideDown( 300 );
-                                jq("li.new-update").removeClass( 'new-update' );
-                                jq("#whats-new").val('');
+                                jq('li.new-update').hide().slideDown( 300 );
+                                jq('li.new-update').removeClass( 'new-update' );
+                                jq('#whats-new').val('');
 
                                 // reset vars to get newest activities
@@ -198 +203 @@
                         }
 
-                        jq("#whats-new-options").animate({
+                        jq('#whats-new-options').animate({
                                 height:'0px'
                         });
-                        jq("#whats-new-form textarea").animate({
+                        jq('#whats-new-form textarea').animate({
                                 height:'20px'
                         });
-                        jq("#aw-whats-new-submit").prop("disabled", true).removeClass('loading');
+                        jq('#aw-whats-new-submit').prop('disabled', true).removeClass('loading');
                 });
 
@@ -212 +217 @@
         /* List tabs event delegation */
         jq('div.activity-type-tabs').on( 'click', function(event) {
-                var target = jq(event.target).parent();
-
-                if ( event.target.nodeName == 'STRONG' || event.target.nodeName == 'SPAN' )
+                var target = jq(event.target).parent(),
+                        scope, filter;
+
+                if ( event.target.nodeName === 'STRONG' || event.target.nodeName === 'SPAN' ) {
                         target = target.parent();
-                else if ( event.target.nodeName != 'A' )
-                        return false;
+                } else if ( event.target.nodeName !== 'A' ) {
+                        return false;
+                }
 
                 /* Reset the page */
@@ -225 +232 @@
 
                 /* Activity Stream Tabs */
-                var scope = target.attr('id').substr( 9, target.attr('id').length );
-                var filter = jq("#activity-filter-select select").val();
-
-                if ( scope == 'mentions' )
+                scope  = target.attr('id').substr( 9, target.attr('id').length );
+                filter = jq('#activity-filter-select select').val();
+
+                if ( scope === 'mentions' ) {
                         jq( '#' + target.attr('id') + ' a strong' ).remove();
+                }
 
                 bp_activity_request(scope, filter);
@@ -238 +246 @@
         /* Activity filter select */
         jq('#activity-filter-select select').change( function() {
-                var selected_tab = jq( 'div.activity-type-tabs li.selected' );
-
-                if ( !selected_tab.length )
-                        var scope = null;
-                else
-                        var scope = selected_tab.attr('id').substr( 9, selected_tab.attr('id').length );
-
-                var filter = jq(this).val();
+                var selected_tab = jq( 'div.activity-type-tabs li.selected' ),
+                        filter = jq(this).val(),
+                        scope;
+
+                if ( !selected_tab.length ) {
+                        scope = null;
+                } else {
+                        scope = selected_tab.attr('id').substr( 9, selected_tab.attr('id').length );
+                }
 
                 bp_activity_request(scope, filter);
@@ -254 +263 @@
         /* Stream event delegation */
         jq('div.activity').on( 'click', function(event) {
-                var target = jq(event.target);
+                var target = jq(event.target),
+                        type, parent, parent_id,
+                        li, id, link_href, nonce, timestamp,
+                        oldest_page, just_posted;
 
                 /* Favoriting activity stream items */
                 if ( target.hasClass('fav') || target.hasClass('unfav') ) {
-                        var type = target.hasClass('fav') ? 'fav' : 'unfav';
-                        var parent = target.closest('.activity-item');
-                        var parent_id = parent.attr('id').substr( 9, parent.attr('id').length );
+                        type      = target.hasClass('fav') ? 'fav' : 'unfav';
+                        parent    = target.closest('.activity-item');
+                        parent_id = parent.attr('id').substr( 9, parent.attr('id').length );
 
                         target.addClass('loading');
@@ -274 +286 @@
                                 target.fadeOut( 200, function() {
                                         jq(this).html(response);
-                                        jq(this).attr('title', 'fav' == type ? BP_DTheme.remove_fav : BP_DTheme.mark_as_fav);
+                                        jq(this).attr('title', 'fav' === type ? BP_DTheme.remove_fav : BP_DTheme.mark_as_fav);
                                         jq(this).fadeIn(200);
                                 });
 
-                                if ( 'fav' == type ) {
+                                if ( 'fav' === type ) {
                                         if ( !jq('.item-list-tabs #activity-favs-personal-li').length ) {
-                                                if ( !jq('.item-list-tabs #activity-favorites').length )
+                                                if ( !jq('.item-list-tabs #activity-favorites').length ) {
                                                         jq('.item-list-tabs ul #activity-mentions').before( '<li id="activity-favorites"><a href="#">' + BP_DTheme.my_favs + ' <span>0</span></a></li>');
+                                                }
 
                                                 jq('.item-list-tabs ul #activity-favorites span').html( Number( jq('.item-list-tabs ul #activity-favorites span').html() ) + 1 );
@@ -296 +309 @@
 
                                         if ( !Number( jq('.item-list-tabs ul #activity-favorites span').html() ) ) {
-                                                if ( jq('.item-list-tabs ul #activity-favorites').hasClass('selected') )
+                                                if ( jq('.item-list-tabs ul #activity-favorites').hasClass('selected') ) {
                                                         bp_activity_request( null, null );
+                                                }
 
                                                 jq('.item-list-tabs ul #activity-favorites').remove();
@@ -303 +317 @@
                                 }
 
-                                if ( 'activity-favorites' == jq( '.item-list-tabs li.selected').attr('id') )
+                                if ( 'activity-favorites' === jq( '.item-list-tabs li.selected').attr('id') ) {
                                         target.closest( '.activity-item' ).slideUp( 100 );
+                                }
                         });
 
@@ -312 +327 @@
                 /* Delete activity stream items */
                 if ( target.hasClass('delete-activity') ) {
-                        var li        = target.parents('div.activity ul li');
-                        var id        = li.attr('id').substr( 9, li.attr('id').length );
-                        var link_href = target.attr('href');
-                        var nonce     = link_href.split('_wpnonce=');
-                        var timestamp = li.prop( 'class' ).match( /date-recorded-([0-9]+)/ );
-
-                        nonce = nonce[1];
+                        li        = target.parents('div.activity ul li');
+                        id        = li.attr('id').substr( 9, li.attr('id').length );
+                        link_href = target.attr('href');
+                        nonce     = link_href.split('_wpnonce=');
+                        timestamp = li.prop( 'class' ).match( /date-recorded-([0-9]+)/ );
+                        nonce     = nonce[1];
 
                         target.addClass('loading');
@@ -330 +344 @@
                         function(response) {
 
-                                if ( response[0] + response[1] == '-1' ) {
+                                if ( response[0] + response[1] === '-1' ) {
                                         li.prepend( response.substr( 2, response.length ) );
                                         li.children('#message').hide().fadeIn(300);
@@ -337 +351 @@
 
                                         // reset vars to get newest activities
-                                        if ( timestamp && activity_last_recorded == timestamp[1] ) {
+                                        if ( timestamp && activity_last_recorded === timestamp[1] ) {
                                                 newest_activities = '';
                                                 activity_last_recorded  = 0;
@@ -349 +363 @@
                 // Spam activity stream items
                 if ( target.hasClass( 'spam-activity' ) ) {
-                        var li        = target.parents( 'div.activity ul li' );
-                        var timestamp = li.prop( 'class' ).match( /date-recorded-([0-9]+)/ );
+                        li        = target.parents( 'div.activity ul li' );
+                        timestamp = li.prop( 'class' ).match( /date-recorded-([0-9]+)/ );
                         target.addClass( 'loading' );
 
@@ -367 +381 @@
                                         li.slideUp( 300 );
                                         // reset vars to get newest activities
-                                        if ( timestamp && activity_last_recorded == timestamp[1] ) {
+                                        if ( timestamp && activity_last_recorded === timestamp[1] ) {
                                                 newest_activities = '';
                                                 activity_last_recorded  = 0;
@@ -379 +393 @@
                 /* Load more updates at the end of the page */
                 if ( target.parent().hasClass('load-more') ) {
-                        jq("#buddypress li.load-more").addClass('loading');
-
-                        if ( null == jq.cookie('bp-activity-oldestpage') )
+                        jq('#buddypress li.load-more').addClass('loading');
+
+                        if ( null === jq.cookie('bp-activity-oldestpage') ) {
                                 jq.cookie('bp-activity-oldestpage', 1, {
                                         path: '/'
                                 } );
-
-                        var oldest_page = ( jq.cookie('bp-activity-oldestpage') * 1 ) + 1;
-
-                        var just_posted = [];
+                        }
+
+                        oldest_page = ( jq.cookie('bp-activity-oldestpage') * 1 ) + 1;
+                        just_posted = [];
 
                         jq('.activity-list li.just-posted').each( function(){
@@ -402 +416 @@
                         function(response)
                         {
-                                jq("#buddypress li.load-more").removeClass('loading');
+                                jq('#buddypress li.load-more').removeClass('loading');
                                 jq.cookie( 'bp-activity-oldestpage', oldest_page, {
                                         path: '/'
                                 } );
-                                jq("#buddypress ul.activity-list").append(response.contents);
+                                jq('#buddypress ul.activity-list').append(response.contents);
 
                                 target.parent().hide();
@@ -429 +443 @@
                         
                         jq.each( activity_html, function( i, el ){
-                                if( 'LI' == el.nodeName && jq(el).hasClass( 'just-posted' ) ) {
-                                        if( jq( '#' + jq(el).attr( 'id' ) ).length )
+                                if( 'LI' === el.nodeName && jq(el).hasClass( 'just-posted' ) ) {
+                                        if( jq( '#' + jq(el).attr( 'id' ) ).length ) {
                                                 jq( '#' + jq(el).attr( 'id' ) ).remove();
+                                        }
                                 }
                         } );
@@ -445 +460 @@
         // Activity "Read More" links
         jq('div.activity').on('click', '.activity-read-more a', function(event) {
-                var target = jq(event.target);
-                var link_id = target.parent().attr('id').split('-');
-                var a_id = link_id[3];
-                var type = link_id[0]; /* activity or acomment */
-
-                var inner_class = type == 'acomment' ? 'acomment-content' : 'activity-inner';
-                var a_inner = jq('#' + type + '-' + a_id + ' .' + inner_class + ':first' );
+                var target = jq(event.target),
+                        link_id = target.parent().attr('id').split('-'),
+                        a_id    = link_id[3],
+                        type    = link_id[0], /* activity or acomment */
+                        inner_class, a_inner;
+
+                inner_class = type === 'acomment' ? 'acomment-content' : 'activity-inner';
+                a_inner = jq('#' + type + '-' + a_id + ' .' + inner_class + ':first' );
                 jq(target).addClass('loading');
 
@@ -471 +487 @@
 
         /* Hide excess comments */
-        if ( jq('.activity-comments').length )
+        if ( jq('.activity-comments').length ) {
                 bp_legacy_theme_hide_comments();
+        }
 
         /* Activity list event delegation */
         jq('div.activity').on( 'click', function(event) {
-                var target = jq(event.target);
+                var target = jq(event.target),
+                        id, ids, a_id, c_id, form,
+                        form_parent, form_id,
+                        tmp_id, comment_id, comment,
+                        ajaxdata,
+                        ak_nonce,
+                        show_all_a, new_count,
+                        link_href, comment_li, nonce;
 
                 /* Comment / comment reply links */
                 if ( target.hasClass('acomment-reply') || target.parent().hasClass('acomment-reply') ) {
-                        if ( target.parent().hasClass('acomment-reply') )
+                        if ( target.parent().hasClass('acomment-reply') ) {
                                 target = target.parent();
-
-                        var id = target.attr('id');
+                        }
+
+                        id  = target.attr('id');
                         ids = id.split('-');
 
-                        var a_id = ids[2]
-                        var c_id = target.attr('href').substr( 10, target.attr('href').length );
-                        var form = jq( '#ac-form-' + a_id );
+                        a_id = ids[2];
+                        c_id = target.attr('href').substr( 10, target.attr('href').length );
+                        form = jq( '#ac-form-' + a_id );
 
                         form.css( 'display', 'none' );
@@ -496 +521 @@
                         /* Hide any error messages */
                         form.children('div').each( function() {
-                                if ( jq(this).hasClass( 'error' ) )
+                                if ( jq(this).hasClass( 'error' ) ) {
                                         jq(this).hide();
+                                }
                         });
 
-                        if ( ids[1] != 'comment' ) {
+                        if ( ids[1] !== 'comment' ) {
                                 jq('#acomment-' + c_id).append( form );
                         } else {
@@ -506 +532 @@
                         }
 
-                        if ( form.parent().hasClass( 'activity-comments' ) )
+                        if ( form.parent().hasClass( 'activity-comments' ) ) {
                                 form.addClass('root');
+                        }
 
                         form.slideDown( 200 );
@@ -520 +547 @@
 
                 /* Activity comment posting */
-                if ( target.attr('name') == 'ac_form_submit' ) {
-                        var form = target.parents( 'form' );
-                        var form_parent = form.parent();
-                        var form_id = form.attr('id').split('-');
+                if ( target.attr('name') === 'ac_form_submit' ) {
+                        form = target.parents( 'form' );
+                        form_parent = form.parent();
+                        form_id = form.attr('id').split('-');
 
                         if ( !form_parent.hasClass('activity-comments') ) {
-                                var tmp_id = form_parent.attr('id').split('-');
-                                var comment_id = tmp_id[1];
+                                tmp_id = form_parent.attr('id').split('-');
+                                comment_id = tmp_id[1];
                         } else {
-                                var comment_id = form_id[2];
-                        }
-
-                        var content = jq( '#' + form.attr('id') + ' textarea' );
+                                comment_id = form_id[2];
+                        }
+
+                        content = jq( '#' + form.attr('id') + ' textarea' );
 
                         /* Hide any error messages */
@@ -539 +566 @@
                         content.addClass('loading').prop('disabled', true);
 
-                        var ajaxdata = {
+                        ajaxdata = {
                                 action: 'new_activity_comment',
                                 'cookie': bp_get_cookies(),
-                                '_wpnonce_new_activity_comment': jq("#_wpnonce_new_activity_comment").val(),
+                                '_wpnonce_new_activity_comment': jq('#_wpnonce_new_activity_comment').val(),
                                 'comment_id': comment_id,
                                 'form_id': form_id[2],
@@ -549 +576 @@
 
                         // Akismet
-                        var ak_nonce = jq('#_bp_as_nonce_' + comment_id).val();
+                        ak_nonce = jq('#_bp_as_nonce_' + comment_id).val();
                         if ( ak_nonce ) {
                                 ajaxdata['_bp_as_nonce_' + comment_id] = ak_nonce;
@@ -559 +586 @@
 
                                 /* Check for errors and append if found. */
-                                if ( response[0] + response[1] == '-1' ) {
+                                if ( response[0] + response[1] === '-1' ) {
                                         form.append( jq( response.substr( 2, response.length ) ).hide().fadeIn( 200 ) );
                                 } else {
                                         var activity_comments = form.parent();
                                         form.fadeOut( 200, function() {
-                                                if ( 0 == activity_comments.children('ul').length ) {
+                                                if ( 0 === activity_comments.children('ul').length ) {
                                                         if ( activity_comments.hasClass('activity-comments') ) {
                                                                 activity_comments.prepend('<ul></ul>');
@@ -585 +612 @@
 
                                         // Increment the 'Show all x comments' string, if present
-                                        var show_all_a = activity_comments.find('.show-all').find('a');
+                                        show_all_a = activity_comments.find('.show-all').find('a');
                                         if ( show_all_a ) {
-                                                var new_count = jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html();
+                                                new_count = jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html();
                                                 show_all_a.html( BP_DTheme.show_x_comments.replace( '%d', new_count ) );
                                         }
                                 }
 
-                                jq(target).prop("disabled", false);
-                                jq(content).prop("disabled", false);
+                                jq(target).prop('disabled', false);
+                                jq(content).prop('disabled', false);
                         });
 
@@ -601 +628 @@
                 /* Deleting an activity comment */
                 if ( target.hasClass('acomment-delete') ) {
-                        var link_href = target.attr('href');
-                        var comment_li = target.parent().parent();
-                        var form = comment_li.parents('div.activity-comments').children('form');
-
-                        var nonce = link_href.split('_wpnonce=');
+                        link_href = target.attr('href');
+                        comment_li = target.parent().parent();
+                        form = comment_li.parents('div.activity-comments').children('form');
+
+                        nonce = link_href.split('_wpnonce=');
                         nonce = nonce[1];
 
-                        var comment_id = link_href.split('cid=');
+                        comment_id = link_href.split('cid=');
                         comment_id = comment_id[1].split('&');
                         comment_id = comment_id[0];
@@ -628 +655 @@
                         function(response) {
                                 /* Check for errors and append if found. */
-                                if ( response[0] + response[1] == '-1' ) {
+                                if ( response[0] + response[1] === '-1' ) {
                                         comment_li.prepend( jq( response.substr( 2, response.length ) ).hide().fadeIn( 200 ) );
                                 } else {
-                                        var children = jq( '#' + comment_li.attr('id') + ' ul' ).children('li');
-                                        var child_count = 0;
+                                        var children  = jq( '#' + comment_li.attr('id') + ' ul' ).children('li');
+                                                child_count = 0,
+                                                count_span, new_count, show_all_a;
+
                                         jq(children).each( function() {
-                                                if ( !jq(this).is(':hidden') )
+                                                if ( !jq(this).is(':hidden') ) {
                                                         child_count++;
+                                                }
                                         });
                                         comment_li.fadeOut(200, function() {
@@ -642 +672 @@
 
                                         /* Decrease the "Reply (X)" button count */
-                                        var count_span = jq('#' + comment_li.parents('#activity-stream > li').attr('id') + ' a.acomment-reply span');
-                                        var new_count = count_span.html() - ( 1 + child_count );
+                                        count_span = jq('#' + comment_li.parents('#activity-stream > li').attr('id') + ' a.acomment-reply span');
+                                        new_count = count_span.html() - ( 1 + child_count );
                                         count_span.html(new_count);
 
                                         // Change the 'Show all x comments' text
-                                        var show_all_a = comment_li.siblings('.show-all').find('a');
+                                        show_all_a = comment_li.siblings('.show-all').find('a');
                                         if ( show_all_a ) {
                                                 show_all_a.html( BP_DTheme.show_x_comments.replace( '%d', new_count ) );
@@ -653 +683 @@
 
                                         /* If that was the last comment for the item, remove the has-comments class to clean up the styling */
-                                        if ( 0 == new_count ) {
+                                        if ( 0 === new_count ) {
                                                 jq(comment_li.parents('#activity-stream > li')).removeClass('has-comments');
                                         }
@@ -664 +694 @@
                 // Spam an activity stream comment
                 if ( target.hasClass( 'spam-activity-comment' ) ) {
-                        var link_href  = target.attr( 'href' );
-                        var comment_li = target.parent().parent();
+                        link_href  = target.attr( 'href' );
+                        comment_li = target.parent().parent();
 
                         target.addClass('loading');
@@ -684 +714 @@
                         function ( response ) {
                                 // Check for errors and append if found.
-                                if ( response[0] + response[1] == '-1' ) {
+                                if ( response[0] + response[1] === '-1' ) {
                                         comment_li.prepend( jq( response.substr( 2, response.length ) ).hide().fadeIn( 200 ) );
 
                                 } else {
-                                        var children = jq( '#' + comment_li.attr( 'id' ) + ' ul' ).children( 'li' );
-                                        var child_count = 0;
+                                        var children  = jq( '#' + comment_li.attr( 'id' ) + ' ul' ).children( 'li' ),
+                                                child_count = 0,
+                                                parent_li;
+
                                         jq(children).each( function() {
                                                 if ( !jq( this ).is( ':hidden' ) ) {
@@ -698 +730 @@
 
                                         // Decrease the "Reply (X)" button count
-                                        var parent_li = comment_li.parents( '#activity-stream > li' );
+                                        parent_li = comment_li.parents( '#activity-stream > li' );
                                         jq( '#' + parent_li.attr( 'id' ) + ' a.acomment-reply span' ).html( jq( '#' + parent_li.attr( 'id' ) + ' a.acomment-reply span' ).html() - ( 1 + child_count ) );
                                 }
@@ -723 +755 @@
                         jq(target).closest('.ac-form').slideUp( 200 );
                         return false;
-                };
+                }
         });
 
@@ -729 +761 @@
         jq(document).keydown( function(e) {
                 e = e || window.event;
-                if (e.target)
+                if (e.target) {
                         element = e.target;
-                else if (e.srcElement)
+                } else if (e.srcElement) {
                         element = e.srcElement;
-
-                if( element.nodeType == 3)
+                }
+
+                if( element.nodeType === 3) {
                         element = element.parentNode;
-
-                if( e.ctrlKey == true || e.altKey == true || e.metaKey == true )
+                }
+
+                if( e.ctrlKey === true || e.altKey === true || e.metaKey === true ) {
                         return;
+                }
 
                 var keyCode = (e.keyCode) ? e.keyCode : e.which;
 
-                if ( keyCode == 27 ) {
-                        if (element.tagName == 'TEXTAREA') {
-                                if ( jq(element).hasClass('ac-input') )
+                if ( keyCode === 27 ) {
+                        if (element.tagName === 'TEXTAREA') {
+                                if ( jq(element).hasClass('ac-input') ) {
                                         jq(element).parent().parent().parent().slideUp( 200 );
+                                }
                         }
                 }
@@ -754 +790 @@
         /* The search form on all directory pages */
         jq( '.dir-search, .groups-members-search' ).on( 'click', function(event) {
-                if ( jq(this).hasClass('no-ajax') )
+                if ( jq(this).hasClass('no-ajax') ) {
                         return;
-
-                var target = jq(event.target);
-
-                if ( target.attr('type') == 'submit' ) {
-                        var css_id = jq('.item-list-tabs li.selected').attr('id').split( '-' );
-                        var object = css_id[0];
-                        var template = null;
+                }
+
+                var target = jq(event.target),
+                        css_id, object, template;
+
+                if ( target.attr('type') === 'submit' ) {
+                        css_id = jq('.item-list-tabs li.selected').attr('id').split( '-' );
+                        object = css_id[0];
+                        template = null;
 
                         // The Group Members page specifies its own template
-                        if ( 'members' == object && 'groups' == css_id[1] ) {
+                        if ( 'members' === object && 'groups' === css_id[1] ) {
                                 object = 'group_members';
                                 template = 'groups/single/members';
@@ -780 +818 @@
         /* When a navigation tab is clicked - e.g. | All Groups | My Groups | */
         jq('div.item-list-tabs').on( 'click', function(event) {
-                if ( jq(this).hasClass('no-ajax') )
+                if ( jq(this).hasClass('no-ajax') )  {
                         return;
-
-                var targetElem = ( event.target.nodeName == 'SPAN' ) ? event.target.parentNode : event.target;
-                var target     = jq( targetElem ).parent();
-                if ( 'LI' == target[0].nodeName && !target.hasClass( 'last' ) ) {
-                        var css_id = target.attr('id').split( '-' );
-                        var object = css_id[0];
-
-                        if ( 'activity' == object )
+                }
+
+                var targetElem = ( event.target.nodeName === 'SPAN' ) ? event.target.parentNode : event.target.
+                        target       = jq( targetElem ).parent(),
+                        css_id, object, scope, filter, search_terms;
+
+                if ( 'LI' === target[0].nodeName && !target.hasClass( 'last' ) ) {
+                        css_id = target.attr('id').split( '-' );
+                        object = css_id[0];
+
+                        if ( 'activity' === object ) {
                                 return false;
-
-                        var scope = css_id[1];
-                        var filter = jq("#" + object + "-order-select select").val();
-                        var search_terms = jq("#" + object + "_search").val();
+                        }
+
+                        scope = css_id[1];
+                        filter = jq('#" + object + "-order-select select').val();
+                        search_terms = jq('#" + object + "_search').val();
 
                         bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, jq.cookie('bp-' + object + '-extras') );
@@ -804 +846 @@
         /* When the filter select box is changed re-query */
         jq('li.filter select').change( function() {
-                if ( jq('.item-list-tabs li.selected').length )
-                        var el = jq('.item-list-tabs li.selected');
-                else
-                        var el = jq(this);
-
-                var css_id = el.attr('id').split('-');
-                var object = css_id[0];
-                var scope = css_id[1];
-                var filter = jq(this).val();
-                var search_terms = false;
-                var template = null;
-
-                if ( jq('.dir-search input').length )
+                var el,
+                        css_id, object, scope, filter, search_terms, template,
+                        $gm_search;
+
+                if ( jq('.item-list-tabs li.selected').length ) {
+                        el = jq('.item-list-tabs li.selected');
+                } else {
+                        el = jq(this);
+                }
+
+                css_id = el.attr('id').split('-');
+                object = css_id[0];
+                scope = css_id[1];
+                filter = jq(this).val();
+                search_terms = false;
+                template = null;
+
+                if ( jq('.dir-search input').length ) {
                         search_terms = jq('.dir-search input').val();
+                }
 
                 // The Group Members page has a different selector for its
                 // search terms box
-                var $gm_search = jq( '.groups-members-search input' );
+                $gm_search = jq( '.groups-members-search input' );
                 if ( $gm_search.length ) {
                         search_terms = $gm_search.val();
@@ -827 +875 @@
 
                 // On the Groups Members page, we specify a template
-                if ( 'members' == object && 'groups' == scope ) {
+                if ( 'members' === object && 'groups' === scope ) {
                         object = 'group_members';
                         template = 'groups/single/members';
                 }
 
-                if ( 'friends' == object )
+                if ( 'friends' === object ) {
                         object = 'members';
+                }
 
                 bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, jq.cookie('bp-' + object + '-extras'), null, template );
@@ -842 +891 @@
         /* All pagination links run through this function */
         jq('#buddypress').on( 'click', function(event) {
-                var target = jq(event.target);
-
-                if ( target.hasClass('button') )
+                var target = jq(event.target),
+                        el,
+                        css_id, object, search_terms, pagination_id, template, page_number,
+                        $gm_search,
+                        caller;
+
+                if ( target.hasClass('button') ) {
                         return true;
+                }
 
                 if ( target.parent().parent().hasClass('pagination') && !target.parent().parent().hasClass('no-ajax') ) {
-                        if ( target.hasClass('dots') || target.hasClass('current') )
+                        if ( target.hasClass('dots') || target.hasClass('current') ) {
                                 return false;
-
-                        if ( jq('.item-list-tabs li.selected').length )
-                                var el = jq('.item-list-tabs li.selected');
-                        else
-                                var el = jq('li.filter select');
-
-                        var css_id = el.attr('id').split( '-' );
-                        var object = css_id[0];
-                        var search_terms = false;
-                        var pagination_id = jq(target).closest('.pagination-links').attr('id');
-                        var template = null;
-
-                        var page_number = target.attr('href').split( '=' );
+                        }
+
+                        if ( jq('.item-list-tabs li.selected').length ) {
+                                el = jq('.item-list-tabs li.selected');
+                        } else {
+                                el = jq('li.filter select');
+                        }
+
+                        css_id = el.attr('id').split( '-' );
+                        object = css_id[0];
+                        search_terms = false;
+                        pagination_id = jq(target).closest('.pagination-links').attr('id');
+                        template = null;
+
+                        page_number = target.attr('href').split( '=' );
                         page_number = page_number[1];
 
                         // Search terms
-                        if ( jq('div.dir-search input').length )
+                        if ( jq('div.dir-search input').length ) {
                                 search_terms = jq('.dir-search input').val();
+                        }
 
                         // The Group Members page has a different selector for
                         // its search terms box
-                        var $gm_search = jq( '.groups-members-search input' );
+                        $gm_search = jq( '.groups-members-search input' );
                         if ( $gm_search.length ) {
                                 search_terms = $gm_search.val();
@@ -877 +934 @@
 
                         // On the Groups Members page, we specify a template
-                        if ( 'members' == object && 'groups' == css_id[1] ) {
+                        if ( 'members' === object && 'groups' === css_id[1] ) {
                                 object = 'group_members';
                                 template = 'groups/single/members';
@@ -884 +941 @@
                         // On the Admin > Requests page, we need to reset the object,
                         // since "admin" isn't specific enough
-                        if ( 'admin' == object && jq( 'body' ).hasClass( 'membership-requests' ) ) {
+                        if ( 'admin' === object && jq( 'body' ).hasClass( 'membership-requests' ) ) {
                                 object = 'requests';
                         }
 
                         if ( pagination_id.indexOf( 'pag-bottom' ) !== -1 ) {
-                                var caller = 'pag-bottom';
+                                caller = 'pag-bottom';
                         } else {
-                                var caller = null;
+                                caller = null;
                         }
 
@@ -905 +962 @@
         /* Hit the "New Topic" button on the forums directory page */
         jq('a.show-hide-new').on( 'click', function() {
-                if ( !jq('#new-topic-post').length )
-                        return false;
-
-                if ( jq('#new-topic-post').is(":visible") )
+                if ( !jq('#new-topic-post').length ) {
+                        return false;
+                }
+
+                if ( jq('#new-topic-post').is(':visible') ) {
                         jq('#new-topic-post').slideUp(200);
-                else
+                } else {
                         jq('#new-topic-post').slideDown(200, function() {
                                 jq('#topic_title').focus();
                         } );
+                }
 
                 return false;
@@ -920 +979 @@
         /* Cancel the posting of a new forum topic */
         jq('#submit_topic_cancel').on( 'click', function() {
-                if ( !jq('#new-topic-post').length )
-                        return false;
+                if ( !jq('#new-topic-post').length ) {
+                        return false;
+                }
 
                 jq('#new-topic-post').slideUp(200);
@@ -936 +996 @@
 
         /* Select a user from the list of friends and add them to the invite list */
-        jq("#send-invite-form").on( 'click', '#invite-list input', function() {
+        jq('#send-invite-form').on( 'click', '#invite-list input', function() {
                 // invites-loop template contains a div with the .invite class
                 // We use the existence of this div to check for old- vs new-
                 // style templates.
-                var invites_new_template = jq( "#send-invite-form > .invite" ).length;
+                var invites_new_template = jq( '#send-invite-form > .invite' ).length,
+                        friend_id, friend_action;
 
                 jq('.ajax-loader').toggle();
@@ -949 +1010 @@
                 }
 
-                var friend_id = jq(this).val();
-
-                if ( jq(this).prop('checked') == true ) {
-                        var friend_action = 'invite';
+                friend_id = jq(this).val();
+
+                if ( jq(this).prop('checked') === true ) {
+                        friend_action = 'invite';
                 } else {
-                        var friend_action = 'uninvite';
+                        friend_action = 'uninvite';
                 }
 
@@ -965 +1026 @@
                         'friend_action': friend_action,
                         'cookie': bp_get_cookies(),
-                        '_wpnonce': jq("#_wpnonce_invite_uninvite_user").val(),
+                        '_wpnonce': jq('#_wpnonce_invite_uninvite_user').val(),
                         'friend_id': friend_id,
-                        'group_id': jq("#group_id").val()
+                        'group_id': jq('#group_id').val()
                 },
                 function(response)
                 {
-                        if ( jq("#message") ) {
-                                jq("#message").hide();
+                        if ( jq('#message') ) {
+                                jq('#message').hide();
                         }
 
@@ -984 +1045 @@
                                 jq('.ajax-loader').toggle();
 
-                                if ( friend_action == 'invite' ) {
+                                if ( friend_action === 'invite' ) {
                                         jq('#friend-list').append(response);
-                                } else if ( friend_action == 'uninvite' ) {
+                                } else if ( friend_action === 'uninvite' ) {
                                         jq('#friend-list li#uid-' + friend_id).remove();
                                 }
@@ -996 +1057 @@
 
         /* Remove a user from the list of users to invite to a group */
-        jq("#send-invite-form").on('click', 'a.remove', function() {
+        jq('#send-invite-form').on('click', 'a.remove', function() {
                 // invites-loop template contains a div with the .invite class
                 // We use the existence of this div to check for old- vs new-
                 // style templates.
-                var invites_new_template = jq("#send-invite-form > .invite").length;
+                var invites_new_template = jq('#send-invite-form > .invite').length,
+                        friend_id = jq(this).attr('id');
 
                 jq('.ajax-loader').toggle();
 
-                var friend_id = jq(this).attr('id');
                 friend_id = friend_id.split('-');
                 friend_id = friend_id[1];
@@ -1012 +1073 @@
                         'friend_action': 'uninvite',
                         'cookie': bp_get_cookies(),
-                        '_wpnonce': jq("#_wpnonce_invite_uninvite_user").val(),
+                        '_wpnonce': jq('#_wpnonce_invite_uninvite_user').val(),
                         'friend_id': friend_id,
-                        'group_id': jq("#group_id").val()
+                        'group_id': jq('#group_id').val()
                 },
                 function(response)
@@ -1054 +1115 @@
         } );
 
-        jq("#profile-edit-form input:not(:submit), #profile-edit-form textarea, #profile-edit-form select, #signup_form input:not(:submit), #signup_form textarea, #signup_form select").change( function() {
+        jq('#profile-edit-form input:not(:submit), #profile-edit-form textarea, #profile-edit-form select, #signup_form input:not(:submit), #signup_form textarea, #signup_form select').change( function() {
                 var shouldconfirm = true;
 
@@ -1071 +1132 @@
 
         /* Accept and Reject friendship request buttons */
-        jq("#friend-list a.accept, #friend-list a.reject").on( 'click', function() {
-                var button = jq(this);
-                var li = jq(this).parents('#friend-list li');
-                var action_div = jq(this).parents('li div.action');
-
-                var id = li.attr('id').substr( 11, li.attr('id').length );
-                var link_href = button.attr('href');
-
-                var nonce = link_href.split('_wpnonce=');
-                nonce = nonce[1];
-
-                if ( jq(this).hasClass('accepted') || jq(this).hasClass('rejected') )
-                        return false;
+        jq('#friend-list a.accept, #friend-list a.reject').on( 'click', function() {
+                var button   = jq(this),
+                        li         = jq(this).parents('#friend-list li'),
+                        action_div = jq(this).parents('li div.action'),
+                        id         = li.attr('id').substr( 11, li.attr('id').length ),
+                        link_href  = button.attr('href'),
+                        nonce      = link_href.split('_wpnonce=')[1],
+                        action;
+
+                if ( jq(this).hasClass('accepted') || jq(this).hasClass('rejected') ) {
+                        return false;
+                }
 
                 if ( jq(this).hasClass('accept') ) {
-                        var action = 'accept_friendship';
+                        action = 'accept_friendship';
                         action_div.children('a.reject').css( 'visibility', 'hidden' );
                 } else {
-                        var action = 'reject_friendship';
+                        action = 'reject_friendship';
                         action_div.children('a.accept').css( 'visibility', 'hidden' );
                 }
@@ -1104 +1164 @@
                         button.removeClass('loading');
 
-                        if ( response[0] + response[1] == '-1' ) {
+                        if ( response[0] + response[1] === '-1' ) {
                                 li.prepend( response.substr( 2, response.length ) );
                                 li.children('#message').hide().fadeIn(200);
@@ -1126 +1186 @@
         jq( '#members-dir-list, #members-group-list' ).on('click', '.friendship-button a', function() {
                 jq(this).parent().addClass('loading');
-                var fid = jq(this).attr('id');
+                var fid   = jq(this).attr('id'),
+                        nonce   = jq(this).attr('href'),
+                        thelink = jq(this);
+
                 fid = fid.split('-');
                 fid = fid[1];
 
-                var nonce = jq(this).attr('href');
                 nonce = nonce.split('?_wpnonce=');
                 nonce = nonce[1].split('&');
                 nonce = nonce[0];
-
-                var thelink = jq(this);
 
                 jq.post( ajaxurl, {
@@ -1145 +1205 @@
                 function(response)
                 {
-                        var action = thelink.attr('rel');
-                        var parentdiv = thelink.parent();
-
-                        if ( action == 'add' ) {
+                        var action  = thelink.attr('rel');
+                                parentdiv = thelink.parent();
+
+                        if ( action === 'add' ) {
                                 jq(parentdiv).fadeOut(200,
                                         function() {
@@ -1158 +1218 @@
                                         );
 
-                        } else if ( action == 'remove' ) {
+                        } else if ( action === 'remove' ) {
                                 jq(parentdiv).fadeOut(200,
                                         function() {
@@ -1176 +1236 @@
         // Confirmation when clicking Leave Group in group headers
         jq('#buddypress').on('click', '.group-button .leave-group', function() {
-                if ( false == confirm( BP_DTheme.leave_group_confirm ) ) {
+                if ( false === confirm( BP_DTheme.leave_group_confirm ) ) {
                         return false;
                 }
@@ -1182 +1242 @@
 
         jq('#groups-dir-list').on('click', '.group-button a', function() {
-                var gid = jq(this).parent().attr('id');
+                var gid   = jq(this).parent().attr('id').
+                        nonce   = jq(this).attr('href'),
+                        thelink = jq(this);
+
                 gid = gid.split('-');
                 gid = gid[1];
 
-                var nonce = jq(this).attr('href');
                 nonce = nonce.split('?_wpnonce=');
                 nonce = nonce[1].split('&');
                 nonce = nonce[0];
 
-                var thelink = jq(this);
-
                 // Leave Group confirmation within directories - must intercept
                 // AJAX request
-                if ( thelink.hasClass( 'leave-group' ) && false == confirm( BP_DTheme.leave_group_confirm ) ) {
+                if ( thelink.hasClass( 'leave-group' ) && false === confirm( BP_DTheme.leave_group_confirm ) ) {
                         return false;
                 }
@@ -1219 +1279 @@
                                                 parentdiv.fadeIn(200).html(response);
 
-                                                var mygroups = jq('#groups-personal span');
-                                                var add      = 1;
+                                                var mygroups = jq('#groups-personal span'),
+                                                        add        = 1;
 
                                                 if( thelink.hasClass( 'leave-group' ) ) {
@@ -1259 +1319 @@
         /** Message search*/
         jq('.message-search').on( 'click', function(event) {
-                if ( jq(this).hasClass('no-ajax') )
+                if ( jq(this).hasClass('no-ajax') ) {
                         return;
-
-                var target = jq(event.target);
-
-                if ( target.attr('type') == 'submit' ) {
+                }
+
+                var target = jq(event.target),
+                        object;
+
+                if ( target.attr('type') === 'submit' ) {
                         //var css_id = jq('.item-list-tabs li.selected').attr('id').split( '-' );
-                        var object = 'messages';
+                        object = 'messages';
 
                         bp_filter_request( object, jq.cookie('bp-' + object + '-filter'), jq.cookie('bp-' + object + '-scope') , 'div.' + object, target.parent().children('label').children('input').val(), 1, jq.cookie('bp-' + object + '-extras') );
@@ -1275 +1337 @@
 
         /* AJAX send reply functionality */
-        jq("#send_reply_button").click(
+        jq('#send_reply_button').click(
                 function() {
                         var order = jq('#messages_order').val() || 'ASC',
-                        offset = jq('#message-recipients').offset();
-
-                        var button = jq("#send_reply_button");
+                                offset  = jq('#message-recipients').offset(),
+                                button  = jq('#send_reply_button');
+
                         jq(button).addClass('loading');
 
@@ -1286 +1348 @@
                                 action: 'messages_send_reply',
                                 'cookie': bp_get_cookies(),
-                                '_wpnonce': jq("#send_message_nonce").val(),
-
-                                'content': jq("#message_content").val(),
-                                'send_to': jq("#send_to").val(),
-                                'subject': jq("#subject").val(),
-                                'thread_id': jq("#thread_id").val()
+                                '_wpnonce': jq('#send_message_nonce').val(),
+
+                                'content': jq('#message_content').val(),
+                                'send_to': jq('#send_to').val(),
+                                'subject': jq('#subject').val(),
+                                'thread_id': jq('#thread_id').val()
                         },
                         function(response)
                         {
-                                if ( response[0] + response[1] == "-1" ) {
+                                if ( response[0] + response[1] === '-1' ) {
                                         jq('#send-reply').prepend( response.substr( 2, response.length ) );
                                 } else {
                                         jq('#send-reply #message').remove();
-                                        jq("#message_content").val('');
-
-                                        if ( 'ASC' == order ) {
+                                        jq('#message_content').val('');
+
+                                        if ( 'ASC' === order ) {
                                                 jq('#send-reply').before( response );
                                         } else {
@@ -1308 +1370 @@
                                         }
 
-                                        jq(".new-message").hide().slideDown( 200, function() {
+                                        jq('.new-message').hide().slideDown( 200, function() {
                                                 jq('.new-message').removeClass('new-message');
                                         });
@@ -1320 +1382 @@
 
         /* Marking private messages as read and unread */
-        jq("#mark_as_read, #mark_as_unread").click(function() {
-                var checkboxes_tosend = '';
-                var checkboxes = jq("#message-threads tr td input[type='checkbox']");
-
-                if ( 'mark_as_unread' == jq(this).attr('id') ) {
-                        var currentClass = 'read'
-                        var newClass = 'unread'
-                        var unreadCount = 1;
-                        var inboxCount = 0;
-                        var unreadCountDisplay = 'inline';
-                        var action = 'messages_markunread';
+        jq('#mark_as_read, #mark_as_unread').click(function() {
+                var checkboxes_tosend = '',
+                        checkboxes = jq('#message-threads tr td input[type="checkbox"]'),
+                        currentClass, newClass, unreadCount, inboxCount, unreadCountDisplay, action,
+                        inboxcount, thread_count;
+
+                if ( 'mark_as_unread' === jq(this).attr('id') ) {
+                        currentClass = 'read';
+                        newClass = 'unread';
+                        unreadCount = 1;
+                        inboxCount = 0;
+                        unreadCountDisplay = 'inline';
+                        action = 'messages_markunread';
                 } else {
-                        var currentClass = 'unread'
-                        var newClass = 'read'
-                        var unreadCount = 0;
-                        var inboxCount = 1;
-                        var unreadCountDisplay = 'none';
-                        var action = 'messages_markread';
+                        currentClass = 'unread';
+                        newClass = 'read';
+                        unreadCount = 0;
+                        inboxCount = 1;
+                        unreadCountDisplay = 'none';
+                        action = 'messages_markread';
                 }
 
@@ -1346 +1410 @@
                                         jq('#m-' + jq(this).attr('value')).removeClass(currentClass);
                                         jq('#m-' + jq(this).attr('value')).addClass(newClass);
-                                        var thread_count = jq('#m-' + jq(this).attr('value') + ' td span.unread-count').html();
+                                        thread_count = jq('#m-' + jq(this).attr('value') + ' td span.unread-count').html();
 
                                         jq('#m-' + jq(this).attr('value') + ' td span.unread-count').html(unreadCount);
                                         jq('#m-' + jq(this).attr('value') + ' td span.unread-count').css('display', unreadCountDisplay);
 
-                                        var inboxcount = jq('tr.unread').length;
+                                        inboxcount = jq('tr.unread').length;
 
                                         jq('#user-messages span').html( inboxcount );
 
-                                        if ( i != checkboxes.length - 1 ) {
-                                                checkboxes_tosend += ','
+                                        if ( i !== checkboxes.length - 1 ) {
+                                                checkboxes_tosend += ',';
                                         }
                                 }
@@ -1370 +1434 @@
         /* Selecting unread and read messages in inbox */
         jq( 'body.messages #item-body div.messages' ).on( 'change', '#message-type-select', function() {
-                var selection = this.value;
-                var checkboxes = jq( "td input[type='checkbox']" );
+                var selection   = this.value,
+                        checkboxes    = jq( 'td input[type="checkbox"]' ),
+                        checked_value = 'checked';
 
                 checkboxes.each( function(i) {
-                        checkboxes[i].checked = "";
-                });
-
-                var checked_value = "checked";
+                        checkboxes[i].checked = '';
+                });
+
                 switch ( selection ) {
-                        case 'unread' :
-                                checkboxes = jq("tr.unread td input[type='checkbox']");
+                        case 'unread':
+                                checkboxes = jq('tr.unread td input[type="checkbox"]');
                                 break;
-                        case 'read' :
-                                checkboxes = jq("tr.read td input[type='checkbox']");
+                        case 'read':
+                                checkboxes = jq('tr.read td input[type="checkbox"]');
                                 break;
-                        case '' :
-                                checked_value = "";
+                        case '':
+                                checked_value = '';
                                 break;
                 }
@@ -1397 +1461 @@
         /* Bulk delete messages */
         jq( 'body.messages #item-body div.messages' ).on( 'click', '.messages-options-nav a', function() {
-                if ( -1 == jq.inArray( this.id, Array( 'delete_sentbox_messages', 'delete_inbox_messages' ) ) ) {
+                if ( -1 === jq.inArray( this.id, Array( 'delete_sentbox_messages', 'delete_inbox_messages' ) ) ) {
                         return;
                 }
 
                 checkboxes_tosend = '';
-                checkboxes = jq("#message-threads tr td input[type='checkbox']");
+                checkboxes = jq('#message-threads tr td input[type="checkbox"]');
 
                 jq('#message').remove();
@@ -1408 +1472 @@
 
                 jq(checkboxes).each( function(i) {
-                        if( jq(this).is(':checked') )
+                        if( jq(this).is(':checked') ) {
                                 checkboxes_tosend += jq(this).attr('value') + ',';
-                });
-
-                if ( '' == checkboxes_tosend ) {
+                        }
+                });
+
+                if ( '' === checkboxes_tosend ) {
                         jq(this).removeClass('loading');
                         return false;
@@ -1421 +1486 @@
                         'thread_ids': checkboxes_tosend
                 }, function(response) {
-                        if ( response[0] + response[1] == "-1" ) {
+                        if ( response[0] + response[1] === '-1' ) {
                                 jq('#message-threads').prepend( response.substr( 2, response.length ) );
                         } else {
@@ -1437 +1502 @@
 
                         jq('#message').hide().slideDown(150);
-                        jq("#delete_inbox_messages, #delete_sentbox_messages").removeClass('loading');
+                        jq('#delete_inbox_messages, #delete_sentbox_messages').removeClass('loading');
                 });
 
@@ -1444 +1509 @@
 
         /* Close site wide notices in the sidebar */
-        jq("#close-notice").on( 'click', function() {
+        jq('#close-notice').on( 'click', function() {
                 jq(this).addClass('loading');
                 jq('#sidebar div.error').remove();
@@ -1453 +1518 @@
                 },
                 function(response) {
-                        jq("#close-notice").removeClass('loading');
-
-                        if ( response[0] + response[1] == '-1' ) {
+                        jq('#close-notice').removeClass('loading');
+
+                        if ( response[0] + response[1] === '-1' ) {
                                 jq('.notice').prepend( response.substr( 2, response.length ) );
                                 jq( '#sidebar div.error').hide().fadeIn( 200 );
@@ -1466 +1531 @@
 
         /* Toolbar & wp_list_pages Javascript IE6 hover class */
-        jq("#wp-admin-bar ul.main-nav li, #nav li").mouseover( function() {
+        jq('#wp-admin-bar ul.main-nav li, #nav li').mouseover( function() {
                 jq(this).addClass('sfhover');
         });
 
-        jq("#wp-admin-bar ul.main-nav li, #nav li").mouseout( function() {
+        jq('#wp-admin-bar ul.main-nav li, #nav li').mouseout( function() {
                 jq(this).removeClass('sfhover');
         });
@@ -1501 +1566 @@
 
         /* if js is enabled then replace the no-js class by a js one */
-        if( jq('body').hasClass('no-js') )
+        if( jq('body').hasClass('no-js') ) {
                 jq('body').attr('class', jq('body').attr('class').replace( /no-js/,'js' ) );
+        }
 
         /** Activity HeartBeat ************************************************/
 
         // Set the interval and the namespace event
-        if ( typeof wp != 'undefined' && typeof wp.heartbeat != 'undefined' && typeof BP_DTheme.pulse != 'undefined' ) {
+        if ( typeof wp !== 'undefined' && typeof wp.heartbeat !== 'undefined' && typeof BP_DTheme.pulse !== 'undefined' ) {
 
                 wp.heartbeat.interval( Number( BP_DTheme.pulse ) );
@@ -1513 +1579 @@
                 jq.fn.extend({
                         'heartbeat-send': function() {
-                        return this.bind( 'heartbeat-send.buddypress' );
-                },
-            });
-
+                                return this.bind( 'heartbeat-send.buddypress' );
+                        }
+                });
         }
 
@@ -1534 +1599 @@
                 }
 
-                if ( 0 == activity_last_recorded || Number( firstrow ) > activity_last_recorded )
+                if ( 0 === activity_last_recorded || Number( firstrow ) > activity_last_recorded ) {
                         activity_last_recorded = Number( firstrow );
-
-                data['bp_activity_last_recorded'] = activity_last_recorded;
+                }
+
+                data.bp_activity_last_recorded = activity_last_recorded;
         });
 
@@ -1544 +1610 @@
 
                 // Only proceed if we have newest activities
-                if ( ! data['bp_activity_newest_activities'] ) {
+                if ( ! data.bp_activity_newest_activities ) {
                         return;
                 }
 
-                newest_activities = data['bp_activity_newest_activities']['activities'] + newest_activities;
-                activity_last_recorded  = Number( data['bp_activity_newest_activities']['last_recorded'] );
-
-                if ( jq( '#buddypress ul.activity-list li' ).first().hasClass( 'load-newest' ) )
+                newest_activities = data.bp_activity_newest_activities.activities + newest_activities;
+                activity_last_recorded  = Number( data.bp_activity_newest_activities.last_recorded );
+
+                if ( jq( '#buddypress ul.activity-list li' ).first().hasClass( 'load-newest' ) ) {
                         return;
+                }
 
                 jq( '#buddypress ul.activity-list' ).prepend( '<li class="load-newest"><a href="#newest">' + BP_DTheme.newest + '</a></li>' );
@@ -1565 +1632 @@
         } );
 
-        if ( null != jq.cookie('bp-activity-filter') && jq('#activity-filter-select').length )
+        if ( null != jq.cookie('bp-activity-filter') && jq('#activity-filter-select').length ) {
                 jq('#activity-filter-select select option[value="' + jq.cookie('bp-activity-filter') + '"]').prop( 'selected', true );
+        }
 
         /* Activity Tab Set */
@@ -1580 +1648 @@
 function bp_init_objects(objects) {
         jq(objects).each( function(i) {
-                if ( null != jq.cookie('bp-' + objects[i] + '-filter') && jq('#' + objects[i] + '-order-select select').length )
+                if ( null != jq.cookie('bp-' + objects[i] + '-filter') && jq('#' + objects[i] + '-order-select select').length ) {
                         jq('#' + objects[i] + '-order-select select option[value="' + jq.cookie('bp-' + objects[i] + '-filter') + '"]').prop( 'selected', true );
+                }
 
                 if ( null != jq.cookie('bp-' + objects[i] + '-scope') && jq('div.' + objects[i]).length ) {
@@ -1594 +1663 @@
 /* Filter the current content list (groups/members/blogs/topics) */
 function bp_filter_request( object, filter, scope, target, search_terms, page, extras, caller, template ) {
-        if ( 'activity' == object )
+        if ( 'activity' === object ) {
                 return false;
-
-        if ( jq.query.get('s') && !search_terms )
+        }
+
+        if ( jq.query.get('s') && !search_terms ) {
                 search_terms = jq.query.get('s');
-
-        if ( null == scope )
+        }
+
+        if ( null === scope ) {
                 scope = 'all';
+        }
 
         /* Save the settings we want to remain persistent to a cookie */
@@ -1622 +1694 @@
         jq('.item-list-tabs select option[value="' + filter + '"]').prop( 'selected', true );
 
-        if ( 'friends' == object || 'group_members' == object ) {
+        if ( 'friends' === object || 'group_members' === object ) {
                 object = 'members';
         }
 
-        if ( bp_ajax_request )
+        if ( bp_ajax_request ) {
                 bp_ajax_request.abort();
+        }
 
         bp_ajax_request = jq.post( ajaxurl, {
@@ -1643 +1716 @@
         {
                 /* animate to top if called from bottom pagination */
-                if ( caller == 'pag-bottom' && jq('#subnav').length ) {
+                if ( caller === 'pag-bottom' && jq('#subnav').length ) {
                         var top = jq('#subnav').parent();
                         jq('html,body').animate({scrollTop: top.offset().top}, 'slow', function() {
@@ -1649 +1722 @@
                                         jq(this).html(response);
                                         jq(this).fadeIn(100);
-                                });
+                                });
                         });
 
@@ -1656 +1729 @@
                                 jq(this).html(response);
                                 jq(this).fadeIn(100);
-                        });
+                        });
                 }
 
@@ -1688 +1761 @@
         jq('.widget_bp_activity_widget h2 span.ajax-loader').show();
 
-        if ( bp_ajax_request )
+        if ( bp_ajax_request ) {
                 bp_ajax_request.abort();
+        }
 
         bp_ajax_request = jq.post( ajaxurl, {
                 action: 'activity_widget_filter',
                 'cookie': bp_get_cookies(),
-                '_wpnonce_activity_filter': jq("#_wpnonce_activity_filter").val(),
+                '_wpnonce_activity_filter': jq('#_wpnonce_activity_filter').val(),
                 'scope': scope,
                 'filter': filter
@@ -1711 +1785 @@
 
                 /* Update the feed link */
-                if ( null != response.feed_url )
+                if ( null != response.feed_url ) {
                         jq('.directory #subnav li.feed a, .home-page #subnav li.feed a').attr('href', response.feed_url);
+                }
 
                 jq('.item-list-tabs li.selected').removeClass('loading');
@@ -1721 +1796 @@
 /* Hide long lists of activity comments, only show the latest five root comments. */
 function bp_legacy_theme_hide_comments() {
-        var comments_divs = jq('div.activity-comments');
-
-        if ( !comments_divs.length )
+        var comments_divs = jq('div.activity-comments'),
+                parent_li, comment_lis, comment_count;
+
+        if ( !comments_divs.length ) {
                 return false;
+        }
 
         comments_divs.each( function() {
-                if ( jq(this).children('ul').children('li').length < 5 ) return;
-
-                var comments_div = jq(this);
-                var parent_li = comments_div.parents('#activity-stream > li');
-                var comment_lis = jq(this).children('ul').children('li');
-                var comment_count = ' ';
-
-                if ( jq('#' + parent_li.attr('id') + ' a.acomment-reply span').length )
-                        var comment_count = jq('#' + parent_li.attr('id') + ' a.acomment-reply span').html();
+                if ( jq(this).children('ul').children('li').length < 5 ) {
+                        return;
+                }
+
+                comments_div = jq(this);
+                parent_li = comments_div.parents('#activity-stream > li');
+                comment_lis = jq(this).children('ul').children('li');
+                comment_count = ' ';
+
+                if ( jq('#' + parent_li.attr('id') + ' a.acomment-reply span').length ) {
+                        comment_count = jq('#' + parent_li.attr('id') + ' a.acomment-reply span').html();
+                }
 
                 comment_lis.each( function(i) {
@@ -1743 +1823 @@
                                 jq(this).toggle();
 
-                                if ( !i )
+                                if ( !i ) {
                                         jq(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + BP_DTheme.show_all_comments + '">' + BP_DTheme.show_x_comments.replace( '%d', comment_count ) + '</a></li>' );
+                                }
                         }
                 });
@@ -1754 +1835 @@
 
 function checkAll() {
-        var checkboxes = document.getElementsByTagName("input");
-        for(var i=0; i<checkboxes.length; i++) {
-                if(checkboxes[i].type == "checkbox") {
-                        if($("check_all").checked == "") {
-                                checkboxes[i].checked = "";
+        var checkboxes = document.getElementsByTagName('input'),
+                i;
+
+        for(i=0; i<checkboxes.length; i++) {
+                if(checkboxes[i].type === 'checkbox') {
+                        if($('check_all').checked === '') {
+                                checkboxes[i].checked = '';
                         }
                         else {
-                                checkboxes[i].checked = "checked";
+                                checkboxes[i].checked = 'checked';
                         }
                 }
@@ -1798 +1881 @@
 /* Returns a querystring of BP cookies (cookies beginning with 'bp-') */
 function bp_get_cookies() {
-        // get all cookies and split into an array
-        var allCookies   = document.cookie.split(";");
-
-        var bpCookies    = {};
-        var cookiePrefix = 'bp-';
+        var allCookies = document.cookie.split(';'),  // get all cookies and split into an array
+                bpCookies      = {},
+                cookiePrefix   = 'bp-',
+                i, cookie, delimiter, name, value;
 
         // loop through cookies
-        for (var i = 0; i < allCookies.length; i++) {
-                var cookie    = allCookies[i];
-                var delimiter = cookie.indexOf("=");
-                var name      = jq.trim( unescape( cookie.slice(0, delimiter) ) );
-                var value     = unescape( cookie.slice(delimiter + 1) );
+        for (i = 0; i < allCookies.length; i++) {
+                cookie    = allCookies[i];
+                delimiter = cookie.indexOf('=');
+                name      = jq.trim( unescape( cookie.slice(0, delimiter) ) );
+                value     = unescape( cookie.slice(delimiter + 1) );
 
                 // if BP cookie, store it
-                if ( name.indexOf(cookiePrefix) == 0 ) {
+                if ( name.indexOf(cookiePrefix) === 0 ) {
                         bpCookies[name] = value;
                 }

trunk/src/bp-xprofile/admin/js/admin.js

@@ +1 @@
+/* exported add_option, show_options, hide, fixHelper */
+/* jshint scripturl: true */
+
 function add_option(forWhat) {
-        var holder    = document.getElementById(forWhat + "_more");
-        var theId     = document.getElementById(forWhat + '_option_number').value;
-        var newDiv    = document.createElement('p');
-        var newOption = document.createElement('input');
-        var span      = document.createElement( 'span' );
-        var txt       = document.createTextNode( "\u00A0\u039E\u00A0" );
-        var isDefault = document.createElement( 'input' );
-        var span1     = document.createElement( 'span' );
-        var txt1      = document.createTextNode( " Default Value " );
+        var holder  = document.getElementById(forWhat + '_more'),
+                theId     = document.getElementById(forWhat + '_option_number').value,
+                newDiv    = document.createElement('p'),
+                newOption = document.createElement('input'),
+                span      = document.createElement( 'span' ),
+                txt       = document.createTextNode( '\u00A0\u039E\u00A0' ),
+                isDefault = document.createElement( 'input' ),
+                span1     = document.createElement( 'span' ),
+                txt1      = document.createTextNode( ' Default Value ' ),
+
+                toDelete     = document.createElement( 'a' ),
+                toDeleteText = document.createTextNode( '[x]' );
+
 
         newDiv.setAttribute('id', forWhat + '_div' + theId);
@@ -19 +26 @@
         span.appendChild( txt );
 
-        if ( forWhat == 'checkbox' || forWhat == 'multiselectbox' ) {
+        if ( forWhat === 'checkbox' || forWhat === 'multiselectbox' ) {
                 isDefault.setAttribute( 'type', 'checkbox' );
                 isDefault.setAttribute( 'name', 'isDefault_' + forWhat + '_option[' + theId + ']' );
@@ -31 +38 @@
         span1.appendChild( txt1 );
 
-        var toDelete     = document.createElement( 'a' );
-        var toDeleteText = document.createTextNode( '[x]' );
-
-        toDelete.setAttribute( 'href', "javascript:hide('" + forWhat + '_div' + theId + "')" );
+
+        toDelete.setAttribute( 'href', 'javascript:hide("' + forWhat + '_div' + theId + '")' );
         toDelete.setAttribute( 'class', 'delete' );
         toDelete.appendChild( toDeleteText );
@@ -40 +45 @@
         newDiv.appendChild( span );
         newDiv.appendChild( newOption );
-        newDiv.appendChild( document.createTextNode( " " ) );
+        newDiv.appendChild( document.createTextNode( ' ' ) );
         newDiv.appendChild( isDefault );
         newDiv.appendChild( span1 );
@@ -50 +55 @@
 
         // set focus on newly created element
-        document.getElementById(forWhat + "_option" + theId).focus();
+        document.getElementById(forWhat + '_option' + theId).focus();
 
         theId++;
 
-        document.getElementById(forWhat + "_option_number").value = theId;
+        document.getElementById(forWhat + '_option_number').value = theId;
 }
 
@@ -63 +68 @@
         document.getElementById( 'checkbox'       ).style.display = 'none';
 
-        if ( forWhat == 'radio' )
-                document.getElementById( 'radio' ).style.display = "";
-
-        if ( forWhat == 'selectbox' )
-                document.getElementById( 'selectbox' ).style.display = "";
-
-        if ( forWhat == 'multiselectbox' )
-                document.getElementById( 'multiselectbox' ).style.display = "";
-
-        if ( forWhat == 'checkbox' )
-                document.getElementById( 'checkbox' ).style.display = "";
+        if ( forWhat === 'radio' ) {
+                document.getElementById( 'radio' ).style.display = '';
+        }
+
+        if ( forWhat === 'selectbox' ) {
+                document.getElementById( 'selectbox' ).style.display = '';
+        }
+
+        if ( forWhat === 'multiselectbox' ) {
+                document.getElementById( 'multiselectbox' ).style.display = '';
+        }
+
+        if ( forWhat === 'checkbox' ) {
+                document.getElementById( 'checkbox' ).style.display = '';
+        }
 }
 
 function hide( id ) {
-        if ( !document.getElementById( id ) ) return false;
-
-        document.getElementById( id ).style.display = "none";
+        if ( !document.getElementById( id ) ) {
+                return false;
+        }
+
+        document.getElementById( id ).style.display = 'none';
         // the field id is [fieldtype]option[iterator] and not [fieldtype]div[iterator]
-        field_id = id.replace( 'div', 'option' ); 
+        var field_id = id.replace( 'div', 'option' );
         document.getElementById( field_id ).value = '';
 }
@@ -126 +137 @@
                         'option_id': theId
                 },
-                function( response ) {} );
+                function() {} );
         } );
 
         //
         jQuery( '[id^="sort_order_"]' ).change(function() {
-                if ( jQuery( this ).val() != 'custom' ) {
+                if ( jQuery( this ).val() !== 'custom' ) {
                         destroySortableFieldOptions();
                 } else {
@@ -156 +167 @@
                                 'group_order': jQuery( this ).sortable( 'serialize' )
                         },
-                        function( response ) {} );
+                        function() {} );
                 }
         }).disableSelection();
@@ -175 +186 @@
                                 'field_group_id': jQuery(this).attr( 'id' )
                         },
-                        function( response ) {} );
+                        function() {} );
                 }
         })
@@ -189 +200 @@
 
         // tabs init with a custom tab template and an "add" callback filling in the content
-        var $tab_items;
-        var $tabs = jQuery( '#tabs' ).tabs();
+        var $tab_items,
+                $tabs = jQuery( '#tabs' ).tabs();
+
         set_tab_items( $tabs );
 
@@ -203 +215 @@
                         // When field is dropped on tab
                         drop: function( ev, ui ) {
-                                // The tab
-                                var $item = jQuery(this);
-
-                                // The tab body
-                                var $list = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' );
+                                var $item = jQuery(this),  // The tab
+                                        $list   = jQuery( $item.find( 'a' ).attr( 'href' ) ).find( '.connectedSortable' );  // The tab body
 
                                 // Remove helper class
@@ -219 +228 @@
 
                                         // Show new placement
-                                        jQuery(this).appendTo($list).show( 'slow' ).animate( {opacity: "1"}, 500 );
+                                        jQuery(this).appendTo($list).show( 'slow' ).animate( {opacity: '1'}, 500 );
 
                                         // Refresh $list variable
@@ -229 +238 @@
                                                 action: 'xprofile_reorder_fields',
                                                 'cookie': encodeURIComponent(document.cookie),
-                                                '_wpnonce_reorder_fields': jQuery( "input#_wpnonce_reorder_fields" ).val(),
+                                                '_wpnonce_reorder_fields': jQuery( 'input#_wpnonce_reorder_fields' ).val(),
                                                 'field_order': jQuery( $list ).sortable( 'serialize' ),
                                                 'field_group_id': jQuery( $list ).attr( 'id' )
                                         },
-                                        function( response ) {} );
+                                        function() {} );
                                 });
                         },
-                        over: function( event, ui ) {
+                        over: function() {
                                 jQuery(this).addClass( 'drop-candidate' );
                         },
-                        out: function( event, ui ) {
+                        out: function() {
                                 jQuery(this).removeClass( 'drop-candidate' );
                         }