merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1277,9 +1277,9 @@ var ImageWriter = xe.createPlugin('ImageWriter', {
}
_resize.find('p.resizeError').hide();
var _src = _image.attr('rawsrc') || _image.attr('src');
var _file_srl = _image.attr('filesrl');
$.exec_json('file.procFileImageResize',{width:w, source_src:decodeURI(_src)},function(data){
$.exec_json('file.procFileImageResize',{width:w, file_srl:_file_srl},function(data){
if(data.error != 0) return;
_image.attr({