From 580682c2f6b6a4e0d8185fdf54248573178507f6 Mon Sep 17 00:00:00 2001 From: Alib Date: Sun, 21 Mar 2010 01:17:42 +0100 Subject: generate thumb before starting encoding prevent click on links while animating. --- bin/session.php | 12 ++++++------ js/istreamdev.js | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bin/session.php b/bin/session.php index 09f7fc8..2a149d3 100755 --- a/bin/session.php +++ b/bin/session.php @@ -33,6 +33,12 @@ function sessioncreate($type, $url, $mode) // Create session exec('mkdir ../ram/' .$session); + // Create logo + if ($type == 'vid') + generatelogo($type, $url, '../ram/' .$session .'/thumb.png'); + else + generatelogo($type, $channame, '../ram/' .$session .'/thumb.png'); + // Start encoding $url = str_replace("\\'", "'", $url); switch ($type) { @@ -71,12 +77,6 @@ function sessioncreate($type, $url, $mode) // Write streaminfo writeinfostream($session, $type, $mode, $url, $channame); - // Create logo - if ($type == 'vid') - generatelogo($type, $url, '../ram/' .$session .'/thumb.png'); - else - generatelogo($type, $channame, '../ram/' .$session .'/thumb.png'); - return $session; } diff --git a/js/istreamdev.js b/js/istreamdev.js index 7bb151b..3b87b6b 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -104,6 +104,10 @@ $('div').bind('pageAnimationStart', function(event, info){ }) }); +$('a[class="back"]').tap(function(event) { + event.preventDefault(); + $(this).parents('div').find('a').unbind("tap"); +}); // show active sessions $(document).ready(function(e){ getRunningSessions(); @@ -536,11 +540,13 @@ $('ul[rel="filelist"] li[class="arrow"] a').tap(function(event) { $('div[rel="browser"] a[class="back"]').tap(function(event) { event.preventDefault(); + $(this).parents('div[rel="browser"]').find('ul[rel="filelist"] li[class="arrow"] a').unbind("tap"); $(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'); -- cgit v1.2.3