summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAlib <aliboba@free.fr>2010-03-23 18:47:27 +0100
committerAlib <aliboba@free.fr>2010-03-23 18:47:27 +0100
commit3e3f0e1e4ccd57b3b32028bf9980f9104ae6f913 (patch)
tree7dd5920adb9ba35f98cf8a6c45cd1b5d60d1e716 /js
parentb1195b4cf5bdfbd807fcb33c8096528f7b4503dc (diff)
downloadistreamdev-3e3f0e1e4ccd57b3b32028bf9980f9104ae6f913.tar.gz
istreamdev-3e3f0e1e4ccd57b3b32028bf9980f9104ae6f913.tar.bz2
corrected bug when returning back to home
Diffstat (limited to 'js')
-rw-r--r--js/istreamdev.js18
1 files changed, 7 insertions, 11 deletions
diff --git a/js/istreamdev.js b/js/istreamdev.js
index 1ce37e9..743eee0 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -95,6 +95,12 @@ function addAudiofiles() {
$('#home_but').tap(function(event) {
event.preventDefault();
$(this).parents('div').find('a').unbind("tap");
+ $('#home').bind('pageAnimationEnd', function(event, info){
+ if (info.direction == 'in') {
+ $('#jqt div[rel="browser"]').remove();
+ $('#home').unbind('pageAnimationEnd');
+ }
+ });
jQT.goTo('#home','flip');
});
@@ -385,6 +391,7 @@ $('#streamchannel span.recButton a').tap(function(event) {
gen_edittimer(id,name,active,channumber,channame,rec_date,starttime,endtime);
return false;
});
+
$('#streamrec span.streamButton a').tap(function(event) {
event.preventDefault();
json_start(this);
@@ -616,17 +623,6 @@ $('div[rel="browser"] a[class="back"]').tap(function(event) {
$(this).parents('div[rel="browser"]').remove();
});
-$('div[rel="browser"] #home_but').tap(function(event) {
- event.preventDefault();
- $(this).parents('div[rel="browser"]').find('ul[rel="filelist"] li[class="arrow"] a').unbind("tap");
- $('#home').bind('pageAnimationEnd', function(event, info){
- $('#jqt div[rel="browser"]').remove();
- $('#home').unbind('pageAnimationEnd');
- });
-});
-
-
-
//Generate browser div according to type
function gen_browser(path,browser,name,foldertype) {
browser_template = '<div class="toolbar"></div>';