Extend view engine.

petersirka · petersirka · commit 05d61646b710 · 2017-08-30T15:13:50.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -30,7 +30,8 @@
 - added: NoSQL backuping documents while they are updating/removing in `DatabaseBuilder.backup([user])`
 - added: `CLONE(obj)` alias for `U.clone()`
 - added: `GROUP(flags, fn)` alias for `F.group()`
-- addeD: `F.cache.set2()` it creates a persistent cache (persistent items are stored in a file)
+- added: `F.cache.set2()` it creates a persistent cache (persistent items are stored in a file)
+- added: new View Engine command `@{'%config'}` which reads a value from config directly
 
 - updated: (IMPORTANT) packages compress/decompress function supports streaming data
 - updated: (IMPORTANT) `NOSQL().backup()` !!! was changed !!!!
diff --git a/internal.js b/internal.js
@@ -1798,7 +1798,12 @@ function view_parse(content, minify, filename, controller) {
 		});
 
 		if (cmd[0] === '\'' || cmd[0] === '"') {
-			builder += '+' + DELIMITER + (new Function('self', 'return self.$import(' + cmd[0] + '!' + cmd.substring(1) + ')'))(controller) + DELIMITER;
+			if (cmd[1] === '%') {
+				var t = F.config[cmd.substring(2, cmd.length - 1)];
+				if (t != null)
+					builder += '+' + DELIMITER + t + DELIMITER;
+			} else
+				builder += '+' + DELIMITER + (new Function('self', 'return self.$import(' + cmd[0] + '!' + cmd.substring(1) + ')'))(controller) + DELIMITER;
 		} else if (cmd7 === 'compile' && cmd.lastIndexOf(')') === -1) {
 
 			builderTMP = builder + '+(F.onCompileView.call(self,\'' + (cmd8[7] === ' ' ? cmd.substring(8) : '') + '\',';
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -574,6 +574,8 @@ function viewViews() {
 	assert.ok(output.contains('#absolute1=<script src="http://127.0.0.1:8001/js/filename.js"></script>#'), name + 'absolute problem without hostname');
 	assert.ok(output.contains('#absolute2=<script src="https://www.google.sk/js/filename.js"></script>#'), name + 'aboslute problem with hostname');
 	assert.ok(output.contains('#absolute3=<script src="http://localhost:8000/js/default.js"></script><script src="http://localhost:8000/js/home.js"></script>#'), name + 'aboslute problem array + with hostname');
+	assert.ok(output.contains('#CONFIGNAME1=Total.js#'), name + 'inline config value with value');
+	assert.ok(output.contains('#CONFIGNAME2=#'), name + 'inline config value without value');
 
 	assert.ok(output.contains('#d429c9c776604a9e15d04d9bd90dba27e0155965=a+b+c#'), name + 'https://github.com/totaljs/framework/commit/d429c9c776604a9e15d04d9bd90dba27e0155965');
 
diff --git a/test/views/a.html b/test/views/a.html
@@ -86,3 +86,5 @@
 #absolute2=@{absolute('filename.js', 'https://www.google.sk')}#
 #absolute3=@{absolute(['default.js', 'home.js'], 'http://localhost:8000')}#
 #d429c9c776604a9e15d04d9bd90dba27e0155965=@{repository.a}+@{repository.b}+@{repository.c}#
+#CONFIGNAME1=@{'%name'}#
+#CONFIGNAME2=@{'%fet'}#
