Changeset 12525

Timestamp:

01/18/2020 11:34:45 AM (5 years ago)

Author:

imath

Message:

Nouveau: fix JS Code standards in inline comments

Props passoniate

Fixes #8213

Location:

trunk/src/bp-templates/bp-nouveau/js

Files:

• buddypress-messages.js (modified) (39 diffs)
• buddypress-notifications.js (modified) (5 diffs)

trunk/src/bp-templates/bp-nouveau/js/buddypress-messages.js

@@ -7 +7 @@
 ( function( exports, $ ) {
 
-    // Bail if not set
+    // Bail if not set.
     if ( typeof BP_Nouveau === 'undefined' ) {
         return;
@@ -47 +47 @@
             var self = this;
 
-            // First adapt the compose nav
+            // First adapt the compose nav.
             $( '#compose-personal-li' ).addClass( 'last' );
 
-            // Then listen to nav click and load the appropriate view
+            // Then listen to nav click and load the appropriate view.
             $( '#subnav a' ).on( 'click', function( event ) {
                 event.preventDefault();
@@ -56 +56 @@
                 var view_id = $( event.target ).prop( 'id' );
 
-                // Remove the editor to be sure it will be added dynamically later
+                // Remove the editor to be sure it will be added dynamically later.
                 self.removeTinyMCE();
 
-                // The compose view is specific (toggle behavior)
+                // The compose view is specific (toggle behavior).
                 if ( 'compose' === view_id ) {
-                    // If it exists, it means the user wants to remove it
+                    // If it exists, it means the user wants to remove it.
                     if ( ! _.isUndefined( self.views.get( 'compose' ) ) ) {
                         var form = self.views.get( 'compose' );
@@ -67 +67 @@
                         self.views.remove( { id: 'compose', view: form } );
 
-                        // Back to inbox
+                        // Back to inbox.
                         if ( 'single' === self.box ) {
                             self.box = 'inbox';
                         }
 
-                        // Navigate back to current box
+                        // Navigate back to current box.
                         self.router.navigate( self.box + '/', { trigger: true } );
 
-                    // Otherwise load it
+                    // Otherwise load it.
                     } else {
                         self.router.navigate( 'compose/', { trigger: true } );
@@ -133 +133 @@
             var feedback;
 
-            // Make sure to remove the feedbacks
+            // Make sure to remove the feedbacks.
             this.removeFeedback();
 
@@ -151 +151 @@
 
         clearViews: function() {
-            // Clear views
+            // Clear views.
             if ( ! _.isUndefined( this.views.models ) ) {
                 _.each( this.views.models, function( model ) {
@@ -165 +165 @@
             this.clearViews();
 
-            // Create the loop view
+            // Create the loop view.
             var form = new bp.Views.messageForm( {
                 model: new bp.Models.Message()
@@ -176 +176 @@
 
         threadsView: function() {
-            // Activate the appropriate nav
+            // Activate the appropriate nav.
             $( '#subnav ul li' ).each( function( l, li ) {
                 $( li ).removeClass( 'current selected' );
@@ -182 +182 @@
             $( '#subnav a#' + this.box ).closest( 'li' ).addClass( 'current selected' );
 
-            // Create the loop view
+            // Create the loop view.
             var threads_list = new bp.Views.userThreads( { collection: this.threads, box: this.box } );
 
@@ -189 +189 @@
             threads_list.inject( '.bp-messages-content' );
 
-            // Attach filters
+            // Attach filters.
             this.displayFilters( this.threads );
         },
@@ -196 +196 @@
             var filters_view;
 
-            // Create the model
+            // Create the model.
             this.filters = new Backbone.Model( {
                 'page'         : 1,
@@ -204 +204 @@
             } );
 
-            // Use it in the filters viex
+            // Use it in the filters viex.
             filters_view = new bp.Views.messageFilters( { model: this.filters, threads: collection } );
 
@@ -218 +218 @@
             this.box = 'single';
 
-            // Create the single thread view
+            // Create the single thread view.
             var single_thread = new bp.Views.userMessages( { collection: this.messages, thread: thread } );
 
@@ -311 +311 @@
             options.data    = options.data || {};
 
-            // Add generic nonce
+            // Add generic nonce.
             options.data.nonce = BP_Nouveau.nonces.messages;
 
@@ -394 +394 @@
             options.data    = options.data || {};
 
-            // Add generic nonce
+            // Add generic nonce.
             options.data.nonce = BP_Nouveau.nonces.messages;
 
@@ -448 +448 @@
     } );
 
-    // Extend wp.Backbone.View with .prepare() and .inject()
+    // Extend wp.Backbone.View with .prepare() and .inject().
     bp.Nouveau.Messages.View = bp.Backbone.View.extend( {
         inject: function( selector ) {
@@ -465 +465 @@
     } );
 
-    // Feedback view
+    // Feedback view.
     bp.Views.Feedback = bp.Nouveau.Messages.View.extend( {
         tagName: 'div',
@@ -479 +479 @@
     } );
 
-    // Hook view
+    // Hook view.
     bp.Views.Hook = bp.Nouveau.Messages.View.extend( {
         tagName: 'div',
@@ -523 +523 @@
 
         initialize: function() {
-            // Clone the model to set the resetted one
+            // Clone the model to set the resetted one.
             this.resetModel = this.model.clone();
 
-            // Add the editor view
+            // Add the editor view.
             this.views.add( '#bp-message-content', new bp.Views.messageEditor() );
 
             this.model.on( 'change', this.resetFields, this );
 
-            // Activate bp_mentions
+            // Activate bp_mentions.
             this.on( 'ready', this.addMentions, this );
         },
@@ -539 +539 @@
                 mention = bp.Nouveau.getLinkParams( null, 'r' ) || null;
 
-            // Add autocomplete to send_to field
+            // Add autocomplete to send_to field.
             sendToInput.bp_mentions( {
                 data: [],
@@ -545 +545 @@
             } );
 
-            // Check for mention
+            // Check for mention.
             if ( ! _.isNull( mention ) ) {
                 sendToInput.val( '@' + _.escape( mention ) + ' ' );
@@ -553 +553 @@
 
         resetFields: function( model ) {
-            // Clean inputs
+            // Clean inputs.
             _.each( model.previousAttributes(), function( value, input ) {
                 if ( 'message_content' === input ) {
-                    // tinyMce
+                    // tinyMce.
                     if ( undefined !== tinyMCE.activeEditor && null !== tinyMCE.activeEditor ) {
                         tinyMCE.activeEditor.setContent( '' );
                     }
 
-                // All except meta or empty value
+                // All except meta or empty value.
                 } else if ( 'meta' !== input && false !== value ) {
                     $( 'input[name="' + input + '"]' ).val( '' );
@@ -577 +577 @@
             bp.Nouveau.Messages.removeFeedback();
 
-            // Set the content and meta
+            // Set the content and meta.
             _.each( this.$el.serializeArray(), function( pair ) {
                 pair.name = pair.name.replace( '[]', '' );
 
-                // Group extra fields in meta
+                // Group extra fields in meta.
                 if ( -1 === _.indexOf( ['send_to', 'subject', 'message_content'], pair.name ) ) {
                     if ( _.isUndefined( meta[ pair.name ] ) ) {
@@ -593 +593 @@
                     }
 
-                // Prepare the core model
+                // Prepare the core model.
                 } else {
-                    // Send to
+                    // Send to.
                     if ( 'send_to' === pair.name ) {
                         var usernames = pair.value.match( /(^|[^@\w\-])@([a-zA-Z0-9_\-]{1,50})\b/g );
@@ -614 +614 @@
                         }
 
-                    // Subject and content
+                    // Subject and content.
                     } else {
-                        // Message content
+                        // Message content.
                         if ( 'message_content' === pair.name && undefined !== tinyMCE.activeEditor ) {
                             pair.value = tinyMCE.activeEditor.getContent();
@@ -641 +641 @@
             }
 
-            // Set meta
+            // Set meta.
             this.model.set( 'meta', meta, { silent: true } );
 
             // Send the message.
             this.model.sendMessage().done( function( response ) {
-                // Reset the model
+                // Reset the model.
                 self.model.set( self.resetModel );
 
                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
 
-                // Remove tinyMCE
+                // Remove tinyMCE.
                 bp.Nouveau.Messages.removeTinyMCE();
 
-                // Remove the form view
+                // Remove the form view.
                 var form = bp.Nouveau.Messages.views.get( 'compose' );
                 form.get( 'view' ).remove();
@@ -691 +691 @@
             }, this );
 
-            // Load threads for the active view
+            // Load threads for the active view.
             this.requestThreads();
 
@@ -849 +849 @@
             var isChecked = $( event.currentTarget ).prop( 'checked' );
 
-            // To avoid infinite loops
+            // To avoid infinite loops.
             this.model.set( 'checked', isChecked, { silent: true } );
 
@@ -895 +895 @@
 
         render: function() {
-            // Only render if we have some content to render
+            // Only render if we have some content to render.
             if ( _.isUndefined( this.model ) || true !== this.model.get( 'active' ) ) {
                 return;
@@ -945 +945 @@
             mid = model.get( 'id' );
 
-            // Open the full conversation
+            // Open the full conversation.
             if ( 'view' === action ) {
                 bp.Nouveau.Messages.router.navigate(
@@ -974 +974 @@
 
                 if ( 'delete' === action || ( 'starred' === self.collection.options.box && 'unstar' === action ) ) {
-                    // Remove from the list of messages
+                    // Remove from the list of messages.
                     self.collection.remove( model.get( 'id' ) );
 
-                    // And Requery
+                    // And Requery.
                     self.collection.fetch( {
                         data : _.pick( self.collection.options, ['box', 'search_terms', 'page'] )
@@ -1050 +1050 @@
             } );
 
-            // Default to thread ids
+            // Default to thread ids.
             ids = thread_ids;
 
-            // We need to get the starred ids
+            // We need to get the starred ids.
             if ( 'star' === action || 'unstar' === action ) {
                 ids = _.map( threads, function( model ) {
@@ -1065 +1065 @@
                 }
 
-                // Map with first message starred in the thread
+                // Map with first message starred in the thread.
                 attr = 'starred_id';
             }
 
-            // Message id to Thread id
+            // Message id to Thread id.
             var m_tid = _.object( _.map( threads, function (model) {
                 return [model.get( attr ), model.get( 'id' )];
@@ -1085 +1085 @@
 
                 if ( 'delete' === action || ( 'starred' === self.collection.options.box && 'unstar' === action ) ) {
-                    // Remove from the list of messages
+                    // Remove from the list of messages.
                     self.collection.remove( thread_ids );
 
-                    // And Requery
+                    // And Requery.
                     self.collection.fetch( {
                         data : _.pick( self.collection.options, ['box', 'search_terms', 'page'] )
                     } );
                 } else if ( response.messages ) {
-                    // Update each model attributes
+                    // Update each model attributes.
                     _.each( response.messages, function( updated, id ) {
                         var model = self.collection.get( m_tid[id] );
@@ -1245 +1245 @@
                 bp.Nouveau.Messages.removeFeedback();
 
-                // Display the feedback
+                // Display the feedback.
                 bp.Nouveau.Messages.displayFeedback( response.feedback, response.type );
             } ).fail( function( response ) {
@@ -1282 +1282 @@
 
         initialize: function() {
-            // Load Messages
+            // Load Messages.
             this.requestMessages();
 
-            // Init a reply
+            // Init a reply.
             this.reply = new bp.Models.messageThread();
 
             this.collection.on( 'add', this.addMessage, this );
 
-            // Add the editor view
+            // Add the editor view.
             this.views.add( '#bp-message-content', new bp.Views.messageEditor() );
         },
@@ -1367 +1367 @@
             var reply = this.collection.parse( response );
 
-            // Reset the form
+            // Reset the form.
             tinyMCE.activeEditor.setContent( '' );
             this.reply.set( 'sending', false );
@@ -1400 +1400 @@
             }
 
-            // Try to get the corresponding thread
+            // Try to get the corresponding thread.
             var thread = bp.Nouveau.Messages.threads.get( thread_id );
 
@@ -1427 +1427 @@
     } );
 
-    // Launch BP Nouveau Groups
+    // Launch BP Nouveau Groups.
     bp.Nouveau.Messages.start();
 

trunk/src/bp-templates/bp-nouveau/js/buddypress-notifications.js

@@ -5 +5 @@
 ( function( exports, $ ) {
 
-    // Bail if not set
+    // Bail if not set.
     if ( typeof BP_Nouveau === 'undefined' ) {
         return;
@@ -25 +25 @@
             this.setupGlobals();
 
-            // Listen to events ("Add hooks!")
+            // Listen to events ("Add hooks!").
             this.addListeners();
         },
@@ -48 +48 @@
             $( '#buddypress [data-bp-list="notifications"]' ).on( 'click', '[data-bp-notifications-order]', bp.Nouveau, this.sortNotifications );
 
-            // Enable the Apply Button once the bulk action is selected
+            // Enable the Apply Button once the bulk action is selected.
             $( '#buddypress [data-bp-list="notifications"]' ).on( 'change', '#notification-select', this.enableBulkSubmit );
 
-            // Select all displayed notifications
+            // Select all displayed notifications.
             $( '#buddypress [data-bp-list="notifications"]' ).on( 'click', '#select-all-notifications', this.selectAll );
 
-            // Reset The filter before unload
+            // Reset The filter before unload.
             $( window ).on( 'unload', this.resetFilter );
         },
@@ -73 +73 @@
             }
 
-            // Make sure a 'Bulk Action' is selected before submitting the form
+            // Make sure a 'Bulk Action' is selected before submitting the form.
             $( '#notification-bulk-manage' ).prop( 'disabled', 'disabled' );
         },
@@ -135 +135 @@
     };
 
-    // Launch BP Nouveau Notifications
+    // Launch BP Nouveau Notifications.
     bp.Nouveau.Notifications.start();