Changeset 37257 for branches/4.5

Timestamp:

04/20/2016 02:07:33 PM (10 years ago)

Author:

pento

Message:

Emoji: The diversity support test was incorrectly passing on all browsers.

[37028] missed some logic to capture the base emoji skin tone, to compare to the modified emoji skin tone. This caused all browsers to report that they supported skin tone modifiers, regardless of whether they actually did.

Merge of [37256] to the 4.5 branch.

Fixes #36604.

File:

• branches/4.5/src/wp-includes/js/wp-emoji-loader.js (modified) (1 diff)

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

@@ -50 +50 @@
                                 context.fillText( stringFromCharCode( 55356, 57221 ), 0, 0 );
                                 tonedata = context.getImageData( 16, 16, 1, 1 ).data;
+                                tone = tonedata[0] + ',' + tonedata[1] + ',' + tonedata[2] + ',' + tonedata[3];
 
                                 context.fillText( stringFromCharCode( 55356, 57221, 55356, 57343 ), 0, 0 );