From f002d6f06a938d544f182341110a63c932088c20 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Thu, 28 Nov 2013 15:53:11 +0000
Subject: [PATCH] Autoresize des images: ne force pas le style inline en CSS -
conflit avec styles utilisateurs / charte graphique
---
public/admin/js/onload_utils.js | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/public/admin/js/onload_utils.js b/public/admin/js/onload_utils.js
index 7eac249523d..e464c0864c9 100644
--- a/public/admin/js/onload_utils.js
+++ b/public/admin/js/onload_utils.js
@@ -13,7 +13,6 @@ function resizeElement(element, maxw, keep_ratio) {
}
element.width(maxw);
}
- element.css('display','inline');
}
@@ -85,7 +84,7 @@ var autoHideShowTagOnParentHover = function (child_selector, parent_selector) {
function() {
if (!$(this).find('select').is(":focus"))
- $(parent_selector).find(child_selector).fadeOut();
+ $(parent_selector).find(child_selector).fadeOut();
}
);
@@ -94,14 +93,16 @@ var autoHideShowTagOnParentHover = function (child_selector, parent_selector) {
var initializeImgHover = function() {
- var images = $('img[data-hover]');
- images.each(function(index, element) {
- var image = $(element);
- image.attr('data-out', image.attr('src'));
- if(image.parents('.menu').length==0)
+ var images = $('img[data-hover]');
+ images.each(function(index, element) {
+ var image = $(element);
+ image.attr('data-out', image.attr('src'));
+
+ if(image.parents('.menu').length==0)
image.hover(function(){image.attr('src', image.data('hover'));},
- function(){image.attr('src', image.data('out'));});
- image.parents('.menu').hover(function(){image.attr('src', image.data('hover'));},
- function(){image.attr('src', image.data('out'));});
- });
+ function(){image.attr('src', image.data('out'));});
+
+ image.parents('.menu').hover(function(){image.attr('src', image.data('hover'));},
+ function(){image.attr('src', image.data('out'));});
+ });
}
--
GitLab