bug abe space getattr

abecms · Aug 3, 2016 · cefe01b · cefe01b
1 parent 5feaf3b
commit cefe01b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/dist/cli/helpers/regex-helper.js b/dist/cli/helpers/regex-helper.js
@@ -11,9 +11,11 @@ var _ = require('../');
 
 function getAttr(str, attr) {
   // var rex = new RegExp(attr + '=["\']([^\'"]+)')
-  var rex = new RegExp(attr + '=["|\']([\\S\\s]*?)["|\']( [a-zA-Z0-9-]*?=|}})');
+  var rex = new RegExp(attr + '=["|\']([\\S\\s]*?)["|\']( +[a-zA-Z0-9-]*?=|}})');
+  // var rex = new RegExp(attr + '=["|\']([\\S\\s]*?)["|\']( [a-zA-Z0-9-]*?=|}})')
   var res = rex.exec(str);
-  return typeof res !== null && res !== null && res.length > 1 ? res[1] : '';
+  res = typeof res !== null && res !== null && res.length > 1 ? res[1] : '';
+  return res;
 }
 
 /**

diff --git a/dist/server/controllers/editor.js b/dist/server/controllers/editor.js
@@ -67,7 +67,6 @@ function add(obj, json, text, fakeContent, util) {
   if (fakeContent) {
     value = util.lorem(obj.type);
   }
-
   util.add(obj);
 
   return value;

diff --git a/src/cli/helpers/regex-helper.js b/src/cli/helpers/regex-helper.js
@@ -2,9 +2,11 @@ import {cli} from '../'
 
 export function getAttr (str, attr) {
   // var rex = new RegExp(attr + '=["\']([^\'"]+)')
-  var rex = new RegExp(attr + '=["|\']([\\S\\s]*?)["|\']( [a-zA-Z0-9-]*?=|}})')
+  var rex = new RegExp(attr + '=["|\']([\\S\\s]*?)["|\']( +[a-zA-Z0-9-]*?=|}})')
+  // var rex = new RegExp(attr + '=["|\']([\\S\\s]*?)["|\']( [a-zA-Z0-9-]*?=|}})')
   var res = rex.exec(str)
-  return (typeof res !== null && res !== null && res.length > 1) ? res[1] : ''
+  res = (typeof res !== null && res !== null && res.length > 1) ? res[1] : ''
+  return res
 }
 
 /**

diff --git a/src/server/controllers/editor.js b/src/server/controllers/editor.js
@@ -62,7 +62,6 @@ function add(obj, json, text, fakeContent, util) {
   if(fakeContent) {
     value = util.lorem(obj.type)
   }
-
   util.add(obj)
 
   return value