Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

edit properties reflect image members

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2018-01-17 11:57:40 -08:00
parent c9c55af661
commit ecb53192ad
2 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
scripts/system/html/css/edit-style.css
View file

@ -448,7 +448,7 @@ input[type=checkbox]:checked + label:hover {
border: 1.5pt solid black;
}
.shape-section, .light-section, .model-section, .web-section, .hyperlink-section, .text-section, .zone-section {
.shape-section, .light-section, .model-section, .web-section, .image-section, .hyperlink-section, .text-section, .zone-section {
display: table;
}
@ -564,6 +564,7 @@ hr {
.text-group[collapsed="true"] ~ .text-group,
.zone-group[collapsed="true"] ~ .zone-group,
.image-group[collapsed="true"] ~ .image-group,
.web-group[collapsed="true"] ~ .web-group,
.hyperlink-group[collapsed="true"] ~ .hyperlink-group,
.spatial-group[collapsed="true"] ~ .spatial-group,
@ -1466,6 +1467,9 @@ input#reset-to-natural-dimensions {
#properties-list.ShapeMenu #text,
#properties-list.BoxMenu #text,
#properties-list.SphereMenu #text,
#properties-list.ShapeMenu #image,
#properties-list.BoxMenu #image,
#properties-list.SphereMenu #image,
#properties-list.ShapeMenu #web,
#properties-list.BoxMenu #web,
#properties-list.SphereMenu #web {
@ -1497,6 +1501,7 @@ input#reset-to-natural-dimensions {
#properties-list.ParticleEffectMenu #shape-list,
#properties-list.ParticleEffectMenu #text,
#properties-list.ParticleEffectMenu #web,
#properties-list.ParticleEffectMenu #image,
#properties-list.ParticleEffectMenu #zone {
display: none;
}
@ -1527,6 +1532,7 @@ input#reset-to-natural-dimensions {
#properties-list.LightMenu #model,
#properties-list.LightMenu #zone,
#properties-list.LightMenu #text,
#properties-list.LightMenu #image,
#properties-list.LightMenu #web {
display: none;
}
@ -1563,6 +1569,7 @@ input#reset-to-natural-dimensions {
#properties-list.ModelMenu #light,
#properties-list.ModelMenu #zone,
#properties-list.ModelMenu #text,
#properties-list.ModelMenu #image,
#properties-list.ModelMenu #web {
display: none;
}
@ -1599,6 +1606,7 @@ input#reset-to-natural-dimensions {
#properties-list.ZoneMenu #light,
#properties-list.ZoneMenu #model,
#properties-list.ZoneMenu #text,
#properties-list.ZoneMenu #image,
#properties-list.ZoneMenu #web {
display: none;
}
@ -1609,6 +1617,43 @@ input#reset-to-natural-dimensions {
}
/* ----- Order of Menu items for Image ----- */
#properties-list.ImageMenu #general {
order: 1;
}
#properties-list.ImageMenu #image {
order: 2;
}
#properties-list.ImageMenu #collision-info {
order: 3;
}
#properties-list.ImageMenu #physical {
order: 4;
}
#properties-list.ImageMenu #spatial {
order: 5;
}
#properties-list.ImageMenu #behavior {
order: 6;
}
#properties-list.ImageMenu #hyperlink {
order: 7;
}
/* sections to hide */
#properties-list.ImageMenu #light,
#properties-list.ImageMenu #model,
#properties-list.ImageMenu #zone,
#properties-list.ImageMenu #web,
#properties-list.ImageMenu #text {
display: none;
}
/* items to hide */
#properties-list.ImageMenu #shape-list,
#properties-list.ImageMenu #base-color-section {
display: none;
}
/* ----- Order of Menu items for Web ----- */
#properties-list.WebMenu #general {
order: 1;
@ -1635,6 +1680,7 @@ input#reset-to-natural-dimensions {
#properties-list.WebMenu #light,
#properties-list.WebMenu #model,
#properties-list.WebMenu #zone,
#properties-list.WebMenu #image,
#properties-list.WebMenu #text {
display: none;
}
@ -1672,6 +1718,7 @@ input#reset-to-natural-dimensions {
#properties-list.TextMenu #light,
#properties-list.TextMenu #model,
#properties-list.TextMenu #zone,
#properties-list.TextMenu #image,
#properties-list.TextMenu #web {
display: none;
}

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

@ -19,6 +19,7 @@ var ICON_FOR_TYPE = {
ParticleEffect: "",
Model: "",
Web: "q",
Image: "q", // what do?
Text: "l",
Light: "p",
Zone: "o",
@ -134,9 +135,9 @@ function createEmitGroupNumberPropertyUpdateFunction(group, propertyName) {
}
function createImageURLUpdateFunction(propertyName) {
return function() {
return function () {
updateProperty(propertyName, this.value);
}
};
}
function createEmitTextPropertyUpdateFunction(propertyName) {
@ -1735,7 +1736,7 @@ function loaded() {
}
// Dropdowns
// For each dropdown the following replacement is created in place of the oriringal dropdown...
// For each dropdown the following replacement is created in place of the original dropdown...
// Structure created:
// <dl dropped="true/false">
// <dt name="?" id="?" value="?"><span>display text</span><span>carat</span></dt>