History

WL 21666 - Window.domainChanged() isn't emitted if domain isn't running

Cain Kilgore committed 8 years ago

Commit 46de7ed1 parent c33c6372 files · +7 −0Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+6−0
@@ -49,6 +49,8 @@ void CustomPromptResultFromScriptValue(const QScriptValue& object, CustomPromptR · 48 unmodified lines
49WindowScriptingInterface::WindowScriptingInterface() {49WindowScriptingInterface::WindowScriptingInterface() {
50 const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();50 const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
51 connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged);51 connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged);
52 connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &WindowScriptingInterface::disconnectedFromDomain);
53
52 connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);54 connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
53 55
54 connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {56 connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {
@@ -134,6 +136,10 @@ void WindowScriptingInterface::promptAsync(const QString& message, const QString · 79 unmodified lines
134 });136 });
135}137}
136 138
139void WindowScriptingInterface::disconnectedFromDomain() {
140 emit domainChanged("");
141}
142
137CustomPromptResult WindowScriptingInterface::customPrompt(const QVariant& config) {143CustomPromptResult WindowScriptingInterface::customPrompt(const QVariant& config) {
138 CustomPromptResult result;144 CustomPromptResult result;
139 bool ok = false;145 bool ok = false;