Browse Source

Fix select property default value

pull/36/head
Artur Arseniev 10 years ago
parent
commit
95fdbf8027
  1. 6
      src/demo.js
  2. 2
      src/style_manager/view/LayerView.js
  3. 20
      test/specs/style_manager/view/PropertySelectView.js

6
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',

2
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),

20
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);
});

Loading…
Cancel
Save