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

Fix bootstrap conflict

Browse Source
This commit is contained in:
Romain Neutron
2012-07-23 12:42:35 +02:00
parent 2cebd50313
commit 7eefbe1c76
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/include/jquery.image_enhancer.js
View File

@@ -94,6 +94,10 @@
$image.removeAttr('ondragstart'); $image.removeAttr('ondragstart');
} }
$image.draggable(); $image.draggable();
$image.css({
'max-width':'none',
'max-height':'none'
});
var image_width = parseInt($('input[name="width"]', $this).val()); var image_width = parseInt($('input[name="width"]', $this).val());
var image_height = parseInt($('input[name="height"]', $this).val()); var image_height = parseInt($('input[name="height"]', $this).val());
@@ -147,17 +151,19 @@
if(bool) if(bool)
{ {
if(w1 * 1.08 < 32767) if((w1 * 1.08) < 32767) {
w2 = w1 * 1.08; w2 = w1 * 1.08;
else } else {
w2 = w1; w2 = w1;
}
} }
else else
{ {
if(w1 / 1.08 > 20) if((w1 / 1.08) > 20) {
w2 = w1 / 1.08; w2 = w1 / 1.08;
else } else {
w2 = w1; w2 = w1;
}
} }
var datas = $(this).data('image_enhance'); var datas = $(this).data('image_enhance');