Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow thisArg to be null or undefined in Function.prototype.bind()

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@261594 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hannes%helma.at 2010-11-24 20:45:53 +00:00
parent 983b37f5ef
commit 6ec33d9ff5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/js/rhino/src/org/mozilla/javascript/BaseFunction.java
View File

@ -309,11 +309,11 @@ public class BaseFunction extends IdScriptableObject implements Function
final Scriptable boundThis;
final Object[] boundArgs;
if (argc > 0) {
boundThis = ScriptRuntime.toObject(cx, scope, args[0]);
boundThis = ScriptRuntime.toObjectOrNull(cx, args[0], scope);
boundArgs = new Object[argc-1];
System.arraycopy(args, 1, boundArgs, 0, argc-1);
} else {
boundThis = ScriptRuntime.toObject(cx, scope, Undefined.instance);
boundThis = null;
boundArgs = ScriptRuntime.emptyArgs;
}
return new BoundFunction(cx, scope, targetFunction, boundThis, boundArgs);

3
mozilla/js/rhino/src/org/mozilla/javascript/BoundFunction.java
View File

@ -79,7 +79,8 @@ public class BoundFunction extends BaseFunction {
@Override
public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] extraArgs)
{
return targetFunction.call(cx, scope, boundThis, concat(boundArgs, extraArgs));
Scriptable callThis = boundThis != null ? boundThis : ScriptRuntime.getTopCallScope(cx);
return targetFunction.call(cx, scope, callThis, concat(boundArgs, extraArgs));
}
@Override