');
+ imageEdit.close(postid);
+ return;
+ }
+
+ if ( ret.fw && ret.fh )
+ $('#media-dims-' + postid).html( ret.fw + ' × ' + ret.fh );
+
+ if ( ret.thumbnail )
+ $('.thumbnail', '#thumbnail-head-' + postid).attr('src', ''+ret.thumbnail);
+
+ if ( ret.msg )
+ $('#imgedit-response-' + postid).html('
');
+
+ imageEdit.close(postid);
+ });
+ },
+
open : function(postid, nonce) {
- var t = this, data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
+ var data, elem = $('#image-editor-' + postid), head = $('#media-head-' + postid),
btn = $('#imgedit-open-btn-' + postid), spin = btn.siblings('img');
btn.attr('disabled', 'disabled');
spin.css('visibility', 'visible');
data = {
- 'action': 'open-image-editor',
+ 'action': 'image-editor',
'_ajax_nonce': nonce,
- 'postid': postid
+ 'postid': postid,
+ 'do': 'open'
};
elem.load(ajaxurl, data, function() {
-
elem.fadeIn('fast');
-
head.fadeOut('fast', function(){
btn.removeAttr('disabled');
spin.css('visibility', 'hidden');
});
-
- t.toggleEditor(postid, 1);
-
- $('#image-preview-' + postid).load(function(){
- var t = imageEdit, parent = $('#imgedit-crop-' + postid);
-
- t.initCrop(postid, this, parent);
- t.setDefaultAspect(postid);
- t.toggleEditor(postid, 0);
- });
});
},
+ imgLoaded : function(postid) {
+ var img = $('#image-preview-' + postid), parent = $('#imgedit-crop-' + postid);
+
+ this.initCrop(postid, img, parent);
+ this.setCropSelection(postid, 0);
+ this.toggleEditor(postid, 0);
+ },
+
initCrop : function(postid, image, parent) {
- var t = this;
+ var t = this, selW = $('#imgedit-sel-width-' + postid),
+ selH = $('#imgedit-sel-height-' + postid);
t.iasapi = $(image).imgAreaSelect({
parent: parent,
instance: true,
handles: true,
keys: true,
- minHeight: 5,
- minWidth: 5,
+ minWidth: 3,
+ minHeight: 3,
onInit: function(img, c) {
parent.children().mousedown(function(e){
- var sel, ratio = false, X = t.intval( $('#imgedit-aspect-x-' + postid).val() ),
- Y = t.intval( $('#imgedit-aspect-y-' + postid).val() );
-
- defRatio = ( X && Y ) ? X + ':' + Y : '1:1';
+ var ratio = false, sel, defRatio;
if ( e.shiftKey ) {
sel = t.iasapi.getSelection();
- ratio = ( sel.width && sel.height ) ? sel.width + ':' + sel.height : defRatio;
+ defRatio = t.getSelRatio(postid);
+ ratio = ( sel && sel.width && sel.height ) ? sel.width + ':' + sel.height : defRatio;
}
t.iasapi.setOptions({
@@ -288,18 +313,72 @@ imageEdit = {
});
},
+ onSelectStart: function(img, c) {
+ imageEdit.setDisabled($('#imgedit-crop-sel-' + postid), 1);
+ },
+
onSelectEnd: function(img, c) {
- var sel = { 'x': c.x1, 'y': c.y1, 'w': c.width, 'h': c.height };
- $('#imgedit-selection-' + postid).val( JSON.stringify(sel) );
+ imageEdit.setCropSelection(postid, c);
+ },
+
+ onSelectChange: function(img, c) {
+ var sizer = imageEdit.hold.sizer;
+ selW.val( imageEdit.round(c.width / sizer) );
+ selH.val( imageEdit.round(c.height / sizer) );
}
});
},
+ setCropSelection : function(postid, c) {
+ var sel, min = $('#imgedit-minthumb-' + postid).val() || '128:128',
+ sizer = this.hold['sizer'];
+ min = min.split(':');
+ c = c || 0;
+
+ if ( !c || ( c.width < 3 && c.height < 3 ) ) {
+ this.setDisabled($('.imgedit-crop', '#imgedit-panel-' + postid), 0);
+ this.setDisabled($('#imgedit-crop-sel-' + postid), 0);
+ $('#imgedit-sel-width-' + postid).val('');
+ $('#imgedit-sel-height-' + postid).val('');
+ $('#imgedit-selection-' + postid).val('');
+ return false;
+ }
+
+ if ( c.width < (min[0] * sizer) && c.height < (min[1] * sizer) ) {
+ this.setDisabled($('.imgedit-crop', '#imgedit-panel-' + postid), 0);
+ $('#imgedit-selection-' + postid).val('');
+ return false;
+ }
+
+ sel = { 'x': c.x1, 'y': c.y1, 'w': c.width, 'h': c.height };
+ this.setDisabled($('.imgedit-crop', '#imgedit-panel-' + postid), 1);
+ $('#imgedit-selection-' + postid).val( JSON.stringify(sel) );
+ },
+
close : function(postid) {
+ if ( this.notsaved(postid) )
+ return false;
+
+ this.iasapi = {};
+ this.hold = {};
$('#image-editor-' + postid).fadeOut('fast', function() {
$('#media-head-' + postid).fadeIn('fast');
+ $(this).empty();
});
},
+
+ notsaved : function(postid) {
+ var h = $('#imgedit-history-' + postid).val(),
+ history = (h != '') ? JSON.parse(h) : new Array(),
+ pop = this.intval( $('#imgedit-undone-' + postid).val() );
+
+ if ( pop < history.length ) {
+ if ( confirm( $('#imgedit-leaving-' + postid).html() ) )
+ return false;
+ return true;
+ }
+ return false;
+ },
addStep : function(op, postid, nonce) {
var t = this, elem = $('#imgedit-history-' + postid),
@@ -317,26 +396,47 @@ imageEdit = {
elem.val( JSON.stringify(history) );
t.refreshEditor(postid, nonce, function() {
- t.setClass($('#image-undo-' + postid), true);
- t.setClass($('#image-redo-' + postid), false);
+ t.setDisabled($('#image-undo-' + postid), true);
+ t.setDisabled($('#image-redo-' + postid), false);
});
},
- rotate : function(angle, postid, nonce) {
- this.addStep({ 'r': angle }, postid, nonce);
+ rotate : function(angle, postid, nonce, t) {
+ if ( $(t).hasClass('disabled') )
+ return false;
+
+ this.addStep({ 'r': { 'r': angle, 'fw': this.hold['h'], 'fh': this.hold['w'] }}, postid, nonce);
},
- flip : function (axis, postid, nonce) {
- this.addStep({ 'f': axis }, postid, nonce);
+ flip : function (axis, postid, nonce, t) {
+ if ( $(t).hasClass('disabled') )
+ return false;
+
+ this.addStep({ 'f': { 'f': axis, 'fw': this.hold['w'], 'fh': this.hold['h'] }}, postid, nonce);
},
- crop : function (postid, nonce) {
+ // w, h are the new full size dims
+ newDims : function(postid, w, h) {
+ var max = Math.max( w, h ), s;
+
+ s = max > 400 ? 400 / max : 1;
+ this.hold['sizer'] = s;
+ this.hold['w'] = w;
+ this.hold['h'] = h;
+ return s;
+ },
+
+ crop : function (postid, nonce, t) {
var sel = $('#imgedit-selection-' + postid).val();
- if ( sel != '' ) {
- sel = JSON.parse(sel);
- if ( sel.w > 0 && sel.h > 0 )
- this.addStep({ 'c': sel }, postid, nonce);
+ if ( $(t).hasClass('disabled') || sel == '' )
+ return false;
+
+ sel = JSON.parse(sel);
+ if ( sel.w > 0 && sel.h > 0 ) {
+ sel['fw'] = this.intval( $('#imgedit-sel-width-' + postid).val() );
+ sel['fh'] = this.intval( $('#imgedit-sel-height-' + postid).val() );
+ this.addStep({ 'c': sel }, postid, nonce);
}
},
@@ -352,8 +452,8 @@ imageEdit = {
var elem = $('#imgedit-history-' + postid),
history = (elem.val() != '') ? JSON.parse(elem.val()) : new Array();
- t.setClass($('#image-redo-' + postid), true);
- t.setClass(button, pop < history.length);
+ t.setDisabled($('#image-redo-' + postid), true);
+ t.setDisabled(button, pop < history.length);
});
},
@@ -366,27 +466,98 @@ imageEdit = {
elem.val(pop);
t.refreshEditor(postid, nonce, function() {
- t.setClass($('#image-undo-' + postid), true);
- t.setClass(button, pop > 0);
+ t.setDisabled($('#image-undo-' + postid), true);
+ t.setDisabled(button, pop > 0);
});
},
- scaleSwitched : function(postid) {
- var enable = this.isChecked( $('#imgedit-scale-switch-' + postid) );
+ setNumSelection : function(postid) {
+ var sel, elX = $('#imgedit-sel-width-' + postid), elY = $('#imgedit-sel-height-' + postid),
+ x = this.intval( elX.val() ), y = this.intval( elY.val() ),
+ img = $('#image-preview-' + postid), imgh = img.height(), imgw = img.width(),
+ sizer = this.hold['sizer'], x1, y1, x2, y2, ias = this.iasapi;
- this.setState($('#imgedit-scale-width-' + postid), enable);
- this.setState($('#imgedit-scale-height-' + postid), enable);
- // this.setClass($('#imgedit-scale-values-' + postid), !enable);
- this.scaleWidthChanged(postid);
+ if ( x < 1 ) {
+ elX.val('');
+ return false;
+ }
+
+ if ( y < 1 ) {
+ elY.val('');
+ return false;
+ }
+
+ if ( x && y && ( sel = ias.getSelection() ) ) {
+ x2 = sel.x1 + Math.round( x * sizer );
+ y2 = sel.y1 + Math.round( y * sizer );
+ x1 = sel.x1;
+ y1 = sel.y1;
+
+ if ( x2 > imgw ) {
+ x1 = 0;
+ x2 = imgw;
+ elX.val( Math.round( x2 / sizer ) );
+ }
+
+ if ( y2 > imgh ) {
+ y1 = 0;
+ y2 = imgh;
+ elY.val( Math.round( y2 / sizer ) );
+ }
+
+ ias.setSelection( x1, y1, x2, y2 );
+ ias.update();
+ this.setCropSelection(postid, ias.getSelection());
+ }
+ },
+
+ round : function(num) {
+ var s;
+ num = Math.round(num);
+
+ if ( this.hold.sizer > 0.6 )
+ return num;
+
+ s = num.toString().slice(-1);
+
+ if ( '1' == s )
+ return num - 1;
+ else if ( '9' == s )
+ return num + 1;
+
+ return num;
},
- targetChanged : function(postid) {
- var target = $('#imgedit-save-target-' + postid).val(),
- enable = (target == 'full' || target == 'all');
+ setRatioSelection : function(postid, n, el) {
+ var sel, r, x = this.intval( $('#imgedit-crop-width-' + postid).val() ),
+ y = this.intval( $('#imgedit-crop-height-' + postid).val() ),
+ h = $('#image-preview-' + postid).height();
- this.setState($('#imgedit-scale-switch-' + postid), enable);
- this.setClass($('#imgedit-scale-' + postid), !enable);
- this.scaleSwitched(postid);
+ if ( !this.intval( $(el).val() ) ) {
+ $(el).val('');
+ return;
+ }
+
+ if ( x && y ) {
+ this.iasapi.setOptions({
+ aspectRatio: x + ':' + y
+ });
+
+ if ( sel = this.iasapi.getSelection(true) ) {
+ r = Math.ceil( sel.y1 + ((sel.x2 - sel.x1) / (x / y)) );
+
+ if ( r > h ) {
+ r = h;
+ if ( n )
+ $('#imgedit-crop-height-' + postid).val('');
+ else
+ $('#imgedit-crop-width-' + postid).val('');
+ }
+
+ this.iasapi.setSelection( sel.x1, sel.y1, sel.x2, r );
+ this.iasapi.update();
+ }
+ }
}
}
})(jQuery);
diff --git a/wp-admin/js/image-edit.js b/wp-admin/js/image-edit.js
index ad13144750..78dc212a9d 100644
--- a/wp-admin/js/image-edit.js
+++ b/wp-admin/js/image-edit.js
@@ -1 +1 @@
-var imageEdit;(function(a){imageEdit={iasapi:{},intval:function(b){return b|0},setState:function(c,b){if(b){c.removeAttr("disabled")}else{c.attr("disabled","disabled")}},setClass:function(b,d){if(d){b.removeClass("disabled")}else{b.addClass("disabled")}},gcd:function(d,c){var e;if(d==0||c==0){return 0}else{if(d==c){return d}else{do{e=d%c;d=c;c=e}while(e!=0);return d}}},toggleEditor:function(d,b){var c=a("#imgedit-wait-"+d);if(b){c.height(a("#imgedit-panel-"+d).height()).fadeIn("fast")}else{c.height(500).fadeOut("fast")}},isChecked:function(b){return(!b.attr("disabled")&&b[0].checked)},getAspect:function(e){var b=this.isChecked(a("#imgedit-scale-switch-"+e)),d,c;if(b){d=this.intval(a("#imgedit-aspect-x-"+e).val());c=this.intval(a("#imgedit-aspect-y-"+e).val());return d/c}else{return 0}},scaleWidthChanged:function(d){var c=a("#imgedit-scale-width-"+d),b;if(!c.attr("disabled")){b=this.getAspect(d);if(b!=0){a("#imgedit-scale-height-"+d).val((c.val()!="")?this.intval(c.val()/b):"")}}},scaleHeightChanged:function(d){var c=a("#imgedit-scale-height-"+d),b;if(!c.attr("disabled")){b=this.getAspect(d);if(b!=0){a("#imgedit-scale-width-"+d).val((c.val()!="")?this.intval(c.val()*b):"")}}},setDefaultAspect:function(h){var b=this,d,c=a("#image-preview-"+h),f=c.attr("width"),e=c.attr("height");while((d=b.gcd(f,e))>1){f=b.intval(Math.ceil(f/d));e=b.intval(Math.ceil(e/d))}if(f>10&&e>10){while(f>10&&e>10){f=b.intval(Math.ceil(f/10));e=b.intval(Math.ceil(e/10))}while((d=b.gcd(f,e))>1){f=b.intval(Math.ceil(f/d));e=b.intval(Math.ceil(e/d))}}a("#imgedit-aspect-x-"+h).val(f);a("#imgedit-aspect-y-"+h).val(e)},filterHistory:function(d){var c=a("#imgedit-history-"+d).val(),b;if(c!=""){b=this.intval(a("#imgedit-undone-"+d).val());if(b>0){c=JSON.parse(c);while(b>0){c.pop();b--}c=JSON.stringify(c)}}return c},refreshEditor:function(g,c,f){var b=this,e,d;b.toggleEditor(g,1);e={action:"load-preview-image",_ajax_nonce:c,postid:g,history:b.filterHistory(g),rand:b.intval(Math.random()*1000000)};d=a('
![]()
');d.load(function(){var h=a("#imgedit-crop-"+g);h.empty().append(d);b.initCrop(g,d,h);a("#imgedit-panel-"+g).show();if((typeof f!="unknown")&&f!=null){f()}b.toggleEditor(g,0)}).attr("src",ajaxurl+"?"+a.param(e))},save:function(b,i){var l=this,f=-1,c=-1,k,g,e,d=l.isChecked(a("#imgedit-scale-switch-"+b)),j=a("#imgedit-save-target-"+b).val();if(d){k=a("#imgedit-scale-width-"+b);g=a("#imgedit-scale-height-"+b);f=l.intval(k.val());c=l.intval(g.val());if(f<=0){k.focus();return}else{if(c<=0){g.focus();return}}}l.toggleEditor(b,1);e={action:"image-edit-save",_ajax_nonce:i,postid:b,history:l.filterHistory(b),target:j,fwidth:f,fheight:c};a.post(ajaxurl,e,function(p){var m=p.split("!"),s,o,q,h,n,t;for(n=0;n
0){g.pop();b--}f.val(0);g.push(i);e.val(JSON.stringify(g));c.refreshEditor(h,d,function(){c.setClass(a("#image-undo-"+h),true);c.setClass(a("#image-redo-"+h),false)})},rotate:function(c,d,b){this.addStep({r:c},d,b)},flip:function(c,d,b){this.addStep({f:c},d,b)},crop:function(d,b){var c=a("#imgedit-selection-"+d).val();if(c!=""){c=JSON.parse(c);if(c.w>0&&c.h>0){this.addStep({c:c},d,b)}}},undo:function(g,e){var d=this,c=a("#image-undo-"+g),f=a("#imgedit-undone-"+g),b=d.intval(f.val())+1;if(c.hasClass("disabled")){return}f.val(b);d.refreshEditor(g,e,function(){var h=a("#imgedit-history-"+g),i=(h.val()!="")?JSON.parse(h.val()):new Array();d.setClass(a("#image-redo-"+g),true);d.setClass(c,b0)})},scaleSwitched:function(c){var b=this.isChecked(a("#imgedit-scale-switch-"+c));this.setState(a("#imgedit-scale-width-"+c),b);this.setState(a("#imgedit-scale-height-"+c),b);this.scaleWidthChanged(c)},targetChanged:function(d){var c=a("#imgedit-save-target-"+d).val(),b=(c=="full"||c=="all");this.setState(a("#imgedit-scale-switch-"+d),b);this.setClass(a("#imgedit-scale-"+d),!b);this.scaleSwitched(d)}}})(jQuery);
\ No newline at end of file
+var imageEdit;(function(a){imageEdit={iasapi:{},hold:{},postid:"",intval:function(b){return b|0},setDisabled:function(c,b){if(b){c.removeClass("disabled");a("input",c).removeAttr("disabled")}else{c.addClass("disabled");a("input",c).attr("disabled","disabled")}},init:function(g,e){var d=this,c=a("#image-editor-"+d.postid),b=d.intval(a("#imgedit-x-"+g).val()),f=d.intval(a("#imgedit-y-"+g).val());if(d.postid!=g&&c.length){d.close(d.postid)}d.hold.w=d.hold.ow=b;d.hold.h=d.hold.oh=f;d.hold.xy_ratio=b/f;d.hold.sizer=parseFloat(a("#imgedit-sizer-"+g).val());d.postid=g;a("#imgedit-response-"+g).empty();a('input[type="text"]',"#imgedit-panel-"+g).keypress(function(i){var h=i.keyCode;if(36this.hold.oh)||(c&&c>this.hold.ow)){g.css("visibility","visible")}else{g.css("visibility","hidden")}},getSelRatio:function(f){var b=this.hold.w,e=this.hold.h,d=this.intval(a("#imgedit-crop-width-"+f).val()),c=this.intval(a("#imgedit-crop-height-"+f).val());if(d&&c){return d+":"+c}if(b&&e){return b+":"+e}return"1:1"},filterHistory:function(h){var d=a("#imgedit-history-"+h).val(),b,g,e,c,f=[];if(d!=""){d=JSON.parse(d);b=this.intval(a("#imgedit-undone-"+h).val());if(b>0){while(b>0){d.pop();b--}}if(!d.length){this.newDims(h,this.hold.ow,this.hold.oh);return""}e=d[d.length-1];if(e.hasOwnProperty("c")){this.newDims(h,e.c.fw,e.c.fh)}else{if(e.hasOwnProperty("r")){this.newDims(h,e.r.fw,e.r.fh)}else{if(e.hasOwnProperty("f")){this.newDims(h,e.f.fw,e.f.fh)}}}for(g in d){c=d[g];if(c.hasOwnProperty("c")){f[g]={c:{x:c.c.x,y:c.c.y,w:c.c.w,h:c.c.h}}}else{if(c.hasOwnProperty("r")){f[g]={r:c.r.r}}else{if(c.hasOwnProperty("f")){f[g]={f:c.f.f}}}}}return JSON.stringify(f)}return""},refreshEditor:function(g,d,f){var c=this,e,b;c.toggleEditor(g,1);e={action:"imgedit-preview",_ajax_nonce:d,postid:g,history:c.filterHistory(g),rand:c.intval(Math.random()*1000000)};b=a('![]()
');b.load(function(){var i=a("#imgedit-crop-"+g),h=imageEdit;i.empty().append(b);h.initCrop(g,b,i);h.setCropSelection(g,0);if((typeof f!="unknown")&&f!=null){f()}h.toggleEditor(g,0)}).attr("src",ajaxurl+"?"+a.param(e))},action:function(b,g,c){var j=this,e,i,f,d,k;if(j.notsaved(b)){return false}e={action:"image-editor",_ajax_nonce:g,postid:b};if("scale"==c){i=a("#imgedit-scale-width-"+b),f=a("#imgedit-scale-height-"+b),d=j.intval(i.val()),k=j.intval(f.val());if(d<1){i.focus();return false}else{if(k<1){f.focus();return false}}if(d==j.hold.ow||k==j.hold.oh){return false}e["do"]="scale";e.fwidth=d;e.fheight=k}else{if("restore"==c){e["do"]="restore"}else{return false}}j.toggleEditor(b,1);a.post(ajaxurl,e,function(h){a("#image-editor-"+b).empty().append(h);j.toggleEditor(b,0)})},save:function(f,b){var c,e=this.getTarget(f),d=this.filterHistory(f);if(""==d){return false}this.toggleEditor(f,1);c={action:"image-editor",_ajax_nonce:b,postid:f,history:d,target:e,"do":"save"};a.post(ajaxurl,c,function(h){var g=JSON.parse(h);if(g.error){a("#imgedit-response-"+f).html(''+g.error+"
");imageEdit.close(f);return}if(g.fw&&g.fh){a("#media-dims-"+f).html(g.fw+" × "+g.fh)}if(g.thumbnail){a(".thumbnail","#thumbnail-head-"+f).attr("src",""+g.thumbnail)}if(g.msg){a("#imgedit-response-"+f).html('
")}imageEdit.close(f)})},open:function(h,d){var f,e=a("#image-editor-"+h),c=a("#media-head-"+h),b=a("#imgedit-open-btn-"+h),g=b.siblings("img");b.attr("disabled","disabled");g.css("visibility","visible");f={action:"image-editor",_ajax_nonce:d,postid:h,"do":"open"};e.load(ajaxurl,f,function(){e.fadeIn("fast");c.fadeOut("fast",function(){b.removeAttr("disabled");g.css("visibility","hidden")})})},imgLoaded:function(d){var b=a("#image-preview-"+d),c=a("#imgedit-crop-"+d);this.initCrop(d,b,c);this.setCropSelection(d,0);this.toggleEditor(d,0)},initCrop:function(g,e,c){var b=this,d=a("#imgedit-sel-width-"+g),f=a("#imgedit-sel-height-"+g);b.iasapi=a(e).imgAreaSelect({parent:c,instance:true,handles:true,keys:true,minWidth:3,minHeight:3,onInit:function(h,i){c.children().mousedown(function(m){var k=false,l,j;if(m.shiftKey){l=b.iasapi.getSelection();j=b.getSelRatio(g);k=(l&&l.width&&l.height)?l.width+":"+l.height:j}b.iasapi.setOptions({aspectRatio:k})})},onSelectStart:function(h,i){imageEdit.setDisabled(a("#imgedit-crop-sel-"+g),1)},onSelectEnd:function(h,i){imageEdit.setCropSelection(g,i)},onSelectChange:function(h,j){var i=imageEdit.hold.sizer;d.val(imageEdit.round(j.width/i));f.val(imageEdit.round(j.height/i))}})},setCropSelection:function(g,f){var e,b=a("#imgedit-minthumb-"+g).val()||"128:128",d=this.hold.sizer;b=b.split(":");f=f||0;if(!f||(f.width<3&&f.height<3)){this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+g),0);this.setDisabled(a("#imgedit-crop-sel-"+g),0);a("#imgedit-sel-width-"+g).val("");a("#imgedit-sel-height-"+g).val("");a("#imgedit-selection-"+g).val("");return false}if(f.width<(b[0]*d)&&f.height<(b[1]*d)){this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+g),0);a("#imgedit-selection-"+g).val("");return false}e={x:f.x1,y:f.y1,w:f.width,h:f.height};this.setDisabled(a(".imgedit-crop","#imgedit-panel-"+g),1);a("#imgedit-selection-"+g).val(JSON.stringify(e))},close:function(b){if(this.notsaved(b)){return false}this.iasapi={};this.hold={};a("#image-editor-"+b).fadeOut("fast",function(){a("#media-head-"+b).fadeIn("fast");a(this).empty()})},notsaved:function(e){var c=a("#imgedit-history-"+e).val(),d=(c!="")?JSON.parse(c):new Array(),b=this.intval(a("#imgedit-undone-"+e).val());if(b
0){g.pop();b--}f.val(0);g.push(i);e.val(JSON.stringify(g));c.refreshEditor(h,d,function(){c.setDisabled(a("#image-undo-"+h),true);c.setDisabled(a("#image-redo-"+h),false)})},rotate:function(d,e,c,b){if(a(b).hasClass("disabled")){return false}this.addStep({r:{r:d,fw:this.hold.h,fh:this.hold.w}},e,c)},flip:function(d,e,c,b){if(a(b).hasClass("disabled")){return false}this.addStep({f:{f:d,fw:this.hold.w,fh:this.hold.h}},e,c)},newDims:function(f,c,e){var b=Math.max(c,e),d;d=b>400?400/b:1;this.hold.sizer=d;this.hold.w=c;this.hold.h=e;return d},crop:function(e,c,b){var d=a("#imgedit-selection-"+e).val();if(a(b).hasClass("disabled")||d==""){return false}d=JSON.parse(d);if(d.w>0&&d.h>0){d.fw=this.intval(a("#imgedit-sel-width-"+e).val());d.fh=this.intval(a("#imgedit-sel-height-"+e).val());this.addStep({c:d},e,c)}},undo:function(g,e){var d=this,c=a("#image-undo-"+g),f=a("#imgedit-undone-"+g),b=d.intval(f.val())+1;if(c.hasClass("disabled")){return}f.val(b);d.refreshEditor(g,e,function(){var h=a("#imgedit-history-"+g),i=(h.val()!="")?JSON.parse(h.val()):new Array();d.setDisabled(a("#image-redo-"+g),true);d.setDisabled(c,b0)})},setNumSelection:function(c){var g,k=a("#imgedit-sel-width-"+c),j=a("#imgedit-sel-height-"+c),o=this.intval(k.val()),m=this.intval(j.val()),i=a("#image-preview-"+c),p=i.height(),h=i.width(),b=this.hold.sizer,f,n,e,l,d=this.iasapi;if(o<1){k.val("");return false}if(m<1){j.val("");return false}if(o&&m&&(g=d.getSelection())){e=g.x1+Math.round(o*b);l=g.y1+Math.round(m*b);f=g.x1;n=g.y1;if(e>h){f=0;e=h;k.val(Math.round(e/b))}if(l>p){n=0;l=p;j.val(Math.round(l/b))}d.setSelection(f,n,e,l);d.update();this.setCropSelection(c,d.getSelection())}},round:function(b){var c;b=Math.round(b);if(this.hold.sizer>0.6){return b}c=b.toString().slice(-1);if("1"==c){return b-1}else{if("9"==c){return b+1}}return b},setRatioSelection:function(j,i,d){var f,e,b=this.intval(a("#imgedit-crop-width-"+j).val()),g=this.intval(a("#imgedit-crop-height-"+j).val()),c=a("#image-preview-"+j).height();if(!this.intval(a(d).val())){a(d).val("");return}if(b&&g){this.iasapi.setOptions({aspectRatio:b+":"+g});if(f=this.iasapi.getSelection(true)){e=Math.ceil(f.y1+((f.x2-f.x1)/(b/g)));if(e>c){e=c;if(i){a("#imgedit-crop-height-"+j).val("")}else{a("#imgedit-crop-width-"+j).val("")}}this.iasapi.setSelection(f.x1,f.y1,f.x2,e);this.iasapi.update()}}}}})(jQuery);
\ No newline at end of file
diff --git a/wp-admin/wp-admin.dev.css b/wp-admin/wp-admin.dev.css
index 2f6aafc9e5..ab342878ad 100644
--- a/wp-admin/wp-admin.dev.css
+++ b/wp-admin/wp-admin.dev.css
@@ -1292,8 +1292,7 @@ strong .post-com-count {
clear: both;
}
-.form-table td,
-#wpbody-content .describe td {
+.form-table td {
margin-bottom: 9px;
padding: 8px 10px;
line-height: 20px;
@@ -1306,8 +1305,7 @@ strong .post-com-count {
text-shadow: rgba(255,255,255,1) 0 1px 0;
}
-.form-table th,
-#wpbody-content .describe th {
+.form-table th {
vertical-align: top;
text-align: left;
padding: 10px;
@@ -2834,6 +2832,13 @@ table .inline-edit-row fieldset ul.cat-hover {
padding: 5px;
}
+#wpbody-content .describe th {
+ vertical-align: top;
+ text-align: left;
+ padding: 10px;
+ width: 140px;
+}
+
#wpbody-content .describe .media-item-info tr {
background-color: transparent;
}
@@ -2842,8 +2847,8 @@ table .inline-edit-row fieldset ul.cat-hover {
padding: 4px 10px 0;
}
-#wpbody-content .describe .media-item-info .A1B1 {
- padding-bottom: 8px;
+.describe .media-item-info .A1B1 {
+ padding: 0 15px 8px 0;
}
#wpbody-content .filename {
@@ -2917,6 +2922,11 @@ abbr.required {
width: 100%;
}
+#wpbody-content .media-single .media-item {
+ border-bottom-style: none;
+ border-bottom-width: 0;
+}
+
#wpbody-content #media-items {
border-style: solid solid none;
border-width: 1px;
@@ -3343,15 +3353,41 @@ label,
top: -3px;
}
+.describe .image-editor {
+ vertical-align: top;
+}
+
.imgedit-wrap {
position: relative;
- min-height: 500px;
+}
+
+.imgedit-settings p {
+ margin: 8px 0;
+}
+
+.describe .imgedit-wrap table td {
+ vertical-align: top;
+ padding-top: 0;
+}
+
+.imgedit-wrap p,
+.describe .imgedit-wrap table td {
+ font-size: 11px;
+ line-height: 18px;
+}
+
+.describe .imgedit-wrap table td.imgedit-settings {
+ padding: 0 5px;
+}
+
+td.imgedit-settings input {
+ vertical-align: middle;
}
.imgedit-wait {
position: absolute;
top: 0;
- background: #FFFFFF url(images/wpspin_light.gif) no-repeat scroll 200px 75px;
+ background: #FFFFFF url(images/wpspin_light.gif) no-repeat scroll 22px 10px;
opacity: 0.7;
filter: alpha(opacity=70);
width: 100%;
@@ -3359,7 +3395,8 @@ label,
display: none;
}
-.media-disabled {
+.media-disabled,
+.imgedit-settings .disabled {
color: grey;
}
@@ -3370,7 +3407,8 @@ label,
}
.imgedit-menu {
- margin: 5px 0;
+ margin: 0 0 12px;
+ min-width: 315px;
}
.imgedit-menu div {
@@ -3385,6 +3423,10 @@ label,
border-style: solid;
}
+.imgedit-crop-wrap {
+ position: relative;
+}
+
.imgedit-crop {
background: transparent url(images/imgedit.gif) no-repeat scroll -62px 2px;
margin: 0 8px 0 0;
@@ -3421,3 +3463,71 @@ label,
}
+.imgedit-applyto img {
+ margin: 0 8px 0 0;
+}
+
+.imgedit-group-top {
+ margin: 5px 0;
+}
+
+.imgedit-applyto .imgedit-label {
+ padding: 2px 0 0;
+ display: block;
+}
+
+.imgedit-help {
+ display: none;
+ font-style: italic;
+ margin-bottom: 8px;
+}
+
+.imgedit-help ul li {
+ font-size: 11px;
+}
+
+a.imgedit-help-toggle {
+ text-decoration: none;
+}
+
+#wpbody-content .imgedit-response div {
+ width: 600px;
+ margin: 8px;
+}
+
+.form-table td.imgedit-response {
+ padding: 0;
+}
+
+.imgedit-submit {
+ margin: 8px 0;
+}
+
+.imgedit-submit-btn {
+ margin-left: 20px;
+}
+
+.imgedit-wrap .nowrap {
+ white-space: nowrap;
+}
+
+span.imgedit-scale-warn {
+ color: red;
+ font-size: 20px;
+ font-style: normal;
+ visibility: hidden;
+ vertical-align: middle;
+}
+
+.imgedit-group {
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ margin-bottom: 8px;
+ padding: 2px 10px;
+}
+
+
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 2d08ed11dd..b4e9383a74 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -2575,7 +2575,8 @@ function wp_delete_attachment($post_id) {
delete_post_meta($post_id, '_wp_trash_meta_status');
delete_post_meta($post_id, '_wp_trash_meta_time');
- $meta = wp_get_attachment_metadata( $post_id, false, false );
+ $meta = wp_get_attachment_metadata( $post_id );
+ $backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
$file = get_attached_file( $post_id );
do_action('delete_attachment', $post_id);
@@ -2609,14 +2610,11 @@ function wp_delete_attachment($post_id) {
}
}
- if ( isset($meta['sizes']) && is_array($meta['sizes']) ) {
- foreach ( array_keys($meta['sizes']) as $size ) {
- if ( preg_match('/backup-[0-9]+/', $size) ) { // make sure this is a backup
- if ( $del = image_get_intermediate_size($post_id, $size) ) {
- $del_file = apply_filters('wp_delete_file', $del['path']);
- @ unlink( path_join($uploadpath['basedir'], $del_file) );
- }
- }
+ if ( is_array($backup_sizes) ) {
+ foreach ( $backup_sizes as $size ) {
+ $del_file = path_join( dirname($meta['file']), $size['file'] );
+ $del_file = apply_filters('wp_delete_file', $del_file);
+ @ unlink( path_join($uploadpath['basedir'], $del_file) );
}
}
@@ -2639,21 +2637,13 @@ function wp_delete_attachment($post_id) {
* @param bool $unfiltered Optional, default is false. If true, filters are not run.
* @return string|bool Attachment meta field. False on failure.
*/
-function wp_get_attachment_metadata( $post_id, $unfiltered = false, $remove_backups = true ) {
+function wp_get_attachment_metadata( $post_id, $unfiltered = false ) {
$post_id = (int) $post_id;
if ( !$post =& get_post( $post_id ) )
return false;
$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
- if ( $remove_backups && isset($data['sizes']) && is_array($data['sizes']) ) {
- $sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') );
- foreach ( $data['sizes'] as $size => $val ) {
- if ( !in_array( $size, $sizes, true ) )
- unset($data['sizes'][$size]);
- }
- }
-
if ( $unfiltered )
return $data;
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index defc6a6984..2ac94659ad 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -405,7 +405,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'codepress', '/wp-includes/js/codepress/codepress.js', false, '0.9.6' );
$scripts->add_data( 'codepress', 'group', 1 );
- $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), '20090831' );
+ $scripts->add( 'image-edit', "/wp-admin/js/image-edit$suffix.js", array('jquery', 'json2', 'imgareaselect'), '20090922' );
$scripts->add_data( 'image-edit', 'group', 1 );
}
}
@@ -442,12 +442,12 @@ function wp_default_styles( &$styles ) {
$rtl_styles = array( 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' );
// all colors stylesheets need to have the same query strings (cache manifest compat)
- $colors_version = '20090824';
+ $colors_version = '20090922';
$styles->add( 'wp-admin', "/wp-admin/wp-admin$suffix.css", array(), '20090824' );
$styles->add_data( 'wp-admin', 'rtl', "/wp-admin/rtl$suffix.css" );
- $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090824' );
+ $styles->add( 'ie', '/wp-admin/css/ie.css', array(), '20090922' );
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
@@ -460,7 +460,7 @@ function wp_default_styles( &$styles ) {
$styles->add_data( 'colors-classic', 'rtl', true );
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20090630' );
- $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20090612' );
+ $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20090922' );
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20090603' );
$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20090514' );
$styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20090514' );
