Skip to content

Commit

Permalink
made it so you can mashup more than once
Browse files Browse the repository at this point in the history
  • Loading branch information
Boaz Sender authored and Boaz Sender committed Sep 11, 2011
1 parent ee097c8 commit 2ce41a6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 16 deletions.
16 changes: 5 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,13 @@

</head>
<body>
<figure id="bin1">
</figure>
<figure id="bin1"></figure>
<figure id="canvas">
<section id="audioSource">
</section>
<section id="videoSource">
</section>
<section id="audioSource"></section>
<section id="videoSource"></section>
<a href="#" id="makeMashup" class="btn primary">Mashup!</a>
<section id="mashup">

</section>
</figure>
<figure id="bin2">
<section id="mashup"></section>
</figure>
<figure id="bin2"></figure>
</body>
</html>
12 changes: 7 additions & 5 deletions scripts/remixer.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ jQuery(function($){
display: 'none'
});

$('<video>', {
src: videoSrc,
id: 'newVideo'
})
.appendTo('#canvas')
$('#mashup').html(
$('<video>', {
src: videoSrc,
id: 'newVideo'
})
)


var newAudio = Popcorn('#newAudio'),
newVideo = Popcorn('#newVideo');
Expand Down

0 comments on commit 2ce41a6

Please sign in to comment.