Changeset 31744

Timestamp:

03/12/2015 03:16:51 AM (10 years ago)

Author:

nacin

Message:

Emoji JS cleanup.

• Filename: emoji.js => wp-emoji.js
• Script handle: emoji => wp-emoji
• Object: WPEmoji => wp.emoji
• Script settings: EmojiSettings => _wpemojiSettings
• Setting key: base_url => baseUrl
• Remove executable bit from files

see #31242.

Location:

trunk/src

Files:

• wp-admin/js/inline-edit-post.js (modified) (1 diff)
• wp-admin/js/inline-edit-tax.js (modified) (1 diff)
• wp-admin/js/post.js (modified) (1 diff)
• wp-admin/js/tags.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpemoji/plugin.js (modified) (3 diffs)
• wp-includes/js/twemoji.js (modified) (1 prop)
• wp-includes/js/wp-emoji.js (moved) (moved from trunk/src/wp-includes/js/emoji.js) (7 diffs, 1 prop)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-admin/js/inline-edit-post.js

@@ -273 +273 @@
                         $(inlineEditPost.what+id).siblings('tr.hidden').addBack().remove();
                         $('#edit-'+id).before(r).remove();
-                        window.WPEmoji.parse( $( inlineEditPost.what + id ).get( 0 ) );
+                        wp.emoji.parse( $( inlineEditPost.what + id ).get( 0 ) );
                         $(inlineEditPost.what+id).hide().fadeIn();
                     } else {

trunk/src/wp-admin/js/inline-edit-tax.js

@@ -118 +118 @@
                         $( '#parent' ).find( 'option[value=' + option_value + ']' ).text( row.find( '.row-title' ).text() );
 
-                        window.WPEmoji.parse( row.get( 0 ) );
+                        wp.emoji.parse( row.get( 0 ) );
 
                         row.hide().fadeIn();

trunk/src/wp-admin/js/post.js

@@ -742 +742 @@
                 }
 
-                window.WPEmoji.parse( box.get( 0 ) );
+                wp.emoji.parse( box.get( 0 ) );
 
                 b.html(revert_b);

trunk/src/wp-admin/js/tags.js

@@ -50 +50 @@
                 $( '.tags' ).prepend( res.responses[0].supplemental.parents ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
 
-            window.WPEmoji.parse( $( '.tags' ).get( 0 ) );
+            wp.emoji.parse( $( '.tags' ).get( 0 ) );
 
             $('.tags .no-items').remove();

trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js

@@ -1 @@
-( function( tinymce, WPEmoji ) {
+( function( tinymce, wp ) {
     tinymce.PluginManager.add( 'wpemoji', function( editor, url ) {
         var typing;
 
-        if ( ! WPEmoji.parseEmoji ) {
+        if ( ! wp.emoji.parseEmoji ) {
             return;
         }
@@ -33 +33 @@
             bookmark = selection.getBookmark();
 
-            WPEmoji.parse( node );
+            wp.emoji.parse( node );
 
             imgs = editor.dom.select( 'img.emoji', node );
@@ -62 +62 @@
         } );
     } );
-} )( window.tinymce, window.WPEmoji );
+} )( window.tinymce, window.wp );

trunk/src/wp-includes/js/wp-emoji.js

@@ -1 @@
-/* global EmojiSettings, twemoji */
-var WPEmoji;
+/* global _wpemojiSettings, twemoji */
+window.wp = window.wp || {};
 
 (function() {
-    WPEmoji = {
+    var emoji;
+
+    wp.emoji = emoji = {
         /**
          * The CDN URL for where emoji files are hosted.
@@ -11 +13 @@
          * @var string
          */
-        base_url: '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72',
+        baseUrl: '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72',
 
         /**
@@ -55 +57 @@
          */
         init: function() {
-            if ( typeof EmojiSettings !== 'undefined' ) {
-                this.base_url = EmojiSettings.base_url || this.base_url;
-                this.ext = EmojiSettings.ext || this.ext;
-            }
-
-            WPEmoji.parseAllEmoji = ! WPEmoji.browserSupportsEmoji();
-            WPEmoji.parseFlags = ! WPEmoji.browserSupportsFlagEmoji();
-            WPEmoji.parseEmoji = WPEmoji.parseAllEmoji || WPEmoji.parseFlags;
-
-            if ( ! WPEmoji.parseEmoji ) {
+            if ( typeof _wpemojiSettings !== 'undefined' ) {
+                emoji.baseUrl = _wpemojiSettings.baseUrl || emoji.baseUrl;
+                emoji.ext = _wpemojiSettings.ext || emoji.ext;
+            }
+
+            emoji.parseAllEmoji = ! emoji.browserSupportsEmoji();
+            emoji.parseFlags = ! emoji.browserSupportsFlagEmoji();
+            emoji.parseEmoji = emoji.parseAllEmoji || emoji.parseFlags;
+
+            if ( ! emoji.parseEmoji ) {
                 return;
             }
@@ -75 +77 @@
          */
         load: function() {
-            WPEmoji.parse( document.body );
+            emoji.parse( document.body );
         },
 
@@ -161 +163 @@
          */
         parse: function( element ) {
-            if ( ! WPEmoji.parseEmoji ) {
+            if ( ! emoji.parseEmoji ) {
                 return;
             }
 
             return twemoji.parse( element, {
-                base: this.base_url,
-                ext: this.ext,
+                base:     emoji.baseUrl,
+                ext:      emoji.ext,
                 callback: function( icon, options ) {
                     // Ignore some standard characters that TinyMCE recommends in its character map.
@@ -182 +184 @@
                     }
 
-                    if ( WPEmoji.parseFlags && ! WPEmoji.parseAllEmoji && ! icon.match( /^1f1(e[6-9a-f]|f[1-9a-f])-1f1(e[6-9a-f]|f[1-9a-f])$/ ) ) {
+                    if ( emoji.parseFlags && ! emoji.parseAllEmoji && ! icon.match( /^1f1(e[6-9a-f]|f[1-9a-f])-1f1(e[6-9a-f]|f[1-9a-f])$/ ) ) {
                         return false;
                     }
@@ -193 +195 @@
 
     if ( window.addEventListener ) {
-        window.addEventListener( 'load', WPEmoji.load, false );
+        window.addEventListener( 'load', emoji.load, false );
     } else if ( window.attachEvent ) {
-        window.attachEvent( 'onload', WPEmoji.load );
+        window.attachEvent( 'onload', emoji.load );
     }
 
-    WPEmoji.init();
+    emoji.init();
 })();

trunk/src/wp-includes/script-loader.php

@@ -426 +426 @@
 
     $scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), false, 1 );
-    $scripts->add( 'emoji', "/wp-includes/js/emoji$suffix.js", array( 'twemoji' ), false, 1 );
-    did_action( 'init' ) && $scripts->localize( 'emoji', 'EmojiSettings', array(
+    $scripts->add( 'emoji', "/wp-includes/js/wp-emoji$suffix.js", array( 'twemoji' ), false, 1 );
+    did_action( 'init' ) && $scripts->localize( 'wp-emoji', '_wpemojiSettings', array(
         /**
          * Filter the URL where emoji images are hosted.
@@ -435 +435 @@
          * @param string The emoji base URL.
          */
-        'base_url' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ),
+        'baseUrl' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ),
         /**
          * Filter the extension of the emoji files.