Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-07 04:42:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing test code

Browse source
This commit is contained in:
Brad Davis 2019-08-29 14:11:22 -07:00
parent 31340d278a
commit 6aa967f29f
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -7507,7 +7507,11 @@ void Application::registerScriptEngineWithApplicationServices(const ScriptEngine
if (clientScript) {
scriptEngine->registerGlobalObject("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
} else {
scriptEngine->registerGlobalObject("Desktop", new DesktopScriptingInterface(scriptEngine.get(), true));
auto desktopScriptingInterface = new DesktopScriptingInterface(nullptr, true);
scriptEngine->registerGlobalObject("Desktop", desktopScriptingInterface);
if (QThread::currentThread() != thread()) {
desktopScriptingInterface->moveToThread(thread());
}
}
#endif

30
scripts/developer/tests/ui/testLocalFileAccessServer.js Normal file
View file

@ -0,0 +1,30 @@
"use strict";
// Created by Bradley Austin Davis on 2019/08/29
// Copyright 2013-2019 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
(function () {
var QML_URL = "qrc:/qml/hifi/tablet/DynamicWebview.qml"
var LOCAL_FILE_URL = "file:///C:/test-file.html"
var _this = this;
_this.preload = function (pEntityID) {
var window = Desktop.createWindow(QML_URL, {
title: "Local file access test",
additionalFlags: Desktop.ALWAYS_ON_TOP,
presentationMode: Desktop.PresentationMode.NATIVE,
size: { x: 640, y: 480 },
visible: true,
position: { x: 100, y: 100 },
});
window.sendToQml({ url: LOCAL_FILE_URL });
};
_this.unload = function () {
console.log("QQQ on preload");
};
});