Permalink
Browse files

Merge [5602] from trunk

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5603 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2043513 commit 87ecb782e6613f93790cd258eff65425128f2bad @madrobby madrobby committed Nov 20, 2006
Showing with 12 additions and 2 deletions.
  1. +6 −1 actionpack/lib/action_view/helpers/javascripts/effects.js
  2. +6 −1 railties/html/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]; }
);
@@ -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]; }
);

0 comments on commit 87ecb78

Please sign in to comment.