new example

petersirka · petersirka · commit 0d3ee40bf072 · 2014-09-23T20:53:27.000+02:00
diff --git a/static-file-merge/controllers/default.js b/static-file-merge/controllers/default.js
@@ -0,0 +1,7 @@
+exports.install = function(framework) {
+	framework.route('/', view_homepage);
+};
+
+function view_homepage() {
+	this.view('homepage');
+}
diff --git a/static-file-merge/definitions/merge.js b/static-file-merge/definitions/merge.js
@@ -0,0 +1,3 @@
+
+// Merging files
+framework.merge('merge.js', '/js/a.js', '/js/b.js', 'http://www.totaljs.com/inject.js');
diff --git a/static-file-merge/index.js b/static-file-merge/index.js
@@ -0,0 +1,7 @@
+// ===================================================
+// IMPORTANT: only for development
+// total.js - web application framework for node.js
+// http://www.totaljs.com
+// ===================================================
+
+require('total.js').http('debug');
diff --git a/static-file-merge/public/js/a.js b/static-file-merge/public/js/a.js
@@ -0,0 +1,3 @@
+var exports = {};
+
+console.log('a');
diff --git a/static-file-merge/public/js/b.js b/static-file-merge/public/js/b.js
@@ -0,0 +1 @@
+console.log('b');
diff --git a/static-file-merge/views/homepage.html b/static-file-merge/views/homepage.html
@@ -0,0 +1,19 @@
+@{layout('')}
+
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Merging</title>
+    <meta charset="utf-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=10" />
+	<meta name="format-detection" content="telephone=no"/>
+	<meta name="viewport" content="width=1024, user-scalable=yes" />
+	<meta name="robots" content="all,follow" />
+    <script src="/merge.js"></script>
+</head>
+<body>
+
+	OPEN WEB DEVELOPER TOOLS -&gt; CONSOLE
+
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+// Merging files`
	`3`	`+framework.merge('merge.js', '/js/a.js', '/js/b.js', 'http://www.totaljs.com/inject.js');`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var exports = {};`
	`2`	`+`
	`3`	`+console.log('a');`