Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery

* 'jquery' of projects.vdr-developer.org:istreamdev:
  removed FastTouch true for now.
  fixed animation bug with lot of elements when back
  fixed hiding toggle elements for Browser

1 files changed, 9 insertions, 1 deletions

diff --git a/js/istreamdev.js b/js/istreamdev.js
index b57816a..5761dbb 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -2,7 +2,7 @@
 jQT = new $.jQTouch({

 	icon: 'img/istreamdev.png',

 	addGlossToIcon: true,

-	useFastTouch: true,

+	useFastTouch: false,

 	startupScreen: 'img/startup.png',

 	statusBar: 'black',

 	iconIsGlossy: true,

@@ -95,6 +95,12 @@ $('div').bind('pageAnimationEnd', function(event, info){
 	if (info.direction == 'in') {

 		$('li[rel="toggle"]').show();

 		}

+		

+	})

+$('div').bind('pageAnimationStart', function(event, info){ 

+	if (info.direction == 'in') {

+		$('li[rel="toggle"]').hide();

+		}

 	})

 });

 

@@ -264,6 +270,7 @@ function gen_categories() {
 			}

 			$("#cat_menu").append('<li class="arrow" rel="' + togglestatus + '"><a class="cat_but" href="#">' + categories.name  + '</a><small class="counter">' + categories.channels + '</small></li>');

 			});

+		$('li[rel="toggle"]').hide();

 		json_complete('#categories','cube');

 		})

 }

@@ -612,6 +619,7 @@ function gen_browser(path,browser,name,foldertype) {
 				$("#browser" + browser).find('ul').append('<li class="track" rel="' + hidetoggle + '"><a href="javascript:document.player.Play();" onclick="addplayer(this);" rel="audio"><div class="numberbox"><span class="number">' + list.number + '</span></div><span class="tracktitle" rel="'+ list.name + '">' + name + '</span><div class="timebox"><span class="time">' + list.length +'</span></div></a></li>');

 				}

 			});

+			$('li[rel="toggle"]').hide();

 			json_complete('#browser' + browser,'cube');

     });

 }