diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-03-05 20:57:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 20:57:55 +0300 |
| commit | 80e9458f2bb6c9f088aa8a55fa3121d8825cb015 (patch) | |
| tree | 04fd94e7bd779a5cabbd302fdb8f0a40b05d84b7 | |
| parent | b863720bf4c6894cdb7b7d38043c6fd5997f54b2 (diff) | |
| parent | 976f13d3bcf328cc7871bcae0060dd8826b17492 (diff) | |
Merge pull request #502 from nextcloud/bugfix/noid/fix-upload
Quick fix for new files OperationProgressbar
| -rw-r--r-- | js/galleryview.js | 8 | ||||
| -rw-r--r-- | js/merged.json | 12 | ||||
| -rw-r--r-- | js/upload-helper.js | 4 | ||||
| -rw-r--r-- | templates/part.content.php | 13 |
4 files changed, 27 insertions, 10 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/js/merged.json b/js/merged.json index c504ed46..68bc5c3d 100644 --- a/js/merged.json +++ b/js/merged.json @@ -1,7 +1,10 @@ [ - "app.js", + "upload-helper.js", + "vendor/bigshot/bigshot-compressed.js", "vendor/jquery-touch-events/src/1.0.8/jquery.mobile-events.min.js", "vendor/jquery.ui.touch-punch-custom.js", + "vendor/modified-eventsource-polyfill/eventsource-polyfill.js", + "vendor/commonmark/dist/commonmark.min.js", "gallery.js", "templates.js", "galleryutility.js", @@ -13,16 +16,13 @@ "galleryrow.js", "galleryimage.js", "thumbnail.js", - "vendor/modified-eventsource-polyfill/eventsource-polyfill.js", "eventsource.js", "vendor/nextcloud/share.js", - "vendor/commonmark/dist/commonmark.min.js", "vendor/dompurify/src/purify.js", - "vendor/bigshot/bigshot-compressed.js", "slideshow.js", "slideshowcontrols.js", "slideshowzoomablepreview.js", - "upload-helper.js", "vendor/nextcloud/newfilemenu.js", - "newfilemenuplugins.js" + "newfilemenuplugins.js", + "app.js" ] diff --git a/js/upload-helper.js b/js/upload-helper.js index b0cd5dd3..e0a81c85 100644 --- a/js/upload-helper.js +++ b/js/upload-helper.js @@ -217,5 +217,5 @@ var Files = { } }; -OCA.Files = Files; -OCA.Files.App.fileList = FileList; +OCA.Files = Object.assign({}, OCA.Files, Files); +OCA.Files.App.fileList = Object.assign({}, OCA.Files.App.fileList, FileList); diff --git a/templates/part.content.php b/templates/part.content.php index 91785568..99a75288 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -7,7 +7,9 @@ */ script( $_['appName'], - 'merged' + [ + 'upload-helper', + ] ); script( 'files', @@ -15,6 +17,15 @@ script( 'upload', 'file-upload', 'jquery.fileupload', + 'operationprogressbar', + 'templates', + 'semaphore' + ] +); +script( + $_['appName'], + [ + 'merged' ] ); style( |