Changeset 23262

Timestamp:

01/04/2013 08:02:16 AM (12 years ago)

Author:

nacin

Message:

Media: Restore 3.4 behavior by consulting the old-school DB options for default align, size, and link properties.

This restores linking to media files as the default, over attachment pages. This 'default' cannot currently be changed by a user setting (per 3.4 behavior), due to the default database schema.

see #22841, for trunk.

Location:

trunk/wp-includes

Files:

• js/media-editor.js (modified) (3 diffs)
• js/media-views.js (modified) (1 diff)
• media-template.php (modified) (2 diffs)
• media.php (modified) (2 diffs)

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

@@ -10 +10 @@
         // attachment's type.
         props: function( props, attachment ) {
-            var link, linkUrl, size, sizes, fallbacks;
+            var link, linkUrl, size, sizes, fallbacks,
+                defaultProps = wp.media.view.settings.defaultProps;
 
             // Final fallbacks run after all processing has been completed.
@@ -30 +31 @@
             if ( 'image' === props.type ) {
                 props = _.defaults( props || {}, {
-                    align:   getUserSetting( 'align', 'none' ),
-                    size:    getUserSetting( 'imgsize', 'medium' ),
+                    align:   defaultProps.align || getUserSetting( 'align', 'none' ),
+                    size:    defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
                     url:     '',
                     classes: []
@@ -43 +44 @@
             props.title = props.title || attachment.title;
 
-            link = props.link || getUserSetting( 'urlbutton', 'post' );
+            link = props.link || defaultProps.link || getUserSetting( 'urlbutton', 'file' );
             if ( 'file' === link )
                 linkUrl = attachment.url;

trunk/wp-includes/js/media-views.js

@@ -439 +439 @@
 
         resetDisplays: function() {
+            var defaultProps = media.view.settings.defaultProps;
             this._displays = [];
             this._defaultDisplaySettings = {
-                align: getUserSetting( 'align', 'none' ),
-                size:  getUserSetting( 'imgsize', 'medium' ),
-                link:  getUserSetting( 'urlbutton', 'post' )
+                align: defaultProps.align || getUserSetting( 'align', 'none' ),
+                size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
+                link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
             };
         },

trunk/wp-includes/media-template.php

@@ -292 +292 @@
                         <?php esc_attr_e('Custom URL'); ?>
                     </option>
-                    <option value="post" selected>
+                    <option value="file" selected>
+                        <?php esc_attr_e('Media File'); ?>
+                    </option>
+                    <option value="post">
                         <?php esc_attr_e('Attachment Page'); ?>
-                    </option>
-                    <option value="file">
-                        <?php esc_attr_e('Media File'); ?>
                     </option>
                     <option value="none">
@@ -348 +348 @@
                 <# } #>>
 
-                <option value="post" selected>
+                <option value="file" selected>
+                    <?php esc_attr_e('Media File'); ?>
+                </option>
+                <option value="post">
                     <?php esc_attr_e('Attachment Page'); ?>
-                </option>
-                <option value="file">
-                    <?php esc_attr_e('Media File'); ?>
                 </option>
             </select>

trunk/wp-includes/media.php

@@ -1455 +1455 @@
     unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
 
+    $props = array(
+        'link'  => get_option( 'image_default_link_type' ), // db default is 'file'
+        'align' => get_option( 'image_default_align' ), // empty default
+        'size'  => get_option( 'image_default_size' ),  // empty default
+    );
+
     $settings = array(
         'tabs'      => $tabs,
@@ -1466 +1472 @@
             'id' => 0,
         ),
+        'defaultProps' => $props,
     );