Changeset 4670 for trunk/wp-admin/upload-js.php

Timestamp:

01/02/2007 07:28:30 PM (19 years ago)

Author:

ryan

Message:

Attachment fixes from mdawaffe. fixes #3411

File:

• trunk/wp-admin/upload-js.php (modified) (7 diffs)

trunk/wp-admin/upload-js.php

@@ -38 +38 @@
                 return;
             var thumbEl = $('attachment-thumb-url-' + id);
-            this.currentImage.isImage = true;
             if ( thumbEl ) {
                 this.currentImage.thumb = ( 0 == id ? '' : thumbEl.value );
@@ -44 +43 @@
             } else {
                 this.currentImage.thumb = false;
-                var isImageEl = $('attachment-is-image-' + id);
-                if ( !isImageEl )
-                    this.currentImage.isImage = false;
             }
             this.currentImage.src = ( 0 == id ? '' : $('attachment-url-' + id).value );
@@ -61 +57 @@
                 this.currentImage.height = false;
             }
+            this.currentImage.isImage = ( 0 == id ? '' : $('attachment-is-image-' + id).value );
             this.currentImage.ID = id;
         },
@@ -97 +94 @@
             h += "<form name='uploadoptions' id='uploadoptions' class='alignleft'>";
             h += "<table>";
-            if ( this.currentImage.thumb ) {
+            var display = [];
+            var checked = 'display-title';
+            if ( 1 == this.currentImage.isImage ) {
+                checked = 'display-full';
+                if ( this.currentImage.thumb ) {
+                    display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> <?php echo attribute_escape(__('Thumbnail')); ?></label><br />");
+                    checked = 'display-thumb';
+                }
+                display.push("<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> <?php echo attribute_escape(__('Full size')); ?></label>");
+            } else if ( this.currentImage.thumb ) {
+                display.push("<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' /> <?php echo attribute_escape(__('Icon')); ?></label>");
+            }
+            if ( display.length ) {
+                display.push("<br /><label for='display-title'><input type='radio' name='display' id='display-title' value='title' /> <?php echo attribute_escape(__('Title')); ?></label>");
                 h += "<tr><th style='padding-bottom:.5em'><?php echo attribute_escape(__('Show:')); ?></th><td style='padding-bottom:.5em'>";
-                h += "<label for='display-thumb'><input type='radio' name='display' id='display-thumb' value='thumb' checked='checked' /> <?php echo attribute_escape(__('Thumbnail')); ?></label><br />";
-                h += "<label for='display-full'><input type='radio' name='display' id='display-full' value='full' /> <?php echo attribute_escape(__('Full size')); ?></label>";
+                $A(display).each( function(i) { h += i; } );
                 h += "</td></tr>";
             }
@@ -118 +127 @@
 
             new Insertion.Top('upload-content', h);
+            var displayEl = $(checked);
+            if ( displayEl )
+                displayEl.checked = true;
+
             if (e) Event.stop(e);
             return false;
@@ -145 +158 @@
                 h += "<h2>" + this.currentImage.title + "</h2>";
             h += " &#8212; <span>";
-            h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'><?php attribute_escape(__('Insert')); ?></a>"
+            h += "<a href='#' onclick='return theFileList.imageView(" + id + ");'><?php echo attribute_escape(__('Insert')); ?></a>"
             h += "</span>";
             h += '</div>'
@@ -223 +236 @@
             if ( 'none' != link )
                 h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment wp-att-" + this.currentImage.ID ) ) + "' title='" + this.currentImage.title + "'>";
-            if ( display )
+            if ( display && 'title' != display )
                 h += "<img src='" + ( 'thumb' == display ? ( this.currentImage.thumbBase + this.currentImage.thumb ) : ( this.currentImage.srcBase + this.currentImage.src ) ) + "' alt='" + this.currentImage.title + "' />";
             else