Changeset 27655 for trunk/src/wp-includes/media-template.php

Timestamp:

03/22/2014 11:25:08 PM (12 years ago)

Author:

wonderboymusic

Message:

General code cleanup and improving video sizing in the admin:

• Abstract the setting of a primary button and its callback in wp.media.view.MediaFrame.MediaDetails
• Account for the existence or non-existence of $content_width in the TinyMCE views for video
• Make sure video models always have dimensions, even if they are the defaults
• For browsers that are not Firefox, don't use a timeout when setting the MediaElementPlayer instance in TinyMCE views

See #27320.

File:

• trunk/src/wp-includes/media-template.php (modified) (3 diffs)

trunk/src/wp-includes/media-template.php

@@ -49 +49 @@
     $video_types = wp_get_video_extensions();
 ?>
-<#
-var isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
-    w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
-    h = ! data.model.height ? 360 : data.model.height;
-
-if ( data.model.width && w !== data.model.width ) {
-    h = Math.ceil( ( h * w ) / data.model.width );
-}
+<#  var w, h, settings = wp.media.view.settings,
+        isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
+
+    if ( settings.contentWidth && data.model.width >= settings.contentWidth ) {
+        w = settings.contentWidth;
+    } else {
+        w = data.model.width;
+    }
+
+    if ( w !== data.model.width ) {
+        h = Math.ceil( ( h * w ) / data.model.width );
+    } else {
+        h = data.model.height;
+    }
 #>
 <div style="max-width: 100%; width: {{ w }}px">
@@ -86 +92 @@
         <source src="{{ data.model.src }}" type="video/youtube" />
         <# } else { #>
-        <source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
+        <source src="{{ data.model.src }}" type="{{ settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
         <# }
     } #>
@@ -92 +98 @@
     <?php foreach ( $video_types as $type ):
     ?><# if ( data.model.<?php echo $type ?> ) { #>
-    <source src="{{ data.model.<?php echo $type ?> }}" type="{{ wp.media.view.settings.embedMimes[ '<?php echo $type ?>' ] }}" />
+    <source src="{{ data.model.<?php echo $type ?> }}" type="{{ settings.embedMimes[ '<?php echo $type ?>' ] }}" />
     <# } #>
     <?php endforeach; ?>