From b43b58245fe08613dff2b0c459b884642890203b Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 1 Sep 2020 02:51:23 +0200
Subject: [PATCH] Fix issues with stack properties

---
 src/style_manager/model/Property.js         | 3 ++-
 src/style_manager/view/LayerView.js         | 2 +-
 src/style_manager/view/PropertyStackView.js | 1 +
 src/style_manager/view/PropertyView.js      | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/style_manager/model/Property.js b/src/style_manager/model/Property.js
index f45251892..053084257 100644
--- a/src/style_manager/model/Property.js
+++ b/src/style_manager/model/Property.js
@@ -202,7 +202,8 @@ const Property = Backbone.Model.extend(
       }
 
       if (fn && hasValue) {
-        const fnParameter = fn === 'url' ? `'${value}'` : value;
+        const fnParameter =
+          fn === 'url' ? `'${value.replace(/'/g, '')}'` : value;
         value = `${fn}(${fnParameter})`;
       }
 
diff --git a/src/style_manager/view/LayerView.js b/src/style_manager/view/LayerView.js
index ad99de234..4edbbabc2 100644
--- a/src/style_manager/view/LayerView.js
+++ b/src/style_manager/view/LayerView.js
@@ -169,7 +169,7 @@ export default Backbone.View.extend({
     const preview = model.get('preview');
     const properties = new PropertiesView({
       collection: model.get('properties'),
-      config: this.config,
+      config: { ...this.config, fromLayer: 1 },
       target: propsConfig.target,
       customValue: propsConfig.customValue,
       propTarget: propsConfig.propTarget,
diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js
index d8a543199..e18d02dd1 100644
--- a/src/style_manager/view/PropertyStackView.js
+++ b/src/style_manager/view/PropertyStackView.js
@@ -34,6 +34,7 @@ export default PropertyCompositeView.extend({
       config: this.config,
       propsConfig
     });
+    // For detached properties (eg. clear all)
     const PropertiesView = require('./PropertiesView').default;
     this.propsView = new PropertiesView({
       target: this.target,
diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js
index 9d3b9ed60..96652083f 100644
--- a/src/style_manager/view/PropertyView.js
+++ b/src/style_manager/view/PropertyView.js
@@ -258,6 +258,9 @@ export default Backbone.View.extend({
    * Fired when the target is changed
    * */
   targetUpdated(mod, val, opts = {}) {
+    //  Skip properties rendered in Stack Layers
+    if (this.config.fromLayer) return;
+
     this.emitUpdateTarget();
 
     if (!this.checkVisibility()) {