Browse Source

Update PropertyStackView

pull/36/head
Artur Arseniev 11 years ago
parent
commit
6f843f0787
  1. 7
      src/demo.js
  2. 2
      src/style_manager/view/LayerView.js
  3. 10
      src/style_manager/view/PropertyStackView.js

7
src/demo.js

@ -317,10 +317,6 @@ require(['config/require-config'], function() {
sectors: [{
name: 'General',
properties:[{
name : 'Test',
property : 'test',
defaults : 'testDef',
},{
name : 'Alignment',
property : 'float',
type : 'radio',
@ -476,7 +472,6 @@ require(['config/require-config'], function() {
name : 'Padding',
property : 'padding',
type : 'composite',
detached : true,
properties:[{
name : 'Top',
property : 'padding-top',
@ -619,7 +614,6 @@ require(['config/require-config'], function() {
name : 'Text shadow',
property : 'text-shadow',
type : 'stack',
detached: true,
preview : true,
properties : [{
name: 'X position',
@ -769,6 +763,7 @@ require(['config/require-config'], function() {
property : 'background',
type : 'stack',
preview : true,
detached: true,
properties : [{
name: 'Image',
property: 'background-image',

2
src/style_manager/view/LayerView.js

@ -127,8 +127,8 @@ define(['backbone', 'text!./../templates/layer.html'],
this.model.collection.remove(this.model);
if(this.stackModel && this.stackModel.set){
this.stackModel.set({stackIndex: null}, {silent: true});
this.stackModel.trigger('updateValue');
this.stackModel.set({stackIndex: null},{silent: true});
}
},

10
src/style_manager/view/PropertyStackView.js

@ -96,18 +96,8 @@ define(['backbone','./PropertyCompositeView', 'text!./../templates/propertyStack
var result = null;
// If detached the value in this case is stacked, eg. substack-prop: 1px, 2px, 3px...
if(this.model.get('detached')){
//var aStackDet = this.getStackValues();
//console.log('Stack values');
//console.log(aStackDet);
var valist = propView.componentValue.split(',');
result = valist[this.model.get('stackIndex')];
// In detached mode the value of the property never changed
// so I need some how to update
if(result !== propView.getValueForTarget()){
//UPDATE?!?
//this.refreshLayers(); NO!!
}
//console.log(propView.property + ' model: ' + propView.getValueForTarget() + ' found on comp: ' + result);
}else{
var aStack = this.getStackValues();
var strVar = aStack[this.model.get('stackIndex')];

Loading…
Cancel
Save