Changeset 31741

Timestamp:

03/12/2015 01:04:44 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Fix JSHint errors in [31734] and add missing dependencies.

props iseulde.
fixes #31328.

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/script-loader.php (modified) (4 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();
-                        if ( WPEmoji ) {
-                            WPEmoji.parse( $( inlineEditPost.what + id ).get( 0 ) );
-                        }
+                        window.WPEmoji.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() );
 
-                        if ( WPEmoji ) {
-                            WPEmoji.parse( row.get( 0 ) );
-                        }
+                        window.WPEmoji.parse( row.get( 0 ) );
 
                         row.hide().fadeIn();

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

@@ -742 +742 @@
                 }
 
-                if ( WPEmoji ) {
-                    WPEmoji.parse( box.get( 0 ) );
-                }
+                window.WPEmoji.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
 
-            if ( WPEmoji ) {
-                WPEmoji.parse( $( '.tags' ).get( 0 ) );
-            }
+            window.WPEmoji.parse( $( '.tags' ).get( 0 ) );
 
             $('.tags .no-items').remove();

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

@@ -448 +448 @@
 
     if ( is_admin() ) {
-        $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array('jquery', 'wp-ajax-response'), false, 1 );
+        $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response', 'emoji' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
             'noPerm' => __('You do not have permission to do that.'),
@@ -471 +471 @@
         ) );
 
-        $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box' ), false, 1 );
+        $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'emoji' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
             'ok' => __('OK'),
@@ -523 +523 @@
         $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone' ), false, 1 );
 
-        $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 );
+        $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest', 'emoji' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
             'error' => __('Error while saving the changes.'),
@@ -531 +531 @@
         ) );
 
-        $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), false, 1 );
+        $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'emoji' ), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
             'error' => __('Error while saving the changes.')