diff options
author | Alib <aliboba@free.fr> | 2010-03-17 18:37:01 +0100 |
---|---|---|
committer | Alib <aliboba@free.fr> | 2010-03-17 18:37:01 +0100 |
commit | d425e7f9f8c7ffe40f133e99e1d6ca6c6fee9d80 (patch) | |
tree | cba7e045a43716e1fd9846e1c99667196ce7f4b1 | |
parent | 9f94e565988c2cd5bf765b4d21584b1ac2fcb64f (diff) | |
download | istreamdev-d425e7f9f8c7ffe40f133e99e1d6ca6c6fee9d80.tar.gz istreamdev-d425e7f9f8c7ffe40f133e99e1d6ca6c6fee9d80.tar.bz2 |
solved category character encoding bug
-rwxr-xr-x | bin/backend.php | 4 | ||||
-rw-r--r-- | js/istreamdev.js | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/backend.php b/bin/backend.php index 3eaa127..a3104dd 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) {
|