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>2016-06-19 03:49:28 +0300
committerOlivier Paroz <github@oparoz.com>2016-06-19 14:32:45 +0300
commit61920fd80f0885bb51069d72e739a45f45f92549 (patch)
treeda94cffee1fd836c23cfa9697bb649c851385bd1
parent70de06213b69c03d9b9db231d611d996f4b8e086 (diff)
Init the slideshow before getting filesv9.1.0RC1
Fixes #679 (cherry picked from commit dcc0d57)
-rw-r--r--js/app.js21
1 files changed, 10 insertions, 11 deletions
diff --git a/js/app.js b/js/app.js
index d4d5186c..0c04a66a 100644
--- a/js/app.js
+++ b/js/app.js
@@ -28,19 +28,18 @@ $(document).ready(function () {
.then(function (config) {
Gallery.config = new Gallery.Config(config);
var currentLocation = window.location.href.split('#')[1] || '';
- Gallery.getFiles(currentLocation).then(function () {
- Gallery.activeSlideShow = new SlideShow();
- $.when(
- Gallery.activeSlideShow.init(
- false,
- null,
- Gallery.config.galleryFeatures
- ))
- .then(function () {
+ Gallery.activeSlideShow = new SlideShow();
+ $.when(
+ Gallery.activeSlideShow.init(
+ false,
+ null,
+ Gallery.config.galleryFeatures
+ ))
+ .then(function () {
+ Gallery.getFiles(currentLocation).then(function () {
window.onhashchange();
});
-
- });
+ });
});
$(document).click(function () {