← Back to branch summary

~canonical-sysadmins/wordpress/4.4.2

« back to all changes in this revision

Viewing changes to wp-includes/js/wp-emoji.js

  • Committer: Barry Price
  • Date: 2016-01-07 06:09:42 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: barry.price@canonical.com-20160107060942-1ghv2tqiwm8z0j36
Merge WP4.4.1 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/js/wp-emoji.js
149
149
                                                        return false;
150
150
                                        }
151
151
 
152
 
                                        if ( ! settings.supports.flag && settings.supports.simple && settings.supports.unicode8 &&
 
152
                                        if ( ! settings.supports.flag && settings.supports.simple && settings.supports.unicode8 && settings.supports.diversity &&
153
153
                                                ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) ) {
154
154
 
155
155
                                                return false;
178
178
                 * Initialize our emoji support, and set up listeners.
179
179
                 */
180
180
                if ( settings ) {
181
 
                        replaceEmoji = ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8;
 
181
                        replaceEmoji = ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8 || ! settings.supports.diversity;
182
182
 
183
183
                        if ( settings.DOMReady ) {
184
184
                                load();