Fix JavaScript minificator.

petersirka · petersirka · commit bed7cd24e170 · 2016-10-09T23:47:34.000+02:00
diff --git a/index.js b/index.js
@@ -464,7 +464,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 2100;
-	this.version_header = '2.1.0-23';
+	this.version_header = '2.1.0-24';
 	this.version_node = process.version.toString().replace('v', '').replace(/\./g, '').parseFloat();
 
 	this.config = {
diff --git a/internal.js b/internal.js
@@ -1122,7 +1122,6 @@ function minify_javascript(data) {
 	var white = /\W/;
 	var skip = { '$': true, '_': true };
 	var regexp = false;
-	var skipnext = false;
 	var scope;
 	var prev;
 	var next;
@@ -1188,18 +1187,15 @@ function minify_javascript(data) {
 				regexp = (last === '=' || last === '(' || last === ':') && (c === '/');
 		}
 
-/*
-		WTF? For what?
-		if (scope && prev === '\\' && c === '\\') {
+		if (scope && c === '\\') {
 			output.push(c);
-			skipnext = true;
+			output.push(next);
+			index++;
+			last = next;
 			continue;
 		}
-*/
-
-		if (!regexp && (c === '"' || c === '\'' || c === '`') && (prev !== '\\' || skipnext)) {
 
-			skipnext = false;
+		if (!regexp && (c === '"' || c === '\'' || c === '`')) {
 
 			if (scope && scope !== c) {
 				output.push(c);
@@ -1219,7 +1215,7 @@ function minify_javascript(data) {
 		last = c;
 	}
 
-	return output.join('');
+	return output.join('').trim();
 }
 
 exports.compile_css = function(value, filename) {
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
         "name": "Peter Štolc",
         "email": "stolcp@gmail.com"
     }],
-    "version": "2.1.0-23",
+    "version": "2.1.0-24",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
diff --git a/test/javascript.js b/test/javascript.js
@@ -0,0 +1,11 @@
+// FOR UNITTEST
+return '\\' + 2;
+
+var attributes = "\\[" + a + "*(" + b + ")(?:" + c +
+		// Operator (capture 2)
+		"*([*^$|!~]?=)" + d +
+		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + e + "))|)" + f +
+		"*\\]";
+
+var a = 200;
diff --git a/test/test-javascript.js b/test/test-javascript.js
@@ -1,5 +1,6 @@
 var assert = require('assert');
 var javascript = require('../internal');
+var fs = require('fs');
 
 var buffer = [];
 buffer.push('<script type="text/javascript">');
@@ -13,6 +14,7 @@ buffer.push('</script>');
 
 var result1 = '<script type="text/javascript">function skuska(name,value){var arr=[1,2,3,4,5];var obj={Name:"Peter",Age:"28"}}console.log("OK");</script>';
 assert.ok(javascript.compile_javascript(buffer.join('\n')) === result1, 'javascript');
+assert.ok(new Buffer(javascript.compile_javascript(fs.readFileSync('javascript.js').toString('utf8'))).toString('base64') === 'cmV0dXJuJ1xcJysyO3ZhciBhdHRyaWJ1dGVzPSJcXFsiK2ErIiooIitiKyIpKD86IitjKyIqKFsqXiR8IX5dPz0pIitkKyIqKD86JygoPzpcXFxcLnxbXlxcXFwnXSkqKSd8XCIoKD86XFxcXC58W15cXFxcXCJdKSopXCJ8KCIrZSsiKSl8KSIrZisiKlxcXSI7dmFyIGE9MjAwOw==', 'Problem 1');
 
 console.log('================================================');
 console.log('success - OK');
