Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Quick fix for new files OperationProgressbar #502

Merged
merged 2 commits into from
Mar 5, 2019
Merged

Quick fix for new files OperationProgressbar #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9497659
Quick fix for new files OperationProgressbar
juliusknorr Feb 26, 2019
976f13d
Fix loading of files/gallery script
juliusknorr Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion js/galleryview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions js/merged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
]
4 changes: 2 additions & 2 deletions js/upload-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
13 changes: 12 additions & 1 deletion templates/part.content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,25 @@
*/
script(
$_['appName'],
'merged'
[
'upload-helper',
]
);
script(
'files',
[
'upload',
'file-upload',
'jquery.fileupload',
'operationprogressbar',
'templates',
'semaphore'
]
);
script(
$_['appName'],
[
'merged'
]
);
style(
Expand Down