Skip to content

Commit

Permalink
refs #13699 make return values overridable in dojo.fx
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.dojotoolkit.org/src/dojo/trunk@26242 560b804f-0ae3-0310-86f3-f6aa0a117693
  • Loading branch information
ccmitchellusa committed Aug 16, 2011
1 parent 27a383e commit ee9c12d
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions fx.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ define([
dojo.fx = {
// summary: Effects library on top of Base animations
};
var coreFx = dojo.fx;
=====*/
var CoreFx = dojo.fx = {};

var _baseObj = {
_fire: function(evt, args){
Expand Down Expand Up @@ -139,7 +141,7 @@ define([
});
lang.extend(_chain, _baseObj);

dojo.fx.chain = function(/*dojo.Animation[]*/ animations){
coreFx.chain = dojo.fx.chain = function(/*dojo.Animation[]*/ animations){
// summary:
// Chain a list of `dojo.Animation`s to run in sequence
//
Expand Down Expand Up @@ -232,7 +234,7 @@ define([
});
lang.extend(_combine, _baseObj);

dojo.fx.combine = function(/*dojo.Animation[]*/ animations){
coreFx.combine = dojo.fx.combine = function(/*dojo.Animation[]*/ animations){
// summary:
// Combine a list of `dojo.Animation`s to run in parallel
//
Expand Down Expand Up @@ -262,7 +264,7 @@ define([
return new _combine(animations); // dojo.Animation
};

dojo.fx.wipeIn = function(/*Object*/ args){
coreFx.wipeIn = dojo.fx.wipeIn = function(/*Object*/ args){
// summary:
// Expand a node to it's natural height.
//
Expand Down Expand Up @@ -318,7 +320,7 @@ define([
return anim; // dojo.Animation
};

dojo.fx.wipeOut = function(/*Object*/ args){
coreFx.wipeOut = dojo.fx.wipeOut = function(/*Object*/ args){
// summary:
// Shrink a node to nothing and hide it.
//
Expand Down Expand Up @@ -359,7 +361,7 @@ define([
return anim; // dojo.Animation
};

dojo.fx.slideTo = function(/*Object*/ args){
coreFx.slideTo = dojo.fx.slideTo = function(/*Object*/ args){
// summary:
// Slide a node to a new top/left position
//
Expand Down Expand Up @@ -407,12 +409,6 @@ define([

return anim; // dojo.Animation
};

return {
chain: dojo.fx.chain,
combine: dojo.fx.combine,
slideTo: dojo.fx.slideTo,
wipeOut: dojo.fx.wipeOut,
wipeIn: dojo.fx.wipeIn
};

return coreFx;
});

0 comments on commit ee9c12d

Please sign in to comment.