Permalink
Browse files

Use Butter submodule's Popcorn submodule, rather than a direct Popcor…

…n submodule. Closes #26
  • Loading branch information...
1 parent 9b3d97f commit da00a0919a10e0f3bc96c262bc08fdfdb4f8d412 @jeremyBanks jeremyBanks committed May 31, 2012
Showing with 4 additions and 8 deletions.
  1. +0 −3 .gitmodules
  2. +0 −1 external/popcornjs
  3. +1 −1 index.html
  4. +3 −3 mobile/index.html
View
@@ -1,6 +1,3 @@
-[submodule "external/popcornjs"]
- path = external/popcornjs
- url = https://github.com/mozilla/popcorn-js.git
[submodule "external/butter"]
path = external/butter
url = https://github.com/jeremybanks/butter.git
Submodule popcornjs deleted from 4cb0cc
View
@@ -25,7 +25,7 @@
<script src="external/modernizr/modernizr.custom.js"></script>
<!-- Popcorn scripts -->
- <script src="external/popcornjs/popcorn.js"></script>
+ <script src="external/butter/external/popcorn-js/popcorn.js"></script>
<script src="js/custom-plugins/plugin.slidedrive.js"></script>
<!-- project-container class determines the size of the container.
This contains the slideshow, media element, and transcript
View
@@ -27,9 +27,9 @@
<script src="../external/modernizr/modernizr.custom.js"></script>
<!-- Popcorn scripts -->
- <script src="../external/popcornjs/popcorn.js"></script>
- <script src="../external/popcornjs/plugin.deckjs.js"></script>
- <script src="../external/popcornjs/mobile.parser.deckjs.js"></script>
+ <script src="../external/butter/external/popcorn-js/popcorn.js"></script>
+ <script src="../external/butter/external/popcorn-js/plugin.deckjs.js"></script>
+ <script src="../external/butter/external/popcorn-js/mobile.parser.deckjs.js"></script>
<!-- project-container class determines the size of the container.
This contains the slideshow, media element, and transcript
deck-container will override height set by deckjs to whatever you desire

0 comments on commit da00a09

Please sign in to comment.