aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2005-06-27 17:10:52 +0000
committerSam Stephenson <sam@37signals.com>2005-06-27 17:10:52 +0000
commit05ef7898bd42970a45a6727b1cf44338982ab2c6 (patch)
treec0e37ea5ed90627a29ea6e3b0ae868523cf5aa32 /actionpack
parent9965993e8babc177d89a547bee92573bc0712dea (diff)
downloadrails-05ef7898bd42970a45a6727b1cf44338982ab2c6.tar.gz
rails-05ef7898bd42970a45a6727b1cf44338982ab2c6.tar.bz2
rails-05ef7898bd42970a45a6727b1cf44338982ab2c6.zip
Make Object.prototype.extend work correctly
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1544 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/prototype.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/prototype.js b/actionpack/lib/action_view/helpers/javascripts/prototype.js
index 775ea76804..eefb6e82b8 100644
--- a/actionpack/lib/action_view/helpers/javascripts/prototype.js
+++ b/actionpack/lib/action_view/helpers/javascripts/prototype.js
@@ -32,8 +32,8 @@ Object.extend = function(destination, source) {
return destination;
}
-Object.prototype.extend = function() {
- return Object.extend.apply(this, arguments);
+Object.prototype.extend = function(object) {
+ return Object.extend.apply(this, [this, object]);
}
Function.prototype.bind = function(object) {