From 6f843f0787c24d614b688be109cec866e68a3950 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 18 May 2016 02:20:56 +0200 Subject: [PATCH] Update PropertyStackView --- src/demo.js | 7 +------ src/style_manager/view/LayerView.js | 2 +- src/style_manager/view/PropertyStackView.js | 10 ---------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/demo.js b/src/demo.js index 1f27c3181..eecb0e2e5 100644 --- a/src/demo.js +++ b/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', diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js index c3b716e20..2e0956dbe 100644 --- a/src/style_manager/view/LayerView.js +++ b/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}); } }, diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js index 2d7b82b54..0de00b903 100644 --- a/src/style_manager/view/PropertyStackView.js +++ b/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')];