Skip to content

Commit

Permalink
Merge branch 'master' of heroku.com:social-music
Browse files Browse the repository at this point in the history
  • Loading branch information
EnTeQuAk committed Aug 27, 2011
2 parents d90decf + 745d5ea commit 97787c8
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
1 change: 0 additions & 1 deletion sm/static/coffee/app.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,3 @@ $ ->

false
)
false
10 changes: 1 addition & 9 deletions sm/static/js/app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions sm/static/js/resolvers.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
var args, results, url;
url = 'http://api.jamendo.com/get2/id+name+duration+stream+album_name+artist_name/track/json/track_album+album_artist/';
args = {};
console.log("Artist: " + artist + " Album: " + album + " Title: " + title);
if (title !== '') {
args.name = title;
}
Expand All @@ -19,7 +18,6 @@
results = [];
return $.get(url, args, function(data) {
return $.each(data, function() {
console.log("GOT " + $.param(this));
callback({
artist: this.artist_name,
album: this.album_name,
Expand Down

0 comments on commit 97787c8

Please sign in to comment.