Fix new layer default inputs

GrapesJS · Sep 14, 2017 · 3f1be03 · 3f1be03
1 parent f230b83
commit 3f1be03
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/style_manager/model/PropertyComposite.js b/src/style_manager/model/PropertyComposite.js
@@ -24,10 +24,15 @@ module.exports = Property.extend({
     this.set('properties', new Properties(properties));
   },
 
-  getDefaultValue() {
+  /**
+   * Returns default value
+   * @param  {Boolean} defaultProps Force to get defaults from properties
+   * @return {string}
+   */
+  getDefaultValue(defaultProps) {
     let value = this.get('defaults');
 
-    if (value) {
+    if (value && !defaultProps) {
       return value;
     }
 

diff --git a/src/style_manager/view/PropertyStackView.js b/src/style_manager/view/PropertyStackView.js
@@ -4,7 +4,7 @@ var Layers = require('./../model/Layers');
 var LayersView = require('./LayersView');
 
 module.exports = PropertyCompositeView.extend({
-  
+
   templateField() {
     const pfx = this.pfx;
     const ppfx = this.ppfx;
@@ -162,25 +162,21 @@ module.exports = PropertyCompositeView.extend({
   },
 
   /**
-   * Add layer
-   * @param Event
-   *
-   * @return Object
+   * Add new layer
    * */
-  addLayer(e) {
-    if(this.getTarget()){
-      var layers = this.getLayers();
-      var layer  = layers.add({ name : 'test' });
-      var index  = layers.indexOf(layer);
-      layer.set('value', this.getDefaultValue());
+  addLayer() {
+    if (this.getTarget()) {
+      const layers = this.getLayers();
+      const layer = layers.add({name: 'New'});
+      const index = layers.indexOf(layer);
+      layer.set('value', this.model.getDefaultValue(1));
 
       // In detached mode valueUpdated will add new 'layer value'
       // to all subprops
       this.valueUpdated();
 
       // This will set subprops with a new default values
       this.model.set('stackIndex', index);
-      return layer;
     }
   },