NOTICKET: Merging OSM/master to OSM/projects

[osm/UI.git] / skyquake / plugins / composer / src / src / components / EditDescriptorModelProperties.js

diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index c1d65be..22ba179 100644 (file)
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -78,6 +78,8 @@ function getTitle(model = {}) {
 export default function EditDescriptorModelProperties(props) {
 
        const container = props.container;
+       const readonly = props.readonly;
+       const isEditable = !readonly; //true
 
        if (!(DescriptorModelFactory.isContainer(container))) {
                return
@@ -148,6 +150,9 @@ export default function EditDescriptorModelProperties(props) {
                        }
                        CatalogItemsActions.catalogItemDescriptorChanged(this.getRoot());
                }
+               if(readonly) {
+                       return null;
+               }
                return (
                                <Button className="inline-hint" onClick={onClickAddProperty.bind(container, property, path)} label="Add" src={imgAdd} />
                );
@@ -165,6 +170,9 @@ export default function EditDescriptorModelProperties(props) {
                        }
                        CatalogItemsActions.catalogItemDescriptorChanged(this.getRoot());
                }
+               if(readonly) {
+                       return null;
+               }
                return (
                        <Button className="remove-property-action inline-hint" title="Remove" onClick={onClickRemoveProperty.bind(container, property, path)} label="Remove" src={imgRemove}/>
                );
@@ -233,7 +241,7 @@ export default function EditDescriptorModelProperties(props) {
                                        onBlur={endEditing} 
                                        onMouseDown={startEditing} 
                                        onMouseOver={startEditing} 
-                                       readOnly={!isEditable}>
+                                       disabled={!isEditable}>
                                                {options}
                                </select>
                        );
@@ -268,7 +276,7 @@ export default function EditDescriptorModelProperties(props) {
                                        onBlur={endEditing} 
                                        onMouseDown={startEditing} 
                                        onMouseOver={startEditing} 
-                                       readOnly={!isEditable}>
+                                       disabled={!isEditable}>
                                                {options}
                                </select>
                        );
@@ -301,7 +309,7 @@ export default function EditDescriptorModelProperties(props) {
                                        onBlur={endEditing} 
                                        onMouseDown={startEditing} 
                                        onMouseOver={startEditing} 
-                                       readOnly={!isEditable}>
+                                       disabled={!isEditable}>
                                                {options}
                                </select>
                        );
@@ -330,7 +338,7 @@ export default function EditDescriptorModelProperties(props) {
                                        onBlur={endEditing} 
                                        onMouseDown={startEditing} 
                                        onMouseOver={startEditing} 
-                                       readOnly={!isEditable}>
+                                       disabled={!isEditable}>
                                                {options}
                                </select>
                        );
@@ -351,7 +359,7 @@ export default function EditDescriptorModelProperties(props) {
                                        onMouseOver={startEditing} 
                                        onMouseOut={endEditing} 
                                        onMouseLeave={endEditing} 
-                                       readOnly={!isEditable} />
+                                       disabled={!isEditable} />
                        );
                }
 
@@ -370,7 +378,7 @@ export default function EditDescriptorModelProperties(props) {
                                onMouseOver={startEditing}
                                onMouseOut={endEditing}
                                onMouseLeave={endEditing}
-                               readOnly={!isEditable}
+                               disabled={!isEditable}
                        />
                );
 
@@ -428,7 +436,7 @@ export default function EditDescriptorModelProperties(props) {
                                // write the current choice value into the state
                                let choiceObject = utils.resolvePath(this.model, [name, selected].join('.'));
                                let isTopCase = false;
-                               if (!choiceObject) {
+                               if (choiceObject) {
                                        isTopCase = true;
                                        choiceObject = utils.resolvePath(this.model, [selected].join('.'));
                                }
@@ -553,6 +561,7 @@ export default function EditDescriptorModelProperties(props) {
                                        onMouseOver={startEditing} 
                                        onMouseOut={endEditing} 
                                        onMouseLeave={endEditing}
+                                       disabled={!isEditable}
                                >
                                        {options}
                                </select>