aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_imageviewer/js/lightbox.js4
-rw-r--r--core/templates/layout.admin.php1
-rw-r--r--core/templates/layout.user.php1
3 files changed, 2 insertions, 4 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
+}
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 dedb6e2e4a1..ffdb7937ae7 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>