Changeset 27317

Timestamp:

02/27/2014 08:10:32 PM (12 years ago)

Author:

wonderboymusic

Message:

In media-editor.js, use _.isUndefined() when available.

See #26631.

File:

• trunk/src/wp-includes/js/media-editor.js (modified) (5 diffs)

trunk/src/wp-includes/js/media-editor.js

@@ -213 +213 @@
             classes = props.classes || [];
 
-            img.src = typeof attachment !== 'undefined' ? attachment.url : props.url;
+            img.src = ! _.isUndefined( attachment ) ? attachment.url : props.url;
             _.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
 
@@ -280 +280 @@
         return _.extend( attributes, {
             coerce: function ( attrs, key ) {
-                if ( 'undefined' === typeof attrs[ key ] && 'undefined' !== typeof this.defaults[ key ] ) {
+                if ( _.isUndefined( attrs[ key ] ) && ! _.isUndefined( this.defaults[ key ] ) ) {
                     attrs[ key ] = this.defaults[ key ];
                 } else if ( 'true' === attrs[ key ] ) {
@@ -633 +633 @@
         insert: function( html ) {
             var editor,
-                hasTinymce = typeof tinymce !== 'undefined',
-                hasQuicktags = typeof QTags !== 'undefined',
+                hasTinymce = ! _.isUndefined( tinymce ),
+                hasQuicktags = ! _.isUndefined( QTags ),
                 wpActiveEditor = window.wpActiveEditor;
 
@@ -799 +799 @@
 
             // If that doesn't work, fall back to `tinymce.activeEditor.id`.
-            if ( ! id && typeof tinymce !== 'undefined' && tinymce.activeEditor ) {
+            if ( ! id && ! _.isUndefined( tinymce ) && tinymce.activeEditor ) {
                 id = tinymce.activeEditor.id;
             }
@@ -930 +930 @@
 /*
             // Save a bookmark of the caret position in IE.
-            if ( typeof tinymce !== 'undefined' ) {
+            if ( ! _.isUndefined( tinymce ) ) {
                 editor = tinymce.get( id );