Changeset 22053

Timestamp:

09/27/2012 07:45:26 AM (13 years ago)

Author:

koopersmith

Message:

Add quick insert buttons to attachment views in the library and remove buttons to attachment views in the gallery editor. see #21390, #21809.

Location:

trunk/wp-includes

Files:

• css/media-views.css (modified) (1 diff)
• js/media-views.js (modified) (6 diffs)
• media.php (modified) (1 diff)

trunk/wp-includes/css/media-views.css

@@ -294 +294 @@
     margin: 0 auto;
     box-shadow: inset 0 0 0 1px rgba( 0, 0, 0, 0.4 );
+}
+
+.attachment .insert {
+    display: none;
+    position: absolute;
+    left: 7px;
+    bottom: 7px;
+}
+
+.attachment:hover .insert {
+    display: block;
+}
+
+.attachment .close {
+    /*display: none;*/
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 26px;
+    width: 26px;
+    font-size: 20px;
+    line-height: 24px;
+    text-align: center;
+    text-decoration: none;
+    color: #464646;
+    background: #fff;
+}
+
+.attachment:hover .close {
+    display: block;
 }
 

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

@@ -379 +379 @@
         },
 
+        buttons: {},
+
         initialize: function() {
             this.controller = this.options.controller;
@@ -386 +388 @@
             this.model.on( 'add', this.select, this );
             this.model.on( 'remove', this.deselect, this );
+
+            // Prevent default navigation on all links.
+            this.$el.on( 'click', 'a', this.preventDefault );
         },
 
@@ -395 +400 @@
                     orientation: attachment.orientation || 'landscape',
                     type:        attachment.type,
-                    subtype:     attachment.subtype
+                    subtype:     attachment.subtype,
+                    buttons:     this.buttons
                 };
 
@@ -446 +452 @@
 
             this.$el.removeClass('selected');
+        },
+
+        preventDefault: function( event ) {
+            event.preventDefault();
         }
     });
@@ -453 +463 @@
      */
     media.view.Attachment.Library = media.view.Attachment.extend({
-        className: 'attachment library'
+        className: 'attachment library',
+
+        buttons: {
+            insert: true
+        },
+
+        events: _.defaults({
+            'click .insert': 'insert'
+        }, media.view.Attachment.prototype.events ),
+
+        insert: function() {
+            this.controller.selection.reset([ this.model ]);
+            this.controller.update();
+        }
     });
 
@@ -460 +483 @@
      */
     media.view.Attachment.Gallery = media.view.Attachment.extend({
-        events: {}
+        buttons: {
+            close: true
+        },
+
+        events: {
+            'click .close': 'toggleSelection'
+        }
     });
 

trunk/wp-includes/media.php

@@ -1400 +1400 @@
                 <div class="media-progress-bar"><div></div></div>
             <% } %>
-            <div class="actions"></div>
+
+            <% if ( buttons.close ) { %>
+                <a class="close" href="#">&times;</a>
+            <% } %>
+
+            <% if ( buttons.insert ) { %>
+                <a class="insert button button-primary button-small" href="#"><?php _e( 'Insert' ); ?></a>
+            <% } %>
         </div>
         <div class="describe"></div>