From 466145f38940ac6e066d97a0b4215a5a542b5029 Mon Sep 17 00:00:00 2001
From: Marc MAURICE <dooblempub@positon.org>
Date: Tue, 4 Jan 2011 21:40:44 +0100
Subject: [PATCH] Moved all javascript to the bottom (good practice)

---
 plugins/viewer/view.php |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/viewer/view.php b/plugins/viewer/view.php
index e9a9949..ce9bf61 100644
--- a/plugins/viewer/view.php
+++ b/plugins/viewer/view.php
@@ -73,6 +73,8 @@ else $prevPageUrl = dirname($_SERVER["REQUEST_URI"])."/$prevImage";
 
 $directoryUrl = "$bizouRootUrl/index.php".dirname($simpleImagePath);
 
+$firefox = strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox') !== false;
+
 header('Content-Type: text/html; charset=utf-8');
 header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 3600));
 ?>
@@ -121,22 +123,9 @@ img {
 }
 </style>
 
-<?php if ($nextImageUrl !== '') { ?>
- <?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox') !== false) { ?>
+<?php if ($nextImageUrl !== '' and $firefox) { ?>
 <link rel="prefetch" href="<?php echo $nextImageUrl ?>" />
 <link rel="prefetch" href="<?php echo $nextPageUrl ?>" />
-
- <?php } else { ?>
-<script type="text/javascript">
-window.onload = function() {
-	var im = new Image();
-	im.src = '<?php echo $nextImageUrl ?>';
-	var req = new XMLHttpRequest();
-	req.open('GET', '<?php echo $nextPageUrl ?>', false);
-	req.send(null);
-};
-</script>
- <?php } ?>
 <?php } ?>
 
 </head>
@@ -160,7 +149,18 @@ window.onload = function() {
 </div>
 <?php } ?>
 
-<script language="javascript">
+<script type="text/javascript">
+
+<?php if ($nextImageUrl !== '' and ! $firefox) { ?>
+window.onload = function() { // for browsers not supporting link rel=prefetch
+	var im = new Image();
+	im.src = '<?php echo $nextImageUrl ?>';
+	var req = new XMLHttpRequest();
+	req.open('GET', '<?php echo $nextPageUrl ?>', false);
+	req.send(null);
+};
+<?php } ?>
+
 // keyboard navigation
 function keyup(e)
 {
-- 
1.7.10.4