sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emoji: always export the methods in wp-emoji.js, even when dependencies are missing and we cannot initialize. 

See #31242.

git-svn-id: https://develop.svn.wordpress.org/trunk@31780 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2015-03-15 00:16:47 +00:00
parent 59b22c284d
commit e94b808f3b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wp-includes/js/wp-emoji.js
View File

@ -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 {