diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-01 07:25:44 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-01 07:25:44 +0000 |
commit | cadcd9e7144394ecc9df01961191d20e5e219a37 (patch) | |
tree | 6014e509c117efbb6cb20e806388e73f7d34f8c6 /actionpack/lib/action_view/helpers/javascripts/effects.js | |
parent | 24a8cb1e5600d95a51323982e4d7508eb22c8b1f (diff) | |
download | rails-cadcd9e7144394ecc9df01961191d20e5e219a37.tar.gz rails-cadcd9e7144394ecc9df01961191d20e5e219a37.tar.bz2 rails-cadcd9e7144394ecc9df01961191d20e5e219a37.zip |
Fix IE 30-sec timeout bug, make auto_complete_for even more delicious #1572 [Thomas Fuchs]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1579 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/javascripts/effects.js')
-rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/effects.js | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/effects.js b/actionpack/lib/action_view/helpers/javascripts/effects.js index 9a26c5d712..756c95cfeb 100644 --- a/actionpack/lib/action_view/helpers/javascripts/effects.js +++ b/actionpack/lib/action_view/helpers/javascripts/effects.js @@ -307,25 +307,33 @@ Effect.Puff = function(element) { } Effect.BlindUp = function(element) { + $(element)._overflow = $(element).style.overflow || 'visible'; $(element).style.overflow = 'hidden'; new Effect.Scale(element, 0, { scaleContent: false, scaleX: false, afterFinish: function(effect) - { Element.hide(effect.element) } + { + Element.hide(effect.element); + effect.element.style.overflow = effect.element._overflow; + } }.extend(arguments[1] || {}) ); } Effect.BlindDown = function(element) { $(element).style.height = '0px'; + $(element)._overflow = $(element).style.overflow || 'visible'; $(element).style.overflow = 'hidden'; Element.show(element); new Effect.Scale(element, 100, { scaleContent: false, scaleX: false, scaleMode: 'contents', - scaleFrom: 0 + scaleFrom: 0, + afterFinish: function(effect) { + effect.element.style.overflow = effect.element._overflow; + } }.extend(arguments[1] || {}) ); } @@ -375,6 +383,7 @@ Effect.Shake = function(element) { } Effect.SlideDown = function(element) { + $(element)._overflow = $(element).style.overflow || 'visible'; $(element).style.height = '0px'; $(element).style.overflow = 'hidden'; $(element).firstChild.style.position = 'relative'; @@ -386,12 +395,15 @@ Effect.SlideDown = function(element) { scaleFrom: 0, afterUpdate: function(effect) { effect.element.firstChild.style.bottom = - (effect.originalHeight - effect.element.clientHeight) + 'px'; } + (effect.originalHeight - effect.element.clientHeight) + 'px'; }, + afterFinish: function(effect) + { effect.element.style.overflow = effect.element._overflow; } }.extend(arguments[1] || {}) ); } Effect.SlideUp = function(element) { + $(element)._overflow = $(element).style.overflow || 'visible'; $(element).style.overflow = 'hidden'; $(element).firstChild.style.position = 'relative'; Element.show(element); @@ -402,7 +414,10 @@ Effect.SlideUp = function(element) { { effect.element.firstChild.style.bottom = (effect.originalHeight - effect.element.clientHeight) + 'px'; }, afterFinish: function(effect) - { Element.hide(effect.element); } + { + Element.hide(effect.element); + effect.element.style.overflow = effect.element._overflow; + } }.extend(arguments[1] || {}) ); } |