Changeset 37090

Timestamp:

03/29/2016 02:18:51 AM (9 years ago)

Author:

pento

Message:

Emoji: Fix the diversity emoji check in Safari.

When the browser test for diversity emoji was added in [36160], it included a workaround for Chrome not being able to compare Uint8ClampedArray objects directly, by converting them to a string. Unfortunately, Safari doesn't support the Uint8ClampedArray.toString() method correctly, so the test was incorrectly failing in Safari.

Merge of [37028] to the 4.4 branch.

Fixes #36266.

File:

• branches/4.4/src/wp-includes/js/wp-emoji-loader.js (modified) (2 diffs)

branches/4.4/src/wp-includes/js/wp-emoji-loader.js

@@ -15 +15 @@
             context = canvas.getContext && canvas.getContext( '2d' ),
             stringFromCharCode = String.fromCharCode,
-            tone;
+            tonedata, tone, tone2;
 
         if ( ! context || ! context.fillText ) {
@@ -48 +48 @@
              */
             context.fillText( stringFromCharCode( 55356, 57221 ), 0, 0 );
-            tone = context.getImageData( 16, 16, 1, 1 ).data.toString();
+            tonedata = context.getImageData( 16, 16, 1, 1 ).data;
+
             context.fillText( stringFromCharCode( 55356, 57221, 55356, 57343 ), 0, 0 );
-            // Chrome has issues comparing arrays, so we compare it as a  string, instead.
-            return tone !== context.getImageData( 16, 16, 1, 1 ).data.toString();
+            // Chrome has issues comparing arrays, and Safari has issues converting arrays to strings.
+            // So, we create our own string and compare that, instead.
+            tonedata = context.getImageData( 16, 16, 1, 1 ).data;
+            tone2 = tonedata[0] + ',' + tonedata[1] + ',' + tonedata[2] + ',' + tonedata[3];
+
+            return tone !== tone2;
         } else {
             if ( 'simple' === type ) {