Changeset 2116

Timestamp:

11/23/2015 04:08:42 PM (6 years ago)

Author:

ocean90

Message:

Trac: Preserve the char(s) before an @-mention.

File:

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

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

@@ -93 +93 @@
         linkMentions: function() {
             // See https://github.com/regexps/mentions-regex/blob/master/index.js#L21
-            var mentionsRegEx = /(?:^|[^a-zA-Z0-9_＠!@#$%&*])(?:(?:@|＠)(?!\/))([a-zA-Z0-9/_.]{1,20})(?:\b(?!@|＠)|$)/g;
+            var mentionsRegEx = /(^|[^a-zA-Z0-9_＠!@#$%&*])(?:(?:@|＠)(?!\/))([a-zA-Z0-9/_.]{1,20})(?:\b(?!@|＠)|$)/g;
 
             $( 'div.change .comment, #ticket .description' ).each( function() {
                 $comment = $( this ).html();
                 if ( mentionsRegEx.test( $comment ) ) {
-                    $comment = $comment.replace( mentionsRegEx, function( match, username ) {
+                    $comment = $comment.replace( mentionsRegEx, function( match, pre, username ) {
                         if ( -1 !== $.inArray( username, reservedTerms ) ) {
                             return match;
@@ -104 +104 @@
 
                         var meClass = ( username === wpTrac.currentUser ) ? ' me' : '';
-                        return ' <a class="mention' + meClass + '" href="https://profiles.wordpress.org/' + username + '">@' + username + '</a>';
+                        return pre + '<a class="mention' + meClass + '" href="https://profiles.wordpress.org/' + username + '">@' + username + '</a>';
                     } );
                     $( this ).html( $comment );