Changeset 22466 for trunk/wp-includes/media.php

Timestamp:

11/08/2012 02:15:09 PM (12 years ago)

Author:

koopersmith

Message:

Media: Improve sidebar handling and make attachment display properties attachment-specific.

wp.mce.media

• Watch all workflows for the insert event and attempt to insert the current state's selection if it exists.
• Fetch and pass attachment display properties through to wp.media.string.image().

wp.media.controller.Region

• Separate the concept of events and modes.
• All events triggered on a Region trigger both event and event:mode callbacks.
• When a mode is deactivated, deactivate and deactivate:mode events are fired.
• When a mode is activated, activate and activate:mode events are fired.

wp.media.controller.Library

• Remove the details(), buildDetails(), and clearDetails() methods that juggled sidebar views. Instead, handle the sidebar views using modes.

wp.media.controller.Gallery

• Shift the overloaded sidebar() method to use modes.

wp.media.view.MediaFrame.Post

• Declare activate:mode event bindings using an nested object to reduce repetition.
• Update sidebar activation callbacks.

wp.media.view.Settings

• Refactor to leverage HTML data attributes and implicit values (instead of setting the fallback whenever an object was created). This has the additional benefit that gallery shortcode parameters are not output when the user has left them set to the default.

see #21390.

File:

• trunk/wp-includes/media.php (modified) (5 diffs)

trunk/wp-includes/media.php

@@ -1418 +1418 @@
 
         <h4><?php _e('Alignment'); ?></h4>
-        <div class="alignment button-group button-large" data-setting="align">
+        <div class="alignment button-group button-large"
+            data-setting="align"
+            <# if ( userSettings ) { #>
+                data-user-setting="align"
+            <# } #>>
+
             <button class="button" value="left">
                 <?php esc_attr_e('Left'); ?>
@@ -1428 +1433 @@
                 <?php esc_attr_e('Right'); ?>
             </button>
-            <button class="button" value="none">
+            <button class="button active" value="none">
                 <?php esc_attr_e('None'); ?>
             </button>
@@ -1434 +1439 @@
 
         <h4><?php _e('Link To'); ?></h4>
-        <div class="link-to button-group button-large" data-setting="link">
-            <button class="button" value="post">
+        <div class="link-to button-group button-large"
+            data-setting="link"
+            <# if ( userSettings ) { #>
+                data-user-setting="urlbutton"
+            <# } #>>
+
+            <button class="button active" value="post">
                 <?php esc_attr_e('Attachment Page'); ?>
             </button>
@@ -1451 +1461 @@
 
         <h4><?php _e('Link To'); ?></h4>
-        <div class="link-to button-group" data-setting="link">
-            <button class="button" value="post">
+        <div class="link-to button-group"
+            data-setting="link">
+
+            <button class="button active" value="post">
                 <?php esc_attr_e('Attachment Page'); ?>
             </button>
@@ -1462 +1474 @@
         <h4><?php _e('Gallery Columns'); ?></h4>
 
-        <select class="columns" name="columns" data-setting="columns">
+        <select class="columns" name="columns"
+            data-setting="columns">
             <?php for ( $i = 1; $i <= 9; $i++ ) : ?>
-                <option value="<?php echo esc_attr( $i ); ?>">
+                <option value="<?php echo esc_attr( $i ); ?>" <?php selected( $i, 3 ); ?>>
                     <?php echo esc_html( $i ); ?>
                 </option>