From 2ff66f7c50cf375289cf5f2e47d140250c94e59e Mon Sep 17 00:00:00 2001 From: Peter Wilson Date: Sun, 17 Sep 2017 22:51:42 +0000 Subject: [PATCH] Emoji: Invert value returned by UN test for accuracy. The JavaScript testing for UN flag support was passing when it failed, and failing when it passes. This inverts the result to take more traditional approach of returning the correct result. Unprops Pento. Fixes #41852. git-svn-id: https://develop.svn.wordpress.org/trunk@41386 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media-models.js | 2 +- src/wp-includes/js/wp-emoji-loader.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/js/media-models.js b/src/wp-includes/js/media-models.js index ba93f9722a..caa7fcb590 100644 --- a/src/wp-includes/js/media-models.js +++ b/src/wp-includes/js/media-models.js @@ -12,6 +12,7 @@ window.wp = window.wp || {}; * * @alias wp.media * @memberOf wp + * @namespace * * @param {object} attributes The properties passed to the main media controller. * @return {wp.media.view.MediaFrame} A media workflow. @@ -51,7 +52,6 @@ media = wp.media = function( attributes ) { return frame; }; -/** @namespace wp.media */ /** @namespace wp.media.model */ /** @namespace wp.media.view */ /** @namespace wp.media.controller */ diff --git a/src/wp-includes/js/wp-emoji-loader.js b/src/wp-includes/js/wp-emoji-loader.js index 3dfa6dc951..326934474f 100644 --- a/src/wp-includes/js/wp-emoji-loader.js +++ b/src/wp-includes/js/wp-emoji-loader.js @@ -54,7 +54,7 @@ context.fillText( stringFromCharCode( 55356, 56826, 8203, 55356, 56819 ), 0, 0 ); flag2 = canvas.toDataURL(); - if ( flag !== flag2 ) { + if ( flag === flag2 ) { return false; }