handle edit changes

This commit is contained in:
Liv Erickson 2018-04-17 17:31:16 -07:00
parent e35efccfa3
commit 2a055429cd

View file

@ -463,18 +463,14 @@ var toolBar = (function () {
Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) { Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) {
if (isActive && !canAdjustLocks) { if (isActive && !canAdjustLocks) {
that.setActive(false); that.setActive(false);
tablet.gotoHomeScreen();
} }
checkEditPermissionsAndUpdate(); checkEditPermissionsAndUpdate();
}); });
Entities.canRezChanged.connect(function (canRez) { Entities.canRezChanged.connect(checkEditPermissionsAndUpdate);
if (isActive && !canRez) { Entities.canRezTmpChanged.connect(checkEditPermissionsAndUpdate);
that.setActive(false); Entities.canRezCertifiedChanged.connect(checkEditPermissionsAndUpdate);
tablet.gotoHomeScreen(); Entities.canRezTmpCertifiedChanged.connect(checkEditPermissionsAndUpdate);
}
checkEditPermissionsAndUpdate();
})
var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified()); var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp() || Entities.canRezCertified() || Entities.canRezTmpCertified());
var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON); var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON);
@ -873,6 +869,13 @@ function checkEditPermissionsAndUpdate() {
icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON), icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON),
captionColor: (hasRezPermissions ? "#ffffff" : "#888888"), captionColor: (hasRezPermissions ? "#ffffff" : "#888888"),
}); });
if (!hasRezPermissions) {
if (isActive) {
that.setActive(false);
}
tablet.gotoHomeScreen();
}
} }
function handleMessagesReceived(channel, message, sender) { function handleMessagesReceived(channel, message, sender) {
@ -2335,6 +2338,11 @@ var PopupMenu = function () {
Controller.mousePressEvent.disconnect(self.mousePressEvent); Controller.mousePressEvent.disconnect(self.mousePressEvent);
Controller.mouseMoveEvent.disconnect(self.mouseMoveEvent); Controller.mouseMoveEvent.disconnect(self.mouseMoveEvent);
Controller.mouseReleaseEvent.disconnect(self.mouseReleaseEvent); Controller.mouseReleaseEvent.disconnect(self.mouseReleaseEvent);
Entities.canRezChanged.disconnect(checkEditPermissionsAndUpdate);
Entities.canRezTmpChanged.disconnect(checkEditPermissionsAndUpdate);
Entities.canRezCertifiedChanged.disconnect(checkEditPermissionsAndUpdate);
Entities.canRezTmpCertifiedChanged.disconnect(checkEditPermissionsAndUpdate);
} }
Controller.mousePressEvent.connect(self.mousePressEvent); Controller.mousePressEvent.connect(self.mousePressEvent);