Changeset 31772

Timestamp:

03/13/2015 08:26:39 PM (10 years ago)

Author:

azaozz

Message:

Emoji: better regex when testing for only char emoji. Props iseulde. See #31242.

File:

• trunk/src/wp-includes/js/wp-emoji.js (modified) (2 diffs)

trunk/src/wp-includes/js/wp-emoji.js

@@ -103 +103 @@
 
             /*
-             * Chrome OS X added native emoji rendering in M41. Unfortunately,
+             * Chrome on OS X added native emoji rendering in M41. Unfortunately,
              * it doesn't work when the font is bolder than 500 weight. So, we
              * check for bold rendering support to avoid invisible emoji in Chrome.
@@ -175 +175 @@
                     }
 
-                    if ( emoji.parseFlags && ! emoji.parseAllEmoji && ! icon.match( /^1f1(e[6-9a-f]|f[1-9a-f])-1f1(e[6-9a-f]|f[1-9a-f])$/ ) ) {
+                    if ( emoji.parseFlags && ! emoji.parseAllEmoji &&
+                        ! /^1f1(?:e[6-9a-f]|f[1-9a-f])-1f1(?:e[6-9a-f]|f[1-9a-f])$/.test( icon ) ) {
+
                         return false;
                     }