diff options
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/controls.js | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/effects.js | 5 | ||||
| -rw-r--r-- | railties/html/javascripts/controls.js | 4 | ||||
| -rw-r--r-- | railties/html/javascripts/effects.js | 5 |
4 files changed, 10 insertions, 8 deletions
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}); } }) diff --git a/railties/html/javascripts/controls.js b/railties/html/javascripts/controls.js index 82857c44e0..de0261ed54 100644 --- a/railties/html/javascripts/controls.js +++ b/railties/html/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/railties/html/javascripts/effects.js b/railties/html/javascripts/effects.js index 91f551e2bf..e23554ecad 100644 --- a/railties/html/javascripts/effects.js +++ b/railties/html/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}); } }) |