Changeset 6870 for lang/javascript/jsruby

Timestamp:

02/18/08 19:34:54 (5 years ago)

Author:

nshuyo

Message:

lang/javascript/jsruby: fixed errors of functional test for Safari

Files:

• lang/javascript/jsruby/branches/async/src/builtinobjects.js (modified) (2 diffs)

lang/javascript/jsruby/branches/async/src/builtinobjects.js

@@ -289 +289 @@
 RubyEngine.RubyObject.JSObject.prototype.toValue = function(){ return this.obj; }
 RubyEngine.RubyObject.JSObject.methods = {
-  "new": function(self, args, block) {
+  "new": function(_self, args, block) {
     var jsargs = [];
     if(args) for(var i=0;i<args.length;i++) jsargs.push("args["+i+"].toValue()");
-    return RubyEngine.RubyObject.js2r(eval( "new self.obj("+jsargs.join(',')+")" ));
+    return RubyEngine.RubyObject.js2r(eval( "new _self.obj("+jsargs.join(',')+")" ));
   },
   "[]": function(self, args, block) {
@@ -318 +318 @@
     } else {
       if (name in self.obj) {
-        if (RubyEngine.FIREFOX || RubyEngine.OPERA) { // Firefox, Opera
+        if (RubyEngine.IE) {
+          var jsargs = [];
+          for (var i=1;i<args.length;i++) jsargs.push( "args["+i+"].toValue()" );
+          return RubyEngine.RubyObject.js2r( eval( "self.obj[name]("+jsargs.join(',')+")" ));
+        } else { // others
           var jsargs = [];
           for (var i=1;i<args.length;i++) jsargs.push( args[i].toValue() );
           return RubyEngine.RubyObject.js2r(self.obj[name].apply(self.obj, jsargs));
-        } else { // others
-          var jsargs = [];
-          for (var i=1;i<args.length;i++) jsargs.push( "args["+i+"].toValue()" );
-          return RubyEngine.RubyObject.js2r( eval( "self.obj[name]("+jsargs.join(',')+")" ));
         }
       } else {