WordPress.org

Make WordPress Core

Changeset 36927


Ignore:
Timestamp:
03/10/2016 05:08:10 AM (4 years ago)
Author:
pento
Message:

Emoji: Twemoji replacements weren't working in TinyMCE after [36816].

See #35300.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js

    r32142 r36927  
    1 ( function( tinymce, wp ) {
     1( function( tinymce, wp, settings ) {
    22    tinymce.PluginManager.add( 'wpemoji', function( editor ) {
    33        var typing,
     
    1515            }());
    1616
    17         if ( ! wp || ! wp.emoji || ! wp.emoji.replaceEmoji ) {
     17        if ( ! wp || ! wp.emoji || settings.supports.everything ) {
    1818            return;
    1919        }
     
    126126        } );
    127127    } );
    128 } )( window.tinymce, window.wp );
     128} )( window.tinymce, window.wp, window._wpemojiSettings );
Note: See TracChangeset for help on using the changeset viewer.