X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/3789b528d8dd8aad4558e38e22d775bcab1cbd36..refs/heads/master:/docs/source/Animate.html diff --git a/docs/source/Animate.html b/docs/source/Animate.html index fe1523e6..f57b5271 100644 --- a/docs/source/Animate.html +++ b/docs/source/Animate.html @@ -3,8 +3,8 @@ The source code - - + + @@ -20,7 +20,7 @@ * This animation class is a mixin. * * Ext.util.Animate provides an API for the creation of animated transitions of properties and styles. - * This class is used as a mixin and currently applied to {@link Ext.core.Element}, {@link Ext.CompositeElement}, + * This class is used as a mixin and currently applied to {@link Ext.Element}, {@link Ext.CompositeElement}, * {@link Ext.draw.Sprite}, {@link Ext.draw.CompositeSprite}, and {@link Ext.Component}. Note that Components * have a limited subset of what attributes can be animated such as top, left, x, y, height, width, and * opacity (color, paddings, and margins can not be animated). @@ -138,7 +138,7 @@ * * ## Animation Keyframes * - * You can also set up complex animations with {@link Ext.fx.Anim#keyframe keyframe} which follows the + * You can also set up complex animations with {@link Ext.fx.Anim#keyframes keyframes} which follow the * CSS3 Animation configuration pattern. Note rotation, translation, and scaling can only be done for sprites. * The previous example can be written with the following syntax: * @@ -162,7 +162,7 @@ * * ## Animation Events * - * Each animation you create has events for {@link Ext.fx.Anim#beforeanimation beforeanimation}, + * Each animation you create has events for {@link Ext.fx.Anim#beforeanimate beforeanimate}, * {@link Ext.fx.Anim#afteranimate afteranimate}, and {@link Ext.fx.Anim#lastframe lastframe}. * Keyframed animations adds an additional {@link Ext.fx.Animator#keyframe keyframe} event which * fires for each keyframe in your animation. @@ -223,7 +223,7 @@ Ext.define('Ext.util.Animate', { /** * <p>Perform custom animation on this object.<p> - * <p>This method is applicable to both the the {@link Ext.Component Component} class and the {@link Ext.core.Element Element} class. + * <p>This method is applicable to both the {@link Ext.Component Component} class and the {@link Ext.Element Element} class. * It performs animated transitions of certain properties of this object over a specified timeline.</p> * <p>The sole parameter is an object which specifies start property values, end property values, and properties which * describe the timeline. Of the properties listed below, only <b><code>to</code></b> is mandatory.</p> @@ -250,7 +250,7 @@ Ext.define('Ext.util.Animate', { * <li><code>listeners</code> <div class="sub-desc">This is a standard {@link Ext.util.Observable#listeners listeners} configuration object which may be used * to inject behaviour at either the <code>beforeanimate</code> event or the <code>afteranimate</code> event.</div></li> * </ul></p> - * <h3>Animating an {@link Ext.core.Element Element}</h3> + * <h3>Animating an {@link Ext.Element Element}</h3> * When animating an Element, the following properties may be specified in <code>from</code>, <code>to</code>, and <code>keyframe</code> objects:<ul> * <li><code>x</code> <div class="sub-desc">The page X position in pixels.</div></li> * <li><code>y</code> <div class="sub-desc">The page Y position in pixels</div></li> @@ -344,7 +344,7 @@ myWindow.header.el.on('click', function() { * @deprecated 4.0 Replaced by {@link #stopAnimation} * Stops any running effects and clears this object's internal effects queue if it contains * any additional effects that haven't started yet. - * @return {Ext.core.Element} The Element + * @return {Ext.Element} The Element * @method */ stopFx: Ext.Function.alias(Ext.util.Animate, 'stopAnimation'), @@ -352,7 +352,7 @@ myWindow.header.el.on('click', function() { /** * Stops any running effects and clears this object's internal effects queue if it contains * any additional effects that haven't started yet. - * @return {Ext.core.Element} The Element + * @return {Ext.Element} The Element */ stopAnimation: function() { Ext.fx.Manager.stopAnimation(this.id); @@ -385,22 +385,23 @@ myWindow.header.el.on('click', function() { /** * @deprecated 4.0 Replaced by {@link #getActiveAnimation} - * Returns thq current animation if this object has any effects actively running or queued, else returns false. - * @return {Mixed} anim if element has active effects, else false + * @alias Ext.util.Animate#getActiveAnimation * @method */ hasActiveFx: Ext.Function.alias(Ext.util.Animate, 'getActiveAnimation'), /** - * Returns thq current animation if this object has any effects actively running or queued, else returns false. - * @return {Mixed} anim if element has active effects, else false + * Returns the current animation if this object has any effects actively running or queued, else returns false. + * @return {Ext.fx.Anim/Boolean} Anim if element has active effects, else false */ getActiveAnimation: function() { return Ext.fx.Manager.getActiveAnimation(this.id); } -}); - -// Apply Animate mixin manually until Element is defined in the proper 4.x way -Ext.applyIf(Ext.core.Element.prototype, Ext.util.Animate.prototype); +}, function(){ + // Apply Animate mixin manually until Element is defined in the proper 4.x way + Ext.applyIf(Ext.Element.prototype, this.prototype); + // We need to call this again so the animation methods get copied over to CE + Ext.CompositeElementLite.importElementMethods(); +});