diff options
Diffstat (limited to 'app/js')
-rw-r--r-- | app/js/app.js | 18 | ||||
-rw-r--r-- | app/js/directives.js | 10 | ||||
-rw-r--r-- | app/js/yt_musicsearch.js | 18 |
3 files changed, 35 insertions, 11 deletions
diff --git a/app/js/app.js b/app/js/app.js index c59b849..514f187 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -135,10 +135,24 @@ var dummyPoints= [ }, { x: 800, - y: 750, + y: 200, label:"piste f" }, - + { + x: 950, + y: 300, + label:"piste f" + }, + { + x: 740, + y: 120, + label:"piste f" + }, + { + x: 900, + y: 320, + label:"piste f" + } ] var Song = function(point){ diff --git a/app/js/directives.js b/app/js/directives.js index add724b..428fad1 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -69,15 +69,15 @@ app.directive('pgLine', function () { var lines = []; scope.$watch('list', function(newPoints) { console.log("update"); -angular.forEach(lines, function(line) { - line.remove(); - }); + angular.forEach(lines, function(line) { + line.remove(); + }); if (newPoints) { for (var i = 0; i < newPoints.length - 1; ++i) { if (newPoints[i].selected) { - var line = new paper.Path.Line(newPoints[i], newPoints[i+1]); - line.strokeColor = 'red'; + var line = paper.Path.Line(newPoints[i], newPoints[i+1]); + line.strokeColor = 'rgba(7,140,255,.6)'; line.strokeWidth = 2; lines.push(line) } diff --git a/app/js/yt_musicsearch.js b/app/js/yt_musicsearch.js index fcc52db..82ad741 100644 --- a/app/js/yt_musicsearch.js +++ b/app/js/yt_musicsearch.js @@ -18,12 +18,22 @@ function searchClicked() document.documentElement.firstChild.appendChild(script); } - - function newMusic(id) + + var musicTimer; + + function startSongWithDuration(id, duration) { $('#ytplayer').attr('src', 'https://www.youtube.com/embed/'+id+'?autoplay=1&modestbranding=1'); + console.log("Starting music "+id+", timer="+duration); + musicTimer = setInterval(changeSong, duration * 1000); } - + + function changeSong() + { + alert("Done"); + clearInterval(musicTimer); + } + function getAllMatchingIds(data) { var feed = data.feed; @@ -44,7 +54,7 @@ function searchClicked() for (var i = 0; i < results.length; i++) { //html.push('<li>', '<img src="http://img.youtube.com/vi/', results[i].id, '/2.jpg" /><a href="#" onclick="newMusic(\'', results[i].id ,'\')">', results[i].title, '</a>(', results[i].duration, ')', '</li>'); - html.push('<li>', '<a href="#" onclick="newMusic(\'', results[i].id ,'\')">', results[i].title, '</a>', '</li>'); + html.push('<li>', '<a href="#" onclick="startSongWithDuration(\'', results[i].id ,'\', '+results[i].duration +')">', results[i].title, '</a>', '</li>'); } html.push('</ul>'); document.getElementById('videoResultsDiv').innerHTML = html.join(''); |