diff options
| author | Thomas Fuchs <thomas@fesch.at> | 2007-12-04 18:12:54 +0000 |
|---|---|---|
| committer | Thomas Fuchs <thomas@fesch.at> | 2007-12-04 18:12:54 +0000 |
| commit | cfa31c30b84d9ecd6423ab7341df6eb646bcc508 (patch) | |
| tree | 4cc73703fdac6c5196ee87aa8bb289dad8e4ff8b | |
| parent | 112ed3031671476d6aee3d0f69affe6c113e711f (diff) | |
| download | rails-cfa31c30b84d9ecd6423ab7341df6eb646bcc508.tar.gz rails-cfa31c30b84d9ecd6423ab7341df6eb646bcc508.tar.bz2 rails-cfa31c30b84d9ecd6423ab7341df6eb646bcc508.zip | |
Update trunk to script.aculo.us 1.8.0.1, fixes a regression in the autocompleter
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8268 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/controls.js | 6 | ||||
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/html/javascripts/controls.js | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1ee499c69e..491d6956b5 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update script.aculo.us to 1.8.0.1. [madrobby] + * Add 'disabled' attribute to <OPTION> separators used in time zone and country selects. Closes #10354 [hasmanyjosh] * Added the same record identification guessing rules to fields_for as form_for has [DHH] diff --git a/actionpack/lib/action_view/helpers/javascripts/controls.js b/actionpack/lib/action_view/helpers/javascripts/controls.js index da7bfa2a77..fbc4418b83 100644 --- a/actionpack/lib/action_view/helpers/javascripts/controls.js +++ b/actionpack/lib/action_view/helpers/javascripts/controls.js @@ -86,7 +86,7 @@ Autocompleter.Base = Class.create({ Element.hide(this.update); Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this)); - Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this)); + Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this)); }, show: function() { @@ -142,12 +142,12 @@ Autocompleter.Base = Class.create({ case Event.KEY_UP: this.markPrevious(); this.render(); - if(Prototype.Browser.WebKit) Event.stop(event); + Event.stop(event); return; case Event.KEY_DOWN: this.markNext(); this.render(); - if(Prototype.Browser.WebKit) Event.stop(event); + Event.stop(event); return; } else diff --git a/railties/CHANGELOG b/railties/CHANGELOG index cf0425a22e..e56e5f2547 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update script.aculo.us to 1.8.0.1. [madrobby] + * Added db:fixtures:identity as a way of locating what ID a foxy fixture was assigned #10332 [jbarnette] * Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [jbarnette] diff --git a/railties/html/javascripts/controls.js b/railties/html/javascripts/controls.js index da7bfa2a77..fbc4418b83 100644 --- a/railties/html/javascripts/controls.js +++ b/railties/html/javascripts/controls.js @@ -86,7 +86,7 @@ Autocompleter.Base = Class.create({ Element.hide(this.update); Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this)); - Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this)); + Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this)); }, show: function() { @@ -142,12 +142,12 @@ Autocompleter.Base = Class.create({ case Event.KEY_UP: this.markPrevious(); this.render(); - if(Prototype.Browser.WebKit) Event.stop(event); + Event.stop(event); return; case Event.KEY_DOWN: this.markNext(); this.render(); - if(Prototype.Browser.WebKit) Event.stop(event); + Event.stop(event); return; } else |