diff --git a/server/djrandom/frontend/static/js/djr.min.js b/server/djrandom/frontend/static/js/djr.min.js index 9b3bb309c3dab906692d8d464fa17ba46f74f02c..beacf09511c98aea59ba5d650837835492c68df6 100644 --- a/server/djrandom/frontend/static/js/djr.min.js +++ b/server/djrandom/frontend/static/js/djr.min.js @@ -17,5 +17,5 @@ b);d.removeChunk(b)});e.find(".chunk_inner .song").hover(function(){$(this).find djr.Player.prototype.play=function(a){djr.debug("play "+a);this.cur_song&&(this.old_songs.push(this.cur_song),this.old_songs.length>5&&this.old_songs.shift());this.cur_song=a;$(".song").removeClass("playing");$("#song_"+a).addClass("playing");this.player.jPlayer("setMedia",{mp3:"/dl/"+a}).jPlayer("play");var b=$("#song_"+a+" .artist").text(),c=$("#song_"+a+" .album").text();$("#jp_playlist_1").html($("#song_"+a+" .title").text()+"<br>"+b+"<br><small>"+c+"</small>");b="/album_image/"+escape(b)+"/"+ escape(c);$("#albumart_fs").attr("src",b);$("#albumart_fs").fullBg();$("#albumart_fs").show();this.backend.nowPlaying(a,this.old_songs)};djr.Player.prototype.nextSong=function(){this.play(this.playlist.getNextSong(this.cur_song))};djr.Player.prototype.streamCurrentPlaylist=function(){};djr.state={backend:null,player:null}; djr.init=function(){djr.state.backend=new djr.Backend;djr.state.player=new djr.Player(djr.state.backend,"#djr_player");$("#playlistClearBtn").click(function(){djr.state.player.clearPlaylist()});$("#playlistStreamBtn").click(function(){djr.state.player.streamCurrentPlaylist()});$("#playlistExtendBtn").click(function(){djr.state.player.extendCurrentPlaylist()});$("#playlistLast25").click(function(){djr.state.player.lastPlaylist(25)});$("#playlistRandom").click(function(){djr.state.player.randomPlaylist(25)}); -$("#playlistMost").click(function(){djr.state.player.mostPlayedPlaylist(25)});$("#wikiDiv").click(function(){var a=$("#song_"+djr.state.player.cur_song+" .title").text();$("#wikipedia").display=="none"?a!=""&&(a=a.split(" ").join("+"),$("#wikipedia").attr("src","http://en.wikipedia.org/wiki/Special:Search?search="+a+"&go=Go"),window.frames.wikipedia.location.reload(),$("#wikipedia").show()):$("#wikipedia").attr("display","none")});$("#googleDiv").click(function(){var a=$("#song_"+djr.state.player.cur_song+ -" .title").text();$("#google").display=="none"?a!=""&&(a=a.split(" ").join("+"),$("#google").attr("src","http://www.google.ie/#hl=en&q="+a),window.frames.google.location.reload(),$("#google").show()):$("#google").attr("display","none")});$("#albumart_fs").load(function(){$(this).fullBg();$(this).show()})};djr.player=function(){return djr.state.player};djr.debug=function(a){$("#debug").append(a+"<br>")}; +$("#playlistMost").click(function(){djr.state.player.mostPlayedPlaylist(25)});$("#wikiDiv").click(function(){var a=$("#song_"+djr.state.player.cur_song+" .title").text();$("#wikipedia").display=="none"?a!=""&&(a=a.split(" ").join("+"),$("#wikipedia").attr("src","/ext?url="+escape("http://en.wikipedia.org/wiki/Special:Search?search="+a+"&go=Go")),window.frames.wikipedia.location.reload(),$("#wikipedia").show()):$("#wikipedia").attr("display","none")});$("#googleDiv").click(function(){var a=$("#song_"+ +djr.state.player.cur_song+" .title").text();$("#google").display=="none"?a!=""&&(a=a.split(" ").join("+"),$("#google").attr("src","/ext?url="+escape("http://www.google.ie/#hl=en&q="+a)),window.frames.google.location.reload(),$("#google").show()):$("#google").attr("display","none")});$("#albumart_fs").load(function(){$(this).fullBg();$(this).show()})};djr.player=function(){return djr.state.player};djr.debug=function(a){$("#debug").append(a+"<br>")}; diff --git a/server/djrandom/frontend/static/js/djr/player.js b/server/djrandom/frontend/static/js/djr/player.js index fc5d2011cd4cab759fb146accc5ed4b736bdeeff..ccd057a1d7cac906e3ea2e70d8b6de148bf6ac66 100644 --- a/server/djrandom/frontend/static/js/djr/player.js +++ b/server/djrandom/frontend/static/js/djr/player.js @@ -315,7 +315,9 @@ djr.init = function () { if ( $('#wikipedia').display == 'none' ) { if ( stitle != "" ) { stitle = stitle.split(' ').join('+'); - $('#wikipedia').attr("src","http://en.wikipedia.org/wiki/Special:Search?search=" + stitle + "&go=Go"); + $('#wikipedia').attr("src", "/ext?url=" + + escape("http://en.wikipedia.org/wiki/Special:Search?search=" + + stitle + "&go=Go")); window.frames["wikipedia"].location.reload(); $('#wikipedia').show(); } @@ -328,7 +330,8 @@ djr.init = function () { if ( $('#google').display == 'none' ) { if ( stitle != "" ) { stitle = stitle.split(' ').join('+'); - $('#google').attr("src","http://www.google.ie/#hl=en&q=" + stitle); + $('#google').attr("src", "/ext?url=" + + escape("http://www.google.ie/#hl=en&q=" + stitle)); window.frames["google"].location.reload(); $('#google').show(); }