mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	Merge branch 'beta'
# Conflicts: # docs/backend_api/BAttachment.html # docs/backend_api/BRevision.html # docs/backend_api/BackendScriptApi.html # docs/backend_api/becca_entities_battachment.js.html # docs/backend_api/becca_entities_bblob.js.html # docs/backend_api/becca_entities_brevision.js.html # docs/frontend_api/FNote.html # docs/frontend_api/FrontendScriptApi.html # docs/frontend_api/entities_fattachment.js.html # docs/frontend_api/entities_fblob.js.html # docs/frontend_api/services_frontend_script_api.js.html # package-lock.json # src/public/app/services/frontend_script_api.js
This commit is contained in:
		| @@ -34,7 +34,7 @@ import shortcutService from "./shortcuts.js"; | ||||
|  * @constructor | ||||
|  */ | ||||
| function FrontendScriptApi(startNote, currentNote, originEntity = null, $container = null) { | ||||
|     /**  | ||||
|     /** | ||||
|      * Container of all the rendered script content | ||||
|      * @type {jQuery} | ||||
|      * */ | ||||
| @@ -51,7 +51,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain | ||||
|      * @type {FNote} | ||||
|      */ | ||||
|     this.currentNote = currentNote; | ||||
|     /**  | ||||
|     /** | ||||
|      * Entity whose event triggered this execution | ||||
|      * @type {object|null} | ||||
|      */ | ||||
| @@ -331,6 +331,8 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain | ||||
|      * @param {boolean} [params.showNotePath=false] - show also whole note's path as part of the link | ||||
|      * @param {boolean} [params.showNoteIcon=false] - show also note icon before the title | ||||
|      * @param {string} [params.title] - custom link tile with note's title as default | ||||
|      * @param {string} [params.title=] - custom link tile with note's title as default | ||||
|      * @returns {jQuery} - jQuery element with the link (wrapped in <span>) | ||||
|      */ | ||||
|     this.createLink = linkService.createLink; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user