mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-10-31 21:11:30 +08:00 
			
		
		
		
	use note size format also in file properties
This commit is contained in:
		
							parent
							
								
									a6ade790c6
								
							
						
					
					
						commit
						7e71029d1c
					
				| @ -483,6 +483,13 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain | ||||
|      */ | ||||
|     this.randomString = utils.randomString; | ||||
| 
 | ||||
|     /** | ||||
|      * @method | ||||
|      * @param {int} size in bytes | ||||
|      * @return {string} formatted string | ||||
|      */ | ||||
|     this.formatNoteSize = utils.formatNoteSize; | ||||
| 
 | ||||
|     this.logMessages = {}; | ||||
|     this.logSpacedUpdates = {}; | ||||
| 
 | ||||
|  | ||||
| @ -354,6 +354,17 @@ function escapeRegExp(str) { | ||||
|     return str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1"); | ||||
| } | ||||
| 
 | ||||
| function formatNoteSize(size) { | ||||
|     size = Math.max(Math.round(size / 1024), 1); | ||||
| 
 | ||||
|     if (size < 1024) { | ||||
|         return `${size} KiB`; | ||||
|     } | ||||
|     else { | ||||
|         return `${Math.round(size / 102.4) / 10} MiB`; | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| export default { | ||||
|     reloadFrontendApp, | ||||
|     parseDate, | ||||
| @ -396,5 +407,6 @@ export default { | ||||
|     filterAttributeName, | ||||
|     isValidAttributeName, | ||||
|     sleep, | ||||
|     escapeRegExp | ||||
|     escapeRegExp, | ||||
|     formatNoteSize | ||||
| }; | ||||
|  | ||||
| @ -136,7 +136,7 @@ export default class FilePropertiesWidget extends NoteContextAwareWidget { | ||||
| 
 | ||||
|         const noteComplement = await this.noteContext.getNoteComplement(); | ||||
| 
 | ||||
|         this.$fileSize.text(`${noteComplement.contentLength} bytes`); | ||||
|         this.$fileSize.text(utils.formatNoteSize(noteComplement.contentLength)); | ||||
| 
 | ||||
|         // open doesn't work for protected notes since it works through browser which isn't in protected session
 | ||||
|         this.$openButton.toggle(!note.isProtected); | ||||
|  | ||||
| @ -1,5 +1,6 @@ | ||||
| import NoteContextAwareWidget from "../note_context_aware_widget.js"; | ||||
| import server from "../../services/server.js"; | ||||
| import utils from "../../services/utils.js"; | ||||
| 
 | ||||
| const TPL = ` | ||||
| <div class="note-info-widget"> | ||||
| @ -105,12 +106,12 @@ export default class NoteInfoWidget extends NoteContextAwareWidget { | ||||
|             this.$subTreeSize.empty().append($('<span class="bx bx-loader bx-spin"></span>')); | ||||
| 
 | ||||
|             const noteSizeResp = await server.get(`stats/note-size/${this.noteId}`); | ||||
|             this.$noteSize.text(this.formatSize(noteSizeResp.noteSize)); | ||||
|             this.$noteSize.text(utils.formatNoteSize(noteSizeResp.noteSize)); | ||||
| 
 | ||||
|             const subTreeResp = await server.get(`stats/subtree-size/${this.noteId}`); | ||||
| 
 | ||||
|             if (subTreeResp.subTreeNoteCount > 1) { | ||||
|                 this.$subTreeSize.text(`(subtree size: ${this.formatSize(subTreeResp.subTreeSize)} in ${subTreeResp.subTreeNoteCount} notes)`); | ||||
|                 this.$subTreeSize.text(`(subtree size: ${utils.formatNoteSize(subTreeResp.subTreeSize)} in ${subTreeResp.subTreeNoteCount} notes)`); | ||||
|             } | ||||
|             else { | ||||
|                 this.$subTreeSize.text(""); | ||||
| @ -143,17 +144,6 @@ export default class NoteInfoWidget extends NoteContextAwareWidget { | ||||
|         this.$noteSizesWrapper.hide(); | ||||
|     } | ||||
|      | ||||
|     formatSize(size) { | ||||
|         size = Math.max(Math.round(size / 1024), 1); | ||||
| 
 | ||||
|         if (size < 1024) { | ||||
|             return `${size} KiB`; | ||||
|         } | ||||
|         else { | ||||
|             return `${Math.round(size / 102.4) / 10} MiB`; | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     entitiesReloadedEvent({loadResults}) { | ||||
|         if (loadResults.isNoteReloaded(this.noteId) || loadResults.isNoteContentReloaded(this.noteId)) { | ||||
|             this.refresh(); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam