diff --git a/src/demo.js b/src/demo.js index b60bc7617..0f1ef0927 100644 --- a/src/demo.js +++ b/src/demo.js @@ -754,9 +754,9 @@ require(['config/require-config'], function() { name: 'Shadow type', property: 'shadow-type', type: 'select', - defaults: ' ', - list: [ { value : ' ', name : 'Outside', }, - { value : 'inset', name : 'Inside', }], + defaults: '', + list: [ { value : '', name : 'Outside', }, + { value : 'inset', name : 'Inside', }], }], },{ name : 'Background', diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index 2e0956dbe..47e4d609b 100644 --- a/src/style_manager/view/LayerView.js +++ b/src/style_manager/view/LayerView.js @@ -79,7 +79,7 @@ define(['backbone', 'text!./../templates/layer.html'], var lim = 3; var nV = ''; props.each(function(p, index){ - var v = aV[index]; + var v = aV[index] || ''; if(v){ if(p.get('type') == 'integer'){ var vI = parseInt(v, 10), diff --git a/test/specs/style_manager/view/PropertySelectView.js b/test/specs/style_manager/view/PropertySelectView.js index 585f1852f..7c5c88901 100644 --- a/test/specs/style_manager/view/PropertySelectView.js +++ b/test/specs/style_manager/view/PropertySelectView.js @@ -161,6 +161,26 @@ define([path + 'PropertySelectView', 'StyleManager/model/Property', 'DomComponen view.model.get('value').should.equal(defValue); }); + it('Empty value as default', function() { + options = [ + {value: 'test1value', name: 'test1'}, + {value: 'test2value', name: 'test2'}, + {value: '', name: 'TestDef'} + ]; + component = new Component(); + model = new Property({ + type: 'select', + list: options, + defaults: '', + property: 'emptyDefault' + }); + view = new PropertySelectView({ + model: model + }); + $fixture.html(view.render().el); + view.$input.val().should.equal(''); + }); + it('Input value is as default', function() { view.$input.val().should.equal(defValue); });