Fix edit toolbar's upload button

This commit is contained in:
David Rowe 2016-03-17 14:44:57 +13:00
parent 62b24e6626
commit ebe13b7b93

View file

@ -411,7 +411,6 @@ var toolBar = (function() {
return entityID;
}
var newModelButtonDown = false;
that.mousePressEvent = function(event) {
var clickedOverlay,
url,
@ -432,14 +431,14 @@ var toolBar = (function() {
return true;
}
// Handle these two buttons in the mouseRelease event handler so that we don't suppress a mouseRelease event from
// occurring when showing a modal dialog.
if (newModelButton === toolBar.clicked(clickedOverlay)) {
newModelButtonDown = true;
url = Window.prompt("Model URL", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
if (url !== null && url !== "") {
addModel(url);
}
return true;
}
if (newCubeButton === toolBar.clicked(clickedOverlay)) {
createNewEntity({
type: "Box",
@ -560,26 +559,8 @@ var toolBar = (function() {
return false;
};
that.mouseReleaseEvent = function(event) {
var handled = false;
if (newModelButtonDown) {
var clickedOverlay = Overlays.getOverlayAtPoint({
x: event.x,
y: event.y
});
if (newModelButton === toolBar.clicked(clickedOverlay)) {
url = Window.prompt("Model URL", modelURLs[Math.floor(Math.random() * modelURLs.length)]);
if (url !== null && url !== "") {
addModel(url);
}
handled = true;
}
}
newModelButtonDown = false;
return handled;
that.mouseReleaseEvent = function (event) {
return false;
}
Window.domainChanged.connect(function() {