Changeset 9999

Timestamp:

08/07/07 05:55:01 (16 months ago)

Author:

peller

Message:

Rename slideIn/slideOut to wipeIn/wipeOut. Fixes #3917

Files:

• dijit/trunk/TitlePane.js (modified) (7 diffs)
• dijit/trunk/Tree.js (modified) (12 diffs)
• dojo/trunk/fx.js (modified) (4 diffs)
• dojox/trunk/fx/_base.js (modified) (6 diffs)

dijit/trunk/TitlePane.js

@@ -40 +40 @@
                 // setup open/close animations
                 var hideNode = this.hideNode, wipeNode = this.wipeNode;
-                this._slideIn = dojo.fx.slideIn({
+                this._wipeIn = dojo.fx.wipeIn({
                         node: this.wipeNode,
                         duration: this.duration,
@@ -47 +47 @@
                         }
                 });
-                this._slideOut = dojo.fx.slideOut({
+                this._wipeOut = dojo.fx.wipeOut({
                         node: this.wipeNode,
                         duration: this.duration,
@@ -59 +59 @@
                 // summary
                 //              Typically called when an href is loaded.  Our job is to make the animation smooth
-                if(this._slideOut.status() == "playing"){
+                if(this._wipeOut.status() == "playing"){
                         // we are currently *closing* the pane, so just let that continue
                         dijit.layout.ContentPane.prototype.setContent.apply(this, content);
                 }else{
-                        if(this._slideIn.status() == "playing"){
-                                this._slideIn.stop();
+                        if(this._wipeIn.status() == "playing"){
+                                this._wipeIn.stop();
                         }
                         
@@ -73 +73 @@
                         dijit.layout.ContentPane.prototype.setContent.apply(this, arguments);
                         
-                        // call _slideIn.play() to animate from current height to new height
-                        this._slideIn.play();
+                        // call _wipeIn.play() to animate from current height to new height
+                        this._wipeIn.play();
                 }
         },
@@ -80 +80 @@
         toggle: function(){
                 // summary: switches between opened and closed state
-                dojo.forEach([this._slideIn, this._slideOut], function(animation){
+                dojo.forEach([this._wipeIn, this._wipeOut], function(animation){
                         if(animation.status() == "playing"){
                                 animation.stop();
@@ -86 +86 @@
                 });
 
-                this[this.open ? "_slideOut" : "_slideIn"].play();
-                this.open=!this.open;
+                this[this.open ? "_wipeOut" : "_wipeIn"].play();
+                this.open =! this.open;
 
                 // load content (if this is the first time we are opening the TitlePane
@@ -111 +111 @@
                         this._onTitleClick();
                 }
-                else if (e.keyCode == dojo.keys.DOWN_ARROW){
+                else if(e.keyCode == dojo.keys.DOWN_ARROW){
                         if(this.open){
                                 this.containerNode.focus();

dijit/trunk/Tree.js

@@ -24 +24 @@
         lock: function(){
                 // summary: lock this node (and it's descendants) while a delete is taking place?
-                this.locked=true;
+                this.locked = true;
         },
         unlock: function(){
@@ -31 +31 @@
                         throw new Error(this.declaredClass+" unlock: not locked");
                 }
-                this.locked=false;
+                this.locked = false;
         },
 
@@ -92 +92 @@
                 }
                 
-                if (this.isTree){
+                if(this.isTree){
                         // put first child in tab index if one exists.
                         var fc = this.getChildren()[0];
-                        var tabnode = (fc) ? fc.labelNode : this.domNode; 
+                        var tabnode = fc ? fc.labelNode : this.domNode; 
                         tabnode.setAttribute("tabIndex", "0");
                 }
@@ -164 +164 @@
                 var div = document.createElement('div');
                 div.style.display = 'none';
-                div.className="dijitTreeContainer";     
+                div.className = "dijitTreeContainer";   
                 dijit.wai.setAttr(div, "waiRole", "role", "presentation");
                 this.containerNodeTemplate = div;
@@ -190 +190 @@
 
         toString: function(){
-                return "["+this.declaredClass+" ID:"+this.id    +"]"
+                return "["+this.declaredClass+" ID:"+this.id+"]";
         },
 
@@ -197 +197 @@
                 do{
                         ret=dijit.byNode(domElement);
-                }while(!ret && (domElement=domElement.parentNode));
+                }while(!ret && (domElement = domElement.parentNode));
                 return ret;
         },
@@ -330 +330 @@
         postCreate: function(){
                 // set label, escaping special characters
-                this.labelNode.innerHTML="";
+                this.labelNode.innerHTML = "";
                 this.labelNode.appendChild(document.createTextNode(this.label));
                 
@@ -387 +387 @@
 
                 // create animations for showing/hiding the children
-                this._slideIn = dojo.fx.slideIn({node: this.containerNode, duration: 250});
-                dojo.connect(this.slideIn, "onEnd", dojo.hitch(this, "_afterExpand"));
-                this._slideOut = dojo.fx.slideOut({node: this.containerNode, duration: 250});
-                dojo.connect(this.slideOut, "onEnd", dojo.hitch(this, "_afterCollapse"));
+                this._wipeIn = dojo.fx.wipeIn({node: this.containerNode, duration: 250});
+                dojo.connect(this.wipeIn, "onEnd", dojo.hitch(this, "_afterExpand"));
+                this._wipeOut = dojo.fx.wipeOut({node: this.containerNode, duration: 250});
+                dojo.connect(this.wipeOut, "onEnd", dojo.hitch(this, "_afterCollapse"));
         },
 
@@ -398 +398 @@
 
                 // cancel in progress collapse operation
-                if(this._slideOut.status() == "playing"){
-                        this._slideOut.stop();
+                if(this._wipeOut.status() == "playing"){
+                        this._wipeOut.stop();
                 }
 
@@ -409 +409 @@
 
                 // TODO: use animation that's constant speed of movement, not constant time regardless of height
-                this._slideIn.play();
+                this._wipeIn.play();
         },
 
@@ -421 +421 @@
 
                 // cancel in progress expand operation
-                if(this._slideIn.status() == "playing"){
-                        this._slideIn.stop();
+                if(this._wipeIn.status() == "playing"){
+                        this._wipeIn.stop();
                 }
 
@@ -429 +429 @@
                 this._setExpando();
 
-                this._slideOut.play();
+                this._wipeOut.play();
         },
 

dojo/trunk/fx.js

@@ -45 +45 @@
                 //                      showDuration: 500,
                 //                      // hideDuration will default to "200"
-                //                      showFunc: dojo.slideIn, 
+                //                      showFunc: dojo.wipeIn, 
                 //                      // hideFunc will default to "fadeOut"
                 //              });
@@ -59 +59 @@
 
                 dojo.mixin(_t, args);
-                _t.node = args["node"];
+                _t.node = args.node;
                 _t._showArgs = dojo.mixin({}, args);
                 _t._showArgs.node = _t.node;
@@ -102 +102 @@
 );
 
-dojo.fx.slideIn = function(/*Object*/ args){
+dojo.fx.wipeIn = function(/*Object*/ args){
         // summary
         //              Returns an animation that will expand the
@@ -143 +143 @@
 }
 
-dojo.fx.slideOut = function(/*Object*/ args){
+dojo.fx.wipeOut = function(/*Object*/ args){
         // summary
         //              Returns an animation that will shrink node defined in "args"
         //              from it's current height to 1px, and then hide it.
-        var node = args.node = dojo.byId(args.node);
+        var node = (args.node = dojo.byId(args.node));
 
         var anim = dojo.animateProperty(dojo.mixin({

dojox/trunk/fx/_base.js

@@ -9 +9 @@
 dojox.fx.chain = dojo.fx.chain;
 dojox.fx.combine = dojo.fx.combine;
-dojox.fx.slideIn = dojo.fx.slideIn;
-dojox.fx.slideOut = dojo.fx.slideOut;
+dojox.fx.wipeIn = dojo.fx.wipeIn;
+dojox.fx.wipeOut = dojo.fx.wipeOut;
 dojox.fx.slideTo = dojo.fx.slideTo;
 
@@ -35 +35 @@
         //
         //
-        var node = args.node = dojo.byId(args.node);
+        var node = (args.node = dojo.byId(args.node));
         var compute = dojo.getComputedStyle;
 
@@ -81 +81 @@
 
         // FIXME: 
-        // dojo.fx[args.method]([anim1,anim2]);         
-        if(args.method == "combine"){
-                var anim = dojo.fx.combine([anim1,anim2]);
-        }else{
-                var anim = dojo.fx.chain([anim1,anim2]);
-        }
+        // dojo.fx[args.method]([anim1,anim2]);
+        var anim = dojo.fx[((args.method == "combine") ? "combine" : "chain")]([anim1,anim2]);
         dojo.connect(anim, "beforeBegin", anim, init);
         return anim; // dojo._Animation
@@ -107 +103 @@
         //              args.cssClass: String - class string (to be added onEnd)
         //              
-        var node = args.node = dojo.byId(args.node); 
+        var node = (args.node = dojo.byId(args.node)); 
 
         var pushClass = (function(){
@@ -148 +144 @@
         //      args.cssClass: String - class string (to be removed from node)
         //              
-        var node = args.node = dojo.byId(args.node); 
+        var node = (args.node = dojo.byId(args.node)); 
 
         var pullClass = (function(){
@@ -241 +237 @@
         //      false to calculate what removing the class would do
 
-        var node = args.node = dojo.byId(args.node); 
+        var node = (args.node = dojo.byId(args.node)); 
         var compute = dojo.getComputedStyle(node);