From 777180e0aa326b5490297b315d4953b5d16ddbe6 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sun, 16 Dec 2018 16:21:42 +0100 Subject: [PATCH] Fix update on clear of properties --- src/style_manager/model/PropertyFactory.js | 10 ++++++---- src/style_manager/view/PropertyView.js | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js index d51e0cb04..e3d690fd0 100644 --- a/src/style_manager/model/PropertyFactory.js +++ b/src/style_manager/model/PropertyFactory.js @@ -185,10 +185,6 @@ module.exports = () => ({ case 'text-shadow-v': case 'text-shadow-blur': case 'border-radius-c': - case 'border-top-left-radius': - case 'border-top-right-radius': - case 'border-bottom-left-radius': - case 'border-bottom-right-radius': case 'box-shadow-h': case 'box-shadow-v': case 'box-shadow-spread': @@ -198,6 +194,12 @@ module.exports = () => ({ case 'transform-rotate-z': obj.defaults = 0; break; + case 'border-top-left-radius': + case 'border-top-right-radius': + case 'border-bottom-left-radius': + case 'border-bottom-right-radius': + obj.defaults = '0px'; + break; case 'transform-scale-x': case 'transform-scale-y': case 'transform-scale-z': diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js index d01c6419e..017996224 100644 --- a/src/style_manager/view/PropertyView.js +++ b/src/style_manager/view/PropertyView.js @@ -125,7 +125,8 @@ module.exports = Backbone.View.extend({ clear(e) { e && e.stopPropagation(); this.model.clearValue(); - this.targetUpdated(); + // Skip one stack with setTimeout to avoid inconsistencies + setTimeout(() => this.targetUpdated()); }, /**