Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/gallery.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorOlivier Paroz <github@oparoz.com>2015-04-02 12:20:38 +0300
committerOlivier Paroz <github@oparoz.com>2015-06-21 21:56:02 +0300
commitdb182ba040f24627d2767b3c72228971b35c1ba1 (patch)
tree6aa57e7888d5304eb08536c05f863b6d7a975a84 /js
parent5d8db6f5a3dbccfb766141e5a6df92dd32b21cde (diff)
Proper fix for #165
There was actually a bug in the resizing routine
Diffstat (limited to 'js')
-rw-r--r--js/app.js4
-rw-r--r--js/galleryinfobox.js1
2 files changed, 2 insertions, 3 deletions
diff --git a/js/app.js b/js/app.js
index 050a6773..ba377a3e 100644
--- a/js/app.js
+++ b/js/app.js
@@ -66,7 +66,7 @@ $(document).ready(function () {
if (windowWidth !== $(window).width()) {
Gallery.view.viewAlbum(Gallery.currentAlbum);
// 320 is the width required for the buttons
- Gallery.view.breadcrumb.setMaxWidth(windowWidth - 320);
+ Gallery.view.breadcrumb.setMaxWidth($(window).width() - 320);
windowWidth = $(window).width();
}
@@ -74,7 +74,7 @@ $(document).ready(function () {
Gallery.resetContentHeight();
var infoContentElement = $('.album-info-content');
// 150 is the space required for the browser toolbar on some mobile OS
- infoContentElement.css('max-height', windowHeight - 150);
+ infoContentElement.css('max-height', $(window).height() - 150);
windowHeight = $(window).height();
}
diff --git a/js/galleryinfobox.js b/js/galleryinfobox.js
index add00125..b43ad221 100644
--- a/js/galleryinfobox.js
+++ b/js/galleryinfobox.js
@@ -15,7 +15,6 @@
if (this.infoContentElement.is(':visible')) {
this.infoContentElement.slideUp();
} else {
- this.infoContentElement.css('max-height', $(window).height() - 150);
this.albumInfo = Gallery.config.albumInfo;
if (!this.albumInfo.infoLoaded) {