Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts: dist/server/public/scripts/template-engine-compiled.js package.json
abecms · Aug 3, 2016 · 3343d97 · 3343d97
2 parents cefe01b + af53986
commit 3343d97
Show file tree

Hide file tree

Showing 5 changed files with 266 additions and 262 deletions.
diff --git a/dist/cli/handlebars/abe/printInput.js b/dist/cli/handlebars/abe/printInput.js
@@ -42,6 +42,8 @@ function printInput() {
     params.value = '';
   }
 
+  if (typeof params.value === 'string') params.value = params.value.replace(/\"/g, '&quot;');
+
   var inputClass = 'form-control form-abe';
   var commonParams = 'id="' + params.key + '"\n                    data-id="' + params.key + '"\n                    value="' + params.value + '"\n                    maxlength="' + params.maxLength + '"\n                    reload="' + params.reload + '"\n                    tabIndex="' + params.order + '"\n                    data-required="' + params.required + '"\n                    data-display="' + params.display + '"\n                    data-visible="' + params.visible + '"\n                    data-autocomplete="' + params.autocomplete + '"\n                    placeholder="' + params.placeholder + '"';