Changeset 13519

Timestamp:

04/15/2024 03:55:00 AM (2 years ago)

Author:

dd32

Message:

Trac: Properly handle multiple @mention's within a ticket title when multiple links to the ticket/changeset are listed in a single comment.

This was previously only escaping/skipping the first @mention, which in this case was in the changeset text, the second instance was being skipped.

See https://meta.trac.wordpress.org/ticket/7584#comment:2

Location:

sites/trunk

Files:

• trac.wordpress.org/templates/site.html (modified) (1 diff)
• wordpress.org/public_html/style/trac/wp-trac.js (modified) (2 diffs)

sites/trunk/trac.wordpress.org/templates/site.html

@@ -5 +5 @@
 
 <?python
-        scripts_version = '217'
+        scripts_version = '218'
         project_slug = req.environ['HTTP_HOST'].split(':')[0].split('.')[0]
         wporg_endpoint = 'https://make.wordpress.org/' + project_slug + '/'

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

@@ -198 +198 @@
                         // 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,
-                                mentionsInAttrRegEx = new RegExp( '="[^"]*?' + mentionsRegEx.source + '[\\s\\S]*?"' );
+                                mentionsInAttrRegEx = new RegExp( '="[^"]*?' + mentionsRegEx.source + '[\\s\\S]*?"', 'g' );
 
                         $( selector || 'div.change .comment, #ticket .description' ).each( function() {
@@ -225 +225 @@
                                         // Restore mentions in HTML attributes.
                                         if ( placeholders.length ) {
-                                                $comment = $comment.replace( '__PLACEHOLDER__', function() {
+                                                $comment = $comment.replace( /__PLACEHOLDER__/g, function() {
                                                         return placeholders.shift();
                                                 } );