Changeset 1990

Timestamp:

10/18/2015 06:45:08 PM (11 years ago)

Author:

ocean90

Message:

Trac: Enhance autocomplete for usernames by separating ticket and non-ticket participants.

props helen, ocean90.
See #830.

File:

• sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js (modified) (6 diffs)

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

@@ -440 +440 @@
 
                 autocomplete: (function() {
-                        var users,
-                                attachments,
+                        var ticketParticipants = [],
+                                nonTicketParticipants = [],
+                                attachments = [],
                                 settings = {};
 
@@ -454 +455 @@
                                         }
 
-                                        users = this.getUsers();
-                                        attachments  = this.getAttachments();
+                                        this.initTicketParticipants();
+                                        this.initNonTicketParticipants();
 
                                         $( '#comment' ).atwho({
-                                                at:  '@',
-                                                data: users
+                                                at:        '@',
+                                                callbacks: {
+                                                        filter:       this.filterTicketParticipants,
+                                                        remoteFilter: this.filterNonTicketParticipants
+                                                }
                                         }).atwho({
-                                                at: '[att',
-                                                insertTpl: '${atwho-at}achment:${name}]',
+                                                at:         '[att',
+                                                insertTpl:  '${atwho-at}achment:${name}]',
                                                 displayTpl: '<li>${display}</li>',
-                                                data: attachments
-                                        });
-                                },
-
-                                getUsers: function() {
+                                                data:       this.getAttachments()
+                                        });
+                                },
+
+                                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() {
                                         var users  = [], exclude = [];
 
@@ -493 +533 @@
                                         }
 
-                                        // Add additional users.
-                                        if ( 'undefined' !== typeof settings.include ) {
-                                                $.each( settings.include, function( k, username ) {
-                                                        if ( -1 === $.inArray( username, users ) ) {
-                                                                users.push( username );
-                                                        }
-                                                });
-                                        }
-
                                         // Exclude current user.
                                         if ( 'undefined' !== wpTrac.currentUser ) {
@@ -509 +540 @@
                                         }
 
-                                        return users;
+                                        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;
+                                        }
+
+                                        if ( 'undefined' !== typeof settings.include ) {
+                                                $.each( settings.include, function( k, username ) {
+                                                        if ( -1 === $.inArray( username, users ) && -1 === $.inArray( username, ticketParticipants ) ) {
+                                                                users.push( username );
+                                                        }
+                                                });
+                                        }
+
+                                        // Exclude current user.
+                                        if ( 'undefined' !== wpTrac.currentUser ) {
+                                                users = $.grep( users, function( user ) {
+                                                        return user != wpTrac.currentUser;
+                                                });
+                                        }
+
+                                        nonTicketParticipants = users;
+                                },
+
+                                getNonTicketParticipants: function() {
+                                        return nonTicketParticipants;
+                                },
+
+                                addNonTicketParticipant: function( nonTicketParticipant ) {
+                                        if ( -1 === $.inArray( nonTicketParticipant, nonTicketParticipants ) ) {
+                                                $.merge( nonTicketParticipants, [ nonTicketParticipant ] );
+                                        }
                                 },
 
@@ -516 +592 @@
 
                                         // Most recent should show up first.
-                                        $ ($( 'dl.attachments dt' ).get().reverse() ).each( function() {
+                                        $( $( 'dl.attachments dt' ).get().reverse() ).each( function() {
                                                 attachments.push({
                                                         display: $( this ).text(),
@@ -908 +984 @@
                                                 if ( data.data.maintainers ) {
                                                         maintainerLabels( data.data.maintainers );
-                                                }
-                                        }
-                                });
+                                                //      wpTrac.autocomplete.addNonTicketParticipant( data.data.maintainers ); doesn't work yet, because ticketInit() runs before autocomplete.init()
+                                                }
+                                        }
+                                });
                         }
 
                         function maintainerLabels( maintainers ) {
                                 var i, len, labels = {};
-                                for ( i = 0, len = maintainers.length; i < len; i++ ) {
-                                labels[ maintainers[i] ] = {
+                                        for ( i = 0, len = maintainers.length; i < len; i++ ) {
+                                        labels[ maintainers[i] ] = {
                                                 text:  'Component Maintainer',
                                                 title: '@' + maintainers[i] + ' maintains the ' + $.trim( $('td[headers="h_component"]').text() ) + ' component'
                                         };
                                 }
-                                wpTrac.showContributorLabels( labels );
+                                wpTrac.showContributorLabels( labels );
                         }