From 77c8e3a0fd32e736575edce503b2e9f891193f9e Mon Sep 17 00:00:00 2001
From: Thomas Fuchs <thomas@fesch.at>
Date: Sun, 26 Mar 2006 20:28:05 +0000
Subject: effects.js and controls.js fixes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_view/helpers/javascripts/controls.js | 4 ++--
 actionpack/lib/action_view/helpers/javascripts/effects.js  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_view/helpers/javascripts/controls.js b/actionpack/lib/action_view/helpers/javascripts/controls.js
index 82857c44e0..de0261ed54 100644
--- a/actionpack/lib/action_view/helpers/javascripts/controls.js
+++ b/actionpack/lib/action_view/helpers/javascripts/controls.js
@@ -141,8 +141,8 @@ Autocompleter.Base.prototype = {
          return;
       }
      else 
-      if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN) 
-        return;
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
+         (navigator.appVersion.indexOf('AppleWebKit') > 0 && event.keyCode == 0)) return;
 
     this.changed = true;
     this.hasFocus = true;
diff --git a/actionpack/lib/action_view/helpers/javascripts/effects.js b/actionpack/lib/action_view/helpers/javascripts/effects.js
index 91f551e2bf..e23554ecad 100644
--- a/actionpack/lib/action_view/helpers/javascripts/effects.js
+++ b/actionpack/lib/action_view/helpers/javascripts/effects.js
@@ -581,7 +581,8 @@ Effect.Puff = function(element) {
       beforeSetupInternal: function(effect) {
         effect.effects[0].element.setStyle({position: 'absolute'}); },
       afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide().setStyle(oldStyle); }
+         effect.effects[0].element.hide();
+         effect.effects[0].element.setStyle(oldStyle); }
      }, arguments[1] || {})
    );
 }
@@ -640,7 +641,7 @@ Effect.SwitchOff = function(element) {
         afterFinishInternal: function(effect) {
           effect.element.hide();
           effect.element.undoClipping();
-          effect.element.undoPositionend();
+          effect.element.undoPositioned();
           effect.element.setStyle({opacity: oldOpacity});
         }
       })
-- 
cgit v1.2.3