Merge pull request #1620 from lostdalek/hotfix/PHRAS-899

PHRAS-899
This commit is contained in:
Benoît Burnichon
2016-01-11 09:52:45 +01:00
2 changed files with 41 additions and 30 deletions

View File

@@ -33,6 +33,10 @@
sequentialUploads: true,
add: function (e, data) {
$('#upload-error').empty();
require([
"blueimp.loadimage"
], function (loadImage) {
$.each(data.files, function (index, file) {
var fileType = /^image\/(gif|jpeg|png)$/;
if(typeof loadImage == 'function' && fileType.test(file.type)){
@@ -59,6 +63,7 @@
}
}
});
});
},
done: function (e, data) {
return false;

View File

@@ -166,6 +166,7 @@
<script type="text/javascript">
$(document).ready(function(){
var selected_files = [];
@@ -182,6 +183,10 @@ $(document).ready(function(){
return false;
}
require([
"blueimp.loadimage"
], function (loadImage) {
loadImage(file,function(img){
$('input[name='+data.paramName[0]+']').closest('.controls').find('.thumbnail').empty().append(img);
}, {
@@ -193,6 +198,7 @@ $(document).ready(function(){
minHeight: 16
});
});
});
selected_files.push(data);