Merge branch 'pr/1138'

Close #1138
tastejs · Feb 8, 2015 · c898a78 · c898a78
2 parents 480cf29 + 038fc12
commit c898a78
Show file tree

Hide file tree

Showing 177 changed files with 72,556 additions and 60,281 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,14 +2,12 @@
 # run on your project. The secure: variable must be generated by running `travis encrypt`
 # on a github oauth key that you can generate using curl.
 
-language:
-    node_js
-sudo:
-    false
+sudo: false
+language: node_js
 node_js:
-    - 0.10
+    - '0.12'
 notifications:
-    irc: "irc.freenode.org#tastejs"
+    irc: 'irc.freenode.org#tastejs'
 branches:
     only:
         - master
@@ -26,7 +24,7 @@ env:
         # travis encrypt GH_OAUTH_TOKEN=XXXXXXXXXXXXXXX
         #
         # User specific env variables
-        - secure: "fHgfjMpYuliwMr2QLnjYZExIViNrxprf9dhXRBLZ6P9Hz7P6m1BMYrI/xEG8X+fFbCi0+n3AXh8SEMHi9ou/Pty/cx12z4w/z3B2BHMxh4XBwpZHs+AB4IXkLiwwWoP4QFy4vTipgYnMDMq9CRhlRbhZEpenQBmaTEc472By1uM="
+        - secure: 'fHgfjMpYuliwMr2QLnjYZExIViNrxprf9dhXRBLZ6P9Hz7P6m1BMYrI/xEG8X+fFbCi0+n3AXh8SEMHi9ou/Pty/cx12z4w/z3B2BHMxh4XBwpZHs+AB4IXkLiwwWoP4QFy4vTipgYnMDMq9CRhlRbhZEpenQBmaTEc472By1uM='
         - GH_OWNER: tastejs
         - GH_PROJECT_NAME: todomvc
 
@@ -45,8 +43,8 @@ after_success:
     - cp -R ../dist/* .
     - cp ../dist/.* .
     - git add -f .
-    - git config user.email "travis@rdrei.net"
-    - git config user.name "TasteBot"
-    - git commit -am "update the build files for gh-pages [ci skip]"
+    - git config user.email 'travis@rdrei.net'
+    - git config user.name 'TasteBot'
+    - git commit -am 'update the build files for gh-pages [ci skip]'
     # Any command that using GH_OAUTH_TOKEN must pipe the output to /dev/null to not expose your oauth token
     - git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages > /dev/null 2>&1
diff --git a/examples/ampersand/.gitignore b/examples/ampersand/.gitignore
@@ -0,0 +1,13 @@
+node_modules/.bin
+node_modules/browserify
+node_modules/watchify
+node_modules/jadeify
+node_modules/jade
+node_modules/debounce
+node_modules/ampersand-*
+
+node_modules/todomvc-app-css
+!node_modules/todomvc-app-css/index.css
+node_modules/todomvc-common
+!node_modules/todomvc-common/base.css
+!node_modules/todomvc-common/base.js
diff --git a/examples/ampersand/index.html b/examples/ampersand/index.html
@@ -3,7 +3,8 @@
     <head>
         <meta charset="utf-8">
         <title>Ampersand.js • TodoMVC</title>
-        <link rel="stylesheet" href="todomvc-common/base.css">
+        <link rel="stylesheet" href="node_modules/todomvc-common/base.css">
+        <link rel="stylesheet" href="node_modules/todomvc-app-css/index.css">
     </head>
     <body>
         <section id="todoapp">
@@ -37,7 +38,7 @@ <h1>todos</h1>
             <p>Written by <a href="https://twitter.com/henrikjoreteg">Henrik Joreteg</a>, <a href="https://twitter.com/lukekarrys">Luke Karrys</a>, and <a href="https://twitter.com/philip_roberts">Philip Roberts</a></p>
             <p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
         </footer>
-        <script src="todomvc-common/base.js"></script>
+        <script src="node_modules/todomvc-common/base.js"></script>
         <script src="todomvc.bundle.js"></script>
     </body>
 </html>