Changeset 33729

Timestamp:

08/25/2015 12:12:59 PM (9 years ago)

Author:

wonderboymusic

Message:

Media:

When inserting an image into a post, the values in wp.media.controller.Library should not default to linking the image when no user settings are present.

The default display setting value for link is now none. User settings persist and will override or confirm this value based on user actions.

Props liljimmi, janhenckens, eherman24, wonderboymusic.
Fixes #31467.

Location:

trunk/src

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (1 diff)
• wp-includes/js/media/controllers/library.js (modified) (1 diff)
• wp-includes/media-template.php (modified) (2 diffs)

trunk/src/wp-admin/includes/schema.php

@@ -468 +468 @@
     'large_size_w' => 1024,
     'large_size_h' => 1024,
-    'image_default_link_type' => 'file',
+    'image_default_link_type' => 'none',
     'image_default_size' => '',
     'image_default_align' => '',

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

@@ -1183 +1183 @@
         this._displays = [];
         this._defaultDisplaySettings = {
-            align: defaultProps.align || getUserSetting( 'align', 'none' ),
-            size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
-            link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+            align: getUserSetting( 'align', defaultProps.align ) || 'none',
+            size:  getUserSetting( 'imgsize', defaultProps.size ) || 'medium',
+            link:  getUserSetting( 'urlbutton', defaultProps.link ) || 'none'
         };
     },

trunk/src/wp-includes/js/media/controllers/library.js

@@ -140 +140 @@
         this._displays = [];
         this._defaultDisplaySettings = {
-            align: defaultProps.align || getUserSetting( 'align', 'none' ),
-            size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
-            link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+            align: getUserSetting( 'align', defaultProps.align ) || 'none',
+            size:  getUserSetting( 'imgsize', defaultProps.size ) || 'medium',
+            link:  getUserSetting( 'urlbutton', defaultProps.link ) || 'none'
         };
     },

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

@@ -653 +653 @@
                     <option value="file">
                 <# } else { #>
-                    <option value="file" selected>
+                    <option value="none" selected>
+                        <?php esc_attr_e('None'); ?>
+                    </option>
+                    <option value="file">
                 <# } #>
                     <# if ( data.model.canEmbed ) { #>
@@ -671 +674 @@
                     <option value="custom">
                         <?php esc_attr_e('Custom URL'); ?>
-                    </option>
-                    <option value="none">
-                        <?php esc_attr_e('None'); ?>
                     </option>
                 <# } #>