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:
authorJulius Härtl <jus@bitgrid.net>2019-02-26 20:23:36 +0300
committerJulius Härtl <jus@bitgrid.net>2019-03-05 19:50:19 +0300
commit9497659b81d46d3347d6a9e0e75b1af6f03a85f2 (patch)
treee851667c024a32bfbe389c0650333df760872be0
parentb863720bf4c6894cdb7b7d38043c6fd5997f54b2 (diff)
Quick fix for new files OperationProgressbar
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--js/galleryview.js8
-rw-r--r--templates/part.content.php3
2 files changed, 10 insertions, 1 deletions
diff --git a/js/galleryview.js b/js/galleryview.js
index c9f30db1..a4cd4411 100644
--- a/js/galleryview.js
+++ b/js/galleryview.js
@@ -311,9 +311,15 @@
if (!$uploadEl.exists()) {
return;
}
+
+ this._operationProgressBar = new OCA.Files.OperationProgressBar();
+ this._operationProgressBar.render();
+ $('#content').find('#uploadprogresswrapper').replaceWith(this._operationProgressBar.$el);
+
this._uploader = new OC.Uploader($uploadEl, {
fileList: FileList,
- dropZone: $('#content')
+ dropZone: $('#content'),
+ progressBar: this._operationProgressBar
});
this._uploader.on('add', function (e, data) {
data.targetDir = '/' + Gallery.currentAlbum;
diff --git a/templates/part.content.php b/templates/part.content.php
index 91785568..2bfe5576 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -15,6 +15,9 @@ script(
'upload',
'file-upload',
'jquery.fileupload',
+ 'operationprogressbar',
+ 'templates',
+ 'semaphore'
]
);
style(