1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-20 21:59:42 +02:00

refactored, improved doc import routine to show progress

This commit is contained in:
Harvey Kandola 2017-09-26 10:12:46 +01:00
parent a0a1dd396a
commit 2cee83d570
3 changed files with 22 additions and 16 deletions

View file

@ -77,7 +77,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
},
onImport() {
// this.attrs.onRefresh();
this.attrs.onRefresh();
},
onStartDocument() {

View file

@ -23,6 +23,7 @@ export default Ember.Component.extend(NotifierMixin, {
templateService: service('template'),
importedDocuments: [],
savedTemplates: [],
importStatus: [],
dropzone: null,
newDocumentName: '',
newDocumentNameMissing: computed.empty('newDocumentName'),
@ -69,7 +70,6 @@ export default Ember.Component.extend(NotifierMixin, {
},
setupImport() {
console.log("setting up import");
// already done init?
if (is.not.null(this.get('dropzone'))) {
this.get('dropzone').destroy();
@ -103,7 +103,7 @@ export default Ember.Component.extend(NotifierMixin, {
console.log("Conversion failed for", x.name, x); // eslint-disable-line no-console
});
this.on("queuecomplete", function () {});
// this.on("queuecomplete", function () {});
this.on("addedfile", function (file) {
self.send('onDocumentImporting', file.name);
@ -146,30 +146,30 @@ export default Ember.Component.extend(NotifierMixin, {
},
onDocumentImporting(filename) {
if (this.isDestroyed) { return; }
this.send("showNotification", `Importing ${filename}`);
this.get('onHideStartDocument')();
let status = this.get('importStatus');
let documents = this.get('importedDocuments');
status.pushObject(`Converting ${filename}...`);
documents.push(filename);
if (this.isDestroyed) { return; }
this.set('importStatus', status);
this.set('importedDocuments', documents);
},
onDocumentImported(filename /*, document*/ ) {
if (this.isDestroyed) { return; }
this.send("showNotification", `${filename} ready`);
let status = this.get('importStatus');
let documents = this.get('importedDocuments');
status.pushObject(`Successfully converted ${filename}`);
documents.pop(filename);
if (this.isDestroyed) { return; }
this.set('importStatus', status);
this.set('importedDocuments', documents);
if (documents.length === 0) {
this.get('onHideStartDocument')();
this.get('onImport')();
}
},
}
});

View file

@ -39,4 +39,10 @@
Alternatively, click to select or drag-drop files <br/>(doc, docx, md, markdown)
</div>
<div class="import-status">
{{#each importStatus as |status|}}
<p>{{status}}</p>
{{/each}}
</div>
</div>