From b71ea287aac37237c948ae9f8c825ddda0601857 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 12 Jan 2012 02:02:45 +0100 Subject: [PATCH] reimplement auto playing music from location hash (like from search results) --- apps/media/js/music.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/media/js/music.js b/apps/media/js/music.js index bf08220782..3373cbac25 100644 --- a/apps/media/js/music.js +++ b/apps/media/js/music.js @@ -26,18 +26,25 @@ $(document).ready(function(){ button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true}); } Collection.display(); + + Collection.load(function(){ + var urlVars=getUrlVars(); + if(urlVars.artist){ + var song=Collection.find(urlVars.artist,urlVars.album,urlVars.song); + PlayList.add(song); + PlayList.play(0); + } + }) }); function getUrlVars(){ - var vars = [], hash; - var hashes = window.location.href.slice(window.location.href.indexOf('#') + 1).split('&'); - for(var i = 0; i < hashes.length; i++) - { + var vars = {}, hash; + var hashes = window.location.hash.substr(1).split('&'); + for(var i = 0; i < hashes.length; i++){ hash = hashes[i].split('='); - vars.push(hash[0]); - vars[hash[0]] = hash[1].replace(/\+/g,' '); + vars[hash[0]] = decodeURIComponent(hash[1]).replace(/\+/g,' '); } return vars; }