hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
PHRAS-899
This commit is contained in:
Benoît Burnichon
2016-01-11 09:52:45 +01:00
parent 1b95b603d5 1f0c30fdb3
commit 31d04cf5a3
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
templates/web/admin/publications/fiche.html.twig
View File

@@ -33,31 +33,36 @@
sequentialUploads: true, sequentialUploads: true,
add: function (e, data) { add: function (e, data) {
$('#upload-error').empty(); $('#upload-error').empty();
$.each(data.files, function (index, file) { require([
var fileType = /^image\/(gif|jpeg|png)$/; "blueimp.loadimage"
if(typeof loadImage == 'function' && fileType.test(file.type)){ ], function (loadImage) {
if(file.size < 204800){ //200 ko
var options = {
maxWidth: 32,
maxHeight: 32,
minWidth: 32,
minHeight: 32
};
data.oldImage = $("#img_before").get(0); $.each(data.files, function (index, file) {
var fileType = /^image\/(gif|jpeg|png)$/;
if(typeof loadImage == 'function' && fileType.test(file.type)){
if(file.size < 204800){ //200 ko
var options = {
maxWidth: 32,
maxHeight: 32,
minWidth: 32,
minHeight: 32
};
loadImage(file, function(img){ data.oldImage = $("#img_before").get(0);
$("#img_before").remove();
$("#pub_icon .thumb_wrapper").append(img);
$("#pub_icon .thumb_wrapper img").attr("img_before");
return false;
}, options);
data.submit(); loadImage(file, function(img){
} else { $("#img_before").remove();
$('#upload-error').empty().append(language.errorFileApiTooBig); $("#pub_icon .thumb_wrapper").append(img);
$("#pub_icon .thumb_wrapper img").attr("img_before");
return false;
}, options);
data.submit();
} else {
$('#upload-error').empty().append(language.errorFileApiTooBig);
}
} }
} });
}); });
}, },
done: function (e, data) { done: function (e, data) {

24
templates/web/admin/statusbit/edit.html.twig
View File

@@ -166,6 +166,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var selected_files = []; var selected_files = [];
@@ -182,15 +183,20 @@ $(document).ready(function(){
return false; return false;
} }
loadImage(file,function(img){ require([
$('input[name='+data.paramName[0]+']').closest('.controls').find('.thumbnail').empty().append(img); "blueimp.loadimage"
}, { ], function (loadImage) {
fileType: /^image\/(gif|jpeg|png|jpg)$/,
maxSize : 5242880, // 5MB loadImage(file,function(img){
maxWidth: 16, $('input[name='+data.paramName[0]+']').closest('.controls').find('.thumbnail').empty().append(img);
maxHeight: 16, }, {
minWidth: 16, fileType: /^image\/(gif|jpeg|png|jpg)$/,
minHeight: 16 maxSize : 5242880, // 5MB
maxWidth: 16,
maxHeight: 16,
minWidth: 16,
minHeight: 16
});
}); });
}); });