<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6527] sites/trunk/wordpress.org/public_html/style/trac: Trac: jshint fixes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6527">6527</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6527","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-02 17:22:54 +0000 (Fri, 02 Feb 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Trac: jshint fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletractracsearchjs">sites/trunk/wordpress.org/public_html/style/trac/trac-search.js</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlstyletracwptracjs">sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlstyletractracsearchjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/style/trac/trac-search.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/style/trac/trac-search.js 2018-02-02 16:50:06 UTC (rev 6526)
+++ sites/trunk/wordpress.org/public_html/style/trac/trac-search.js 2018-02-02 17:22:54 UTC (rev 6527)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,13 +1,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function($){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var base = window.location.hostname,
- ajaxurl = 'https://api.wordpress.org/core/trac-search/1.0/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var ajaxurl = 'https://api.wordpress.org/core/trac-search/1.0/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('div#content.ticket input#field-summary').change( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var keywords,
- related,
- el = $(this);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var related,
+ el = $(this),
+ keywords = el.val();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var keywords = el.val();
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! keywords.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +27,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list = $('<ul />').appendTo( related );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list.css({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: '4px',
</del><span class="cx" style="display: block; padding: 0 10px"> 'list-style': 'none',
</span><span class="cx" style="display: block; padding: 0 10px"> margin: '4px 0',
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +48,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> dataType: 'json'
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- })
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> })(jQuery);
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlstyletracwptracjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2018-02-02 16:50:06 UTC (rev 6526)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2018-02-02 17:22:54 UTC (rev 6527)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var wpTrac, coreKeywordList, gardenerKeywordList, coreFocusesList;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* globals wpTracAutoCompleteUsers, wpTracContributorLabels, wpTracCurrentUser */
+var wpTrac, coreKeywordList, gardenerKeywordList, reservedTerms, coreFocusesList;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($){
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +106,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mentionsInAttrRegEx = new RegExp( '="[^"]*?' + mentionsRegEx.source + '[\\s\\S]*?"' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'div.change .comment, #ticket .description' ).each( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = $( this ).html();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $comment = $( this ).html();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( mentionsRegEx.test( $comment ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var placeholders = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Submit comment form on Cmd/Ctrl + Enter.
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#comment' ).keydown( function( event ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( event.ctrlKey && ( event.keyCode == 10 || event.keyCode == 13 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( event.ctrlKey && ( event.keyCode === 10 || event.keyCode === 13 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'input[name="submit"]' ).click();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> subst = prefix + sel + suffix;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== typeof document.selection) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var range = document.selection.createRange().text = subst;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ document.selection.createRange().text = subst;
</ins><span class="cx" style="display: block; padding: 0 10px"> textarea.caretPos -= suffix.length;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( 'undefined' !== typeof textarea.setSelectionRange ) {
</span><span class="cx" style="display: block; padding: 0 10px"> textarea.value = textarea.value.substring( 0, start ) + subst + textarea.value.substring( end );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> addButton( 'code-php', 'PHP Code block: {{{#!php example }}}', '#code', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- encloseSelection( "{{{#!php\n<?php\n", "\n}}}\n" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ encloseSelection( "{{{#!php\n<?php\n", "\n}}}\n" ); // jshint ignore:line
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'textarea.wikitext' ).each( extendWikiFormattingToolbar );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Force 'Attachments' and 'Modify Ticket' to be shown.
</span><span class="cx" style="display: block; padding: 0 10px"> $('#attachments').removeClass('collapsed');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $("#modify").parent().removeClass('collapsed');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#modify').parent().removeClass('collapsed');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Push live comment previews above 'Modify Ticket'.
</span><span class="cx" style="display: block; padding: 0 10px"> $('#ticketchange').insertAfter('#trac-add-comment');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,11 +419,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> duplicateTicket = parseInt( $('#action_dupe').val() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'duplicate' === action && ( ! duplicateTicket || currentTicket === duplicateTicket ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#action_dupe').val('')
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#action_dupe').val('');
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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', '‘Wordpress', '“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 ) );
+ } );
+ } );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add a 'Show only commits/attachments' view option to tickets.
</span><span class="cx" style="display: block; padding: 0 10px"> $('label[for="trac-comments-only-toggle"]').text('Show only comment text');
</span><span class="cx" style="display: block; padding: 0 10px"> $('form#prefs')
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,24 +533,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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', '‘Wordpress', '“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 ) );
- } );
- } );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If we're not dealing with a trusted bug gardener:
</span><span class="cx" style="display: block; padding: 0 10px"> nonGardeners: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var version,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $('#field-component').parent().add( $('#field-component').parent().prev() ).wrapAll( '<tr />' ).insertBefore( $( '#field-focuses' ).parents( 'tr' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $('label[for="field-focuses"]').html( 'Contributor<br/>Focuses:' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#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>" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $('#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>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $('.set-trunk').on( 'click', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $('#field-version').val('trunk');
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,10 +571,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> elements.version.find('option').each( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var value = $(this).val();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( version === value )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( version === value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( remove && value )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( remove && value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $(this).remove();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> popup.appendTo( '#main' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.open-ticket-report' ).click( function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( popup.children().length === 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var jqxhr = $.ajax({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.ajax({
</ins><span class="cx" style="display: block; padding: 0 10px"> url: 'https://make.wordpress.org/core/reports/?from-trac',
</span><span class="cx" style="display: block; padding: 0 10px"> xhrFields: { withCredentials: true }
</span><span class="cx" style="display: block; padding: 0 10px"> }).done( function( data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +645,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( url.length > 1500 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> url = href + '?' + $.param({
</span><span class="cx" style="display: block; padding: 0 10px"> summary: $('#field-summary').val(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- description: "(Couldn't copy over your description as it was too long. Please paste it here. Your old window was not closed.)"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ description: '(Couldn\'t copy over your description as it was too long. Please paste it here. Your old window was not closed.)'
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> window.open( url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,7 +658,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> autocomplete: (function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var ticketParticipants = [],
</span><span class="cx" style="display: block; padding: 0 10px"> nonTicketParticipants = [],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attachments = [],
</del><span class="cx" style="display: block; padding: 0 10px"> settings = {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +767,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Exclude current user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== wpTrac.currentUser ) {
</span><span class="cx" style="display: block; padding: 0 10px"> users = $.grep( users, function( user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return user != wpTrac.currentUser;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return user !== wpTrac.currentUser;
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,7 +802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Exclude current user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== wpTrac.currentUser ) {
</span><span class="cx" style="display: block; padding: 0 10px"> users = $.grep( users, function( user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return user != wpTrac.currentUser;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return user !== wpTrac.currentUser;
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -922,8 +925,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Populates the keywords and dropdown.
</span><span class="cx" style="display: block; padding: 0 10px"> populate : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> // For repopulation. Starting over.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( elements.bin.find('span').length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( elements.bin.find('span').length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> elements.bin.empty();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace commas, collapse spaces, trim, then split by space.
</span><span class="cx" style="display: block; padding: 0 10px"> keywords = $.trim( elements.hiddenEl.val().replace(/,/g, ' ').replace(/ +/g, ' ') ).split(' ');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,8 +939,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 !== keywords.length || keywords[0] !== '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $.each( keywords, function( k, v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var html = $('<span />').text(v).attr('data-keyword', v).prepend('<a class="dashicons dashicons-dismiss" href="#" />');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( v in coreKeywordList )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( v in coreKeywordList ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> html.attr('title', coreKeywordList[v]);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> html.appendTo( elements.bin );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -948,22 +953,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> elements.add = $('#keyword-add');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( coreKeywordList, function( k, v ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( coreKeywordList, function( k ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't show special (permission-based) ones.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wpTrac.gardener && -1 !== $.inArray( k, gardenerKeywordList ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wpTrac.gardener && -1 !== $.inArray( k, gardenerKeywordList ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> elements.add.append( '<option value="' + k + ( -1 !== $.inArray( k, keywords ) ? '" disabled="disabled">* ' : '">' ) + k + '</option>' );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a keyword. Takes a sanitized string.
</span><span class="cx" style="display: block; padding: 0 10px"> addKeyword : function( keyword ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! keyword )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! keyword ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var html, title = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't add it again.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( -1 !== $.inArray( keyword, keywords ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 !== $.inArray( keyword, keywords ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> keywords.push( keyword );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the dropdown. Core keywords also get a title attribute with their description.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -992,8 +1002,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add it to the bin, and refresh the hidden input.
</span><span class="cx" style="display: block; padding: 0 10px"> html = $('<span />').text(keyword).attr('data-keyword', keyword).prepend('<a class="dashicons dashicons-dismiss" href="#" />');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( title )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( title ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> html.attr('title', title);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> html.appendTo( elements.bin );
</span><span class="cx" style="display: block; padding: 0 10px"> elements.hiddenEl.val( keywords.join(' ') );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1003,37 +1014,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var keyword;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof object === 'string' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> keyword = object;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- object = elements.bin.find('span[data-keyword="' + keyword + '"]');
- if ( ! object.length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ object = elements.bin.find('span[data-keyword="' + keyword + '"]');
+
+ if ( ! object.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> keyword = object.text();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> keywords = $.grep( keywords, function(v) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return v != keyword;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return v !== keyword;
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the core keyword dropdown.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( keyword in coreKeywordList )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( keyword in coreKeywordList ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> elements.add.find('option[value=' + keyword + ']').prop('disabled', false).text( keyword );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> elements.hiddenEl.val( keywords.join(' ') );
</span><span class="cx" style="display: block; padding: 0 10px"> object.remove();
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check on submit that we're not just re-ordering keywords.
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise, Trac flips out and adds a useless 'Keywords changed from X to X' marker.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- submit : function(e) {
- if ( keywords.length !== originalKeywords.length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ submit : function() {
+ if ( keywords.length !== originalKeywords.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var testKeywords = $.grep( keywords, function(v) {
</span><span class="cx" style="display: block; padding: 0 10px"> return -1 === $.inArray( v, originalKeywords );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the difference has no length, then restore to the original keyword order.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! testKeywords.length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! testKeywords.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> elements.hiddenEl.val( originalKeywords.join(' ') );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ };
</ins><span class="cx" style="display: block; padding: 0 10px"> }()),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> focuses: (function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1052,7 +1070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $( '#field-owner' ).length === 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $('label[for="field-focuses"]').parent().remove();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( field.parent().attr( 'colspan' ) == 3 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( field.parent().attr( 'colspan' ) === 3 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> field.parent().attr( 'id', 'focuses' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> field.parent().attr({ colspan: 2, id: 'focuses' });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,7 +1132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> focus.removeClass( 'active' );
</span><span class="cx" style="display: block; padding: 0 10px"> var remove = focus.data( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> focuses = $.grep( focuses, function( value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return value != remove;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return value !== remove;
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> updateField();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1137,11 +1155,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function submit() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( focuses.length !== originalFocuses.length )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( focuses.length !== originalFocuses.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> var testFocuses = $.grep( focuses, function(v) {
</span><span class="cx" style="display: block; padding: 0 10px"> return -1 === $.inArray( v, originalFocuses );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the difference has no length, then restore to the original order.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! testFocuses.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> field.val( originalFocuses.join( ', ' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1154,7 +1175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }()),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> notifications: (function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var notifications, endpoint, _ticket, _nonce;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var notifications, endpoint, star, _ticket, _nonce;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function init( settings ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( hide_cc_field );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1246,14 +1267,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('#ticket.trac-content > h2').prepend( '<div class="ticket-star dashicons dashicons-star-' +
</span><span class="cx" style="display: block; padding: 0 10px"> ( notifications.hasClass('subscribed') ? 'filled' : 'empty' ) + '" title="Watch/unwatch this ticket"></div>' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> star = $('.ticket-star');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> star.click( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $(this).hasClass('dashicons-star-empty') ? subscribe() : unsubscribe();
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> $('.grid-toggle').on( 'click', 'a', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var names = $(this).hasClass('names');
</span><span class="cx" style="display: block; padding: 0 10px"> notifications.toggleClass('show-usernames', names );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- document.cookie="wp_trac_ngrid=" + (names ? 1 : 0) + ";max-age=31557600;domain=.wordpress.org;path=/";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ document.cookie = 'wp_trac_ngrid=' + (names ? 1 : 0) + ';max-age=31557600;domain=.wordpress.org;path=/';
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>