mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fix for javascript invocation of object methods.

Browse source
This commit is contained in:
jules 2013-11-01 22:09:26 +00:00
parent aa8fdc8cba
commit 4f5fd4daa7
1 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
modules/juce_core/javascript/juce_Javascript.cpp
View file

@ -90,15 +90,6 @@ struct JavascriptEngine::RootObject : public DynamicObject
return ExpPtr (tb.parseExpression())->getResult (Scope (nullptr, this, this));
}
var invoke (Identifier function, const var::NativeFunctionArgs& args)
{
if (const var* m = getProperties().getVarPointer (function))
if (FunctionObject* fo = dynamic_cast<FunctionObject*> (m->getObject()))
return fo->invoke (Scope (nullptr, this, this), args);
return var::undefined();
}
//==============================================================================
static bool areTypeEqual (const var& a, const var& b)
{
@ -191,6 +182,32 @@ struct JavascriptEngine::RootObject : public DynamicObject
: var::undefined();
}
bool findAndInvokeMethod (Identifier function, const var::NativeFunctionArgs& args, var& result) const
{
const NamedValueSet& props = scope->getProperties();
DynamicObject* target = args.thisObject.getDynamicObject();
if (target == nullptr || target == scope)
{
if (const var* m = props.getVarPointer (function))
{
if (FunctionObject* fo = dynamic_cast<FunctionObject*> (m->getObject()))
{
result = fo->invoke (*this, args);
return true;
}
}
}
for (int i = 0; i < props.size(); ++i)
if (DynamicObject* o = props.getValueAt (i).getDynamicObject())
if (Scope (this, root, o).findAndInvokeMethod (function, args, result))
return true;
return false;
}
void checkTimeOut (const CodeLocation& location) const
{
if (Time::getCurrentTime() > root->timeout)
@ -763,7 +780,7 @@ struct JavascriptEngine::RootObject : public DynamicObject
void writeAsJSON (OutputStream& out, int /*indentLevel*/, bool /*allOnOneLine*/) override
{
out << "function" << functionCode;
out << "function " << functionCode;
}
var invoke (const Scope& s, const var::NativeFunctionArgs& args) const
@ -1674,18 +1691,20 @@ var JavascriptEngine::evaluate (const String& code, Result* result)
var JavascriptEngine::callFunction (Identifier function, const var::NativeFunctionArgs& args, Result* result)
{
var returnVal (var::undefined());
try
{
prepareTimeout();
if (result != nullptr) *result = Result::ok();
return root->invoke (function, args);
RootObject::Scope (nullptr, root, root).findAndInvokeMethod (function, args, returnVal);
}
catch (String& error)
{
if (result != nullptr) *result = Result::fail (error);
}
return var::undefined();
return returnVal;
}
#if JUCE_MSVC