Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery

* 'jquery' of projects.vdr-developer.org:istreamdev:
  fixed mp3player

1 files changed, 4 insertions, 11 deletions

diff --git a/js/istreamdev.js b/js/istreamdev.js
index 9998f53..5ae5f58 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -506,15 +506,6 @@ $('ul[rel="filelist"] li[class="arrow"] a').tap(function(event) {
 		{

 		gen_streamvid(name,path);

 		}

-	else if ( type == "rec" )

-		{

-		gen_streamrec(name,path);

-		}

-	else if ( type == "audio" )

-		{

-		var track = $(this).find('span[class="number"]').text();

-		addplayer(path,name,track,(browser-1));

-		}

 	return false;

 });

 

@@ -603,8 +594,10 @@ function gen_browser(path,browser,name,foldertype) {
 function addplayer(button) {

 	json_start(button);

 	var name = $(button).find('span[class="tracktitle"]').text();

-	var path = $(button).parents('div').find('span[rel="path"]').text();

-	var browser = $(button).parents('div').find('span[rel="currentbrowser"]').text();

+	var browser = $(button).parents('div').find('span[rel="currentbrowser"]').html();

+	alert(browser);

+	var path = $('#browser'+browser+' div[rel="dataholder"] span[rel="path"]').text();

+	alert(path);

 	browser = parseInt(browser);

 	$('#browser'+browser+' #div_player').remove();

 	$('#browser'+browser).append('<div style="position:absolute; left:0; top:0" name="div_player" id="div_player"></div>');