From 5182153eac95c77bd61e6d4ca697536bea0f7987 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 27 Jun 2014 16:48:35 +0000 Subject: [PATCH] Fix quick_add button in pixelegg template --- pixelegg/js/slider.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pixelegg/js/slider.js b/pixelegg/js/slider.js index 234f3fabf8..f1f9754155 100644 --- a/pixelegg/js/slider.js +++ b/pixelegg/js/slider.js @@ -159,7 +159,7 @@ egw_LAB.wait(function() { $j('#quick_add').on({ mouseover: function(ev){ // do NOT react on bubbeling events from contained selectbox - if (ev.relatedTarget && ev.relatedTarget.id != 'quick_add_selectbox') + if (ev.relatedTarget && ev.relatedTarget.id != 'quick_add_selectbox' && ev.target.id !='quick_add_selectbox') { $j(this).css({ transition: "0.2s ease-out 0s", @@ -176,7 +176,7 @@ egw_LAB.wait(function() { }, mouseout: function(ev){ // do NOT react on bubbeling events from contained selectbox - if (ev.relatedTarget && ev.relatedTarget.id != 'quick_add_selectbox') + if (ev.target && ev.target.id != 'quick_add_selectbox' && ev.relatedTarget.id != 'quick_add' && ev.relatedTarget.id !='quick_add_selectbox') { $j(this).css({ transition: "0.6s ease-out 0s", @@ -190,6 +190,19 @@ egw_LAB.wait(function() { }); } ev.stopPropagation(); + }, + focusout: function (ev) + { + $j(this).css({ + transition: "0.6s ease-out 0s", + width: "16px", + 'border-top-left-radius': "0px", + 'background-color': "transparent" + }); + $j('select', this).css({ + transition: "0s linear 0s", + visibility: "hidden" + }); } });