change "value" to "defaultValue"

This commit is contained in:
Keegan
2016-02-12 17:49:12 -08:00
parent e2d7c93cdb
commit d05686a85f
5 changed files with 24 additions and 18 deletions
+10 -10
View File
@@ -5,12 +5,12 @@ module.exports = [
{
"type": "heading",
"id": "main-heading",
"value": "Clay Test Page",
"defaultValue": "Clay Test Page",
"size": 1
},
{
"type": "text",
"value": "Some arbitrary text explaining how this all works. " +
"defaultValue": "Some arbitrary text explaining how this all works. " +
"It's cool if this wraps across multiple lines"
},
{
@@ -18,12 +18,12 @@ module.exports = [
"items": [
{
"type": "heading",
"value": "This is a section"
"defaultValue": "This is a section"
},
{
"type": "input",
"appKey": "email",
"value": "",
"defaultValue": "",
"label": "Email",
"attributes": {
"placeholder": "eg: name@domain.com",
@@ -36,19 +36,19 @@ module.exports = [
"type": "toggle",
"appKey": "cool_stuff",
"label": "Enable Cool Stuff",
"value": true
"defaultValue": true
},
{
"type": "color",
"appKey": "background",
"value": "FF0000",
"appKey": "colorTest",
"defaultValue": "FF0000",
"label": "Background Color",
"sunlight": false
},
{
"type": "color",
"appKey": "background",
"value": "00FF00",
"defaultValue": "00FF00",
"label": "Sunny Color",
"sunlight": true
}
@@ -59,13 +59,13 @@ module.exports = [
"items": [
{
"type": "heading",
"value": "More Settings"
"defaultValue": "More Settings"
},
{
"id": "flavor",
"type": "select",
"appKey": "flavor",
"value": "grape",
"defaultValue": "grape",
"label": "Favorite Flavor",
"options": [
{ "label": "Berry things", "value": "berry" },
+2 -2
View File
@@ -4,7 +4,7 @@
* A Clay config Item
* @typedef {object} Clay~ConfigItem
* @property {string} type
* @property {string|boolean|number} value
* @property {string|boolean|number} defaultValue
* @property {string} [appKey]
* @property {string} [id]
* @property {string} [label]
@@ -68,7 +68,7 @@ function ClayConfig(settings, config, $rootContainer) {
// set the value of the item via the manipulator to ensure consistency
var value = typeof _settings[item.appKey] !== 'undefined' ?
_settings[item.appKey] :
(item.value || '');
(item.defaultValue || '');
clayItem.set(value);
+2 -2
View File
@@ -18,7 +18,7 @@ describe('component - color', function() {
type: 'color',
sunlight: true,
id: '1',
value: 'ff0000'
defaultValue: 'ff0000'
}
]);
var colorItem = clayConfig.getItemById('1');
@@ -41,7 +41,7 @@ describe('component - color', function() {
type: 'color',
sunlight: false,
id: '1',
value: 'ff0000'
defaultValue: 'ff0000'
}
]);
var colorItem = clayConfig.getItemById('1');
+1 -1
View File
@@ -8,7 +8,7 @@ describe('component - color', function() {
var clayConfig = fixture.clayConfig([
{
type: 'select',
value: 'value-1',
defaultValue: 'value-1',
options: [
{ label: 'label 1', value: 'value-1' },
{ label: 'label 2', value: 'value-2' }
+9 -3
View File
@@ -87,7 +87,7 @@ describe('ClayConfig', function() {
it('returns the correct settings', function() {
var clayConfig = fixtures.clayConfig(
[
{type: 'input', appKey: 'test1', value: 'not this'},
{type: 'input', appKey: 'test1', defaultValue: 'default val'},
{type: 'select', appKey: 'test2', options: [
{label: 'label-1', value: 'val-1'},
{label: 'label-2', value: 'val-2'}
@@ -97,11 +97,17 @@ describe('ClayConfig', function() {
true,
true,
{
test1: 'val-1' // set one of the values via settings
test2: 'val-2' // set one of the values via settings
}
);
clayConfig.getItemByAppKey('test2').set('val-2');
assert.deepEqual(clayConfig.getSettings(), {
test1: 'default val',
test2: 'val-2',
test3: false
});
clayConfig.getItemByAppKey('test1').set('val-1');
clayConfig.getItemByAppKey('test3').set(true);
assert.deepEqual(clayConfig.getSettings(), {