8000 updated: code · nCodefresh/examples@3577d37 · GitHub
[go: up one dir, main page]
S 8000 kip to content

Commit 3577d37

Browse files
petersirkapetersirka
committed
updated: code
1 parent 0d3ee40 commit 3577d37

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

‎static-file-merge/definitions/merge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
21
// Merging files
3-
framework.merge('merge.js', '/js/a.js', '/js/b.js', 'http://www.totaljs.com/inject.js');
2+
framework.merge('merge.js', '/js/a.js', '/js/b.js', 'http://www.totaljs.com/inject.js');
3+
framework.merge('together.html', 'a.html', ['b.html', 'c.html']);

‎static-file-merge/public/a.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<b>A</b>

‎static-file-merge/public/b.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<i>b</i>

‎static-file-merge/public/c.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<s>c</s>

‎static-file-merge/views/homepage.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
</head>
1414
<body>
1515

16-
OPEN WEB DEVELOPER TOOLS -&gt; CONSOLE
16+
<div>OPEN WEB DEVELOPER TOOLS -&gt; CONSOLE</div>
17+
<br />
18+
<div><a href="/merge.js">JavaScript -> merge.js</a></div>
19+
<div><a href="/together.html">HTML -> together.html</a></div>
1720

1821
</body>
1922
</html>

0 commit comments

Comments
 (0)
0