Skip to content

Commit ef618cb

Browse files
blueimpblueimp
committed
Moved node-qunit into it's own module package.
Added Makefile to create the minified version. Updated Bootstrap version.
1 parent ddb6a9c commit ef618cb

File tree

6 files changed

+40
-92
lines changed

6 files changed

+40
-92
lines changed

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.PHONY: js
2+
3+
js:
4+
uglifyjs -nc tmpl.js > tmpl.min.js

‎index.html‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML>
22
<!--
33
/*
4-
* JavaScript Templates Demo 1.0.1
4+
* JavaScript Templates Demo 1.0.2
55
* https://github.com/blueimp/JavaScript-Templates
66
*
77
* Copyright 2011, Sebastian Tschan
@@ -15,25 +15,34 @@
1515
<head>
1616
<meta charset="utf-8">
1717
<title>JavaScript Templates Demo</title>
18-
<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css">
19-
<!--[if lt IE 7]><link rel="stylesheet" href="http://blueimp.github.com/Bootstrap-Image-Gallery/bootstrap-ie6.min.css"><![endif]-->
20-
<style type="text/css">body {padding-top: 80px;}</style>
2118
<meta name="description" content="&lt; 1KB lightweight, fast &amp; powerful JavaScript templating engine with zero dependencies. Compatible with server-side environments like node.js, module loaders like RequireJS and all web browsers.">
19+
<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap.min.css">
20+
<style>body{padding-top:60px;}</style>
21+
<link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-responsive.min.css">
22+
<!--[if lt IE 7]><link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-ie6.min.css"><![endif]-->
23+
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
2224
</head>
2325
<body>
24-
<div class="topbar">
25-
<div class="fill">
26+
<div class="navbar navbar-fixed-top">
27+
<div class="navbar-inner">
2628
<div class="container">
29+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
30+
<span class="icon-bar"></span>
31+
<span class="icon-bar"></span>
32+
<span class="icon-bar"></span>
33+
</a>
2734
<a class="brand" href="https://github.com/blueimp/JavaScript-Templates">JavaScript Templates</a>
28-
<ul class="nav">
29-
<li class="active"><a href="#">Demo</a></li>
30-
<li><a href="https://github.com/blueimp/JavaScript-Templates/downloads">Downloads</a></li>
31-
<li><a href="https://github.com/blueimp/JavaScript-Templates">Source Code</a></li>
32-
<li><a href="https://github.com/blueimp/JavaScript-Templates">Documentation</a></li>
33-
<li><a href="https://github.com/blueimp/JavaScript-Templates/issues">Issues</a></li>
34-
<li><a href="test/">Test</a></li>
35-
<li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
36-
</ul>
35+
<div class="nav-collapse">
36+
<ul class="nav">
37+
<li class="active"><a href="#">Demo</a></li>
38+
<li><a href="https://github.com/blueimp/JavaScript-Templates/downloads">Downloads</a></li>
39+
<li><a href="https://github.com/blueimp/JavaScript-Templates">Source Code</a></li>
40+
<li><a href="https://github.com/blueimp/JavaScript-Templates">Documentation</a></li>
41+
<li><a href="https://github.com/blueimp/JavaScript-Templates/issues">Issues</a></li>
42+
<li><a href="test/">Test</a></li>
43+
<li><a href="https://blueimp.net">&copy; Sebastian Tschan</a></li>
44+
</ul>
45+
</div>
3746
</div>
3847
</div>
3948
</div>
@@ -47,19 +56,19 @@ <h1>JavaScript Templates Demo</h1>
4756
</blockquote>
4857
<br>
4958
<div class="row">
50-
<div class="span5">
59+
<div class="span4">
5160
<h2>Template</h2>
52-
<textarea class="xlarge" rows="15" id="template"></textarea>
61+
<textarea class="span4" rows="15" id="template"></textarea>
5362
</div>
54-
<div class="span5">
63+
<div class="span4">
5564
<h2>Data (JSON)</h2>
56-
<textarea class="xlarge" rows="15" id="data"></textarea>
65+
<textarea class="span4" rows="15" id="data"></textarea>
5766
</div>
58-
<div class="span6">
67+
<div class="span4">
5968
<h2>Result</h2>
6069
<div class="well" id="result"></div>
6170
<p>
62-
<button class="btn primary" id="render">Render</button>
71+
<button class="btn btn-primary" id="render">Render</button>
6372
<button class="btn" type="reset" id="reset">Reset</button>
6473
</p>
6574
</div>
@@ -95,8 +104,9 @@ <h4>Features</h4>
95104
<code>{%=o%}</code>
96105
</script>
97106
<script src="tmpl.min.js"></script>
98-
<!-- jQuery is not required, but included for the demo -->
107+
<!-- jQuery and Bootstrap JS are not required, but included for the demo -->
99108
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
109+
<script src="http://blueimp.github.com/cdn/js/bootstrap.min.js"></script>
100110
<script>
101111
/*global window, jQuery, tmpl */
102112
(function ($) {
@@ -129,4 +139,4 @@ <h4>Features</h4>
129139
}(jQuery));
130140
</script>
131141
</body>
132-
</html>
142+
</html>

‎test/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ <h2 id="qunit-userAgent"></h2>
2929
<script src="http://code.jquery.com/qunit/git/qunit.js"></script>
3030
<script src="test.js"></script>
3131
</body>
32-
</html>
32+
</html>

‎test/node-qunit.js‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎test/template.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{%=o.value%}
1+
{%=o.value%}

‎test/test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
if (!$.module) {
4444
// Node.js QUnit compatible Testrunner:
45-
nodeQunit = require('./node-qunit');
45+
nodeQunit = require('node-qunit');
4646
$.module = nodeQunit.module;
4747
$.test = nodeQunit.test;
4848
$.strictEqual = nodeQunit.assert.strictEqual;

0 commit comments

Comments
 (0)