Browse Source

A couple of javascript fixes.

tags/2021-05-28
jules 11 years ago
parent
commit
d4a50a8de1
1 changed files with 4 additions and 5 deletions
  1. +4
    -5
      modules/juce_core/javascript/juce_Javascript.cpp

+ 4
- 5
modules/juce_core/javascript/juce_Javascript.cpp View File

@@ -673,14 +673,13 @@ struct JavascriptEngine::RootObject : public DynamicObject
var getResult (const Scope& s) const override
{
var function (object->getResult (s));
if (DotOperator* dot = dynamic_cast<DotOperator*> (object.get()))
{
var thisObject (dot->parent->getResult (s));
return invokeFunction (s, s.findFunctionCall (location, thisObject, dot->child), thisObject);
}
var function (object->getResult (s));
return invokeFunction (s, function, var (s.scope));
}
@@ -790,9 +789,9 @@ struct JavascriptEngine::RootObject : public DynamicObject
static const Identifier thisIdent ("this");
functionRoot->setProperty (thisIdent, args.thisObject);
const int numArgs = jmin (parameters.size(), args.numArguments);
for (int i = 0; i < numArgs; ++i)
functionRoot->setProperty (parameters.getReference(i), args.arguments[i]);
for (int i = 0; i < parameters.size(); ++i)
functionRoot->setProperty (parameters.getReference(i),
i < args.numArguments ? args.arguments[i] : var::undefined());
var result;
body->perform (Scope (&s, s.root, functionRoot), &result);


Loading…
Cancel
Save