Commit 42959f8f authored by Christian Kamm's avatar Christian Kamm
Browse files

Remove the lookup into including Qml files in the root scope of a JS file.

parent 7e01c3b5
...@@ -54,13 +54,16 @@ void Link::scopeChainAt(Document::Ptr doc, Node *currentObject) ...@@ -54,13 +54,16 @@ void Link::scopeChainAt(Document::Ptr doc, Node *currentObject)
if (const ObjectValue *typeEnvironment = _context->typeEnvironment(doc.data())) if (const ObjectValue *typeEnvironment = _context->typeEnvironment(doc.data()))
_context->pushScope(typeEnvironment); _context->pushScope(typeEnvironment);
} else { } else {
// add scope chains for all components that source this document // the global scope of a js file does not see the instantiating component
foreach (Document::Ptr otherDoc, _docs) { if (currentObject != 0) {
if (otherDoc->bind()->includedScripts().contains(doc->fileName())) // add scope chains for all components that source this document
pushScopeChainForComponent(otherDoc, &linkedDocs); foreach (Document::Ptr otherDoc, _docs) {
} if (otherDoc->bind()->includedScripts().contains(doc->fileName()))
pushScopeChainForComponent(otherDoc, &linkedDocs);
}
// ### TODO: Which type environment do scripts see? // ### TODO: Which type environment do scripts see?
}
_context->pushScope(bind->rootObjectValue()); _context->pushScope(bind->rootObjectValue());
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment