summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorTheTroll <trolldev@gmail.com>2010-03-18 18:03:22 +0100
committerTheTroll <trolldev@gmail.com>2010-03-18 18:03:22 +0100
commit19f7bf5bbe473eb76b3089702986b92eb2235003 (patch)
tree24d435c8f06d60842cfa4aa989d3c156981e6116 /js
parentcc273d76c088d5f787d27ec36c0a1d2687e65fe2 (diff)
parentd6c44b76105dd8c0937307b7204685af1923a3d1 (diff)
downloadistreamdev-19f7bf5bbe473eb76b3089702986b92eb2235003.tar.gz
istreamdev-19f7bf5bbe473eb76b3089702986b92eb2235003.tar.bz2
Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery
* 'jquery' of projects.vdr-developer.org:istreamdev: cleaned audio playlist page default pic when no logo for channel list
Diffstat (limited to 'js')
-rw-r--r--js/istreamdev.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/istreamdev.js b/js/istreamdev.js
index ca3c672..9998f53 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -251,7 +251,9 @@ function gen_channels(category) {
}
});
$('li[rel="toggle"]').hide();
+ if ( data.channel.length > 10 ) {
$("#chan_menu").append('<li rel="showbut"><a href="#" class="toggleLink">Show all</a></li>');
+ }
json_complete('#channels','cube');
})
}
@@ -529,7 +531,6 @@ $('div[rel="browser"] #home_but').tap(function(event) {
$('#home').bind('pageAnimationEnd', function(event, info){
$('#jqt div[rel="browser"]').remove();
$('#home').unbind('pageAnimationEnd');
-
});
});