From 1fc8c98fd7e363e29652494c93704f1da0b71434 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 15 Mar 2015 00:17:27 +0000 Subject: [PATCH] Emoji: always export the methods in wp-emoji.js, even when dependencies are missing and we cannot initialize. See #31242. Built from https://develop.svn.wordpress.org/trunk@31780 git-svn-id: http://core.svn.wordpress.org/trunk@31760 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/wp-emoji.js | 22 ++++++++++------------ wp-includes/js/wp-emoji.min.js | 2 +- wp-includes/version.php | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/wp-includes/js/wp-emoji.js b/wp-includes/js/wp-emoji.js index 726f455f4e..4fce566fad 100644 --- a/wp-includes/js/wp-emoji.js +++ b/wp-includes/js/wp-emoji.js @@ -154,21 +154,19 @@ } ); } - if ( ! twemoji || ! settings ) { - return; - } - /** * Initialize our emoji support, and set up listeners. */ - parseAllEmoji = ! browserSupportsEmoji(); - parseFlags = ! browserSupportsEmoji( 'flag' ); - parseEmoji = parseAllEmoji || parseFlags; - - if ( window.addEventListener ) { - window.addEventListener( 'load', load, false ); - } else if ( window.attachEvent ) { - window.attachEvent( 'onload', load ); + if ( twemoji && settings ) { + parseAllEmoji = ! browserSupportsEmoji(); + parseFlags = ! browserSupportsEmoji( 'flag' ); + parseEmoji = parseAllEmoji || parseFlags; + + if ( window.addEventListener ) { + window.addEventListener( 'load', load, false ); + } else if ( window.attachEvent ) { + window.attachEvent( 'onload', load ); + } } return { diff --git a/wp-includes/js/wp-emoji.min.js b/wp-includes/js/wp-emoji.min.js index 2df09c0146..a15d735fe2 100644 --- a/wp-includes/js/wp-emoji.min.js +++ b/wp-includes/js/wp-emoji.min.js @@ -1 +1 @@ -!function(a,b,c){function d(){function d(){g&&new g(function(a){for(var b,c,d=a.length;d--;)for(b=a[d].addedNodes.length;b--;)c=a[d].addedNodes[b],3===c.nodeType&&(c=c.parentNode),c&&1===c.nodeType&&f(c)}).observe(document.body,{childList:!0,subtree:!0}),f(document.body)}function e(a){var b=document.createElement("canvas"),c=b.getContext&&b.getContext("2d");return c&&c.fillText?(c.textBaseline="top",c.font="600 32px Arial","flag"===a?(c.fillText(String.fromCharCode(55356,56812,55356,56807),0,0),b.toDataURL().length>3e3):(c.fillText(String.fromCharCode(55357,56835),0,0),0!==c.getImageData(16,16,1,1).data[0])):!1}function f(a,d){if(!i)return a;var e=d&&d.className||"emoji";return b.parse(a,{base:c.baseUrl,ext:c.ext,className:e,callback:function(a,b){switch(a){case"a9":case"ae":case"2122":case"2194":case"2660":case"2663":case"2665":case"2666":return!1}return!j||h||/^1f1(?:e[6-9a-f]|f[1-9a-f])-1f1(?:e[6-9a-f]|f[1-9a-f])$/.test(a)?"".concat(b.base,"/",a,b.ext):!1}})}var g=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,h=!1,i=!1,j=!1;if(b&&c)return h=!e(),j=!e("flag"),i=h||j,a.addEventListener?a.addEventListener("load",d,!1):a.attachEvent&&a.attachEvent("onload",d),{browserSupportsEmoji:e,parse:f}}a.wp=a.wp||{},a.wp.emoji=new d}(window,window.twemoji,window._wpemojiSettings); \ No newline at end of file +!function(a,b,c){function d(){function d(){g&&new g(function(a){for(var b,c,d=a.length;d--;)for(b=a[d].addedNodes.length;b--;)c=a[d].addedNodes[b],3===c.nodeType&&(c=c.parentNode),c&&1===c.nodeType&&f(c)}).observe(document.body,{childList:!0,subtree:!0}),f(document.body)}function e(a){var b=document.createElement("canvas"),c=b.getContext&&b.getContext("2d");return c&&c.fillText?(c.textBaseline="top",c.font="600 32px Arial","flag"===a?(c.fillText(String.fromCharCode(55356,56812,55356,56807),0,0),b.toDataURL().length>3e3):(c.fillText(String.fromCharCode(55357,56835),0,0),0!==c.getImageData(16,16,1,1).data[0])):!1}function f(a,d){if(!i)return a;var e=d&&d.className||"emoji";return b.parse(a,{base:c.baseUrl,ext:c.ext,className:e,callback:function(a,b){switch(a){case"a9":case"ae":case"2122":case"2194":case"2660":case"2663":case"2665":case"2666":return!1}return!j||h||/^1f1(?:e[6-9a-f]|f[1-9a-f])-1f1(?:e[6-9a-f]|f[1-9a-f])$/.test(a)?"".concat(b.base,"/",a,b.ext):!1}})}var g=a.MutationObserver||a.WebKitMutationObserver||a.MozMutationObserver,h=!1,i=!1,j=!1;return b&&c&&(h=!e(),j=!e("flag"),i=h||j,a.addEventListener?a.addEventListener("load",d,!1):a.attachEvent&&a.attachEvent("onload",d)),{browserSupportsEmoji:e,parse:f}}a.wp=a.wp||{},a.wp.emoji=new d}(window,window.twemoji,window._wpemojiSettings); \ No newline at end of file diff --git a/wp-includes/version.php b/wp-includes/version.php index 40292b39b4..36179d20cf 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-beta1-31779'; +$wp_version = '4.2-beta1-31780'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.