Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 07:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

switching address syntax, updating redirection domain

Browse source
This commit is contained in:
Wayne Chen 2018-08-29 16:11:51 -07:00
parent 223f86108f
commit 6cdcae3349
3 changed files with 1156 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/CMakeLists.txt
View file

@ -341,8 +341,6 @@ else()
set(INTERFACE_EXEC_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>") set(INTERFACE_EXEC_DIR "$<TARGET_FILE_DIR:${TARGET_NAME}>")
set(RESOURCES_DEV_DIR "${INTERFACE_EXEC_DIR}/resources") set(RESOURCES_DEV_DIR "${INTERFACE_EXEC_DIR}/resources")
message(STATUS "${RESOURCES_DEV_DIR}")
# copy the resources files beside the executable # copy the resources files beside the executable
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E copy_if_different COMMAND "${CMAKE_COMMAND}" -E copy_if_different

4
interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
View file

@ -79,7 +79,7 @@ StackView {
return; return;
} }
location.text = targetString; location.text = targetString;
toggleOrGo(true, targetString); toggleOrGo(targetString, true);
clearAddressLineTimer.start(); clearAddressLineTimer.start();
} }
@ -401,7 +401,7 @@ StackView {
} }
} }
function toggleOrGo(fromSuggestions, address) { function toggleOrGo(address, fromSuggestions) {
if (address !== undefined && address !== "") { if (address !== undefined && address !== "") {
addressBarDialog.loadAddress(address, fromSuggestions); addressBarDialog.loadAddress(address, fromSuggestions);
clearAddressLineTimer.start(); clearAddressLineTimer.start();

1155
interface/resources/serverless/redirect.json
View file

File diff suppressed because one or more lines are too long