Merge pull request #173 from wonknu/enhancement_139

Enhancement 139
abecms · Mar 23, 2017 · 4558627 · 4558627
2 parents 015464c + 32e22d8
commit 4558627
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/docs/abe-attributes.md b/docs/abe-attributes.md
@@ -48,6 +48,7 @@ are always required for all content type
 - [locale](#locale)
 - [prefill](#prefill)
 - [prefill-quantity](#prefill-quantity)
+- [value](#value)
 
 ## <a name="tab"></a>tab (String)
 
@@ -423,4 +424,15 @@ Default: null
 prefill-quantity="3"
 ```
 
-How many default values to prefill
+How many default values to prefill
+
+
+## <a name="value"></a>value (String)
+
+Default: none
+
+```html
+value="default text value"
+```
+
+Add a default value inside input, if the input value changes the default value won't be used anymore unless the value of the input become an empty string
diff --git a/src/cli/cms/data/attributes.js b/src/cli/cms/data/attributes.js
@@ -29,7 +29,7 @@ export function getAll(str, json) {
     source: null,
     tab: 'default',
     type: 'text',
-    value: '',
+    value: null,
     file: '',
     visible: true
   }

diff --git a/src/cli/cms/editor/form.js b/src/cli/cms/editor/form.js
@@ -54,7 +54,7 @@ export default class Form {
       source: null,
       tab: 'default',
       type: 'text',
-      value: '',
+      value: null,
       visible: true,
       precontribTemplate: ''
     }

diff --git a/src/cli/cms/editor/handlebars/compileAbe.js b/src/cli/cms/editor/handlebars/compileAbe.js
@@ -33,7 +33,7 @@ export default function compileAbe(){
       value = ''
     }
     if(typeof value === 'function' || value == null) {
-      value = ''
+      value = (hash.value != null) ? hash.value : ''
     }
     if(hash.type != null && hash.type === 'rich'){
       testXSS = xss(value.replace(/&quot;/g, '"'), {
@@ -57,11 +57,11 @@ export default function compileAbe(){
   }else {
     value = hash.key
   }
-  // value = ((content) ? content[hash.key.replace('.', '-')] : hash.key)
+
   if(typeof value === 'function' || value == null) {
-    value = ''
+    value = (hash.value != null) ? hash.value : ''
   }
-  
+
   if(hash.type != null && hash.type === 'rich'){
     testXSS = xss(value.replace(/&quot;/g, '"'), {
       'whiteList': config.htmlWhiteList,

diff --git a/src/cli/cms/editor/handlebars/printInput.js b/src/cli/cms/editor/handlebars/printInput.js
@@ -316,6 +316,7 @@ export function printInput (params, root) {
   var inputClass = 'form-control form-abe'
   res += getLabel(params)
 
+  if(params.value === null && params.defaultvalue != null) params.value = params.defaultvalue
   params.placeholder = params.placeholder || ''
   params.value = params.value || ''
 

diff --git a/src/server/controllers/editor.js b/src/server/controllers/editor.js
@@ -93,7 +93,8 @@ function matchAttrAbe(text, json, util, arrayBlock) {
     match
   // While regexp match HandlebarsJS template item => keepgoing
   while (match = patt.exec(text)) {
-    addToForm(match[0], text, json, util, arrayBlock, null, null)
+    var matchText = match[0].replace(/value=([\'\"].*?[\'\"])/g, 'defaultvalue=$1')
+    addToForm(matchText, text, json, util, arrayBlock, null, null)
   }
 }