Changeset 1540

Timestamp:

04/21/08 09:53:03 (3 weeks ago)

Author:

kamicane

Message:

• added code to fix the lack of function.caller in opera. Its not pretty, but its just for opera, and it only runs in opera. See the comments in the code.
  

• removed additional usage of function.caller, as opera doesnt support it. No big deal, since it was used on internal methods for chaining. I'm now passing the function reference by hand in checks (its hideous, but its internal, so its all good).
  

• added the parentOf method in class instances (aviable when you use Extends). To be used when you want to call another method's ancestor from a different method or closure.
  

Location:

trunk

Files:

• Compatibility/Request/Request.JSON.js (modified) (1 diff)
• Compatibility/Request/Request.js (modified) (1 diff)
• Source/Class/Class.js (modified) (4 diffs)
• Source/Fx/Fx.Morph.js (modified) (1 diff)
• Source/Fx/Fx.Tween.js (modified) (1 diff)
• Source/Fx/Fx.js (modified) (2 diffs)
• Source/Plugins/Fx.Elements.js (modified) (1 diff)
• Source/Plugins/Fx.Scroll.js (modified) (1 diff)
• Source/Plugins/Fx.Slide.js (modified) (1 diff)
• Source/Request/Request.js (modified) (2 diffs)

trunk/Compatibility/Request/Request.JSON.js

@@ -14 +14 @@
 
         send: function(data){
-                if (!this.check(data)) return this;
+                if (!this.check(arguments.callee, data)) return this;
                 return this.parent({url: this.url, data: {json: Json.encode(data)}});
         },

trunk/Compatibility/Request/Request.js

@@ -19 +19 @@
 
         send: function(url, data){
-                if (!this.check(url, data)) return this;
+                if (!this.check(arguments.callee, url, data)) return this;
                 return this.parent({url: url, data: data});
         },

trunk/Source/Class/Class.js

@@ -22 +22 @@
                                 if (!this[mutator]) continue;
                                 Class.Mutators[mutator](this, this[mutator]);
+                                delete this[mutator];
                         }
 
@@ -63 +64 @@
         var instance = new klass($empty);
         
+        delete instance.parent;
+        delete instance.parentOf;
+        
         for (var key in instance){
 
@@ -77 +81 @@
                 
                 switch (ctype){
-                        case 'function': self[key]._parent_ = previous; break;
+                        case 'function': 
+                        
+                                // opera does not support function.caller, so we replace the function code with brute force. Not pretty, but its just for opera.
+                                // if future opera versions will support function.caller, this code wont be executed anymore.
+                                // this code will be only executed if the current browser does not support function.caller (only opera).
+                                
+                                if (!arguments.callee.caller) self[key] = eval('(' + current.toString().replace(/\bthis\.parent\((.*)\)/g, function(full, args){
+                                        return 'arguments.callee._parent_.call(' + ((args) ? 'this, ' + args : 'this') + ')';
+                                }) + ')');
+                                
+                                //end "opera" code
+                        
+                                self[key]._parent_ = previous;
+                        break;
                         case 'object': self[key] = $merge(previous, current);
                 }
@@ -86 +103 @@
                 return arguments.callee.caller._parent_.apply(this, arguments);
         };
+        
+        self.parentOf = function(descendant){
+                return descendant._parent_.apply(this, Array.slice(arguments, 1));
+        };
 
 };

trunk/Source/Fx/Fx.Morph.js

@@ -29 +29 @@
 
         start: function(properties){
-                if (!this.check(properties)) return this;
+                if (!this.check(arguments.callee, properties)) return this;
                 if (typeof properties == 'string') properties = this.search(properties);
                 var from = {}, to = {};

trunk/Source/Fx/Fx.Tween.js

@@ -26 +26 @@
 
         start: function(property, from, to){
-                if (!this.check(property, from, to)) return this;
+                if (!this.check(arguments.callee, property, from, to)) return this;
                 var args = Array.flatten(arguments);
                 this.property = this.options.property || args.shift();

trunk/Source/Fx/Fx.js

@@ -53 +53 @@
         },
 
-        check: function(){
+        check: function(caller){
                 if (!this.timer) return true;
                 switch (this.options.link){
                         case 'cancel': this.cancel(); return true;
-                        case 'chain': this.chain(arguments.callee.caller.bind(this, arguments)); return false;
+                        case 'chain': this.chain(caller.bind(this, Array.slice(arguments, 1))); return false;
                 }
                 return false;
@@ -63 +63 @@
 
         start: function(from, to){
-                if (!this.check(from, to)) return this;
+                if (!this.check(arguments.callee, from, to)) return this;
                 this.from = from;
                 this.to = to;

trunk/Source/Plugins/Fx.Elements.js

@@ -34 +34 @@
 
         start: function(obj){
-                if (!this.check(obj)) return this;
+                if (!this.check(arguments.callee, obj)) return this;
                 var from = {}, to = {};
                 for (var i in obj){

trunk/Source/Plugins/Fx.Scroll.js

@@ -49 +49 @@
 
         start: function(x, y){
-                if (!this.check(x, y)) return this;
+                if (!this.check(arguments.callee, x, y)) return this;
                 var offsetSize = this.element.getSize(), scrollSize = this.element.getScrollSize();
                 var scroll = this.element.getScroll(), values = {x: x, y: y};

trunk/Source/Plugins/Fx.Slide.js

@@ -58 +58 @@
 
         start: function(how, mode){
-                if (!this.check(how, mode)) return this;
+                if (!this.check(arguments.callee, how, mode)) return this;
                 this[mode || this.options.mode]();
                 var margin = this.element.getStyle(this.margin).toInt();

trunk/Source/Request/Request.js

@@ -93 +93 @@
         },
 
-        check: function(){
+        check: function(caller){
                 if (!this.running) return true;
                 switch (this.options.link){
                         case 'cancel': this.cancel(); return true;
-                        case 'chain': this.chain(arguments.callee.caller.bind(this, arguments)); return false;
+                        case 'chain': this.chain(caller.bind(this, Array.slice(arguments, 1))); return false;
                 }
                 return false;
@@ -103 +103 @@
 
         send: function(options){
-                if (!this.check(options)) return this;
+                if (!this.check(arguments.callee, options)) return this;
                 this.running = true;