v7.0.0-beta17

SnakeskinTpl · Feb 21, 2016 · 7a1f582 · 7a1f582
1 parent b18a840
commit 7a1f582
Show file tree

Hide file tree

Showing 7 changed files with 132 additions and 144 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "Snakeskin",
   "description": "Awesome JavaScript template engine.",
   "main": "dist/snakeskin.min.js",
-  "version": "7.0.0-beta16",
+  "version": "7.0.0-beta17",
   "homepage": "https://github.com/SnakeskinTpl/Snakeskin",
   "keywords": [
     "templates",

diff --git a/dist/snakeskin.js b/dist/snakeskin.js
@@ -1,11 +1,11 @@
 /*!
- * Snakeskin v7.0.0-beta16
+ * Snakeskin v7.0.0-beta17
  * https://github.com/SnakeskinTpl/Snakeskin
  *
  * Released under the MIT license
  * https://github.com/SnakeskinTpl/Snakeskin/blob/master/LICENSE
  *
- * Date: 'Sun, 21 Feb 2016 13:08:50 GMT
+ * Date: 'Sun, 21 Feb 2016 13:56:36 GMT
  */
 
 (function (global, factory) {
@@ -91,7 +91,7 @@
     babelHelpers;
 
         var Snakeskin = {
-      VERSION: [7, 0, 0, 'beta16']
+      VERSION: [7, 0, 0, 'beta17']
     };
 
     /**
@@ -6509,29 +6509,18 @@
 
     			pCount--;
     			if (!pCount) {
-    				var startD = start,
-    				    endD = j;
-
-    				if (nRes) {
-    					startD = start + diff;
-    					endD = j + diff + pContent.length;
-    				}
-
-    				nRes = res.slice(0, startD) + (pContent && this.out(pContent, { unsafe: true })) + res.slice(endD);
-
+    				nRes = nRes.slice(0, start + diff) + (pContent && this.out(pContent, { unsafe: true }));
     				diff = nRes.length - res.length;
     				pContent = null;
     			}
     		}
 
     		res += el;
-    		if (nRes) {
-    			nRes += el;
-    		}
+    		nRes += el;
     	}
 
     	return {
-    		finalWord: nRes || res,
+    		finalWord: nRes,
     		unary: unaryStr,
     		word: res
     	};
@@ -7745,7 +7734,6 @@
     	notEmpty: true,
     	shorthands: { '?': 'void ' }
     }, function (command) {
-    	console.log(1212);
     	this.append(this.out(command, { unsafe: true }) + ';');
     });
 
@@ -9329,7 +9317,7 @@
     	}
 
     	var str = undefined;
-    	var command = p.command.replace(/([^\s]\s*)(?=\))$/, function (str, $0) {
+    	var command = p.command.replace(/([^\s]\s*)(?=\)$)/, function (str, $0) {
     		if (str[0] !== '(') {
     			wrapParams = ',' + wrapParams;
     		}

diff --git a/dist/snakeskin.live.js b/dist/snakeskin.live.js
@@ -1,11 +1,11 @@
 /*!
- * Snakeskin v7.0.0-beta16 (live)
+ * Snakeskin v7.0.0-beta17 (live)
  * https://github.com/SnakeskinTpl/Snakeskin
  *
  * Released under the MIT license
  * https://github.com/SnakeskinTpl/Snakeskin/blob/master/LICENSE
  *
- * Date: 'Sun, 21 Feb 2016 13:08:50 GMT
+ * Date: 'Sun, 21 Feb 2016 13:56:36 GMT
  */
 
 (function (global, factory) {
@@ -39,7 +39,7 @@
     babelHelpers;
 
         var Snakeskin = {
-      VERSION: [7, 0, 0, 'beta16']
+      VERSION: [7, 0, 0, 'beta17']
     };
 
     /**

diff --git a/dist/snakeskin.live.min.js b/dist/snakeskin.live.min.js
diff --git a/dist/snakeskin.min.js b/dist/snakeskin.min.js
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "Awesome JavaScript template engine.",
   "homepage": "https://github.com/SnakeskinTpl/Snakeskin",
   "main": "snakeskin.js",
-  "version": "7.0.0-beta16",
+  "version": "7.0.0-beta17",
   "license": "MIT",
   "author": {
     "name": "kobezzza",

diff --git a/src/core.js b/src/core.js
@@ -9,7 +9,7 @@
  */
 
 const Snakeskin = {
-	VERSION: [7, 0, 0, 'beta16']
+	VERSION: [7, 0, 0, 'beta17']
 };
 
 export default