mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 19:49:01 +01:00 
			
		
		
		
	fix ctrl+enter in sql console
This commit is contained in:
		
							parent
							
								
									233a50dbb7
								
							
						
					
					
						commit
						24a3f814ed
					
				| @ -50,11 +50,7 @@ async function initEditor() { | ||||
|     codeEditor.focus(); | ||||
| } | ||||
| 
 | ||||
| async function execute(e) { | ||||
|     // stop from propagating upwards (dangerous especially with ctrl+enter executable javascript notes)
 | ||||
|     e.preventDefault(); | ||||
|     e.stopPropagation(); | ||||
| 
 | ||||
| async function execute() { | ||||
|     // execute the selected text or the whole content if there's no selection
 | ||||
|     let sqlQuery = codeEditor.getSelection(); | ||||
| 
 | ||||
|  | ||||
| @ -141,9 +141,10 @@ function bindElShortcut($el, keyboardShortcut, handler) { | ||||
|         } | ||||
| 
 | ||||
|         $el.bind('keydown', keyboardShortcut, e => { | ||||
|             handler(); | ||||
|             handler(e); | ||||
| 
 | ||||
|             e.preventDefault(); | ||||
|             e.stopPropagation(); | ||||
|         }); | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -92,6 +92,10 @@ function getParams(params) { | ||||
| async function getScriptBundleForFrontend(note) { | ||||
|     const bundle = await getScriptBundle(note); | ||||
| 
 | ||||
|     if (!bundle) { | ||||
|         return; | ||||
|     } | ||||
| 
 | ||||
|     // for frontend we return just noteIds because frontend needs to use its own entity instances
 | ||||
|     bundle.noteId = bundle.note.noteId; | ||||
|     delete bundle.note; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zadam
						zadam