Changeset 3167

Timestamp:

05/18/2016 11:11:33 AM (9 years ago)

Author:

ocean90

Message:

Trac: Improve handling of mentions in HTML attributes.

• Revert [3151].
• Make the regex less greedy and add support for multiline attributes.
• Replace matches for mentions in attributes with a placeholder so other mentions in none-attributes can be still replaced.

See #1541.

File:

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

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

@@ -52 +52 @@
     ];
 
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Using_special_characters
-    function escapeRegExp( string ) {
-        return string.replace( /[.*+?^${}()|[\]\\]/g, '\\$&' );
-    }
-
     wpTrac = {
 
@@ -103 +98 @@
         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,
+                mentionsInAttrRegEx = new RegExp( '="[^"]*?' + mentionsRegEx.source + '[\\s\\S]*?"' );
 
             $( 'div.change .comment, #ticket .description' ).each( function() {
                 $comment = $( this ).html();
                 if ( mentionsRegEx.test( $comment ) ) {
+                    var placeholders = [];
+
+                    if ( mentionsInAttrRegEx.test( $comment ) ) {
+                        // Preserve mentions in HTML attributes.
+                        $comment = $comment.replace( mentionsInAttrRegEx, function( match ) {
+                            placeholders.push( match );
+                            return '__PLACEHOLDER__';
+                        } );
+                    }
+
                     $comment = $comment.replace( mentionsRegEx, function( match, pre, username ) {
                         if ( -1 !== $.inArray( username, reservedTerms ) ) {
@@ -113 +119 @@
                         }
 
-                        var matchInAttr = new RegExp( '=".*' + escapeRegExp( match ) + '.*"' );
-                        if ( matchInAttr.test( $comment ) ) {
-                            return match;
-                        }
-
                         var meClass = ( username === wpTrac.currentUser ) ? ' me' : '';
                         return pre + '<a class="mention' + meClass + '" href="https://profiles.wordpress.org/' + username + '">@' + username + '</a>';
                     } );
+
+                    // Restore mentions in HTML attributes.
+                    if ( placeholders.length ) {
+                        $comment = $comment.replace( '__PLACEHOLDER__', function() {
+                            return placeholders.shift();
+                        } );
+                    }
+
                     $( this ).html( $comment );
                 }