update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b third try

[osm/UI.git] / skyquake / plugins / composer / src / src / libraries / model / DescriptorModelMetaProperty.js

diff --git a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
index 2955e55..968bc24 100644 (file)
--- a/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
+++ b/skyquake/plugins/composer/src/src/libraries/model/DescriptorModelMetaProperty.js
@@ -21,8 +21,6 @@
  * This class provides utility methods for interrogating an instance of model uiState object.
  */
 
-'use strict';
-
 import _includes from 'lodash/includes'
 import _isArray from 'lodash/isArray'
 import guid from './../guid'
@@ -36,6 +34,9 @@ export default {
        isBoolean(property = {}) {
                return (typeof(property['data-type']) == 'string') && (property['data-type'].toLowerCase() == 'boolean')
        },
+       isLeafEmpty(property = {}) {
+               return (typeof(property['data-type']) == 'string') && (property['data-type'].toLowerCase() == 'empty')
+       },
        isLeaf(property = {}) {
                return /leaf|choice/.test(property.type);
        },
@@ -77,8 +78,8 @@ export default {
                return /string|int/.test(property['data-type']) || Property.isEnumeration(property) || Property.isGuid(property);
        },
        defaultValue(property = {}) {
-               if (property.defaultValue) {
-                       return property.defaultValue;
+               if (property['default-value']) {
+                       return property['default-value'];
                }
                if (this.isObject(property)) {
                        return {};
@@ -199,6 +200,9 @@ export default {
                        if (property.type === 'leaf') {
                                return defaultValue(property);
                        }
+                       if (property.type === 'leaf_list' ) {
+                               return "";
+                       }
                        if (/list/.test(property.type)) {
                                property.type = 'container';
                        }