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

* 'jquery' of projects.vdr-developer.org:istreamdev:
  solved category character encoding bug

2 files changed, 7 insertions, 4 deletions

diff --git a/bin/backend.php b/bin/backend.php
index 6ae8488..3ed2dcb 100755
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -1,6 +1,6 @@
 <?php
 
-header('Content-Type: application/json; charset: UTF-8');
+header('Content-Type: application/json; charset: utf-8');
 
 if (file_exists('../config.php'))
 	include ('../config.php');
@@ -25,7 +25,7 @@ switch ($action)
 			print $tree;
 			break;
 		case ("getTvCat"):
-			$tree = getTvCat();
+			$tree =  getTvCat();
         	        print $tree;
 			break;
 		
diff --git a/js/istreamdev.js b/js/istreamdev.js
index 9bc4a8a..a4932eb 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -93,6 +93,8 @@ function reinitDivs() {
 	$('#timers ul[rel="timers"]').html('');

 }

 

+

+

 //  [/GENERIC STUFF]

 

 //	[HOME SECTION]

@@ -201,7 +203,7 @@ var dataString = "action=getRunningSessions";
 $('#categories ul#cat_menu a').tap(function(event) {

 	event.preventDefault();

 	json_start(this);

-	var category = $(this).html();

+	var category = $(this).text();

 	gen_channels(category);

 	return false;

 });

@@ -233,6 +235,7 @@ function gen_categories() {
 //Gen Channels

 function gen_channels(category) {

 		$("#chan_menu").html('');

+		alert(category);

 		var dataString = "action=getTvChan&cat=" + encodeURIComponent(category);

 		//Json call to get category array

 		$.getJSON("bin/backend.php",

@@ -561,7 +564,7 @@ function gen_browser(path,browser,name,foldertype) {
 		}

 		$('#browser' + browser + ' div[class="toolbar"]').html(toolbar);

 	}

-	var dataString = 'action=browseFolder&path='+encodeURIComponent(path)+'&browser=' + browser;

+	var dataString = 'action=browseFolder&path='+encodeURIComponent(path);

 	$.getJSON("bin/backend.php",

 	dataString,

 	function(data) {