Permalink
Browse files

Merge pull request #4 from jaitaiwan/master

Spine Update
  • Loading branch information...
maccman committed Nov 20, 2011
2 parents f8a1d0c + 0ed9971 commit c08dd5fde484dc4fe5540a159bbaeee76d15cc63
Showing with 196 additions and 90 deletions.
  1. +1 −1 index.html
  2. +41 −14 lib/application.js
  3. +1 −1 lib/{spine.local.js → local.js}
  4. +86 −41 lib/spine.js
  5. +1 −1 src/application.coffee
  6. +1 −1 src/{spine.local.coffee → local.coffee}
  7. +65 −31 src/spine.coffee
View
@@ -10,7 +10,7 @@
<script src="lib/jquery.tmpl.js" type="text/javascript" charset="utf-8"></script>
<script src="lib/spine.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/spine.local.js" type="text/javascript" charset="utf-8"></script>
+ <script src="lib/local.js" type="text/javascript" charset="utf-8"></script>
<script src="lib/application.js" type="text/javascript" charset="utf-8"></script>
<script type="text/x-jquery-tmpl" id="taskTemplate">
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,6 +1,6 @@
(function() {
if (typeof Spine === "undefined" || Spine === null) {
- Spine = require("spine");
+ Spine = require('spine');
}
Spine.Model.Local = {
extended: function() {
Oops, something went wrong.

0 comments on commit c08dd5f

Please sign in to comment.