changed Models/Delete and Voxels/Delete to both use same menu item name of 'Delete' so that either option will correctly delete either.

This commit is contained in:
ZappoMan 2014-05-31 13:30:45 -07:00
parent 30a5048840
commit f92facea76

View file

@ -771,13 +771,13 @@ function mouseReleaseEvent(event) {
function setupModelMenus() { function setupModelMenus() {
// add our menuitems // add our menuitems
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Models", isSeparator: true, beforeItem: "Physics" }); Menu.addMenuItem({ menuName: "Edit", menuItemName: "Models", isSeparator: true, beforeItem: "Physics" });
Menu.addMenuItem({ menuName: "Edit", menuItemName: "Delete Model", shortcutKeyEvent: { text: "backspace" }, afterItem: "Models" }); Menu.addMenuItem({ menuName: "Edit", menuItemName: "Delete", shortcutKeyEvent: { text: "backspace" }, afterItem: "Models" });
} }
function cleanupModelMenus() { function cleanupModelMenus() {
// delete our menuitems // delete our menuitems
Menu.removeSeparator("Edit", "Models"); Menu.removeSeparator("Edit", "Models");
Menu.removeMenuItem("Edit", "Delete Model"); Menu.removeMenuItem("Edit", "Delete");
} }
function scriptEnding() { function scriptEnding() {
@ -797,7 +797,7 @@ Controller.mouseReleaseEvent.connect(mouseReleaseEvent);
setupModelMenus(); setupModelMenus();
Menu.menuItemEvent.connect(function(menuItem){ Menu.menuItemEvent.connect(function(menuItem){
print("menuItemEvent() in JS... menuItem=" + menuItem); print("menuItemEvent() in JS... menuItem=" + menuItem);
if (menuItem == "Delete Model") { if (menuItem == "Delete") {
if (leftController.grabbing) { if (leftController.grabbing) {
print(" Delete Model.... leftController.modelID="+ leftController.modelID); print(" Delete Model.... leftController.modelID="+ leftController.modelID);
Models.deleteModel(leftController.modelID); Models.deleteModel(leftController.modelID);