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
diff options
context:
space:
mode:
authorOlivier Paroz <github@oparoz.com>2015-07-06 16:25:34 +0300
committerOlivier Paroz <github@oparoz.com>2015-07-10 18:33:13 +0300
commit005029d7a5e258dbf010706e181fba2d006de76a (patch)
tree8120335eb855d917861920c2fb0cbf408dd1ff9e /js/galleryview.js
parent0a93516c2056c90359616d0fd23b1f34decdd028 (diff)
First concept of empty folder when landing from the Files app
Diffstat (limited to 'js/galleryview.js')
-rw-r--r--js/galleryview.js13
1 files changed, 9 insertions, 4 deletions
diff --git a/js/galleryview.js b/js/galleryview.js
index a2b2d5ad..502c22db 100644
--- a/js/galleryview.js
+++ b/js/galleryview.js
@@ -32,7 +32,12 @@
*/
init: function (albumPath) {
if (Gallery.images.length === 0) {
- Gallery.showEmpty();
+ //Gallery.showEmpty();
+ // FIXME Make the diff between a root and deep folder
+ Gallery.showEmptyFolder();
+ Gallery.currentAlbum = albumPath;
+ this.breadcrumb = new Gallery.Breadcrumb(albumPath);
+ this.breadcrumb.setMaxWidth($(window).width() - Gallery.buttonsWidth);
} else {
// Only do it when the app is initialised
if (this.requestId === -1) {
@@ -106,7 +111,7 @@
this.infoButtonSetup();
this.breadcrumb = new Gallery.Breadcrumb(albumPath);
- this.breadcrumb.setMaxWidth($(window).width() - 320);
+ this.breadcrumb.setMaxWidth($(window).width() - Gallery.buttonsWidth);
var currentSort = Gallery.config.albumSorting;
this.sortControlsSetup(currentSort.type, currentSort.order);
@@ -122,7 +127,7 @@
* @param {string} albumPath
*/
shareButtonSetup: function (albumPath) {
- var shareButton = $('button.share');
+ var shareButton = $('#share-button');
if (albumPath === '' || Gallery.token) {
shareButton.hide();
} else {
@@ -138,7 +143,7 @@
infoButton.find('span').hide();
var infoContentElement = $('.album-info-content');
infoContentElement.slideUp();
- infoContentElement.css('max-height', $(window).height() - 150);
+ infoContentElement.css('max-height', $(window).height() - Gallery.browserToolbarHeight);
var albumInfo = Gallery.config.albumInfo;
if (Gallery.config.albumError) {
infoButton.hide();