Skip to content

Commit

Permalink
Merge pull request #27 from stephenplusplus/gh-pages
Browse files Browse the repository at this point in the history
rely on Bower for necessary components.
  • Loading branch information
addyosmani committed Jan 31, 2014
2 parents 7dfe151 + 856cba2 commit 6b58987
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 21,141 deletions.
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"jquery": "~2.0.0",
"lodash": "~1.2.1",
"backbone": "~1.0.0",
"es6-module-loader": "~0.4.2"
"es6-module-loader": "~0.4.2",
"backbone.localStorage": "~1.1.7"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* Backbone localStorage Adapter
* Version 1.1.6
* Version 1.1.7
*
* https://github.com/jeromegn/Backbone.localStorage
*/
(function (root, factory) {
if (typeof exports === 'object' && root.require) {
if (typeof exports === 'object' && typeof require === 'function') {
module.exports = factory(require("underscore"), require("backbone"));
} else if (typeof define === "function" && define.amd) {
// AMD. Register as an anonymous module.
Expand Down
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ <h1>todos</h1>
<script src="bower_components/jquery/jquery.js"></script>
<script src="bower_components/lodash/lodash.js"></script>
<script src="bower_components/backbone/backbone.js"></script>
<script src="js/lib/backbone/backbone.localStorage.js"></script>

<script src="bower_components/backbone.localStorage/backbone.localStorage.js"></script>
<script src="bower_components/es6-module-loader/dist/es6-module-loader.js"></script>
<script>System.import('js/app')</script>
</body>
Expand Down
15 changes: 0 additions & 15 deletions js/lib/traceur/bootstrap.js

This file was deleted.

Loading

0 comments on commit 6b58987

Please sign in to comment.