Index: /trunk/src/js/_enqueues/lib/image-edit.js
===================================================================
--- /trunk/src/js/_enqueues/lib/image-edit.js (revision 46353)
+++ /trunk/src/js/_enqueues/lib/image-edit.js (revision 46354)
@@ -504,5 +504,5 @@
// If a response is returned, close the editor and show an error.
if ( ret.error ) {
- $('#imgedit-response-' + postid).html('
');
+ $('#imgedit-response-' + postid).html('');
imageEdit.close(postid);
return;
@@ -518,5 +518,5 @@
if ( ret.msg ) {
- $('#imgedit-response-' + postid).html('');
+ $('#imgedit-response-' + postid).html('');
}
Index: /trunk/src/js/media/views/frame/select.js
===================================================================
--- /trunk/src/js/media/views/frame/select.js (revision 46353)
+++ /trunk/src/js/media/views/frame/select.js (revision 46354)
@@ -63,4 +63,6 @@
*/
createStates: function() {
+ console.log("test");
+ this.on( 'content:render:edit-image', this.editState, this );
var options = this.options;
@@ -77,5 +79,6 @@
title: options.title,
priority: 20
- })
+ }),
+ new wp.media.controller.EditImage( { model: this.options.editImage } ),
]);
},
Index: /trunk/src/wp-admin/css/edit.css
===================================================================
--- /trunk/src/wp-admin/css/edit.css (revision 46353)
+++ /trunk/src/wp-admin/css/edit.css (revision 46354)
@@ -654,4 +654,10 @@
.edit-form-section {
margin-bottom: 20px;
+}
+
+.wp_attachment_details .attachment-content-description {
+ margin-top: 0.5385em;
+ display: inline-block;
+ min-height: 1.6923em;
}
Index: /trunk/src/wp-admin/css/media.css
===================================================================
--- /trunk/src/wp-admin/css/media.css (revision 46353)
+++ /trunk/src/wp-admin/css/media.css (revision 46354)
@@ -801,4 +801,9 @@
}
+.attachment-details .setting + .description a:focus {
+ /* Only visible in Windows High Contrast mode */
+ outline: 1px solid transparent;
+}
+
.wp_attachment_details .attachment-alt-text-description {
margin-top: 5px;
@@ -1115,8 +1120,12 @@
}
+.imgedit-settings .imgedit-original-dimensions {
+ display: inline-block;
+}
+
.imgedit-settings .imgedit-scale input[type="text"],
.imgedit-settings .imgedit-crop-ratio input[type="text"],
.imgedit-settings .imgedit-crop-sel input[type="text"] {
- width: 50px;
+ width: 80px;
font-size: 14px;
padding: 5px 8px;
@@ -1129,4 +1138,9 @@
font-size: 13px;
color: #444;
+}
+
+.imgedit-settings .imgedit-scale-button-wrapper {
+ margin-top: 0.3077em;
+ display: block;
}
Index: /trunk/src/wp-admin/includes/image-edit.php
===================================================================
--- /trunk/src/wp-admin/includes/image-edit.php (revision 46353)
+++ /trunk/src/wp-admin/includes/image-edit.php (revision 46354)
@@ -39,7 +39,7 @@
if ( $msg ) {
if ( isset( $msg->error ) ) {
- $note = "";
+ $note = "";
} elseif ( isset( $msg->msg ) ) {
- $note = "";
+ $note = "";
}
}
@@ -63,5 +63,5 @@
/* translators: %s: Image width and height in pixels. */
__( 'Original dimensions %s' ),
- $meta['width'] . ' × ' . $meta['height']
+ '' . $meta['width'] . ' × ' . $meta['height'] . ' '
);
?>
@@ -79,5 +79,5 @@
!
- , 'scale')" class="button button-primary" value="" />
+ , 'scale')" class="button button-primary" value="" />
@@ -236,5 +236,5 @@
-
+
Index: /trunk/src/wp-admin/includes/media.php
===================================================================
--- /trunk/src/wp-admin/includes/media.php (revision 46353)
+++ /trunk/src/wp-admin/includes/media.php (revision 46354)
@@ -3208,5 +3208,5 @@
?>
-
+