From 101c6d151ea1cccedf3b6dfbae167c77b3fa4c88 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Thu, 21 Jul 2011 23:30:00 +0200
Subject: [PATCH 1/2] fix resizing images in image viewer

---
 apps/files_imageviewer/js/lightbox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 25da2bc6835..6e45547ebb4 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -36,7 +36,7 @@ function showLightbox(container,img){
 			img.width = maxHeight * ratio;
 		} else {
 			img.width = maxWidth;
-			img.height = maxWidth * ratio;
+			img.height = maxWidth / ratio;
 		}
 	}
 	container.empty();
@@ -55,4 +55,4 @@ function hideLightbox(){
 		$('#lightbox').hide();
 		lightBoxShown=false;
 	}
-}
\ No newline at end of file
+}

From 828a26c69ee3a4920c35265e972e759ed800a461 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 22 Jul 2011 00:24:25 +0200
Subject: [PATCH 2/2] dont load some javascript files multiply times

---
 core/templates/layout.admin.php | 1 -
 core/templates/layout.user.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php
index aa1de65c084..e83cf6861bf 100644
--- a/core/templates/layout.admin.php
+++ b/core/templates/layout.admin.php
@@ -23,7 +23,6 @@
 				echo $header['text'];
 				echo '</'.$header['tag'].'>';
 			?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
 	</head>
 
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2a9a817498d..2f528c9e624 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -23,7 +23,6 @@
 				echo $header['text'];
 				echo '</'.$header['tag'].'>';
 			?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
 	</head>