Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

effects.js and controls.js fixes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4053 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 77c8e3a0fd32e736575edce503b2e9f891193f9e 1 parent 6665375
@madrobby madrobby authored
View
4 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;
View
5 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});
}
})
View
4 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;
View
5 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});
}
})
Please sign in to comment.
Something went wrong with that request. Please try again.