Replace getValue with getFullValue within view properties

GrapesJS · Sep 13, 2017 · 496f461 · 496f461
1 parent 577c144
commit 496f461
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/src/style_manager/view/PropertyCompositeView.js b/src/style_manager/view/PropertyCompositeView.js
@@ -130,16 +130,10 @@ module.exports = PropertyView.extend({
    * @return {string}
    * */
   build(selectedEl, propertyView, opts) {
-    var result = '';
-    this.model.get('properties').each(prop => {
-      var v = prop.getValue();
-      var func = prop.get('functionName');
-
-      if(func)
-        v =  func + '(' + v + ')';
-
-      result   += v + ' ';
-    });
+    let result = '';
+    this.model.get('properties').each(prop =>
+      result += `${prop.getFullValue()} `
+    );
     return result.replace(/ +$/,'');
   },
 

diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js
@@ -143,14 +143,10 @@ module.exports = PropertyCompositeView.extend({
       return;
 
     // Store properties values inside layer, in this way it's more reliable
-    //  to fetch them later
+    // to fetch them later
     var valObj = {};
     this.model.get('properties').each(prop => {
-      var v    = prop.getValue(),
-        func  = prop.get('functionName');
-      if(func)
-        v =  func + '(' + v + ')';
-      valObj[prop.get('property')] = v;
+      valObj[prop.get('property')] = prop.getFullValue();
     });
     model.set('values', valObj);
 

diff --git a/src/style_manager/view/PropertyView.js b/src/style_manager/view/PropertyView.js
@@ -372,12 +372,7 @@ module.exports = Backbone.View.extend({
       return;
     }
 
-    var value = this.getValueForTarget();
-
-    var func = model.get('functionName');
-    if(func)
-      value =  func + '(' + value + ')';
-
+    const value = this.model.getFullValue();
     var target = this.getTarget();
     var onChange = this.onChange;