Ticket #3961: lang-fx-reduction.patch

Users/peller/workspace/trunk2/dojo/_base/fx.js

@@ -36 +36 @@
         },
         
         // public properties
-        curve: null,
+//      curve: null,
         duration: 1000,
-        easing: null,
+//      easing: null,
         repeat: 0,
         rate: 10, // 100 fps
+
+/*=====
         delay: null,
-        
+
         // events
         beforeBegin: null,
         onBegin: null,
@@ -51 +53 @@
         onPlay: null,
         onPause: null,
         onStop: null,
+=====*/
 
         // private properties
-        _active: false,
-        _paused: false,
-        _startTime: null,
-        _endTime: null,
-        _timer: null,
+//      _active: false,
+//      _paused: false,
+//      _startTime: null,
+//      _endTime: null,
+//      _timer: null,
         _percent: 0,
         _startRepeatCount: 0,
 
@@ -125 +128 @@
                 return this; // dojo._Animation
         },
 
-        gotoPercent: function(/*Decimal*/ pct, /*boolean?*/ andPlay){
+        gotoPercent: function(/*Decimal*/ percent, /*boolean?*/ andPlay){
                 // summary: Sets the progress of the animation.
-                // pct: A percentage in decimal notation (between and including 0.0 and 1.0).
+                // percent: A percentage in decimal notation (between and including 0.0 and 1.0).
                 // andPlay: If true, play the animation after setting the progress.
                 clearTimeout(this._timer);
                 this._active = this._paused = true;
-                this._percent = pct * 100;
+                this._percent = percent * 100;
                 if(andPlay){ this.play(); }
                 return this; // dojo._Animation
         },
@@ -222 +225 @@
         }
 
         dojo._fade = function(/*Object*/ args){
-                // summary:Returns an animation that will fade the "nodes" from the start to end values passed.
+                // summary: Returns an animation that will fade the "nodes" from the start to end values passed (end is mandatory)
 
-                //FIXME: remove arg checking?  Change docs above to show that end is not optional.  Just make sure this blows up in a reliable way?
-                if(typeof args.end == "undefined"){
-                        throw new Error("dojo._fade needs an end value");
-                }
                 args.node = dojo.byId(args.node);
                 var fArgs = dojo.mixin({ properties: {} }, args);
                 var props = (fArgs.properties.opacity = {});
@@ -264 +263 @@
                 return dojo._fade(dojo.mixin({ end: 0 }, args)); // dojo._Animation
         }
 
-        if(dojo.isKhtml && !dojo.isSafari){
-                // the cool kids are obviously not using konqueror...
-                // found a very wierd bug in floats constants, 1.5 evals as 1
-                // seems somebody mixed up ints and floats in 3.5.4 ??
-                // FIXME: investigate more and post a KDE bug (Fredrik)
-                dojo._defaultEasing = function(/*Decimal?*/ n){
-                        //      summary: Returns the point for point n on a sin wave.
-                        return parseFloat("0.5")+((Math.sin((n+parseFloat("1.5")) * Math.PI))/2); //FIXME: Does this still occur in the supported Safari version?
-                }
-        }else{
-                dojo._defaultEasing = function(/*Decimal?*/ n){
-                        return 0.5+((Math.sin((n+1.5) * Math.PI))/2);
-                }
+        dojo._defaultEasing = function(/*Decimal?*/ n){
+                return 0.5 + ((Math.sin((n + 1.5) * Math.PI))/2);
         }
 
         var PropLine = function(properties){
@@ -292 +280 @@
                         var ret = {};
                         for(var p in this._properties){
                                 var prop = this._properties[p];
-                                var value = null;
-                                if(prop.start instanceof dojo.Color){
-                                        value = dojo.blendColors(prop.start, prop.end, r, prop.tempColor).toCss();
-                                }else if(!dojo.isArray(prop.start)){
-                                        value = ((prop.end - prop.start) * r) + prop.start + (p != "opacity" ? prop.units||"px" : "");
+                                var start = prop.start;
+                                if(start instanceof dojo.Color){
+                                        ret[p] = dojo.blendColors(start, prop.end, r, prop.tempColor).toCss();
+                                }else if(!dojo.isArray(start)){
+                                        ret[p] = ((prop.end - start) * r) + start + (p != "opacity" ? prop.units||"px" : "");
                                 }
-                                ret[p] = value;
                         }
                         return ret;
                 }
@@ -309 +296 @@
                 // defined in 'args' depending how they are defined in 'args.properties'
 
                 args.node = dojo.byId(args.node);
-                if (!args.easing){ args.easing = dojo._defaultEasing; }
-                
+                if(!args.easing){ args.easing = dojo._defaultEasing; }
+
                 var anim = new dojo._Animation(args);
                 dojo.connect(anim, "beforeBegin", anim, function(){
                         var pm = {};
@@ -318 +305 @@
                                 // Make shallow copy of properties into pm because we overwrite some values below.
                                 // In particular if start/end are functions we don't want to overwrite them or
                                 // the functions won't be called if the animation is reused.
-                                var prop = pm[p] = dojo.mixin({}, this.properties[p]);
+                                var prop = (pm[p] = dojo.mixin({}, this.properties[p]));
 
                                 if(dojo.isFunction(prop.start)){
                                         prop.start = prop.start();

Users/peller/workspace/trunk2/dojo/_base/lang.js

@@ -3 +3 @@
 // Crockford functions (ish)
 
 dojo.isString = function(/*anything*/ it){
-        // summary:     Return true if it is a String.
+        // summary:     Return true if it is a String
         return typeof it == "string" || it instanceof String; // Boolean
 }
 
 dojo.isArray = function(/*anything*/ it){
-        // summary: Return true of it is an Array
+        // summary: Return true if it is an Array
         return it && it instanceof Array || typeof it == "array" ||
-                ((typeof dojo.NodeList != "undefined") && (it instanceof dojo.NodeList)); // Boolean
+                (typeof dojo.NodeList != "undefined" && it instanceof dojo.NodeList); // Boolean
 }
 
-if(dojo.isBrowser && dojo.isSafari){
-        // only slow this down w/ gratuitious casting in Safari since it's what's b0rken
-        dojo.isFunction = function(/*anything*/ it){
-                if(typeof it == "function" && it == "[object NodeList]"){ return false; }
-                return typeof it == "function" || it instanceof Function; // Boolean
-        }
-}else{
-        dojo.isFunction = function(/*anything*/ it){
-                return typeof it == "function" || it instanceof Function; // Boolean
-        }
+/*=====
+dojo.isFunction = function(it){
+        // summary: Return true if it is a Function
+        // it: anything
 }
+=====*/
 
+dojo.isFunction = (function(){
+        var _isFunction = function(/*anything*/ it){
+                return typeof it == "function" || it instanceof Function; // Boolean
+        };
+
+        return dojo.isSafari ?
+                // only slow this down w/ gratuitious casting in Safari since it's what's b0rken
+                function(/*anything*/ it){
+                        if(typeof it == "function" && it == "[object NodeList]"){ return false; }
+                        return _isFunction(it); // Boolean
+                } : _isFunction;
+})();
+
 dojo.isObject = function(/*anything*/ it){
         // summary: 
         //              Returns true if it is a JavaScript object (or an Array, a Function or null)