From 266594f11330b1fca8ecac462e16da062d647bf9 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sun, 5 Nov 2017 03:35:46 +0100 Subject: [PATCH] Update StyleManager status management --- index.html | 7 ++++--- src/style_manager/view/PropertyView.js | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 451504ad3..d4e3766c4 100755 --- a/index.html +++ b/index.html @@ -1298,7 +1298,7 @@ } }, });*/ - + /* bm.add('b1-2', { label: 'Flex Block', category: 'Basic', @@ -1325,6 +1325,7 @@ ` }) + */ 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(); diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js index ba3659ae5..d976c3e9e 100644 --- a/src/style_manager/view/PropertyView.js +++ b/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; },