diff options
| author | TheTroll <trolldev@gmail.com> | 2010-03-17 18:41:27 +0100 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-03-17 18:41:27 +0100 |
| commit | ecc23e50206d248f379fa8346561d3d6e11803fb (patch) | |
| tree | bda961f97831686ba48f6dd156c4035ce524eae0 /js | |
| parent | bba9118edf4b05670bf6ee46af6a569f7fd5650c (diff) | |
| parent | c178fdfb5bd45e45e40af3aa969932af92e3287b (diff) | |
| download | istreamdev-ecc23e50206d248f379fa8346561d3d6e11803fb.tar.gz istreamdev-ecc23e50206d248f379fa8346561d3d6e11803fb.tar.bz2 | |
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
* 'jquery' of projects.vdr-developer.org:istreamdev:
solved category character encoding bug
Diffstat (limited to 'js')
| -rw-r--r-- | js/istreamdev.js | 7 |
1 files changed, 5 insertions, 2 deletions
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) {
|