diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js index f31889e..69eb92e 100644 --- a/app/controllers/config.controller.js +++ b/app/controllers/config.controller.js @@ -4,7 +4,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio //console.log($scope.model.value); //define empty items - var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeId": "-88", "value": "", "config": ""}'; + var newPropertyModel = '{"alias": "", "remove": false, "collapse": false, "label": "", "helpText": "", "dataTypeId": "-88", "value": ""}'; var newFieldsetModel = '{"alias": "", "remove": false, "collapse": false, "labelTemplate": "", "tooltip": "", "icon": "", "label": "", "headerText": "", "footerText": "", "properties": [' + newPropertyModel + ']}'; var defaultFieldsetConfigModel = JSON.parse('{"showAdvancedOptions": false, "hideFieldsetToolbar": false, "enableMultipleFieldsets": false, "hideFieldsetControls": false, "hidePropertyLabel": false, "maxFieldsets": null, "fieldsets": [' + newFieldsetModel + ']}'); diff --git a/app/directives/archetypeproperty.js b/app/directives/archetypeproperty.js index b3ca22b..3eeaaf6 100644 --- a/app/directives/archetypeproperty.js +++ b/app/directives/archetypeproperty.js @@ -47,13 +47,10 @@ angular.module("umbraco").directive('archetypeProperty', function ($compile, $ht var view = ""; var label = configFieldsetModel.properties[scope.propertyConfigIndex].label; var dataTypeId = configFieldsetModel.properties[scope.propertyConfigIndex].dataTypeId; - var config = configFieldsetModel.properties[scope.propertyConfigIndex].config; + var config = null; var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias; var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value; - //try to convert the config to a JS object - config = jsonOrString(config, scope.archetypeConfig.developerMode, "config"); - //try to convert the defaultValue to a JS object defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue"); diff --git a/app/views/archetype.config.html b/app/views/archetype.config.html index c286d48..f0550c6 100644 --- a/app/views/archetype.config.html +++ b/app/views/archetype.config.html @@ -58,9 +58,6 @@