aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-05-19 16:45:53 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-05-19 16:45:53 +0000
commit7ec91d465173fe19241b8d2f2c2f1036b2fff83a (patch)
tree9e9b4e636adefc9c0fc3aabf7916f5ba7f2e5c9b
parent6ea6a725c48ffb79e33852d43702c2b5a873b96a (diff)
downloadrails-7ec91d465173fe19241b8d2f2c2f1036b2fff83a.tar.gz
rails-7ec91d465173fe19241b8d2f2c2f1036b2fff83a.tar.bz2
rails-7ec91d465173fe19241b8d2f2c2f1036b2fff83a.zip
Fixed Form.disable in Prototype #1317 [Wintermute]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1311 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/prototype.js2
-rw-r--r--railties/html/javascripts/prototype.js2
3 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 01f3f700c9..63510e7bc2 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed Form.disable in Prototype #1317 [Wintermute]
+
* Added accessors to logger, params, response, session, and headers from the view, so you can write <% logger.info "stuff" %> instead of <% @logger.info "others" %> -- more consistent with the preferred way of accessing these attributes and collections from the controller
* Added support for POST data in form of YAML or XML, which is controller through the X-POST_DATA_MARSHAL header. Example request:
diff --git a/actionpack/lib/action_view/helpers/javascripts/prototype.js b/actionpack/lib/action_view/helpers/javascripts/prototype.js
index 72b141ac4a..b7647f2714 100644
--- a/actionpack/lib/action_view/helpers/javascripts/prototype.js
+++ b/actionpack/lib/action_view/helpers/javascripts/prototype.js
@@ -312,7 +312,7 @@ var Form = {
for (var i = 0; i < elements.length; i++) {
var element = elements[i];
element.blur();
- element.disable = 'true';
+ element.disabled = 'true';
}
},
diff --git a/railties/html/javascripts/prototype.js b/railties/html/javascripts/prototype.js
index 72b141ac4a..b7647f2714 100644
--- a/railties/html/javascripts/prototype.js
+++ b/railties/html/javascripts/prototype.js
@@ -312,7 +312,7 @@ var Form = {
for (var i = 0; i < elements.length; i++) {
var element = elements[i];
element.blur();
- element.disable = 'true';
+ element.disabled = 'true';
}
},