← Back to branch summary

~canonical-sysadmins/wordpress/4.5.2

« back to all changes in this revision

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

  • Committer: Manuel Seelaus
  • Date: 2015-12-09 17:47:18 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: manuel.seelaus@canonical.com-20151209174718-coxethm2swbeqksy
Merge WP4.4 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/js/wp-emoji.js
58
58
                                                        ii === 1 && removedNodes.length === 1 &&
59
59
                                                        addedNodes[0].nodeType === 3 &&
60
60
                                                        removedNodes[0].nodeName === 'IMG' &&
61
 
                                                        addedNodes[0].data === removedNodes[0].alt
 
61
                                                        addedNodes[0].data === removedNodes[0].alt &&
 
62
                                                        'load-failed' === removedNodes[0].getAttribute( 'data-error' )
62
63
                                                ) {
63
64
                                                        return;
64
65
                                                }
148
149
                                                        return false;
149
150
                                        }
150
151
 
151
 
                                        if ( ! settings.supports.flag && settings.supports.simple &&
 
152
                                        if ( ! settings.supports.flag && settings.supports.simple && settings.supports.unicode8 &&
152
153
                                                ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) ) {
153
154
 
154
155
                                                return false;
155
156
                                        }
156
157
 
157
158
                                        return ''.concat( options.base, icon, options.ext );
 
159
                                },
 
160
                                onerror: function() {
 
161
                                        if ( twemoji.parentNode ) {
 
162
                                                this.setAttribute( 'data-error', 'load-failed' );
 
163
                                                twemoji.parentNode.replaceChild( document.createTextNode( twemoji.alt ), twemoji );
 
164
                                        }
158
165
                                }
159
166
                        };
160
167
 
171
178
                 * Initialize our emoji support, and set up listeners.
172
179
                 */
173
180
                if ( settings ) {
174
 
                        replaceEmoji = ! settings.supports.simple || ! settings.supports.flag;
 
181
                        replaceEmoji = ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8;
175
182
 
176
183
                        if ( settings.DOMReady ) {
177
184
                                load();