You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-06-15 23:00:36 +02:00
Mobile: Display number of resources being fetched in side bar
This commit is contained in:
@ -225,9 +225,15 @@ class SideMenuContentComponent extends Component {
|
|||||||
decryptionReportText = _('Decrypting items: %d/%d', this.props.decryptionWorker.itemIndex + 1, this.props.decryptionWorker.itemCount);
|
decryptionReportText = _('Decrypting items: %d/%d', this.props.decryptionWorker.itemIndex + 1, this.props.decryptionWorker.itemCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let resourceFetcherText = '';
|
||||||
|
if (this.props.resourceFetcher && this.props.resourceFetcher.toFetchCount) {
|
||||||
|
resourceFetcherText = _('Fetching resources: %d', this.props.resourceFetcher.toFetchCount);
|
||||||
|
}
|
||||||
|
|
||||||
let fullReport = [];
|
let fullReport = [];
|
||||||
if (syncReportText) fullReport.push(syncReportText);
|
if (syncReportText) fullReport.push(syncReportText);
|
||||||
if (fullReport.length) fullReport.push('');
|
// if (fullReport.length) fullReport.push('');
|
||||||
|
if (resourceFetcherText) lines.push(resourceFetcherText);
|
||||||
if (decryptionReportText) fullReport.push(decryptionReportText);
|
if (decryptionReportText) fullReport.push(decryptionReportText);
|
||||||
|
|
||||||
while (fullReport.length < 12) fullReport.push(''); // Add blank lines so that height of report text is fixed and doesn't affect scrolling
|
while (fullReport.length < 12) fullReport.push(''); // Add blank lines so that height of report text is fixed and doesn't affect scrolling
|
||||||
@ -272,6 +278,7 @@ const SideMenuContent = connect(
|
|||||||
opacity: state.sideMenuOpenPercent,
|
opacity: state.sideMenuOpenPercent,
|
||||||
collapsedFolderIds: state.collapsedFolderIds,
|
collapsedFolderIds: state.collapsedFolderIds,
|
||||||
decryptionWorker: state.decryptionWorker,
|
decryptionWorker: state.decryptionWorker,
|
||||||
|
resourceFetcher: state.resourceFetcher,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
)(SideMenuContentComponent)
|
)(SideMenuContentComponent)
|
||||||
|
Reference in New Issue
Block a user