Browse Source

Update StyleManager status management

pull/487/head
Artur Arseniev 8 years ago
parent
commit
266594f113
  1. 7
      index.html
  2. 16
      src/style_manager/view/PropertyView.js

7
index.html

@ -1298,7 +1298,7 @@
}
},
});*/
/*
bm.add('b1-2', {
label: 'Flex Block',
category: 'Basic',
@ -1325,6 +1325,7 @@
</style>
`
})
*/
var domc = editor.DomComponents;
var defaultType = domc.getType('default');
@ -1354,12 +1355,12 @@
console.log('STORE ', e);
})
editor.on('styleManager:change:padding-top', function(view) {
editor.on('styleManager:change:padding', function(view) {
var model = view.model;
let targetValue = view.getTargetValue({ignoreDefault: 1});
let computedValue = view.getComputedValue();
let defaultValue = view.model.getDefaultValue();
console.log('Style of ', model.get('property'), 'Target: ', targetValue, 'Computed:', computedValue, 'Default:', defaultValue);
//console.log('Style of ', model.get('property'), 'Target: ', targetValue, 'Computed:', computedValue, 'Default:', defaultValue);
});
editor.render();

16
src/style_manager/view/PropertyView.js

@ -164,8 +164,19 @@ module.exports = Backbone.View.extend({
*/
elementUpdated() {
this.model.set('status', 'updated');
const parent = this.model.parent;
const parentView = parent && parent.view;
parentView && parentView.elementUpdated();
},
setStatus(value) {
this.model.set('status', value);
const parent = this.model.parent;
parent && parent.set('status', value);
},
/**
* Fired when the target is changed
* */
@ -202,7 +213,7 @@ module.exports = Backbone.View.extend({
}
model.setValue(value, 0, { fromTarget: 1 });
model.set('status', status);
this.setStatus(status);
if (em) {
em.trigger('styleManager:change', this);
@ -280,9 +291,6 @@ module.exports = Backbone.View.extend({
const notToSkip = avoid.indexOf(property) < 0;
const value = computed[property];
const valueDef = computedDef[camelCase(property)];
if (property == 'padding-top') {
console.log('value',value, 'valuedef', valueDef, computedDef);
}
return computed && notToSkip && valueDef !== value && value;
},

Loading…
Cancel
Save