Applying fix for StructEditor #265

HashBrownCMS · Mar 4, 2019 · f2579e9 · f2579e9
1 parent bf69ca6
commit f2579e9
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 124 deletions.
diff --git a/public/js/views.js b/public/js/views.js
diff --git a/public/js/views.js.map b/public/js/views.js.map
diff --git a/src/Client/Views/Editors/ContentEditor.js b/src/Client/Views/Editors/ContentEditor.js
@@ -265,7 +265,8 @@ class ContentEditor extends Crisp.View {
             description: fieldDefinition.description || '',
             schema: compiledSchema.getObject(),
             multilingual: fieldDefinition.multilingual === true,
-            $keyActions: $keyActions
+            $keyActions: $keyActions,
+            className: 'editor__field__value'
         });
 
         fieldEditorInstance.on('change', (newValue) => {
@@ -282,12 +283,6 @@ class ContentEditor extends Crisp.View {
             onChange(newValue);
         });
 
-        fieldEditorInstance.element.classList.toggle('editor__field__value', true);
-
-        fieldEditorInstance.on('ready', () => {
-            fieldEditorInstance.element.classList.toggle('editor__field__value', true);
-        });
-
         return fieldEditorInstance.$element;
     }
 

diff --git a/src/Client/Views/Editors/FieldEditors/ArrayEditor.js b/src/Client/Views/Editors/FieldEditors/ArrayEditor.js
@@ -264,14 +264,8 @@ class ArrayEditor extends HashBrown.Views.Editors.FieldEditors.FieldEditor {
                     let editorInstance = new editorClass({
                         value: item.value,
                         config: schema.config,
-                        schema: schema
-                    });
-
-                    // Assign the "value" class name to the field editor
-                    editorInstance.element.classList.toggle('editor__field__value', true);
-
-                    editorInstance.on('ready', () => {
-                        editorInstance.element.classList.toggle('editor__field__value', true);
+                        schema: schema,
+                        className: 'editor__field__value'
                     });
 
                     // Hook up the change event

diff --git a/src/Client/Views/Editors/FieldEditors/FieldEditor.js b/src/Client/Views/Editors/FieldEditors/FieldEditor.js
@@ -28,11 +28,15 @@ class FieldEditor extends Crisp.View {
      * Post render
      */
     postrender() {
-        if(!this.$keyActions) { return; }
-
-        _.append(this.$keyActions.empty(),
-            this.renderKeyActions()
-        );
+        if(this.className) {
+            this.element.classList.toggle(this.className, true);
+        }
+
+        if(this.$keyActions) {
+            _.append(this.$keyActions.empty(),
+                this.renderKeyActions()
+            );
+        }
     }
 }
 

diff --git a/src/Client/Views/Editors/FieldEditors/StructEditor.js b/src/Client/Views/Editors/FieldEditors/StructEditor.js
@@ -358,7 +358,8 @@ class StructEditor extends HashBrown.Views.Editors.FieldEditors.FieldEditor {
                     value: keySchema.multilingual ? value[window.language] : value,
                     disabled: keySchema.disabled || false,
                     config: keySchema.config || fieldSchema.config || {},
-                    schema: keySchema
+                    schema: keySchema,
+                    className: 'editor__field__value'
                 });
 
                 // Hook up the change event