Changeset 6527

Timestamp:

02/02/2018 05:22:54 PM (7 years ago)

Author:

obenland

Message:

Trac: jshint fixes.

Location:

sites/trunk/wordpress.org/public_html/style/trac

Files:

• trac-search.js (modified) (3 diffs)
• wp-trac.js (modified) (29 diffs)

sites/trunk/wordpress.org/public_html/style/trac/trac-search.js

@@ -1 +1 @@
 (function($){
-    var base = window.location.hostname,
-        ajaxurl = 'https://api.wordpress.org/core/trac-search/1.0/';
+    var ajaxurl = 'https://api.wordpress.org/core/trac-search/1.0/';
 
     $('div#content.ticket input#field-summary').change( function() {
-        var keywords,
-            related,
-            el = $(this);
+        var related,
+            el = $(this),
+            keywords = el.val();
 
-        var keywords = el.val();
         if ( ! keywords.length ) {
             return;
@@ -30 +28 @@
 
                     list.css({
-                        margin: '4px',
                         'list-style': 'none',
                         margin: '4px 0',
@@ -52 +49 @@
             dataType: 'json'
         });
-    })
+    });
 })(jQuery);
 

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -1 @@
-var wpTrac, coreKeywordList, gardenerKeywordList, coreFocusesList;
+/* globals wpTracAutoCompleteUsers, wpTracContributorLabels, wpTracCurrentUser */
+var wpTrac, coreKeywordList, gardenerKeywordList, reservedTerms, coreFocusesList;
 
 (function($){
@@ -106 +107 @@
 
             $( 'div.change .comment, #ticket .description' ).each( function() {
-                $comment = $( this ).html();
+                var $comment = $( this ).html();
+
                 if ( mentionsRegEx.test( $comment ) ) {
                     var placeholders = [];
@@ -259 +261 @@
                 // Submit comment form on Cmd/Ctrl + Enter.
                 $( '#comment' ).keydown( function( event ) {
-                    if ( event.ctrlKey && ( event.keyCode == 10 || event.keyCode == 13 ) ) {
+                    if ( event.ctrlKey && ( event.keyCode === 10 || event.keyCode === 13 ) ) {
                         $( 'input[name="submit"]' ).click();
                     }
@@ -339 +341 @@
                         subst = prefix + sel + suffix;
                         if ( 'undefined' !== typeof document.selection) {
-                            var range = document.selection.createRange().text = subst;
+                            document.selection.createRange().text = subst;
                             textarea.caretPos -= suffix.length;
                         } else if ( 'undefined' !== typeof textarea.setSelectionRange ) {
@@ -353 +355 @@
 
                     addButton( 'code-php', 'PHP Code block: {{{#!php example }}}', '#code', function() {
-                        encloseSelection( "{{{#!php\n<?php\n", "\n}}}\n" );
+                        encloseSelection( "{{{#!php\n<?php\n", "\n}}}\n" ); // jshint ignore:line
                     });
                 }
@@ -361 +363 @@
             // Force 'Attachments' and 'Modify Ticket' to be shown.
             $('#attachments').removeClass('collapsed');
-            $("#modify").parent().removeClass('collapsed');
+            $('#modify').parent().removeClass('collapsed');
 
             // Push live comment previews above 'Modify Ticket'.
@@ -418 +420 @@
 
                 if ( 'duplicate' === action && ( ! duplicateTicket || currentTicket === duplicateTicket ) ) {
-                    $('#action_dupe').val('')
+                    $('#action_dupe').val('');
                     return false;
                 }
             });
+
+            // capital_P_dangit()
+            $( '#propertyform' ).on( 'submit', function() {
+                var $summary     = $( '#field-summary' ),
+                    $description = $( '#field-description' ),
+                    $comment     = $( '#comment' );
+
+                // Simple replacement for ticket summary.
+                $summary.val( $summary.val().replace( 'Wordpress', 'WordPress' ) );
+
+                // Use the more judicious replacement for ticket description and comments.
+                $.each( [ ' Wordpress', '&#8216;Wordpress', '&#8220;Wordpress', '>Wordpress', '(Wordpress' ], function( index, value ) {
+                    var replacement = value.replace( 'Wordpress', 'WordPress' );
+
+                    $description.val( $description.val().replace( value, replacement ) );
+                    $comment.val( $comment.val().replace( value, replacement ) );
+                } );
+            } );
 
             // Add a 'Show only commits/attachments' view option to tickets.
@@ -514 +534 @@
         },
 
-        // capital_P_dangit()
-        $( '#propertyform' ).on( 'submit', function() {
-            var $summary     = $( '#field-summary' ),
-                $description = $( '#field-description' ),
-                $comment     = $( '#comment' );
-
-            // Simple replacement for ticket summary.
-            $summary.val( $summary.val().replace( 'Wordpress', 'WordPress' ) );
-
-            // Use the more judicious replacement for ticket description and comments.
-            $.each( [ ' Wordpress', '&#8216;Wordpress', '&#8220;Wordpress', '>Wordpress', '(Wordpress' ], function( index, value ) {
-                var replacement = value.replace( 'Wordpress', 'WordPress' );
-
-                $description.val( $description.val().replace( value, replacement ) );
-                $comment.val( $comment.val().replace( value, replacement ) );
-            } );
-        } );
-
         // If we're not dealing with a trusted bug gardener:
         nonGardeners: function() {
@@ -546 +548 @@
                 }
                 $('label[for="field-focuses"]').html( 'Contributor<br/>Focuses:' );
-                $('#field-version').after( "<br/><em>If you're filing a bug against trunk, choose <a href='#' class='set-trunk'>'trunk'</a>. Otherwise, choose the earliest affected version you tested.</em>" );
+                $('#field-version').after( '<br/><em>If you\'re filing a bug against trunk, choose <a href="#" class="set-trunk">\'trunk\'</a>. Otherwise, choose the earliest affected version you tested.</em>' );
                 $('.set-trunk').on( 'click', function() {
                     $('#field-version').val('trunk');
@@ -570 +572 @@
                 elements.version.find('option').each( function() {
                     var value = $(this).val();
-                    if ( version === value )
+
+                    if ( version === value ) {
                         remove = false;
-                    else if ( remove && value )
+                    } else if ( remove && value ) {
                         $(this).remove();
+                    }
                 });
             }
@@ -591 +595 @@
             $( '.open-ticket-report' ).click( function( event ) {
                 if ( popup.children().length === 0 ) {
-                    var jqxhr = $.ajax({
+                    $.ajax({
                         url: 'https://make.wordpress.org/core/reports/?from-trac',
                         xhrFields: { withCredentials: true }
@@ -642 +646 @@
                     url = href + '?' + $.param({
                         summary: $('#field-summary').val(),
-                        description: "(Couldn't copy over your description as it was too long. Please paste it here. Your old window was not closed.)"
+                        description: '(Couldn\'t copy over your description as it was too long. Please paste it here. Your old window was not closed.)'
                     });
                     window.open( url );
@@ -655 +659 @@
             var ticketParticipants = [],
                 nonTicketParticipants = [],
-                attachments = [],
                 settings = {};
 
@@ -765 +768 @@
                     if ( 'undefined' !== wpTrac.currentUser ) {
                         users = $.grep( users, function( user ) {
-                            return user != wpTrac.currentUser;
+                            return user !== wpTrac.currentUser;
                         });
                     }
@@ -800 +803 @@
                     if ( 'undefined' !== wpTrac.currentUser ) {
                         users = $.grep( users, function( user ) {
-                            return user != wpTrac.currentUser;
+                            return user !== wpTrac.currentUser;
                         });
                     }
@@ -923 +926 @@
                 populate : function() {
                     // For repopulation. Starting over.
-                    if ( elements.bin.find('span').length )
+                    if ( elements.bin.find('span').length ) {
                         elements.bin.empty();
+                    }
 
                     // Replace commas, collapse spaces, trim, then split by space.
@@ -936 +940 @@
                         $.each( keywords, function( k, v ) {
                             var html = $('<span />').text(v).attr('data-keyword', v).prepend('<a class="dashicons dashicons-dismiss" href="#" />');
-                            if ( v in coreKeywordList )
+                            if ( v in coreKeywordList ) {
                                 html.attr('title', coreKeywordList[v]);
+                            }
                             html.appendTo( elements.bin );
                         });
@@ -949 +954 @@
                     }
 
-                    $.each( coreKeywordList, function( k, v ) {
+                    $.each( coreKeywordList, function( k ) {
                         // Don't show special (permission-based) ones.
-                        if ( ! wpTrac.gardener && -1 !== $.inArray( k, gardenerKeywordList ) )
+                        if ( ! wpTrac.gardener && -1 !== $.inArray( k, gardenerKeywordList ) ) {
                             return;
+                        }
                         elements.add.append( '<option value="' + k + ( -1 !== $.inArray( k, keywords ) ? '" disabled="disabled">* ' : '">' ) + k + '</option>' );
                     });
@@ -959 +965 @@
                 // Add a keyword. Takes a sanitized string.
                 addKeyword : function( keyword ) {
-                    if ( ! keyword )
+                    if ( ! keyword ) {
                         return;
+                    }
+
                     var html, title = '';
+
                     // Don't add it again.
-                    if ( -1 !== $.inArray( keyword, keywords ) )
+                    if ( -1 !== $.inArray( keyword, keywords ) ) {
                         return;
+                    }
                     keywords.push( keyword );
 
@@ -993 +1003 @@
                     // Add it to the bin, and refresh the hidden input.
                     html = $('<span />').text(keyword).attr('data-keyword', keyword).prepend('<a class="dashicons dashicons-dismiss" href="#" />');
-                    if ( title )
+                    if ( title ) {
                         html.attr('title', title);
+                    }
                     html.appendTo( elements.bin );
                     elements.hiddenEl.val( keywords.join(' ') );
@@ -1004 +1015 @@
                     if ( typeof object === 'string' ) {
                         keyword = object;
-                        object = elements.bin.find('span[data-keyword="' + keyword + '"]');
-                        if ( ! object.length )
+                        object  = elements.bin.find('span[data-keyword="' + keyword + '"]');
+
+                        if ( ! object.length ) {
                             return;
+                        }
                     } else {
                         keyword = object.text();
@@ -1012 +1025 @@
 
                     keywords = $.grep( keywords, function(v) {
-                        return v != keyword;
+                        return v !== keyword;
                     });
 
                     // Update the core keyword dropdown.
-                    if ( keyword in coreKeywordList )
+                    if ( keyword in coreKeywordList ) {
                         elements.add.find('option[value=' + keyword + ']').prop('disabled', false).text( keyword );
+                    }
                     elements.hiddenEl.val( keywords.join(' ') );
                     object.remove();
@@ -1024 +1038 @@
                 // Check on submit that we're not just re-ordering keywords.
                 // Otherwise, Trac flips out and adds a useless 'Keywords changed from X to X' marker.
-                submit : function(e) {
-                    if ( keywords.length !== originalKeywords.length )
+                submit : function() {
+                    if ( keywords.length !== originalKeywords.length ) {
                         return;
+                    }
+
                     var testKeywords = $.grep( keywords, function(v) {
                         return -1 === $.inArray( v, originalKeywords );
                     });
+
                     // If the difference has no length, then restore to the original keyword order.
-                    if ( ! testKeywords.length )
+                    if ( ! testKeywords.length ) {
                         elements.hiddenEl.val( originalKeywords.join(' ') );
-                }
-            }
+                    }
+                }
+            };
         }()),
 
@@ -1053 +1071 @@
                     $('label[for="field-focuses"]').parent().remove();
                 }
-                if ( field.parent().attr( 'colspan' ) == 3 ) {
+                if ( field.parent().attr( 'colspan' ) === 3 ) {
                     field.parent().attr( 'id', 'focuses' );
                 } else {
@@ -1115 +1133 @@
                 var remove = focus.data( 'focus' );
                 focuses = $.grep( focuses, function( value ) {
-                    return value != remove;
+                    return value !== remove;
                 } );
                 updateField();
@@ -1138 +1156 @@
 
             function submit() {
-                if ( focuses.length !== originalFocuses.length )
+                if ( focuses.length !== originalFocuses.length ) {
                     return;
+                }
+
                 var testFocuses = $.grep( focuses, function(v) {
                     return -1 === $.inArray( v, originalFocuses );
                 });
+
                 // If the difference has no length, then restore to the original order.
                 if ( ! testFocuses.length ) {
@@ -1155 +1176 @@
 
         notifications: (function() {
-            var notifications, endpoint, _ticket, _nonce;
+            var notifications, endpoint, star, _ticket, _nonce;
 
             function init( settings ) {
@@ -1247 +1268 @@
                 $('#ticket.trac-content > h2').prepend( '<div class="ticket-star dashicons dashicons-star-' +
                     ( notifications.hasClass('subscribed') ? 'filled' : 'empty' ) + '" title="Watch/unwatch this ticket"></div>' );
+
                 star = $('.ticket-star');
+
                 star.click( function() {
                     $(this).hasClass('dashicons-star-empty') ? subscribe() : unsubscribe();
@@ -1254 +1277 @@
                     var names = $(this).hasClass('names');
                     notifications.toggleClass('show-usernames', names );
-                    document.cookie="wp_trac_ngrid=" + (names ? 1 : 0) + ";max-age=31557600;domain=.wordpress.org;path=/";
+                    document.cookie = 'wp_trac_ngrid=' + (names ? 1 : 0) + ';max-age=31557600;domain=.wordpress.org;path=/';
                     return false;
                 });