aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorThomas Fuchs <thomas@fesch.at>2006-11-20 23:45:16 +0000
committerThomas Fuchs <thomas@fesch.at>2006-11-20 23:45:16 +0000
commitf5f3cdb1b6254366db66ba04a7b3232707229694 (patch)
tree94f8b7fb86e67964433b8e021162297a6e6d30ca /actionpack
parent9104d63f9917df5a363e073f62402a91a16ccf40 (diff)
downloadrails-f5f3cdb1b6254366db66ba04a7b3232707229694.tar.gz
rails-f5f3cdb1b6254366db66ba04a7b3232707229694.tar.bz2
rails-f5f3cdb1b6254366db66ba04a7b3232707229694.zip
Make sure .morph makes it in
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5602 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/effects.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/effects.js b/actionpack/lib/action_view/helpers/javascripts/effects.js
index 432355b5d6..3b02eda2b2 100644
--- a/actionpack/lib/action_view/helpers/javascripts/effects.js
+++ b/actionpack/lib/action_view/helpers/javascripts/effects.js
@@ -1068,8 +1068,13 @@ String.prototype.parseStyle = function(){
return result;
};
+Element.morph = function(element, style) {
+ new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {}));
+ return element;
+};
+
['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom',
- 'collectTextNodes','collectTextNodesIgnoreClass'].each(
+ 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each(
function(f) { Element.Methods[f] = Element[f]; }
);