yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'Concept211/master' into test

Browse source 
Conflicts:
	js/ui-ready.js
This commit is contained in:
Trevor Squillario 2012-09-28 15:35:06 -04:00
commit 9c5f0e37c5
4 changed files with 74 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/app.js
View file

@ -1,4 +1,4 @@
// Global Variables
// Global Variables
var debug = false;
var audio = null;
var hostURL = location.href;
@ -85,6 +85,7 @@ function loadTabContent(tab) {
case '#tabPlaylists':
if (debug) { console.log("TAG PLAYLIST"); }
loadPlaylists();
loadFolders();
break;
case '#tabPodcasts':
if (debug) { console.log("TAG PODCAST"); }