Permalink
Browse files

1. New version of popcorn ( 0.9 ).

2. Removed dependency on external dir for popcorn.
  • Loading branch information...
1 parent 0ef4e49 commit ca8acb73c484e13968e0f4c28bdec9959dd0d07d @secretrobotron committed Oct 6, 2011
View
@@ -19,7 +19,6 @@ JS_LIBS := \
$(BUTTER_DIR)/dist/lib/butter.comm.js \
$(BUTTER_DIR)/dist/lib/jquery.js \
$(BUTTER_DIR)/dist/lib/jquery-ui.min.js \
- $(BUTTER_DIR)/dist/lib/popcorn-complete.js \
$(BUTTER_DIR)/dist/lib/trackLiner.js
CSS_LIBS := \
View
@@ -19,7 +19,6 @@ MISC_LIBS := \
JS_LIBS := \
$(EXTERNAL_DIR)/jquery/jquery.js \
$(EXTERNAL_DIR)/jquery-ui/jquery-ui.min.js \
- $(EXTERNAL_DIR)/popcorn/popcorn-complete.js \
$(EXTERNAL_DIR)/trackLiner/trackLiner.js \
$(MODULES_DIR)/previewer/butter.preview-link.js \
$(MODULES_DIR)/butter.comm.js
@@ -1,14 +1,14 @@
<html>
<head>
- <script src="../../external/layouts/popcorn-js/popcorn.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.image.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.footnote.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.twitter.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.subtitle.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.attribution.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.flickr.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.webpage.js"></script>
- <script src="../../external/layouts/popcorn-js/popcorn.wikipedia.js"></script>
+ <script src="../../lib/popcorn/popcorn.min.js"></script>
+ <script src="../../lib/popcorn/popcorn.image.js"></script>
+ <script src="../../lib/popcorn/popcorn.footnote.js"></script>
+ <script src="../../lib/popcorn/popcorn.twitter.js"></script>
+ <script src="../../lib/popcorn/popcorn.subtitle.js"></script>
+ <script src="../../lib/popcorn/popcorn.attribution.js"></script>
+ <script src="../../lib/popcorn/popcorn.flickr.js"></script>
+ <script src="../../lib/popcorn/popcorn.webpage.js"></script>
+ <script src="../../lib/popcorn/popcorn.wikipedia.js"></script>
</head>
<style>
video, div {
Oops, something went wrong.

0 comments on commit ca8acb7

Please sign in to comment.