Ticket #8422: 8422.2.diff

src/bp-activity/js/mentions.js

@@ -20 +20 @@
          * @since 2.1.0
          */
         $.fn.bp_mentions = function( options ) {
-                if ( $.isArray( options ) ) {
+                if ( Array.isArray( options ) ) {
                         options = { data: options };
                 }
 

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

@@ -49 +49 @@
         /**** Activity Posting ********************************************************/
 
         /* Textarea focus */
-        $whats_new.focus( function(){
+        $whats_new.on( 'focus', function() {
                 jq( '#whats-new-options' ).slideDown();
 
                 jq( this ).animate({
@@ -80 +80 @@
                                 jq( '#activity-filter-select select' ).trigger( 'change' );
                         }
                 }
-        });
+        } );
 
         /* For the "What's New" form, do the following on focusout. */
         jq( '#whats-new-form' ).on( 'focusout', function( e ) {
@@ -124 +124 @@
                                         inputs[ input.name ] = input.value;
                                 } else {
                                         // Checkboxes/dropdown list can have multiple selected value
-                                        if ( ! jq.isArray( inputs[ input.name ] ) ) {
+                                        if ( ! Array.isArray( inputs[ input.name ] ) ) {
                                                 inputs[ input.name ] = new Array( inputs[ input.name ], input.value );
                                         } else {
                                                 inputs[ input.name ].push( input.value );
@@ -275 +275 @@
         });
 
         /* Activity filter select */
-        jq('#activity-filter-select select').change( function() {
+        jq( '#activity-filter-select select' ).on( 'change', function() {
                 var selected_tab = jq( 'div.activity-type-tabs li.selected' ),
                         filter = jq(this).val(),
                         scope;
@@ -289 +289 @@
                 bp_activity_request(scope, filter);
 
                 return false;
-        });
+        } );
 
         /* Stream event delegation */
         jq('div.activity').on( 'click', function(event) {
@@ -800 +800 @@
         });
 
         /* Escape Key Press for cancelling comment forms */
-        jq(document).keydown( function(e) {
+        jq(document).on( 'keydown', function(e) {
                 e = e || window.event;
                 if (e.target) {
                         element = e.target;
@@ -898 +898 @@
         });
 
         /* When the filter select box is changed re-query */
-        jq('li.filter select').change( function() {
+        jq( 'li.filter select' ).on( 'change', function() {
                 var el,
                         css_id, object, scope, filter, search_terms, template,
                         $gm_search;
@@ -944 +944 @@
                 bp_filter_request( object, filter, scope, 'div.' + object, search_terms, 1, extras, null, template );
 
                 return false;
-        });
+        } );
 
         /* All pagination links run through this function */
         jq('#buddypress').on( 'click', function(event) {
@@ -1164 +1164 @@
                         .show().removeClass( 'field-visibility-settings-hide' );
         } );
 
-        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' ).on( 'change', function() {
                 var shouldconfirm = true;
 
                 jq('#profile-edit-form input:submit, #signup_form input:submit').on( 'click', function() {
@@ -1176 +1176 @@
                                 return BP_DTheme.unsaved_changes;
                         }
                 };
-        });
+        } );
 
         /** Friendship Requests **************************************/
 
@@ -1419 +1419 @@
         });
 
         /* AJAX send reply functionality */
-        jq('#send_reply_button').click(
+        jq( '#send_reply_button' ).on( 'click',
                 function() {
                         var order = jq('#messages_order').val() || 'ASC',
                                 offset  = jq('#message-recipients').offset(),
@@ -1491 +1491 @@
         });
 
         /* Selecting/Deselecting all messages */
-        jq('#select-all-messages').click(function(event) {
-                if( this.checked ) {
-                        jq('.message-check').each(function() {
+        jq( '#select-all-messages' ).on( 'click', function() {
+                if ( this.checked ) {
+                        jq( '.message-check' ).each( function() {
                                 this.checked = true;
-                        });
+                        } );
                 } else {
-                        jq('.message-check').each(function() {
+                        jq( '.message-check' ).each( function() {
                                 this.checked = false;
-                        });
+                        } );
                 }
-        });
+        } );
 
         /* Make sure a 'Bulk Action' is selected before submitting the messages bulk action form */
         jq('#messages-bulk-manage').attr('disabled', 'disabled');
@@ -1590 +1590 @@
         /** Notifications **********************************************/
 
         /* Selecting/Deselecting all notifications */
-        jq('#select-all-notifications').click(function(event) {
-                if( this.checked ) {
-                        jq('.notification-check').each(function() {
+        jq( '#select-all-notifications' ).on( 'click', function() {
+                if ( this.checked ) {
+                        jq( '.notification-check' ).each( function() {
                                 this.checked = true;
-                        });
+                        } );
                 } else {
-                        jq('.notification-check').each(function() {
+                        jq( '.notification-check' ).each( function() {
                                 this.checked = false;
-                        });
+                        } );
                 }
-        });
+        } );
 
         /* Make sure a 'Bulk Action' is selected before submitting the form */
         jq('#notification-bulk-manage').attr('disabled', 'disabled');
@@ -1634 +1634 @@
         });
 
         /* 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').on( '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').on( 'mouseout', function() {
                 jq(this).removeClass('sfhover');
         });
 

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

@@ -171 +171 @@
                 titleprompt.addClass('screen-reader-text');
         }
 
-        titleprompt.click(function(){
+        titleprompt.on( 'click', function(){
                 jQuery(this).addClass('screen-reader-text');
                 title.focus();
         });
 
-        title.blur(function(){
+        title.on( 'blur', function(){
                 if ( '' === this.value ) {
                         titleprompt.removeClass('screen-reader-text');
                 }
-        }).focus(function(){
+        }).on( 'focus', function(){
                 titleprompt.addClass('screen-reader-text');
-        }).keydown(function(e){
+        }).on( 'keydown', function(e){
                 titleprompt.addClass('screen-reader-text');
                 jQuery(this).unbind(e);
         });
@@ -191 +191 @@
 jQuery( document ).ready( function() {
 
         // Set focus in Field Title, if we're on the right page.
-        jQuery( '#bp-xprofile-add-field #title' ).focus();
+        jQuery( '#bp-xprofile-add-field #title' ).trigger( 'focus' );
 
         // Set up the notice that shows when no member types are selected for a field.
         toggle_no_member_type_notice();
@@ -214 +214 @@
         } );
 
         // Set up the sort order change actions.
-        jQuery( '[id^="sort_order_"]' ).change(function() {
+        jQuery( '[id^="sort_order_"]' ).on( 'change', function() {
                 if ( jQuery( this ).val() !== 'custom' ) {
                         destroySortableFieldOptions();
                 } else {
                         enableSortableFieldOptions( jQuery('#fieldtype :selected').val() );
                 }
-        });
+        } );
 
         // Show object if JS is enabled.
         jQuery( 'ul#field-group-tabs' ).show();
@@ -276 +276 @@
         var $date_format = jQuery( 'input[name="date_format"]' );
         var $date_format_custom_value = jQuery( '#date-format-custom-value' );
         var $date_format_sample = jQuery( '#date-format-custom-sample' );
-        $date_format.click( function( e ) {
+        $date_format.on( 'click', function( e ) {
                 switch ( e.target.value ) {
                         case 'elapsed' :
                                 $date_format_custom_value.val( '' );
@@ -295 +295 @@
 
         // Clicking into the custom date format field should select the Custom radio button.
         var $date_format_custom = jQuery( '#date-format-custom' );
-        $date_format_custom_value.focus( function() {
+        $date_format_custom_value.on( 'focus', function() {
                 $date_format_custom.prop( 'checked', 'checked' );
         } );
 
         // Validate custom date field.
         var $date_format_spinner = jQuery( '#date-format-custom-spinner' );
-        $date_format_custom_value.change( function( e ) {
+        $date_format_custom_value.on( 'change', function( e ) {
                 $date_format_spinner.addClass( 'is-active' );
                 jQuery.post( ajaxurl, {
                         action: 'date_format',