mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	Compare commits
	
		
			5 Commits
		
	
	
		
			v0.47.1-be
			...
			v0.46.9
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					25ce2e4253 | ||
| 
						 | 
					c27f573eed | ||
| 
						 | 
					1d99c4e80b | ||
| 
						 | 
					dc7c64a94d | ||
| 
						 | 
					dc6a530d8c | 
@@ -62,7 +62,7 @@ echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token
 | 
			
		||||
 | 
			
		||||
gh release create "$TAG" \
 | 
			
		||||
    --title "$TAG release" \
 | 
			
		||||
    --notes ""
 | 
			
		||||
    --notes "" \
 | 
			
		||||
    $EXTRA \
 | 
			
		||||
    "dist/$DEBIAN_X64_BUILD" \
 | 
			
		||||
    "dist/$LINUX_X64_BUILD" \
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
  "name": "trilium",
 | 
			
		||||
  "productName": "Trilium Notes",
 | 
			
		||||
  "description": "Trilium Notes",
 | 
			
		||||
  "version": "0.46.7",
 | 
			
		||||
  "version": "0.46.9",
 | 
			
		||||
  "license": "AGPL-3.0-only",
 | 
			
		||||
  "main": "electron.js",
 | 
			
		||||
  "bin": {
 | 
			
		||||
@@ -55,7 +55,7 @@
 | 
			
		||||
    "jsdom": "16.5.0",
 | 
			
		||||
    "mime-types": "2.1.29",
 | 
			
		||||
    "multer": "1.4.2",
 | 
			
		||||
    "node-abi": "2.21.0",
 | 
			
		||||
    "node-abi": "2.26.0",
 | 
			
		||||
    "open": "7.4.2",
 | 
			
		||||
    "portscanner": "2.2.0",
 | 
			
		||||
    "rand-token": "1.0.1",
 | 
			
		||||
 
 | 
			
		||||
@@ -382,8 +382,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
 | 
			
		||||
                    }
 | 
			
		||||
                    else {
 | 
			
		||||
                        node.setActive();
 | 
			
		||||
 | 
			
		||||
                        this.clearSelectedNodes();
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    return false;
 | 
			
		||||
@@ -393,6 +391,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
 | 
			
		||||
                // click event won't propagate so let's close context menu manually
 | 
			
		||||
                contextMenu.hide();
 | 
			
		||||
 | 
			
		||||
                this.clearSelectedNodes();
 | 
			
		||||
 | 
			
		||||
                const notePath = treeService.getNotePath(data.node);
 | 
			
		||||
 | 
			
		||||
                const activeTabContext = appContext.tabManager.getActiveTabContext();
 | 
			
		||||
@@ -1144,11 +1144,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (node) {
 | 
			
		||||
                node.setActive(true, {noEvents: true, noFocus: !activeNodeFocused});
 | 
			
		||||
 | 
			
		||||
                if (activeNodeFocused) {
 | 
			
		||||
                    node.setFocus(true);
 | 
			
		||||
                    // needed by Firefox: https://github.com/zadam/trilium/issues/1865
 | 
			
		||||
                    this.tree.$container.focus();
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                await node.setActive(true, {noEvents: true, noFocus: !activeNodeFocused});
 | 
			
		||||
            }
 | 
			
		||||
            else {
 | 
			
		||||
                // this is used when original note has been deleted and we want to move the focus to the note above/below
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
module.exports = { buildDate:"2021-04-18T21:47:45+02:00", buildRevision: "ec36fbd83eb4585115daa0eca6dc6fb6da43d3b1" };
 | 
			
		||||
module.exports = { buildDate:"2021-04-22T20:50:22+02:00", buildRevision: "c27f573eed8905fc1d958adf5bdee0efc3aff593" };
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user