diff options
| author | Olivier Paroz <github@oparoz.com> | 2015-04-19 20:29:44 +0300 |
|---|---|---|
| committer | Olivier Paroz <github@oparoz.com> | 2015-04-19 20:29:44 +0300 |
| commit | bcfe7fe9e2caf0bc5fb1d7e8394c511d5ffd8add (patch) | |
| tree | a828f38b118a061b9f373dc198c426bf20a5f570 /js/galleryview.js | |
| parent | a42adab4bab5c66420fe810bd3863737813bce2a (diff) | |
Differentiate between global and album config
Diffstat (limited to 'js/galleryview.js')
| -rw-r--r-- | js/galleryview.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/galleryview.js b/js/galleryview.js index 0bb61acc..14ce832b 100644 --- a/js/galleryview.js +++ b/js/galleryview.js @@ -106,7 +106,7 @@ this.breadcrumb = new Gallery.Breadcrumb(albumPath); this.breadcrumb.setMaxWidth($(window).width() - 320); - var currentSort = Gallery.albumConfig.sorting; + var currentSort = Gallery.config.albumSorting; this.sortControlsSetup(currentSort.type, currentSort.order); Gallery.albumMap[Gallery.currentAlbum].images.sort(Gallery.utility.sortBy(currentSort.type, currentSort.order)); @@ -137,11 +137,11 @@ var infoContentElement = $('.album-info-content'); infoContentElement.slideUp(); infoContentElement.css('max-height', $(window).height() - 150); - var albumInfo = Gallery.albumConfig.albumInfo; - if (Gallery.albumConfig.error) { + var albumInfo = Gallery.config.albumInfo; + if (Gallery.config.albumError) { infoButton.hide(); var text = '<strong>' + t('gallery', 'Configuration error') + '</strong></br>' + - Gallery.albumConfig.error.message + '</br></br>'; + Gallery.config.albumError.message + '</br></br>'; Gallery.utility.showHtmlNotification(text, 7); } else if ($.isEmptyObject(albumInfo)) { infoButton.hide(); |