Wordpress 3.5.2-scripts

[autoinstalls/wordpress.git] / wp-includes / js / media-editor.js

diff --git a/wp-includes/js/media-editor.js b/wp-includes/js/media-editor.js
index 34777677e6b47eb6eb64d3fa146a87a4610b7e91..5a77d50a5a94da8243f293629e29c7435f68304e 100644 (file)
--- a/wp-includes/js/media-editor.js
+++ b/wp-includes/js/media-editor.js
@@ -9,7 +9,8 @@
                // outputting the proper object format based on the
                // 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.
                        fallbacks = function( props ) {
@@ -17,6 +18,7 @@
                                if ( 'image' === props.type && ! props.alt ) {
                                        props.alt = props.caption || props.title || '';
                                        props.alt = props.alt.replace( /<\/?[^>]+>/g, '' );
+                                       props.alt = props.alt.replace( /[\r\n]+/g, ' ' );
                                }
 
                                return props;
@@ -29,8 +31,8 @@
 
                        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: []
                                });
@@ -42,7 +44,7 @@
 
                        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;
                        else if ( 'post' === link )
@@ -167,7 +169,8 @@
                                itemtag:    'dl',
                                icontag:    'dt',
                                captiontag: 'dd',
-                               columns:    3,
+                               columns:    '3',
+                               link:       'post',
                                size:       'thumbnail',
                                orderby:    'menu_order ID'
                        },