Changeset 27320

Timestamp:

02/27/2014 09:37:36 PM (11 years ago)

Author:

wonderboymusic

Message:

Some playlist cleanup:

• Check properties against the window object when using _.isUndefined() on globals
• Fix a typo for $safe_type introduced in [27311]

See #26631.

Location:

trunk/src/wp-includes

Files:

• js/media-editor.js (modified) (3 diffs)
• js/mediaelement/wp-playlist.js (modified) (3 diffs)
• media.php (modified) (1 diff)

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

@@ -633 +633 @@
         insert: function( html ) {
             var editor,
-                hasTinymce = ! _.isUndefined( tinymce ),
-                hasQuicktags = ! _.isUndefined( QTags ),
+                hasTinymce = ! _.isUndefined( window.tinymce ),
+                hasQuicktags = ! _.isUndefined( window.QTags ),
                 wpActiveEditor = window.wpActiveEditor;
 
@@ -799 +799 @@
 
             // If that doesn't work, fall back to `tinymce.activeEditor.id`.
-            if ( ! id && ! _.isUndefined( tinymce ) && tinymce.activeEditor ) {
+            if ( ! id && ! _.isUndefined( window.tinymce ) && tinymce.activeEditor ) {
                 id = tinymce.activeEditor.id;
             }
@@ -930 +930 @@
 /*
             // Save a bookmark of the caret position in IE.
-            if ( ! _.isUndefined( tinymce ) ) {
+            if ( ! _.isUndefined( window.tinymce ) ) {
                 editor = tinymce.get( id );
 

trunk/src/wp-includes/js/mediaelement/wp-playlist.js

@@ -1 @@
-/*globals window, document, $, jQuery */
+/*globals window, document, jQuery, _, Backbone, _wpmejsSettings */
 
 (function ($, _, Backbone) {
@@ -33 +33 @@
             _.bindAll( this, 'bindPlayer', 'ended', 'clickTrack' );
 
-            if ( typeof _wpmejsSettings !== 'undefined' ) {
+            if ( ! _.isUndefined( window._wpmejsSettings ) ) {
                 settings.pluginPath = _wpmejsSettings.pluginPath;
             }
@@ -48 +48 @@
                 }
                 dimensions = this.current.get( 'dimensions' ).resized;
-                this.playerNode.attr( 'width', dimensions.width );
-                this.playerNode.attr( 'height', dimensions.height );
+                this.playerNode.attr( dimensions );
             } else {
                 if ( ! this.data.images ) {

trunk/src/wp-includes/media.php

@@ -1118 +1118 @@
     $data['tracks'] = $tracks;
 
-    $safe_type = esc_attr( $safe_type );
+    $safe_type = esc_attr( $type );
     $safe_style = esc_attr( $style );