Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix multi-selection color setting visible/locked to false

Browse source
This commit is contained in:
David Back 2018-06-22 18:13:40 -07:00
parent b7069fff71
commit 09ccd3acf0
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/edit.js
View file

@ -2027,12 +2027,8 @@ var PropertiesTool = function (opts) {
} else if (data.type === "update") {
selectionManager.saveProperties();
if (selectionManager.selections.length > 1) {
properties = {
locked: data.properties.locked,
visible: data.properties.visible
};
for (i = 0; i < selectionManager.selections.length; i++) {
Entities.editEntity(selectionManager.selections[i], properties);
Entities.editEntity(selectionManager.selections[i], data.properties);
}
} else if (data.properties) {
if (data.properties.dynamic === false) {

3
scripts/system/html/js/colpick.js
View file

@ -269,6 +269,9 @@ For usage and examples: colpick.com/plugin
},
// Show/hide the color picker
show = function (ev) {
if ($(this).attr('disabled')) {
return;
}
// Prevent the trigger of any direct parent
ev.stopPropagation();
var cal = $('#' + $(this).data('colpickId'));