diff options
| author | Ludovic Barman <ludovic.barman@gmail.com> | 2014-05-11 14:43:54 +0200 |
|---|---|---|
| committer | Ludovic Barman <ludovic.barman@gmail.com> | 2014-05-11 14:43:54 +0200 |
| commit | 690e9635d10817bbbf96f6ba2afd7474a99e7925 (patch) | |
| tree | f19ac74a84db362ef2067d1b3ed700b9fe818fe7 | |
| parent | c0b0cf5377efeb9889470c57124ceae794de7dd6 (diff) | |
| download | playGraph-690e9635d10817bbbf96f6ba2afd7474a99e7925.tar.gz playGraph-690e9635d10817bbbf96f6ba2afd7474a99e7925.tar.bz2 playGraph-690e9635d10817bbbf96f6ba2afd7474a99e7925.zip | |
LBARMAN final
| -rw-r--r-- | app/index.html | 7 | ||||
| -rw-r--r-- | app/js/controllers.js | 5 | ||||
| -rw-r--r-- | app/js/yt_musicsearch.js | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app/index.html b/app/index.html index a83ed5d..825ccdd 100644 --- a/app/index.html +++ b/app/index.html @@ -8,17 +8,18 @@ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu"> <script type="text/javascript" src="lib/paper-full.js"></script> + <script src="lib/jquery-1.11.1.min.js" ></script> + <script src="lib/angular.js"></script> <script src="js/app.js" ></script> <script src="js/filters.js" ></script> <script src="js/services.js" ></script> <script src="js/directives.js" ></script> <script src="js/controllers.js" ></script> - <script src="lib/jquery-1.11.1.min.js" ></script> <script src="js/yt_musicsearch.js" ></script> </head> - <body ng-app="playGraph" ng-controller="pointCtrl"> + <body id="body_spe" ng-app="playGraph" ng-controller="pointCtrl"> <div id="authors"> <p>Jakob Odersky, Nicolas Bornand, Ludovic Barman</p> @@ -46,7 +47,7 @@ </ul> </fieldset> - <iframe id="ytplayer" type="text/html" width="100%" + <iframe id="ytplayer" type="text/html" width="640" height="360" src="https://www.youtube.com/embed/M7lc1UVf-VE?autoplay=1&modestbranding=1" frameborder="0" allowfullscreen></iframe> diff --git a/app/js/controllers.js b/app/js/controllers.js index 2230603..e918ff9 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -13,6 +13,7 @@ app.controller('pointCtrl', function($scope, $http, pathService){ var update = function(newPoints, newLine) { if(newLine.length > 0) { $scope.playseq=pathService.computePlaylist(newPoints, newLine, 60); + startSongWithDuration($scope.playseq[0].id, $scope.playseq[0].duration); } } @@ -30,6 +31,7 @@ app.controller('pointCtrl', function($scope, $http, pathService){ $scope.addNewSongToGraph = function(id, titre, link, duration) { + alert("ninja "+id); var newSong = { x:100, y:100, @@ -38,7 +40,8 @@ app.controller('pointCtrl', function($scope, $http, pathService){ link:link, duration:duration }; - $scope.points.push(newSong); + $scope.points.push(newSong); + $scope.$apply(); }; diff --git a/app/js/yt_musicsearch.js b/app/js/yt_musicsearch.js index 82ad741..3e12f01 100644 --- a/app/js/yt_musicsearch.js +++ b/app/js/yt_musicsearch.js @@ -1,4 +1,4 @@ -function searchClicked() + function searchClicked() { document.getElementById("videoResultsDiv").innerHTML = 'Loading YouTube videos ...'; @@ -34,6 +34,11 @@ function searchClicked() clearInterval(musicTimer); } + function callAngular(id, titre, link, duration) + { + angular.element(document.getElementById('body_spe')).scope().addNewSongToGraph(id, titre, link, duration); + } + function getAllMatchingIds(data) { var feed = data.feed; @@ -46,15 +51,13 @@ function searchClicked() var id = entries[i].id.$t.substring(entries[i].id.$t.lastIndexOf("/")+1); results.push({'id' : id, 'title' : entries[i].title.$t, 'link' : entries[i].link[0].href, 'duration' : entries[i].media$group.yt$duration.seconds}); } - console.log(entries); - console.log(results); var html = ['<ul>']; 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="startSongWithDuration(\'', results[i].id ,'\', '+results[i].duration +')">', results[i].title, '</a>', '</li>'); + html.push('<li>', '<a href="#" onclick="callAngular(\'', results[i].id,'\',\'',results[i].title,'\',\'',results[i].link,'\',\'',results[i].duration, '\')">', results[i].title, '</a>', '</li>'); } html.push('</ul>'); document.getElementById('videoResultsDiv').innerHTML = html.join(''); |