From 218221c06938829d1f63845849dd3f152f73615b Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Wed, 30 Apr 2014 21:57:44 +0000
Subject: [PATCH] 1.0.12 update

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1870 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control        | 2 +-
 CONTROL/preinst        | 2 +-
 webif/html/m/script.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 11410b0b..885a63c1 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.11-5
+Version: 1.0.12
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.10),mongoose(>=3.0.11),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6)
diff --git a/CONTROL/preinst b/CONTROL/preinst
index dc20e1b4..8e028cbe 100755
--- a/CONTROL/preinst
+++ b/CONTROL/preinst
@@ -2,7 +2,7 @@
 
 # Handle moving the legacy /var/mongoose directory to /webif..
 
-if [ -h /mod/webif -a -d /var/mongoose ]; then
+if [ -h /mod/webif -a -d /mod/var/mongoose -a ! -h /mod/var/mongoose ]; then
 	echo "Relocating web interface files..."
 
 	cd /mod
diff --git a/webif/html/m/script.js b/webif/html/m/script.js
index 7c66d4f9..826a5c79 100644
--- a/webif/html/m/script.js
+++ b/webif/html/m/script.js
@@ -2,6 +2,7 @@
 function s(query) {return $("div.ui-page-active " + query);}
 
 $(document).on('pageshow', '#indexpage', function() {
+console.log('pageshow - indexpage');
 	$('div.status').last().empty()
 	    .load('/cgi-bin/status.jim', function() {
 		$(this).slideDown('slow');
@@ -9,6 +10,7 @@ $(document).on('pageshow', '#indexpage', function() {
 });
 
 $(document).on('pagecreate', '#indexpage', function() {
+console.log('pagecreate - indexpage');
 	$('a.refresh').on('click', function(e) {
 		e.preventDefault();
 		$.mobile.loading('show');
@@ -16,7 +18,6 @@ $(document).on('pagecreate', '#indexpage', function() {
 	});
 
 	$('#xepgsearch').hide('fast');
-
 	$('#epgsearch').on('click', function(e) {
 		e.preventDefault();
 		$('#xepgsearch').toggle('slow');