Changeset 22937

Timestamp:

11/30/2012 01:38:41 AM (12 years ago)

Author:

ryan

Message:

In the add media modal, fallback back to caption if alt is not set. Falback to title if neither caption nor alt are set.

Props koopersmith
see #18984

File:

• trunk/wp-includes/js/media-editor.js (modified) (3 diffs)

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

@@ -10 +10 @@
         // attachment's type.
         props: function( props, attachment ) {
-            var link, linkUrl, size, sizes;
+            var link, linkUrl, size, sizes, fallbacks;
+
+            // Final fallbacks run after all processing has been completed.
+            fallbacks = function( props ) {
+                // Generate alt fallbacks and strip tags.
+                if ( 'image' === props.type && ! props.alt ) {
+                    props.alt = props.caption || props.title || '';
+                    props.alt = props.alt.replace( /<\/?[^>]+>/g, '' );
+                }
+
+                return props;
+            };
 
             props = props ? _.clone( props ) : {};
@@ -28 +39 @@
             // All attachment-specific settings follow.
             if ( ! attachment )
-                return props;
+                return fallbacks( props );
+
+            props.title = props.title || attachment.title;
 
             link = props.link || getUserSetting( 'urlbutton', 'post' );
@@ -55 +68 @@
             // Format properties for non-images.
             } else {
-                _.extend( props, {
-                    title:   attachment.title || attachment.filename,
-                    rel:     'attachment wp-att-' + attachment.id
-                });
-            }
-
-            return props;
+                props.title = props.title || attachment.filename;
+                props.rel = props.rel || 'attachment wp-att-' + attachment.id;
+            }
+
+            return fallbacks( props );
         },