Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-18 03:00:41 +01:00
Code Issues Packages Projects Releases Activity

prettier progress count

Browse Source
This commit is contained in:
zadam
2019-02-10 22:56:14 +01:00
parent 8aa7e2d0a0
commit caa7dd9619
7 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/javascripts/dialogs/export.js
View File

@@ -12,8 +12,8 @@ const $subtreeFormats = $("#export-subtree-formats");
const $singleFormats = $("#export-single-formats");
const $subtreeType = $("#export-type-subtree");
const $singleType = $("#export-type-single");
const $exportNoteCountWrapper = $("#export-progress-count-wrapper");
const $exportNoteCount = $("#export-progress-count");
const $exportProgressWrapper = $("#export-progress-count-wrapper");
const $exportProgressCount = $("#export-progress-count");
const $exportButton = $("#export-button");
let exportId = '';
@@ -22,8 +22,8 @@ async function showDialog(defaultType) {
// each opening of the dialog resets the exportId so we don't associate it with previous exports anymore
exportId = '';
$exportButton.removeAttr("disabled");
$exportNoteCountWrapper.hide();
$exportNoteCount.text('0');
$exportProgressWrapper.hide();
$exportProgressCount.text('0');
if (defaultType === 'subtree') {
$subtreeType.prop("checked", true).change();
@@ -108,9 +108,9 @@ messagingService.subscribeToMessages(async message => {
}
if (message.type === 'export-progress-count') {
$exportNoteCountWrapper.show();
$exportProgressWrapper.slideDown();
$exportNoteCount.text(message.progressCount);
$exportProgressCount.text(message.progressCount);
}
else if (message.type === 'export-finished') {
$dialog.modal('hide');

12
src/public/javascripts/dialogs/import.js
View File

@@ -9,8 +9,8 @@ const $dialog = $("#import-dialog");
const $form = $("#import-form");
const $noteTitle = $dialog.find(".note-title");
const $fileUploadInput = $("#import-file-upload-input");
const $importNoteCountWrapper = $("#import-progress-count-wrapper");
const $importNoteCount = $("#import-progress-count");
const $importProgressCountWrapper = $("#import-progress-count-wrapper");
const $importProgressCount = $("#import-progress-count");
const $importButton = $("#import-button");
let importId;
@@ -18,8 +18,8 @@ let importId;
async function showDialog() {
// each opening of the dialog resets the importId so we don't associate it with previous imports anymore
importId = '';
$importNoteCountWrapper.hide();
$importNoteCount.text('0');
$importProgressCountWrapper.hide();
$importProgressCount.text('0');
$fileUploadInput.val('').change(); // to trigger Import button disabling listener below
glob.activeDialog = $dialog;
@@ -75,9 +75,9 @@ messagingService.subscribeToMessages(async message => {
}
if (message.type === 'import-progress-count') {
$importNoteCountWrapper.show();
$importProgressCountWrapper.slideDown();
$importNoteCount.text(message.progressCount);
$importProgressCount.text(message.progressCount);
}
else if (message.type === 'import-finished') {
$dialog.modal('hide');