summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assets/js/app.js5
-rw-r--r--index.html48
2 files changed, 26 insertions, 27 deletions
diff --git a/assets/js/app.js b/assets/js/app.js
index a43f5f8..0c13174 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -14,15 +14,14 @@ ClipPlay.App.addInitializer(function(options) {
//just to have something loaded for debugging
ClipPlay.Config = {};
ClipPlay.Config['key_defaults'] = ['a','s','d','f','g','h','j','k','l'];
+
samples_collection.add({url:"http://www.youtube.com/watch?v=onRk0sjSgFU"});
samples_collection.add({url:"https://vimeo.com/18150336"});
samples_collection.add({url:"http://www.youtube.com/watch?v=8hP9D6kZseM"});
samples_collection.add({url:"http://www.youtube.com/watch?v=QH2-TGUlwu4"});
-
samples_collection.add({url:"http://www.youtube.com/watch?v=eau1qHxI-8w"});
-
samples_collection.add({url:"http://www.youtube.com/watch?v=A2zKARkpDW4"});
-
+ samples_collection.add({url:"http://www.youtube.com/watch?v=ahTyGckSJqw"});
});
diff --git a/index.html b/index.html
index 0b19b20..0fb20e6 100644
--- a/index.html
+++ b/index.html
@@ -9,10 +9,10 @@
<meta name="viewport" content="width=device-width">
- <link rel="stylesheet" href="/assets/css/reset.css" />
- <link rel="stylesheet" href="/assets/fonts/neoretro-draw.css" />
- <link rel="stylesheet" href="/assets/css/application.css" />
- <link rel="stylesheet" href="/assets/css/sample-editor.css" />
+ <link rel="stylesheet" href="assets/css/reset.css" />
+ <link rel="stylesheet" href="assets/fonts/neoretro-draw.css" />
+ <link rel="stylesheet" href="assets/css/application.css" />
+ <link rel="stylesheet" href="assets/css/sample-editor.css" />
</head>
<body>
<header>
@@ -32,25 +32,25 @@
<div id="video"></div>
</div>
-
+
<footer>
Made by <a href="https://github.com/whichlight/">Kawandeep Virdee</a> &amp; <a href="https://github.com/teddywing">Teddy Wing</a> at <a href="http://boston.musichackday.org/">Music Hack Day Boston 2013</a>
</footer>
- <script src="/assets/js/libs/jquery-2.0.3.min.js"></script>
- <script src="/assets/js/libs/mousetrap.min.js"></script>
- <script src="/assets/js/libs/jquery-ui-1.10.3.custom.min.js"></script>
- <script src="/assets/js/libs/jquery.embedly-3.1.1.min.js"></script>
- <script src="/assets/js/libs/underscore-min.js"></script>
- <script src="/assets/js/libs/backbone-min.js"></script>
- <script src="/assets/js/libs/backbone.marionette.min.js"></script>
- <script src="/assets/js/libs/player.js"></script>
+ <script src="assets/js/libs/jquery-2.0.3.min.js"></script>
+ <script src="assets/js/libs/mousetrap.min.js"></script>
+ <script src="assets/js/libs/jquery-ui-1.10.3.custom.min.js"></script>
+ <script src="assets/js/libs/jquery.embedly-3.1.1.min.js"></script>
+ <script src="assets/js/libs/underscore-min.js"></script>
+ <script src="assets/js/libs/backbone-min.js"></script>
+ <script src="assets/js/libs/backbone.marionette.min.js"></script>
+ <script src="assets/js/libs/player.js"></script>
<script type="text/html" id="sample-view-template">
<div class="edit-sample js-edit-sample">
<div class="thumbnail js-thumbnail"></div>
-
+
<div class="progress-bar">
<div class="clip-line clip-line-start js-clip-line js-start-position">
<div class="drag-handle start-drag-handle js-drag-handle">
@@ -74,16 +74,16 @@
</div>
</script>
- <script src="/assets/js/sample.js"></script>
+ <script src="assets/js/sample.js"></script>
- <script src="/assets/js/initialize.js"></script>
- <script src="/assets/js/models/sample.js"></script>
- <script src="/assets/js/collections/samples.js"></script>
- <script src="/assets/js/views/sample-add-view.js"></script>
- <script src="/assets/js/views/selected-bar.js"></script>
- <script src="/assets/js/views/clip-line.js"></script>
- <script src="/assets/js/views/sample.js"></script>
- <script src="/assets/js/views/sample-editor.js"></script>
- <script src="/assets/js/app.js"></script>
+ <script src="assets/js/initialize.js"></script>
+ <script src="assets/js/models/sample.js"></script>
+ <script src="assets/js/collections/samples.js"></script>
+ <script src="assets/js/views/sample-add-view.js"></script>
+ <script src="assets/js/views/selected-bar.js"></script>
+ <script src="assets/js/views/clip-line.js"></script>
+ <script src="assets/js/views/sample.js"></script>
+ <script src="assets/js/views/sample-editor.js"></script>
+ <script src="assets/js/app.js"></script>
</body>
</html>