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

Merge pull request #9853 from sethalves/tablet-ui-fix-edit-props-race

Browse source 
Tablet ui fix edit props race
This commit is contained in:
Seth Alves 2017-03-13 08:56:56 -08:00 committed by GitHub
commit 524e4bdfbc
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/system/edit.js
View file

@ -1548,7 +1548,7 @@ var PropertiesTool = function (opts) {
}); });
} }
selectionManager.addEventListener(function (selectionUpdated) { function updateSelections(selectionUpdated) {
var data = { var data = {
type: 'update' type: 'update'
}; };
@ -1589,7 +1589,8 @@ var PropertiesTool = function (opts) {
} }
data.selections = selections; data.selections = selections;
webView.emitScriptEvent(JSON.stringify(data)); webView.emitScriptEvent(JSON.stringify(data));
}); }
selectionManager.addEventListener(updateSelections);
webView.webEventReceived.connect(function (data) { webView.webEventReceived.connect(function (data) {
try { try {
@ -1751,6 +1752,8 @@ var PropertiesTool = function (opts) {
} }
} }
} }
} else if (data.type === "propertiesPageReady") {
updateSelections(true);
} }
}); });

4
scripts/system/html/js/entityProperties.js
View file

@ -1704,4 +1704,8 @@ function loaded() {
document.addEventListener("contextmenu", function(event) { document.addEventListener("contextmenu", function(event) {
event.preventDefault(); event.preventDefault();
}, false); }, false);
setTimeout(function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'propertiesPageReady' }));
}, 1000);
} }

7
scripts/system/tablet-ui/tabletUI.js
View file

@ -75,8 +75,9 @@
function showTabletUI() { function showTabletUI() {
tabletShown = true; tabletShown = true;
if (!tabletRezzed) { if (!tabletRezzed || !tabletIsValid()) {
rezTablet(false); closeTabletUI()
rezTablet();
} }
if (UIWebTablet && tabletRezzed) { if (UIWebTablet && tabletRezzed) {
@ -199,7 +200,7 @@
preMakeTime = now; preMakeTime = now;
if (!tabletIsValid()) { if (!tabletIsValid()) {
closeTabletUI(); closeTabletUI();
rezTablet(false); rezTablet();
tabletShown = false; tabletShown = false;
} else if (!tabletShown) { } else if (!tabletShown) {
hideTabletUI(); hideTabletUI();