diff options
| author | TheTroll <trolldev@gmail.com> | 2010-03-17 15:05:47 +0100 |
|---|---|---|
| committer | TheTroll <trolldev@gmail.com> | 2010-03-17 15:05:47 +0100 |
| commit | 5b02753d7914287c29b2866998c6ee9f1d610ee4 (patch) | |
| tree | 4855d8a5c8205595c1a845a6aca4722e5d93d94a | |
| parent | 41ad9b1fd6a4cc5370c402def49dd87e89b2953a (diff) | |
| parent | 478709641e55c9050f60c62e478c5d5279970efd (diff) | |
| download | istreamdev-5b02753d7914287c29b2866998c6ee9f1d610ee4.tar.gz istreamdev-5b02753d7914287c29b2866998c6ee9f1d610ee4.tar.bz2 | |
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
* 'jquery' of projects.vdr-developer.org:istreamdev:
added runningsession json
| -rw-r--r-- | bin/textfiles/getRunningSessions.txt | 20 | ||||
| -rw-r--r-- | js/istreamdev.js | 5 |
2 files changed, 24 insertions, 1 deletions
diff --git a/bin/textfiles/getRunningSessions.txt b/bin/textfiles/getRunningSessions.txt new file mode 100644 index 0000000..39b02c8 --- /dev/null +++ b/bin/textfiles/getRunningSessions.txt @@ -0,0 +1,20 @@ +{ + "broadcast": + [ + { + "session": "1", + "name": "TF1", + "type": "tv", + }, + { + "session": "2", + "name": "Turbo", + "type": "rec", + }, + { + "session": "3", + "name": "Movie.avi", + "type": "vid", + } + ] +} diff --git a/js/istreamdev.js b/js/istreamdev.js index 2000c83..53963bc 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -175,7 +175,10 @@ function gen_channels(category) { $.each(data.channel,function(i,channel){
$("#chan_menu").append('<li class="channellist"><a class="chan_but" href="#"><img src="logos/' + channel.name + '.png"/><small class="counter">' + channel.number + '</small><span class="name">' + channel.name + '</span><span class="comment">' + channel.now_title + '</span></a></li>');
});
- json_complete('#channels','slide');
+ $("#chan_menu li:last a img").load(function () {
+
+ json_complete('#channels','cube');
+ });
})
}
|