<!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>[1990] sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js: Trac: Enhance autocomplete for usernames by separating ticket and non-ticket participants.</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/1990">1990</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/1990","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-18 18:45:08 +0000 (Sun, 18 Oct 2015)</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: Enhance autocomplete for usernames by separating ticket and non-ticket participants.
props helen, ocean90.
See <a href="http://meta.trac.wordpress.org/ticket/830">#830</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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_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 2015-10-17 22:15:18 UTC (rev 1989)
+++ sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js 2015-10-18 18:45:08 UTC (rev 1990)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,8 +439,9 @@
</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"> autocomplete: (function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var users,
- attachments,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var ticketParticipants = [],
+ nonTicketParticipants = [],
+ attachments = [],
</ins><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">@@ -453,21 +454,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> settings = wpTracAutoCompleteUsers;
</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">- users = this.getUsers();
- attachments = this.getAttachments();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.initTicketParticipants();
+ this.initNonTicketParticipants();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#comment' ).atwho({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- at: '@',
- data: users
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ at: '@',
+ callbacks: {
+ filter: this.filterTicketParticipants,
+ remoteFilter: this.filterNonTicketParticipants
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }).atwho({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- at: '[att',
- insertTpl: '${atwho-at}achment:${name}]',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ at: '[att',
+ insertTpl: '${atwho-at}achment:${name}]',
</ins><span class="cx" style="display: block; padding: 0 10px"> displayTpl: '<li>${display}</li>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data: attachments
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data: this.getAttachments()
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getUsers: function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ filterNonTicketParticipants: function( query, callback ) {
+ // Bail out if the query is empty.
+ if ( '' === query ) {
+ return callback();
+ }
+
+ var results = [],
+ regex = new RegExp( '^' + query, 'ig' ); // start of string
+
+ $.each( nonTicketParticipants, function( key, value ) {
+ if ( value.toLowerCase().match( regex ) ) {
+ results.push( { name: value } );
+ }
+ });
+
+ callback( results );
+ },
+
+ filterTicketParticipants: function( query ) {
+ // Bail out if the query is empty.
+ if ( '' === query ) {
+ return ticketParticipants;
+ }
+
+ var results = [],
+ regex = new RegExp( '^' + query, 'ig' ); // start of string
+
+ $.each( ticketParticipants, function( key, value ){
+ if ( value.toLowerCase().match( regex ) ) {
+ results.push( value );
+ }
+ });
+
+ return results;
+ },
+
+ initTicketParticipants: function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var users = [], exclude = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== settings.exclude ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,10 +532,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> users.push( ticketReporter );
</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">- // Add additional users.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Exclude current user.
+ if ( 'undefined' !== wpTrac.currentUser ) {
+ users = $.grep( users, function( user ) {
+ return user != wpTrac.currentUser;
+ });
+ }
+
+ ticketParticipants = users;
+ },
+
+ getTicketParticipants: function() {
+ return ticketParticipants;
+ },
+
+ addTicketParticipant: function( ticketParticipant ) {
+ if ( -1 === $.inArray( ticketParticipant, ticketParticipants ) ) {
+ $.merge( ticketParticipants, [ ticketParticipant ] );
+ }
+ },
+
+ initNonTicketParticipants: function() {
+ var users = [], exclude = [];
+
+ if ( 'undefined' !== settings.exclude ) {
+ exclude = settings.exclude;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' !== typeof settings.include ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $.each( settings.include, function( k, username ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( -1 === $.inArray( username, users ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 === $.inArray( username, users ) && -1 === $.inArray( username, ticketParticipants ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> users.push( username );
</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">@@ -508,14 +574,24 @@
</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">- return users;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ nonTicketParticipants = users;
</ins><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">+ getNonTicketParticipants: function() {
+ return nonTicketParticipants;
+ },
+
+ addNonTicketParticipant: function( nonTicketParticipant ) {
+ if ( -1 === $.inArray( nonTicketParticipant, nonTicketParticipants ) ) {
+ $.merge( nonTicketParticipants, [ nonTicketParticipant ] );
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> getAttachments: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var attachments = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Most recent should show up first.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ ($( 'dl.attachments dt' ).get().reverse() ).each( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( $( 'dl.attachments dt' ).get().reverse() ).each( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> attachments.push({
</span><span class="cx" style="display: block; padding: 0 10px"> display: $( this ).text(),
</span><span class="cx" style="display: block; padding: 0 10px"> name: $( this ).find( 'a[title="View attachment"]' ).text()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -907,20 +983,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> render( data.data['notifications-box'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( data.data.maintainers ) {
</span><span class="cx" style="display: block; padding: 0 10px"> maintainerLabels( data.data.maintainers );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // wpTrac.autocomplete.addNonTicketParticipant( data.data.maintainers ); doesn't work yet, because ticketInit() runs before autocomplete.init()
</ins><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">- });
</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"> function maintainerLabels( maintainers ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var i, len, labels = {};
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( i = 0, len = maintainers.length; i < len; i++ ) {
- labels[ maintainers[i] ] = {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ for ( i = 0, len = maintainers.length; i < len; i++ ) {
+ labels[ maintainers[i] ] = {
</ins><span class="cx" style="display: block; padding: 0 10px"> text: 'Component Maintainer',
</span><span class="cx" style="display: block; padding: 0 10px"> title: '@' + maintainers[i] + ' maintains the ' + $.trim( $('td[headers="h_component"]').text() ) + ' component'
</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">- wpTrac.showContributorLabels( labels );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wpTrac.showContributorLabels( labels );
</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"> function render( data ) {
</span></span></pre>
</div>
</div>
</body>
</html>