\
');
- albums_info = $('');
- $.each(data.albums, function(i, album) {
- var album_info;
- if (album.year != null) {
- album_info = $('\
+ albums_info = $('');
+ $.each(data.albums, function(i, album) {
+ var album_info;
+ if (album.year != null) {
+ album_info = $('\
\
\
@@ -18,11 +13,11 @@
' + data.artist.desc + '\
\
\
\
\
');
- return $(album_info).find('.tracklist ul').append(track_info);
- });
- return $(albums_info).append(album_info);
+ return $(album_info).find('.tracklist ul').append(track_info);
+ });
+ return $(albums_info).append(album_info);
+ }
+ });
+ $('.data-container').css({
+ backgroundImage: 'none'
+ });
+ $('.data-container .inner').html('').append(artist_info).append(albums_info);
+ yaCounter7596904.hit(_ajax.getAnchor(), data.artist.name, _ajax.referer);
+ _ajax.setTitle(data.artist.name);
+ return false;
+ };
+ Pages.prototype.renderSearch = function(data) {
+ $('.data-container').css({
+ background: 'url(/images/concrete_wall_2.png) 0 -30px repeat'
+ });
+ $('.data-container .inner').html(data);
+ $('.search-container').css('marginLeft', ($('.data-container').width() - 425) / 2 + 'px').css('marginTop', ($('.data-container').height() / 2 - 230) + 'px').height(($('.data-container').height() - $('#search_form').height()) / 2);
+ setTimeout(function() {
+ $('#search_field').bh_autocomplete({
+ serviceUrl: '/artist/autocomplete',
+ minChars: 2,
+ delimiter: /(,|;)\s*/,
+ maxHeight: 400,
+ width: 415,
+ zIndex: 9999,
+ deferRequestBy: 500,
+ onSelect: function() {
+ return _ajax.loadArtistData($('#search_field').val());
}
});
- $('.data-container').css({
- backgroundImage: 'none'
- });
- $('.data-container .inner').html('').append(artist_info).append(albums_info);
- yaCounter7596904.hit(ajax.getAnchor(), data.artist.name, ajax.referer);
- return ajax.setTitle(data.artist.name);
- };
- Pages.prototype.renderSearch = function(data) {
- $('.data-container').css({
- background: 'url(/images/concrete_wall_2.png) 0 -30px repeat'
- });
- $('.data-container .inner').html(data);
- $('.search-container').css('marginLeft', ($('.data-container').width() - 425) / 2 + 'px').css('marginTop', ($('.data-container').height() / 2 - 230) + 'px').height(($('.data-container').height() - $('#search_form').height()) / 2);
- setTimeout(function() {
- $('#search_field').bh_autocomplete({
- serviceUrl: '/artist/autocomplete',
- minChars: 2,
- delimiter: /(,|;)\s*/,
- maxHeight: 400,
- width: 415,
- zIndex: 9999,
- deferRequestBy: 500,
- onSelect: function() {
- return ajax.loadArtistData();
- }
- });
- return $('#search_field').focus();
- }, 501);
- yaCounter7596904.hit(ajax.getAnchor(), 'Artist Search', ajax.referer);
- return ajax.setTitle('Artist Search');
- };
- Pages.prototype.renderSettings = function(data) {
- $('.data-container').css({
- background: 'none'
- });
- $('.data-container .inner').html(data);
- yaCounter7596904.hit(ajax.getAnchor(), 'Settings', ajax.referer);
- ajax.setTitle('Settings');
- return $('.settings-container .tabs .tab').first().trigger('click');
- };
- return Pages;
- })();
-}).call(this);
+ return $('#search_field').focus();
+ }, 501);
+ yaCounter7596904.hit(_ajax.getAnchor(), 'Artist Search', _ajax.referer);
+ _ajax.setTitle('Artist Search');
+ return false;
+ };
+ Pages.prototype.renderSettings = function(data) {
+ $('.data-container').css({
+ background: 'none'
+ });
+ $('.data-container .inner').html(data);
+ yaCounter7596904.hit(_ajax.getAnchor(), 'Settings', _ajax.referer);
+ _ajax.setTitle('Settings');
+ $('.settings-container .tabs .tab').first().trigger('click');
+ return false;
+ };
+ return Pages;
+})();
\ No newline at end of file
diff --git a/public/javascripts/coffee/player.js b/public/javascripts/coffee/player.js
index 16893a2..377ce3e 100644
--- a/public/javascripts/coffee/player.js
+++ b/public/javascripts/coffee/player.js
@@ -1,285 +1,276 @@
-/* DO NOT MODIFY. This file was compiled Mon, 27 Jun 2011 17:49:39 GMT from
- * /Users/chez/Sites/beathaven/app/coffeescripts/player.coffee
- */
-
-(function() {
- var Player;
- Player = (function() {
- function Player() {}
- Player.prototype.bar_width = 330;
- Player.prototype.jp = null;
- Player.prototype.scrobbled = false;
- Player.prototype.initJplayer = function() {
- var self;
- self = this;
- this.jp = $("#jplayer");
- this.jp.jPlayer({
- swfPath: "/js",
- supplied: "mp3",
- cssSelectorAncestor: "",
- cssSelector: {
- play: "#player .play",
- pause: "#player .pause",
- stop: "",
- videoPlay: "",
- seekBar: "",
- playBar: "",
- mute: "",
- unmute: "",
- volumeBar: "",
- volumeBarValue: "",
- currentTime: "",
- duration: ""
- }
- });
- this.jp.bind($.jPlayer.event.timeupdate, function(e) {
- var $obj, data;
- data = e.jPlayer.status;
- if (!Player.scrobbled && data.currentPercentAbsolute > 50) {
- $obj = $('.playlist-tracks li.now');
- self.scrobble($obj.attr('data-artist'), $obj.attr('data-album'), $obj.attr('data-track'));
- Player.scrobbled = true;
- }
- $('#player .progress .loaded').width(data.seekPercent * self.bar_width / 100);
- return $('#player .progress .played').width(data.currentPercentAbsolute * self.bar_width / 100);
- });
- this.jp.bind($.jPlayer.event.ended, function(e) {
- var next;
- next = self.nextTrack();
- if (!next) {
- $('#jplayer').jPlayer('clearMedia');
- $('#player .now-playing').html('Nothing left to lose play');
- $('#player .loaded, #player .played').width(0);
- return $('.playlist-tracks li').removeClass('now');
- } else {
- return self.setTrack(next);
- }
- });
- return false;
- };
- Player.prototype.addTrack = function(artist, album, track, length, autoplay) {
- var initial_count;
- if (!(autoplay != null)) {
- autoplay = false;
+var Player;
+Player = (function() {
+ function Player() {}
+ Player.prototype.bar_width = 330;
+ Player.prototype.jp = null;
+ Player.prototype.scrobbled = false;
+ Player.prototype.initJplayer = function() {
+ var self;
+ self = this;
+ this.jp = $("#jplayer");
+ this.jp.jPlayer({
+ swfPath: "/js",
+ supplied: "mp3",
+ cssSelectorAncestor: "",
+ cssSelector: {
+ play: ".player .play",
+ pause: ".player .pause",
+ stop: "",
+ videoPlay: "",
+ seekBar: "",
+ playBar: "",
+ mute: "",
+ unmute: "",
+ volumeBar: "",
+ volumeBarValue: "",
+ currentTime: "",
+ duration: ""
}
- initial_count = $('.playlist-tracks li').length;
- $('.playlist-tracks').append('\
+ });
+ this.jp.bind($.jPlayer.event.timeupdate, function(e) {
+ var $obj, data;
+ data = e.jPlayer.status;
+ if (!_player.scrobbled && data.currentPercentAbsolute > 50) {
+ $obj = $('.playlist-tracks li.now');
+ self.scrobble($obj.attr('data-artist'), $obj.attr('data-album'), $obj.attr('data-track'));
+ _player.scrobbled = true;
+ }
+ $('.player .progress .loaded').width(data.seekPercent * self.bar_width / 100);
+ return $('.player .progress .played').width(data.currentPercentAbsolute * self.bar_width / 100);
+ });
+ this.jp.bind($.jPlayer.event.ended, function(e) {
+ var next;
+ next = self.nextTrack();
+ if (!next) {
+ $('#jplayer').jPlayer('clearMedia');
+ $('.player .now-playing').html('Nothing left to lose play');
+ $('.player .loaded, .player .played').width(0);
+ return $('.playlist-tracks li').removeClass('now');
+ } else {
+ return self.setTrack(next);
+ }
+ });
+ return false;
+ };
+ Player.prototype.addTrack = function(artist, album, track, length, autoplay) {
+ var initial_count;
+ if (!(autoplay != null)) {
+ autoplay = false;
+ }
+ initial_count = $('.playlist-tracks li').length;
+ $('.playlist-tracks').append('\
\
');
- $('#playlist').html($('.playlist-tracks')).scrollbar();
- $('.playlist-tracks').sortable();
- if (autoplay) {
- return Player.setTrack($('.playlist-tracks li').last().attr('id').split('i')[1]);
- } else if (initial_count === 0 && !Player.hasTrack()) {
- return Player.setTrack($('.playlist-tracks li').first().attr('id').split('i')[1]);
- }
- };
- Player.prototype.setTrack = function(id) {
- var $obj, query;
- $obj = $('#i' + id);
- query = $obj.attr('data-artist') + ' &mdash ' + $obj.attr('data-track');
- $('#player .now-playing').html(query + '');
- $('.playlist-tracks li').removeClass('now');
- $obj.addClass('now');
- $('#player .loaded, #player .played').width(0);
- vkontakte.loadTracksData($obj.attr('data-artist'), $obj.attr('data-track'), $obj.attr('data-length'), function() {
- return player.playSource();
- });
- return this.updateNowListening($obj.attr('data-artist'), $obj.attr('data-album'), $obj.attr('data-track'));
- };
- Player.prototype.hasTrack = function() {
- if ($('#jplayer audio').length > 0) {
- return $('#jplayer audio').attr('src') != null;
- } else if ($('#jplayer object').length > 0) {
- $('#jplayer').jPlayer('play');
- true;
- }
- return false;
- };
- Player.prototype.playSource = function(url) {
- $('#jplayer').jPlayer('setMedia', {
- mp3: url
- });
+ $('.playlist').html($('.playlist-tracks')).scrollbar();
+ $('.playlist-tracks').sortable();
+ if (autoplay) {
+ return _player.setTrack($('.playlist-tracks li').last().attr('id').split('i')[1]);
+ } else if (initial_count === 0 && !_player.hasTrack()) {
+ return _player.setTrack($('.playlist-tracks li').first().attr('id').split('i')[1]);
+ }
+ };
+ Player.prototype.setTrack = function(id) {
+ var $obj, query;
+ $obj = $('#i' + id);
+ query = $obj.attr('data-artist') + ' — ' + $obj.attr('data-track');
+ $('.player .now-playing').html(query + '');
+ $('.playlist-tracks li').removeClass('now');
+ $obj.addClass('now');
+ $('.player .loaded, .player .played').width(0);
+ _vkontakte.loadTracksData($obj.attr('data-artist'), $obj.attr('data-track'), $obj.attr('data-length'), function(url) {
+ return _player.playSource(url);
+ });
+ return this.updateNowListening($obj.attr('data-artist'), $obj.attr('data-album'), $obj.attr('data-track'));
+ };
+ Player.prototype.hasTrack = function() {
+ if ($('#jplayer audio').length > 0) {
+ return $('#jplayer audio').attr('src') != null;
+ } else if ($('#jplayer object').length > 0) {
$('#jplayer').jPlayer('play');
- return this.scrobbled = false;
- };
- Player.prototype.nextTrack = function(manual) {
- var $li, cnt, rnd;
- manual = manual != null;
- cnt = $('.playlist-tracks li').length;
- if (!this.onShuffle()) {
- if ($('.playlist-tracks .now').next().length === 0) {
- if (Player.onRepeat() || manual) {
- return $('.playlist-tracks li').first().attr('id').split('i')[1];
- } else {
- false;
- }
+ true;
+ }
+ return false;
+ };
+ Player.prototype.playSource = function(url) {
+ $('#jplayer').jPlayer('setMedia', {
+ mp3: url
+ });
+ $('#jplayer').jPlayer('play');
+ return this.scrobbled = false;
+ };
+ Player.prototype.nextTrack = function(manual) {
+ var $li, cnt, rnd;
+ manual = manual != null;
+ cnt = $('.playlist-tracks li').length;
+ if (!this.onShuffle()) {
+ if ($('.playlist-tracks .now').next().length === 0) {
+ if (_player.onRepeat() || manual) {
+ return $('.playlist-tracks li').first().attr('id').split('i')[1];
} else {
- return $('.playlist-tracks .now').next().attr('id').split('i')[1];
+ false;
}
- } else if (cnt === 1) {
- return $('.playlist-tracks li').first().attr('id').split('i')[1];
} else {
- while (true) {
- rnd = Math.floor(Math.random() * (cnt + .999));
- $li = $('.playlist-tracks li').eq(rnd);
- if ($li.length > 0 && !$li.hasClass('now')) {
- return $li.attr('id').split('i')[1];
- }
+ return $('.playlist-tracks .now').next().attr('id').split('i')[1];
+ }
+ } else if (cnt === 1) {
+ return $('.playlist-tracks li').first().attr('id').split('i')[1];
+ } else {
+ while (true) {
+ rnd = Math.floor(Math.random() * (cnt + .999));
+ $li = $('.playlist-tracks li').eq(rnd);
+ if ($li.length > 0 && !$li.hasClass('now')) {
+ return $li.attr('id').split('i')[1];
}
}
- return false;
- };
- Player.prototype.prevTrack = function() {
- var $li, cnt, rnd;
- cnt = $('.playlist-tracks li').length;
- if (!Player.onShuffle()) {
- if ($('.playlist-tracks .now').prev().length === 0) {
- return $('.playlist-tracks li').last().attr('id').split('i')[1];
- } else {
- return $('.playlist-tracks .now').prev().attr('id').split('i')[1];
- }
- } else if (cnt === 1) {
- return $('.playlist-tracks li').first().attr('id').split('i')[1];
+ }
+ return false;
+ };
+ Player.prototype.prevTrack = function() {
+ var $li, cnt, rnd;
+ cnt = $('.playlist-tracks li').length;
+ if (!_player.onShuffle()) {
+ if ($('.playlist-tracks .now').prev().length === 0) {
+ return $('.playlist-tracks li').last().attr('id').split('i')[1];
} else {
- while (true) {
- rnd = Math.floor(Math.random() * (cnt + .999));
- $li = $('.playlist-tracks li').eq(rnd);
- if ($li.length > 0 && !$li.hasClass('now')) {
- return $li.attr('id').split('i')[1];
- }
+ return $('.playlist-tracks .now').prev().attr('id').split('i')[1];
+ }
+ } else if (cnt === 1) {
+ return $('.playlist-tracks li').first().attr('id').split('i')[1];
+ } else {
+ while (true) {
+ rnd = Math.floor(Math.random() * (cnt + .999));
+ $li = $('.playlist-tracks li').eq(rnd);
+ if ($li.length > 0 && !$li.hasClass('now')) {
+ return $li.attr('id').split('i')[1];
}
}
- return false;
- };
- Player.prototype.onShuffle = function() {
- return $('#shuffle').hasClass('active');
- };
- Player.prototype.onRepeat = function() {
- return $('#repeat').hasClass('active');
- };
- Player.prototype.updateNowListening = function(artist, album, track) {
- if (session.user.lastfm_username) {
- return session.query('/lastfm/listening?r=' + Math.random(), {
- artist: artist,
- album: album,
- track: track
- });
- }
- };
- Player.prototype.scrobble = function(artist, album, track) {
- if (session.user.lastfm_username) {
- return session.query('/lastfm/scrobble?r=' + Math.random(), {
- artist: artist,
- album: album,
- track: track
- });
- }
- };
- return Player;
- })();
- $(function() {
- return player.initJplayer();
- });
- $('#player .controls .prev').live('click', function() {
- Player.setTrack(Player.prevTrack());
- return false;
- });
- $('#player .controls .next').live('click', function() {
- Player.setTrack(Player.nextTrack(true));
- return false;
- });
- $('#player .play').live('click', function() {
- if ($('.playlist-tracks li').length > 0 && !Player.hasTrack()) {
- player.setTrack($('.playlist-tracks li').first().attr('id').split('i')[1]);
}
return false;
- });
- $('#player .progress').live('click', function(e) {
- $('#jplayer').jPlayer('playHead', Math.round((e.offsetX / Player.bar_width) * 100));
- return false;
- });
- $('#repeat, #shuffle').live('click', function() {
- $(this).toggleClass('active');
- return false;
- });
- $('#empty-playlist').live('click', function() {
- if (confirm('Are you sure?')) {
- $('.playlist-tracks li').remove();
- $('#jplayer').jPlayer('clearMedia');
- $('#player .now-playing').text('Add some music to playlist');
- $('#player .loaded, #player .played').width(0);
+ };
+ Player.prototype.onShuffle = function() {
+ return $('#shuffle').hasClass('active');
+ };
+ Player.prototype.onRepeat = function() {
+ return $('#repeat').hasClass('active');
+ };
+ Player.prototype.updateNowListening = function(artist, album, track) {
+ if (_session.getUser().lastfm_username) {
+ return _session.query('/lastfm/listening?r=' + Math.random(), {
+ artist: artist,
+ album: album,
+ track: track
+ });
}
- return false;
- });
- $('.playlist-tracks li .fade, .playlist-tracks li .duration, .playlist-tracks li .remove').live('mouseover mouseout', function(e) {
- if (e.type === 'mouseover') {
- $(this).parent().find('.duration').hide();
- $(this).parent().find('.remove').show();
- } else {
- $(this).parent().find('.remove').hide();
- $(this).parent().find('.duration').show();
+ };
+ Player.prototype.scrobble = function(artist, album, track) {
+ if (_session.getUser().lastfm_username) {
+ return _session.query('/lastfm/scrobble?r=' + Math.random(), {
+ artist: artist,
+ album: album,
+ track: track
+ });
}
- return false;
- });
- $('.playlist-tracks li .remove').live('click', function() {
- var $li;
- $li = $(this).parent().parent();
- if ($li.hasClass('now')) {
- $('#jplayer').jPlayer('clearMedia');
- $('#player .now-playing').text('...');
- $('#player .loaded, #player .played').width(0);
- }
- $li.remove();
- return false;
- });
- $('.playlist-tracks li').live('dblclick', function() {
- player.setTrack($(this).attr('id').split('i')[1]);
- return false;
- });
- $('.add-album').live('click', function() {
- var album, artist, item, length, track_name, _i, _len, _ref;
- artist = $('.artist-info .name').html();
- album = $(this).parent().parent().parent().find('h2.name').text().replace(/\s\([\d]{4}\)$/, '');
- _ref = $(this).parent().parent().parent().find('.tracklist li');
- for (_i = 0, _len = _ref.length; _i < _len; _i++) {
- item = _ref[_i];
- track_name = $(item).find('.trackname').html();
- length = $(item).find('.length').html();
- Player.addTrack(artist, album, track_name, length);
- }
- return false;
- });
- $('.add-track').live('click', function() {
- var album, artist, length, track_name;
- artist = $('.artist-info .name').html();
- album = $(this).parent().parent().parent().parent().find('h2.name').text().replace(/\s\([\d]{4}\)$/, '');
- track_name = $(this).parent().find('.trackname').html();
- length = $(this).parent().find('.length').html();
- Player.addTrack(artist, album, track_name, length);
- return false;
- });
- $('.tracklist li').live('mouseover mouseout', function(e) {
- if (e.type === 'mouseover') {
- $(this).find('.add-track').show();
- } else {
- $(this).find('.add-track').hide();
- }
- return false;
- });
- $('.tracklist li').live('dblclick', function(e) {
- var album, artist, length, track_name;
- artist = $('.artist-info .name').html();
- album = $(this).parent().parent().parent().find('h2.name').text().replace(/\s\([\d]{4}\)$/, '');
- track_name = $(this).find('.trackname').html();
- length = $(this).find('.length').html();
- Player.addTrack(artist, album, track_name, length, true);
- return false;
- });
-}).call(this);
+ };
+ return Player;
+})();
+$('.player .controls .prev').live('click', function() {
+ _player.setTrack(_player.prevTrack());
+ return false;
+});
+$('.player .controls .next').live('click', function() {
+ _player.setTrack(_player.nextTrack(true));
+ return false;
+});
+$('.player .play').live('click', function() {
+ if ($('.playlist-tracks li').length > 0 && !_player.hasTrack()) {
+ _player.setTrack($('.playlist-tracks li').first().attr('id').split('i')[1]);
+ }
+ return false;
+});
+$('.player .progress').live('click', function(e) {
+ $('#jplayer').jPlayer('playHead', Math.round((e.offsetX / _player.bar_width) * 100));
+ return false;
+});
+$('#repeat, #shuffle').live('click', function() {
+ $(this).toggleClass('active');
+ return false;
+});
+$('#empty-playlist').live('click', function() {
+ if (confirm('Are you sure?')) {
+ $('.playlist-tracks li').remove();
+ $('#jplayer').jPlayer('clearMedia');
+ $('.player .now-playing').text('Add some music to playlist');
+ $('.player .loaded, .player .played').width(0);
+ }
+ return false;
+});
+$('.playlist-tracks li .fade, .playlist-tracks li .duration, .playlist-tracks li .remove').live('mouseover mouseout', function(e) {
+ if (e.type === 'mouseover') {
+ $(this).parent().find('.duration').hide();
+ $(this).parent().find('.remove').show();
+ } else {
+ $(this).parent().find('.remove').hide();
+ $(this).parent().find('.duration').show();
+ }
+ return false;
+});
+$('.playlist-tracks li .remove').live('click', function() {
+ var $li;
+ $li = $(this).parent().parent();
+ if ($li.hasClass('now')) {
+ $('#jplayer').jPlayer('clearMedia');
+ $('.player .now-playing').text('...');
+ $('.player .loaded, .player .played').width(0);
+ }
+ $li.remove();
+ return false;
+});
+$('.playlist-tracks li').live('dblclick', function() {
+ _player.setTrack($(this).attr('id').split('i')[1]);
+ return false;
+});
+$('.add-album').live('click', function() {
+ var album, artist, item, length, track_name, _i, _len, _ref;
+ artist = $('.artist-info .name').html();
+ album = $(this).parent().parent().parent().find('h2.name').text().replace(/\s\([\d]{4}\)$/, '');
+ _ref = $(this).parent().parent().parent().find('.tracklist li');
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ item = _ref[_i];
+ track_name = $(item).find('.trackname').html();
+ length = $(item).find('.length').html();
+ _player.addTrack(artist, album, track_name, length);
+ }
+ return false;
+});
+$('.add-track').live('click', function() {
+ var album, artist, length, track_name;
+ artist = $('.artist-info .name').html();
+ album = $(this).parent().parent().parent().parent().find('h2.name').text().replace(/\s\([\d]{4}\)$/, '');
+ track_name = $(this).parent().find('.trackname').html();
+ length = $(this).parent().find('.length').html();
+ _player.addTrack(artist, album, track_name, length);
+ return false;
+});
+$('.tracklist li').live('mouseover mouseout', function(e) {
+ if (e.type === 'mouseover') {
+ $(this).find('.add-track').show();
+ } else {
+ $(this).find('.add-track').hide();
+ }
+ return false;
+});
+$('.tracklist li').live('dblclick', function(e) {
+ var album, artist, length, track_name;
+ artist = $('.artist-info .name').html();
+ album = $(this).parent().parent().parent().find('h2.name').text().replace(/\s\([\d]{4}\)$/, '');
+ track_name = $(this).find('.trackname').html();
+ length = $(this).find('.length').html();
+ _player.addTrack(artist, album, track_name, length, true);
+ return false;
+});
\ No newline at end of file
diff --git a/public/javascripts/coffee/search.js b/public/javascripts/coffee/search.js
index d9c056e..faccc2f 100644
--- a/public/javascripts/coffee/search.js
+++ b/public/javascripts/coffee/search.js
@@ -1,81 +1,73 @@
-/* DO NOT MODIFY. This file was compiled Mon, 27 Jun 2011 17:49:39 GMT from
- * /Users/chez/Sites/beathaven/app/coffeescripts/search.coffee
- */
-
-(function() {
- var Search;
- Search = (function() {
- function Search() {}
- Search.prototype.pics = [];
- Search.prototype.showSpinner = function() {
- $('.search-container input').attr({
- disabled: 'disabled'
- }).blur();
- $('.search-container img').show();
- $('.autocomplete-container').hide();
- $('.artist_loading.failed').hide();
- this.hideSuggestions();
- return false;
- };
- Search.prototype.hideSpinner = function() {
- $('.search-container input').removeAttr('disabled');
- $('.search_field').focus();
- $('.search-container img').hide();
- return false;
- };
- Search.prototype.showSuggestions = function(values) {
- var item, _i, _len;
- for (_i = 0, _len = values.length; _i < _len; _i++) {
- item = values[_i];
- $('.suggestions ul').append('\
+var Search;
+Search = (function() {
+ function Search() {}
+ Search.prototype.pics = [];
+ Search.prototype.showSpinner = function() {
+ $('.search-container input').attr({
+ disabled: 'disabled'
+ }).blur();
+ $('.search-container img').show();
+ $('.autocomplete-container').hide();
+ $('.artist_loading.failed').hide();
+ this.hideSuggestions();
+ return false;
+ };
+ Search.prototype.hideSpinner = function() {
+ $('.search-container input').removeAttr('disabled');
+ $('.search_field').focus();
+ $('.search-container img').hide();
+ return false;
+ };
+ Search.prototype.showSuggestions = function(values) {
+ var item, _i, _len;
+ for (_i = 0, _len = values.length; _i < _len; _i++) {
+ item = values[_i];
+ $('.suggestions ul').append('\
\
' + item.name + '\
- ' + (item.desc ? '
' + item.desc(+'') : '') + '\ + ' + (item.desc != null ? '
' + item.desc + '' : '') + '\ ');
- }
- $('.suggestions').show();
- return false;
- };
- Search.prototype.hideSuggestions = function() {
- $('.suggestions ul li').remove();
- $('.suggestions').hide();
- return false;
- };
- Search.prototype.showArtistPics = function(pics) {
- var pic, _i, _len;
- $('.artist_loading.ok, .artist_pics').show();
- for (_i = 0, _len = pics.length; _i < _len; _i++) {
- pic = pics[_i];
- if (this.pics.indexOf(pic) === -1) {
- this.pics.push(pic);
- $('.artist_pics').append('\
+ }
+ $('.suggestions').show();
+ return false;
+ };
+ Search.prototype.hideSuggestions = function() {
+ $('.suggestions ul li').remove();
+ $('.suggestions').hide();
+ return false;
+ };
+ Search.prototype.showArtistPics = function(pics) {
+ var pic, _i, _len;
+ $('.artist_loading.ok, .artist_pics').show();
+ for (_i = 0, _len = pics.length; _i < _len; _i++) {
+ pic = pics[_i];
+ if (this.pics.indexOf(pic) === -1) {
+ this.pics.push(pic);
+ $('.artist_pics').append('\
' + album.name + ' (' + album.year + ')
\\
@@ -34,9 +29,9 @@
\
\
');
- $.each(album.tracks.album, function(i, track) {
- var track_info;
- track_info = $('\
+ $.each(album.tracks.album, function(i, track) {
+ var track_info;
+ track_info = $('\
\
@@ -46,51 +41,53 @@
\
' + track.duration + '
\
\
\
- ' + artist + ' &mdash ' + track + '\
+ ' + artist + ' — ' + track + '\
' + length + '\
\
remove
\
' + item.desc(+'') : '') + '\ + ' + (item.desc != null ? '
' + item.desc + '' : '') + '\
\
\
');
- }
}
- return false;
- };
- Search.prototype.showError = function() {
- $('.artist_loading.ok, .artist_pics').hide();
- $('.artist_loading.failed').show();
- return this.pics = [];
- };
- return Search;
- })();
- $(function() {
- $('.search').live('click', function() {
- ajax.loadSearchPage();
- return false;
- });
- $('#search_form').live('submit', function() {
- $('.autocomplete-container').remove();
- ajax.loadArtistData($('#search_field').val());
- return false;
- });
- return $('.suggestions a').live('click', function() {
- $('#search_field').val($(this).text());
- return false;
- });
- });
-}).call(this);
+ }
+ return false;
+ };
+ Search.prototype.showError = function() {
+ $('.artist_loading.ok, .artist_pics').hide();
+ $('.artist_loading.failed').show();
+ return this.pics = [];
+ };
+ return Search;
+})();
+$('.search').live('click', function() {
+ _ajax.go('/search/');
+ return false;
+});
+$('#search_form').live('submit', function() {
+ $('.autocomplete-container').remove();
+ _ajax.loadArtistData($('#search_field').val());
+ return false;
+});
+$('.suggestions a').live('click', function() {
+ $('#search_field').val($(this).text());
+ return false;
+});
\ No newline at end of file
diff --git a/public/javascripts/coffee/session.js b/public/javascripts/coffee/session.js
index 3ee7557..312ef85 100644
--- a/public/javascripts/coffee/session.js
+++ b/public/javascripts/coffee/session.js
@@ -1,34 +1,36 @@
-/* DO NOT MODIFY. This file was compiled Mon, 27 Jun 2011 17:49:39 GMT from
- * /Users/chez/Sites/beathaven/app/coffeescripts/session.coffee
- */
-
-(function() {
- var Session;
- Session = (function() {
- Session.prototype.vk_params = null;
- Session.prototype.user = null;
- function Session(vk_params) {
- this.vk_params = vk_params;
+var Session;
+Session = (function() {
+ Session.prototype.vk_params = null;
+ Session.prototype.user = null;
+ function Session(params) {
+ var attrs, key, _i, _len, _params;
+ attrs = ['expire', 'mid', 'secret', 'sid', 'sig'];
+ _params = {};
+ for (_i = 0, _len = attrs.length; _i < _len; _i++) {
+ key = attrs[_i];
+ if (params[key] != null) {
+ _params[key] = params[key];
+ }
}
- Session.prototype.query = function(url, params, callback) {
- var attr, q_params, _i, _len;
- q_params = this.vk_params;
- for (_i = 0, _len = params.length; _i < _len; _i++) {
- attr = params[_i];
- q_params[attr] = params[attr];
- }
- $.post(url, q_params, callback);
- return false;
- };
- Session.prototype.setVkParams = function(params) {
- var attrs, key, _i, _len;
- attrs = ['expire', 'mid', 'secret', 'sid', 'sig'];
- for (_i = 0, _len = attrs.length; _i < _len; _i++) {
- key = attrs[_i];
- this.vk_params[key] = params[key];
- }
- return false;
- };
- return Session;
- })();
-}).call(this);
+ this.vk_params = _params;
+ false;
+ }
+ Session.prototype.setUser = function(user) {
+ this.user = user;
+ return false;
+ };
+ Session.prototype.getUser = function() {
+ return this.user;
+ };
+ Session.prototype.query = function(url, params, callback) {
+ var attr, q_params, _i, _len;
+ q_params = this.vk_params;
+ for (_i = 0, _len = params.length; _i < _len; _i++) {
+ attr = params[_i];
+ q_params[attr] = params[attr];
+ }
+ $.post(url, q_params, callback);
+ return false;
+ };
+ return Session;
+})();
\ No newline at end of file
diff --git a/public/javascripts/coffee/settings.js b/public/javascripts/coffee/settings.js
index ee5e1b5..e85a639 100644
--- a/public/javascripts/coffee/settings.js
+++ b/public/javascripts/coffee/settings.js
@@ -1,54 +1,48 @@
-/* DO NOT MODIFY. This file was compiled Mon, 27 Jun 2011 14:00:02 GMT from
- * /Users/chez/Sites/beathaven/app/coffeescripts/settings.coffee
- */
-
-(function() {
- var Settings;
- Settings = (function() {
- function Settings() {}
- Settings.prototype.getAccountInfo = function(callback) {
- return session.query('/user/update/', {}, callback);
- };
- Settings.prototype.saveAccountInfo = function(params, callback) {
- return session.query('/user/update', params, callback);
- };
- Settings.prototype.loadFormData = function(form) {
- if (form === 'account') {
- $('.settings-container .form input[name$="username"]').val(session.user.name);
- return $('.settings-container .form input[name$="email"]').val(session.email);
- } else if (form === 'lastfm') {
- if (this.user.lastfm_username) {
- return $('.form-container input[name$="username"]').first().val(session.lastfm_username);
- }
+var Settings;
+Settings = (function() {
+ function Settings() {}
+ Settings.prototype.getAccountInfo = function(callback) {
+ return _session.query('/user/update/', {}, callback);
+ };
+ Settings.prototype.saveAccountInfo = function(params, callback) {
+ return _session.query('/user/update', params, callback);
+ };
+ Settings.prototype.loadFormData = function(form) {
+ if (form === 'account') {
+ $('.settings-container .form input[name$="username"]').val(_session.getUser().name);
+ return $('.settings-container .form input[name$="email"]').val(_session.getUser().email);
+ } else if (form === 'lastfm') {
+ if (_session.getUser().lastfm_username) {
+ return $('.form-container input[name$="username"]').first().val(_session.getUser().lastfm_username);
}
+ }
+ };
+ return Settings;
+})();
+$('.settings').live('click', function() {
+ return _ajax.go('/settings/');
+});
+$('.settings-container .tabs .tab').live('click', function() {
+ if (!$(this).hasClass('active')) {
+ $('.settings-container .tabs .tab').removeClass('active');
+ $(this).addClass('active');
+ $('.form-container').html($('.forms .' + $(this).attr('data-fieldset')).html());
+ return _settings.loadFormData($(this).attr('data-fieldset'));
+ }
+});
+$('.lastfm-connect').live('click', function() {
+ return window.open(_session.getUser().lastfm_login_url);
+});
+$('.settings-container .form input').live('blur', function() {
+ var active_tab, params;
+ active_tab = $('.settings-container .tabs .tab.active').attr('data-fieldset');
+ if (active_tab === 'account') {
+ params = {
+ username: $('.settings-container .form input[name$="username"]').first().val(),
+ email: $('.settings-container .form input[name$="email"]').first().val()
};
- return Settings;
- })();
- $('.settings').live('click', function() {
- return ajax.loadSettingsPage();
- });
- $('.settings-container .tabs .tab').live('click', function() {
- if ($(this).hasClass('active')) {
- $('.settings-container .tabs .tab').removeClass('active');
- $(this).addClass('active');
- $('.form-container').html($('.forms .' + $(this).attr('data-fieldset')).html());
- return settings.loadFormData($(this).attr('data-fieldset'));
- }
- });
- $('.lastfm-connect').live('click', function() {
- return window.open(session.user.lastfm_login_url);
- });
- $('.settings-container .form input').live('blur', function() {
- var active_tab, params;
- active_tab = $('.settings-container .tabs .tab.active').attr('data-fieldset');
- if (active_tab === 'account') {
- params = {
- username: $('.settings-container .form input[name$="username"]').first().val(),
- email: $('.settings-container .form input[name$="email"]').first().val()
- };
- return settings.saveAccountInfo(params, function() {
- return $('#header-container .hello .greating').text('Hi there, ' + (params.username.length > 0 ? params.username : '%username%') + '!');
- });
- }
- });
-}).call(this);
+ return _settings.saveAccountInfo(params, function() {
+ return $('#header-container .hello .greating').text('Hi there, ' + (params.username.length > 0 ? params.username : '%username%') + '!');
+ });
+ }
+});
\ No newline at end of file
diff --git a/public/javascripts/coffee/vkontakte.js b/public/javascripts/coffee/vkontakte.js
index 3969f00..596ac73 100644
--- a/public/javascripts/coffee/vkontakte.js
+++ b/public/javascripts/coffee/vkontakte.js
@@ -1,121 +1,127 @@
-/* DO NOT MODIFY. This file was compiled Mon, 27 Jun 2011 17:49:39 GMT from
- * /Users/chez/Sites/beathaven/app/coffeescripts/vkontakte.coffee
- */
-
-(function() {
- var Vkontakte;
- Vkontakte = (function() {
- Vkontakte.prototype.qr = [];
- function Vkontakte(api_id) {
- this.api_id = api_id;
- }
- Vkontakte.prototype.init = function() {
- VK.init({
- apiId: this.api_id,
- nameTransportPath: '/xd_receiver.html'
+var Vkontakte;
+Vkontakte = (function() {
+ Vkontakte.prototype.qr = null;
+ function Vkontakte(api_id) {
+ this.api_id = api_id;
+ }
+ Vkontakte.prototype.init = function() {
+ this.qr = [];
+ VK.init({
+ apiId: this.api_id
+ });
+ return VK.Auth.getLoginStatus(this.authInfo);
+ };
+ Vkontakte.prototype.authInfo = function(response) {
+ var _session;
+ if (typeof response !== 'undefined' && response.session) {
+ _session = new Session(response.session);
+ $('#vk_login, .auth_notice').hide();
+ $('#vk_logout').css({
+ display: 'block'
});
- return VK.Auth.getLoginStatus(this.authInfo);
- };
- Vkontakte.prototype.authInfo = function(response) {
- if (typeof response !== 'undefined' && response.session) {
- session.setVkParams(response.session);
- $('#vk_login, .auth_notice').hide();
- $('#vk_logout').css({
- display: 'block'
- });
- if ($('#search_field').length > 0) {
- $('#search_field').focus();
- }
- return session.query('/user/auth', {}, function(ar) {
- if (ar.newbie) {
- VK.Api.call('getVariable', {
- key: 1281
- }, function(r) {
- return Session.query('/user/update', {
- name: r.response
- }, function(ar2) {
- session.user = ar2.user;
- return $('#header-container .hello .greating').text('Hi there, ' + (session.user.name ? session.user.name : '%username%') + '!');
- });
+ if ($('#search_field').length > 0) {
+ $('#search_field').focus();
+ }
+ _session.query('/user/auth', {}, function(ar) {
+ if (ar.newbie) {
+ VK.Api.call('getVariable', {
+ key: 1281
+ }, function(r) {
+ return _session.query('/user/update', {
+ name: r.response
+ }, function(ar2) {
+ _session.setUser(ar2.user);
+ return $('.header-container .hello .greating').text('Hi there, ' + (_session.getUser().name ? _session.getUser().name : '%username%') + '!');
});
- } else {
- session.user = ar.user;
- }
- return $('#header-container .hello .greating').text('Hi there, ' + (session.user.name ? session.user.name : '%username%') + '!');
- });
- } else {
- $('#vk_login, .auth_notice').css({
- display: 'block'
- });
- return $('#vk_logout').hide();
- }
- };
- Vkontakte.prototype.loadTracksData = function(artist, track, duration, callback) {
- var query, track_prepared;
- track_prepared = track.replace(/\(.*\)/i, '').split('/')[0];
- query = artist(+' ' + track_prepared);
- if (this.qr[query] != null) {
- return callback(this.qr[query]);
- } else {
- return VK.Api.call('audio.search', {
- q: query
- }, function(r) {
- var url;
- url = this.matchPerfectResult(r.response, artist, track, duration);
- this.qr[query] = url;
- return callback(url);
- });
- }
- };
- Vkontakte.prototype.matchPerfectResult = function(data, artist, track, duration) {
- var best_result, best_score, delta, item, score, _i, _len;
- duration = duration.split(':');
- duration = parseInt(duration[0], 10) * 60 + parseInt(duration[1], 10);
- best_score = 0;
- best_result = null;
- for (_i = 0, _len = data.length; _i < _len; _i++) {
- item = data[_i];
- score = 0;
- item.artist = item.artist.trim();
- item.title = item.title.trim();
- if (item.artist === artist) {
- score += 10;
- } else if (item.artist.split(artist).length === 2) {
- score += 5;
- } else if (item.title.split(artist).length === 2) {
- score += 4;
- }
- if (item.title === track) {
- score += 10;
- } else if (item.title.split(track).length === 2) {
- score += 5;
- }
- if (parseInt(item.duration, 10) === duration) {
- score += 15;
+ });
} else {
- delta = Math.abs(parseInt(item.duration, 10) - duration);
- if (delta < 10) {
- score += 10 - delta;
- }
+ _session.setUser(ar.user);
}
- if (score > best_score) {
- best_score = score;
- best_result = item;
- }
- if (score === 35) {
- return best_result.url;
+ return $('.header-container .hello .greating').text('Hi there, ' + (_session.getUser().name ? _session.getUser().name : '%username%') + '!');
+ });
+ } else {
+ _session = new Session({});
+ $('#vk_login, .auth_notice').css({
+ display: 'block'
+ });
+ $('#vk_logout').hide();
+ }
+ return window._session = _session;
+ };
+ Vkontakte.prototype.loadTracksData = function(artist, track, duration, callback) {
+ var query, track_prepared, url;
+ track_prepared = track.replace(/\(.*\)/i, '').split('/')[0];
+ query = artist + ' ' + track_prepared;
+ if (url = _vkontakte.getQR(query)) {
+ return callback(url);
+ } else {
+ return VK.Api.call('audio.search', {
+ q: query
+ }, function(r) {
+ r.response.splice(0, 1);
+ url = _vkontakte.matchPerfectResult(r.response, artist, track, duration);
+ _vkontakte.addQR(query, url);
+ return callback(url);
+ });
+ }
+ };
+ Vkontakte.prototype.matchPerfectResult = function(data, artist, track, duration) {
+ var best_result, best_score, delta, item, score, _i, _len;
+ duration = duration.split(':');
+ duration = parseInt(duration[0], 10) * 60 + parseInt(duration[1], 10);
+ best_score = 0;
+ best_result = null;
+ for (_i = 0, _len = data.length; _i < _len; _i++) {
+ item = data[_i];
+ score = 0;
+ item.artist = item.artist.trim();
+ item.title = item.title.trim();
+ if (item.artist === artist) {
+ score += 10;
+ } else if (item.artist.split(artist).length === 2) {
+ score += 5;
+ } else if (item.title.split(artist).length === 2) {
+ score += 4;
+ }
+ if (item.title === track) {
+ score += 10;
+ } else if (item.title.split(track).length === 2) {
+ score += 5;
+ }
+ if (parseInt(item.duration, 10) === duration) {
+ score += 15;
+ } else {
+ delta = Math.abs(parseInt(item.duration, 10) - duration);
+ if (delta < 10) {
+ score += 10 - delta;
}
}
- return best_result.url;
- };
- return Vkontakte;
- })();
- $(function() {
- $('#vk_login').click(function() {
- return VK.Auth.login(vkontakte.authInfo, 8);
- });
- return $('#vk_logout').click(function() {
- return VK.Auth.logout(vkontakte.authInfo);
- });
+ if (score > best_score) {
+ best_score = score;
+ best_result = item;
+ }
+ if (score === 35) {
+ return best_result.url;
+ }
+ }
+ return best_result.url;
+ };
+ Vkontakte.prototype.addQR = function(query, url) {
+ return this.qr[query] = url;
+ };
+ Vkontakte.prototype.getQR = function(query) {
+ if (this.qr[query] != null) {
+ this.qr[query];
+ }
+ return false;
+ };
+ return Vkontakte;
+})();
+$(function() {
+ $('#vk_login').click(function() {
+ return VK.Auth.login(_vkontakte.authInfo(), 8);
});
-}).call(this);
+ return $('#vk_logout').click(function() {
+ return VK.Auth.logout(_vkontakte.authInfo());
+ });
+});
\ No newline at end of file