Browse Source

Other fixes for the file input property

pull/312/head
Artur Arseniev 9 years ago
parent
commit
90a83219f8
  1. 9
      src/style_manager/view/PropertyFileView.js
  2. 9
      src/style_manager/view/PropertyStackView.js
  3. 3
      src/style_manager/view/PropertyView.js

9
src/style_manager/view/PropertyFileView.js

@ -67,12 +67,8 @@ module.exports = PropertyView.extend({
* @return void
* */
setPreviewView(v) {
if(!this.$previewBox)
return;
if(v)
this.$previewBox.addClass(this.pfx + 'show');
else
this.$previewBox.removeClass(this.pfx + 'show');
const pv = this.$previewBox;
pv && pv[v ? 'addClass' : 'removeClass'](`${this.pfx}show`);
},
/**
@ -92,6 +88,7 @@ module.exports = PropertyView.extend({
* */
setPreview(value) {
const preview = this.$preview;
value = value && value.indexOf('url(') < 0 ? `url(${value})` : value;
preview && preview.css('background-image', value);
},

9
src/style_manager/view/PropertyStackView.js

@ -64,9 +64,7 @@ module.exports = PropertyCompositeView.extend({
var model = this.model;
var layer = this.getLayers().at(model.get('stackIndex'));
layer.set('props', this.$props);
model.get('properties').each(prop => {
prop.trigger('targetUpdated');
});
model.get('properties').each(prop => prop.trigger('targetUpdated'));
},
/**
@ -99,7 +97,6 @@ module.exports = PropertyCompositeView.extend({
}
});
console.log(`Property ${subProperty}, value to set: ${propVal}`);
view.updateTargetStyle(propVal, null, opt);
} else {
model.set('value', model.getFullValue(), opt);
@ -128,8 +125,6 @@ module.exports = PropertyCompositeView.extend({
result = valist[layerIndex];
result = result ? result.trim() : propView.getDefaultValue();
result = propView.model.parseValue(result);
//console.log('Value property', propView.model.get('property'), ': ', result, 'TARGET-VALUE', targetValue, valist);
} else {
var aStack = this.getStackValues();
var strVar = aStack[layerIndex];
@ -161,7 +156,6 @@ module.exports = PropertyCompositeView.extend({
// Store properties values inside layer, in this way it's more reliable
// to fetch them later
console.log(`START Property ${model.get('property')}`);
properties.each(prop => {
const propValue = prop.getFullValue();
values[prop.get('property')] = propValue;
@ -170,7 +164,6 @@ module.exports = PropertyCompositeView.extend({
const layerModel = this.getLayers().at(stackIndex);
layerModel && layerModel.set({values, value});
console.log(`END Property ${model.get('property')} value: ${value} values: `, values);
},
/**

3
src/style_manager/view/PropertyView.js

@ -183,6 +183,7 @@ module.exports = Backbone.View.extend({
status = '';
}
// Maybe in some cases I should set here a value on the model (silently)
this.setValue(value, 1);
this.model.set('status', status);
@ -295,8 +296,6 @@ module.exports = Backbone.View.extend({
const value = model.getFullValue();
const target = this.getTarget();
const onChange = this.onChange;
console.log('BEFORE valueChanged ', model.get('property'), value, 'this value: ', model.get('value'));
this.setValue(value);
if (!target) {

Loading…
Cancel
Save