From 3581a59b106203a259ee1ce8c21e2e8a0cc9f348 Mon Sep 17 00:00:00 2001 From: Laurence Maultsby Date: Thu, 20 Apr 2017 11:53:03 -0400 Subject: [PATCH] EditDescriptorModelProperties.js merge issue fix Signed-off-by: Laurence Maultsby --- .../EditDescriptorModelProperties.js | 143 +++++++++--------- 1 file changed, 71 insertions(+), 72 deletions(-) diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js index 22ba1791f..abb94474d 100644 --- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js +++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js @@ -214,7 +214,7 @@ export default function EditDescriptorModelProperties(props) { processFieldValueChange.bind(container, pathToProperty), 2000, {maxWait: 5000})); // max wait for short-name // create an onChange event handler for a select field for the specified field path const onSelectChange = changeHandler.bind(null, processFieldValueChange.bind(container, pathToProperty)); - + if (isEnumeration) { const enumeration = Property.getEnumeration(property, value); const options = enumeration.map((d, i) => { @@ -230,17 +230,17 @@ export default function EditDescriptorModelProperties(props) { options.unshift(); } return ( - @@ -265,17 +265,17 @@ export default function EditDescriptorModelProperties(props) { options.unshift(); } return ( - @@ -298,28 +298,28 @@ export default function EditDescriptorModelProperties(props) { } const isValueSet = (val != '' && val) return ( - ); } - + if (Property.isLeafEmpty(property)) { // A null value indicates the leaf exists (as opposed to undefined). // We stick in a string when the user actually sets it to simplify things // but the correct thing happens when we serialize to user data - let isEmptyLeafPresent = (value === EMPTY_LEAF_PRESENT || value === null); + let isEmptyLeafPresent = (value === EMPTY_LEAF_PRESENT || value === null); let present = isEmptyLeafPresent ? EMPTY_LEAF_PRESENT : ""; const options = [ , @@ -327,17 +327,17 @@ export default function EditDescriptorModelProperties(props) { ] return ( - @@ -346,25 +346,25 @@ export default function EditDescriptorModelProperties(props) { if (property['preserve-line-breaks']) { return ( -