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

PHRAS-899 - fix loadImage dependency in statusbit edition and feed edition

Browse Source
This commit is contained in:
Florian BLOUET
2016-01-08 16:43:25 +01:00
parent 127c9ab243
commit 1f0c30fdb3
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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