Changes from tags/3.5/wp-includes/js/media-editor.js at r50432 to tags/3.5.1/wp-includes/js/media-editor.js at r50432

File:

• tags/3.5.1/wp-includes/js/media-editor.js (modified) (5 diffs)

tags/3.5.1/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.
@@ -18 +19 @@
                     props.alt = props.caption || props.title || '';
                     props.alt = props.alt.replace( /<\/?[^>]+>/g, '' );
+                    props.alt = props.alt.replace( /[\r\n]+/g, ' ' );
                 }
 
@@ -30 +32 @@
             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 +45 @@
             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;
@@ -168 +170 @@
                 icontag:    'dt',
                 captiontag: 'dd',
-                columns:    3,
+                columns:    '3',
                 size:       'thumbnail',
                 orderby:    'menu_order ID'