summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assets/js/views/sample.js3
-rw-r--r--index.html12
-rw-r--r--player.html4
3 files changed, 9 insertions, 10 deletions
diff --git a/assets/js/views/sample.js b/assets/js/views/sample.js
index 7aab111..74da663 100644
--- a/assets/js/views/sample.js
+++ b/assets/js/views/sample.js
@@ -16,13 +16,12 @@ ClipPlay.Views.Sample = Marionette.ItemView.extend({
var src = encodeURIComponent($(f)[0].src);
var schema = data.provider_name.toLowerCase();
var iframe_src= BASE_IFRAME +"?schema="+schema+"&type=text%2Fhtml&html="+src;
- console.log(iframe_src);
var iframe = $('<iframe/>', {
src: iframe_src
});
- console.log(iframe[0]);
$('#video').append(iframe[0]);
var player = new OP.Player(iframe[0]);
+ window.player = player;
that.model.set('player', player);
that.model.set('iframe', iframe);
diff --git a/index.html b/index.html
index 510a437..59c26ec 100644
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@
<button type="button" class="js-create-sample">+</button>
</form>
</div>
-
+
<div id="samples"></div>
@@ -36,27 +36,27 @@
<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="progress-bar">
<div class="clip-line js-clip-line js-start-position">
<div class="drag-handle js-drag-handle"></div>
</div>
-
+
<div class="clip-line js-clip-line js-end-position">
<div class="drag-handle js-drag-handle"></div>
</div>
</div>
-
+
<div>
<input type="text" class="js-keyboard-key" placeholder="a" />
</div>
</div>
</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>
diff --git a/player.html b/player.html
index e2e3e09..e25bbaf 100644
--- a/player.html
+++ b/player.html
@@ -69,8 +69,8 @@
float:left;
}
</style>
- <script src='/js/utils.js'></script>
- <script src='/js/player.js'></script>
+ <script src='assets/js/libs/utils.js'></script>
+ <script src='assets/js/libs/player.js'></script>
</head>
<body>
<div class="controls">