mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-03 20:06:08 +01:00 
			
		
		
		
	Compare commits
	
		
			8 Commits
		
	
	
		
			v0.33.2-be
			...
			v0.33.3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					20d3d61cec | ||
| 
						 | 
					1b831f94a9 | ||
| 
						 | 
					3f241553aa | ||
| 
						 | 
					8624c83108 | ||
| 
						 | 
					d49cae9cea | ||
| 
						 | 
					504b2e2c4a | ||
| 
						 | 
					2c5292222f | ||
| 
						 | 
					989da8877b | 
@@ -18,6 +18,7 @@ RUN set -x \
 | 
				
			|||||||
        make \
 | 
					        make \
 | 
				
			||||||
        nasm \
 | 
					        nasm \
 | 
				
			||||||
        libpng-dev \
 | 
					        libpng-dev \
 | 
				
			||||||
 | 
					        python \
 | 
				
			||||||
    && npm install --production \
 | 
					    && npm install --production \
 | 
				
			||||||
    && apk del .build-dependencies
 | 
					    && apk del .build-dependencies
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,6 +7,9 @@ rm -r node_modules/sqlite3/lib/binding/*
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
 | 
					cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# rebuild binaries for image operations (pngquant ...)
 | 
				
			||||||
 | 
					npm rebuild
 | 
				
			||||||
 | 
					
 | 
				
			||||||
./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 | 
					./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
 | 
					mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,7 +59,7 @@ async function createMainWindow() {
 | 
				
			|||||||
    mainWindowState.manage(win);
 | 
					    mainWindowState.manage(win);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    win.setMenuBarVisibility(false);
 | 
					    win.setMenuBarVisibility(false);
 | 
				
			||||||
    win.loadURL('http://localhost:' + await port);
 | 
					    win.loadURL('http://127.0.0.1:' + await port);
 | 
				
			||||||
    win.on('closed', onClosed);
 | 
					    win.on('closed', onClosed);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    win.webContents.on('new-window', (e, url) => {
 | 
					    win.webContents.on('new-window', (e, url) => {
 | 
				
			||||||
@@ -74,7 +74,7 @@ async function createMainWindow() {
 | 
				
			|||||||
        const parsedUrl = url.parse(targetUrl);
 | 
					        const parsedUrl = url.parse(targetUrl);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // we still need to allow internal redirects from setup and migration pages
 | 
					        // we still need to allow internal redirects from setup and migration pages
 | 
				
			||||||
        if (parsedUrl.hostname !== 'localhost' || (parsedUrl.path && parsedUrl.path !== '/')) {
 | 
					        if (parsedUrl.hostname !== 'localhost' || parsedUrl.hostname !== '127.0.0.1' || (parsedUrl.path && parsedUrl.path !== '/')) {
 | 
				
			||||||
            ev.preventDefault();
 | 
					            ev.preventDefault();
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										8
									
								
								libraries/autocomplete.jquery.min.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								libraries/autocomplete.jquery.min.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										8
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  "name": "trilium",
 | 
					  "name": "trilium",
 | 
				
			||||||
  "version": "0.33.1-beta",
 | 
					  "version": "0.33.2-beta",
 | 
				
			||||||
  "lockfileVersion": 1,
 | 
					  "lockfileVersion": 1,
 | 
				
			||||||
  "requires": true,
 | 
					  "requires": true,
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
@@ -2820,9 +2820,9 @@
 | 
				
			|||||||
      "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
 | 
					      "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "electron": {
 | 
					    "electron": {
 | 
				
			||||||
      "version": "6.0.0-beta.9",
 | 
					      "version": "6.0.0-beta.10",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.9.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.10.tgz",
 | 
				
			||||||
      "integrity": "sha512-tbBpSamFzD1ayJhF+sUo56e7qD+djdMOPh8B0iA0C10pYbi0HUSEH1EOLtB+UMWU3wkc8QOCMWcgz7wze1w6QQ==",
 | 
					      "integrity": "sha512-eKDUv5ZZGjFE2ccBQzBpY6j3oT1NvnHGLcSoGXp6vCWkx+ZYjPyujwG3gW61FK7iL5FMKyg9IlhCOsIy4HEruw==",
 | 
				
			||||||
      "dev": true,
 | 
					      "dev": true,
 | 
				
			||||||
      "requires": {
 | 
					      "requires": {
 | 
				
			||||||
        "@types/node": "^10.12.18",
 | 
					        "@types/node": "^10.12.18",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
  "name": "trilium",
 | 
					  "name": "trilium",
 | 
				
			||||||
  "productName": "Trilium Notes",
 | 
					  "productName": "Trilium Notes",
 | 
				
			||||||
  "description": "Trilium Notes",
 | 
					  "description": "Trilium Notes",
 | 
				
			||||||
  "version": "0.33.2-beta",
 | 
					  "version": "0.33.3",
 | 
				
			||||||
  "license": "AGPL-3.0-only",
 | 
					  "license": "AGPL-3.0-only",
 | 
				
			||||||
  "main": "electron.js",
 | 
					  "main": "electron.js",
 | 
				
			||||||
  "bin": {
 | 
					  "bin": {
 | 
				
			||||||
@@ -75,7 +75,7 @@
 | 
				
			|||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "devtron": "1.4.0",
 | 
					    "devtron": "1.4.0",
 | 
				
			||||||
    "electron": "6.0.0-beta.9",
 | 
					    "electron": "6.0.0-beta.10",
 | 
				
			||||||
    "electron-builder": "20.44.2",
 | 
					    "electron-builder": "20.44.2",
 | 
				
			||||||
    "electron-compile": "6.4.4",
 | 
					    "electron-compile": "6.4.4",
 | 
				
			||||||
    "electron-installer-debian": "2.0.0",
 | 
					    "electron-installer-debian": "2.0.0",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -401,11 +401,14 @@ tabRow.addListener('activeTabChange', async ({ detail }) => {
 | 
				
			|||||||
tabRow.addListener('tabRemove', async ({ detail }) => {
 | 
					tabRow.addListener('tabRemove', async ({ detail }) => {
 | 
				
			||||||
    const tabId = detail.tabEl.getAttribute('data-tab-id');
 | 
					    const tabId = detail.tabEl.getAttribute('data-tab-id');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    const tabContentToDelete = tabContexts.find(nc => nc.tabId === tabId);
 | 
					    const tabContextToDelete = tabContexts.find(nc => nc.tabId === tabId);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (tabContentToDelete) {
 | 
					    if (tabContextToDelete) {
 | 
				
			||||||
        await tabContentToDelete.saveNoteIfChanged();
 | 
					        // sometimes there are orphan autocompletes after closing the tab
 | 
				
			||||||
        tabContentToDelete.$tabContent.remove();
 | 
					        tabContextToDelete.$tabContent.find('.aa-input').autocomplete('close');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        await tabContextToDelete.saveNoteIfChanged();
 | 
				
			||||||
 | 
					        tabContextToDelete.$tabContent.remove();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    tabContexts = tabContexts.filter(nc => nc.tabId !== tabId);
 | 
					    tabContexts = tabContexts.filter(nc => nc.tabId !== tabId);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,12 +67,18 @@ class TabContext {
 | 
				
			|||||||
        this.components = {};
 | 
					        this.components = {};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        this.$noteTitle.on('input', () => {
 | 
					        this.$noteTitle.on('input', () => {
 | 
				
			||||||
 | 
					            if (!this.note) {
 | 
				
			||||||
 | 
					                return;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            this.noteChanged();
 | 
					            this.noteChanged();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            const title = this.$noteTitle.val();
 | 
					            this.note.title = this.$noteTitle.val();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            this.tabRow.updateTab(this.$tab[0], {title});
 | 
					            this.tabRow.updateTab(this.$tab[0], {title: this.note.title});
 | 
				
			||||||
            treeService.setNoteTitle(this.noteId, title);
 | 
					            treeService.setNoteTitle(this.noteId, this.note.title);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            this.setTitleBar();
 | 
				
			||||||
        });
 | 
					        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (utils.isDesktop()) {
 | 
					        if (utils.isDesktop()) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1 @@
 | 
				
			|||||||
module.exports = { buildDate:"2019-06-20T09:39:11+02:00", buildRevision: "fead3cd7ade63620655376dc5e85b4308ec71bde" };
 | 
					module.exports = { buildDate:"2019-06-24T20:47:50+02:00", buildRevision: "1b831f94a98dbbb7184048f329ea89175841dec2" };
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,9 +36,13 @@
 | 
				
			|||||||
                    </div>
 | 
					                    </div>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                <div style="display: inline-block;">
 | 
				
			||||||
                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
 | 
					                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
 | 
				
			||||||
                        <span aria-hidden="true">×</span>
 | 
					                        <span aria-hidden="true">×</span>
 | 
				
			||||||
                    </button>
 | 
					                    </button>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    <button class="help-button" type="button" data-help-page="Link-map" title="Help on Link map">?</button>
 | 
				
			||||||
 | 
					                </div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
            <div class="modal-body" style="outline: none; overflow: hidden;">
 | 
					            <div class="modal-body" style="outline: none; overflow: hidden;">
 | 
				
			||||||
                <div id="link-map-container"></div>
 | 
					                <div id="link-map-container"></div>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user