Electron release v1.0.221

* Try add codemirror type again

* Add global typedef for codemirror

* Add comment

.eslintignore

@@ -61,6 +61,7 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/langs/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+ElectronClient/global.d.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js
@@ -114,6 +115,7 @@ ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
 ReactNativeClient/lib/services/ResourceEditWatcher.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.js
 ReactNativeClient/PluginAssetsLoader.js

.gitignore

@@ -51,6 +51,7 @@ Tools/commit_hook.txt
 *.map
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
+ElectronClient/global.d.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js
@@ -104,6 +105,7 @@ ReactNativeClient/lib/services/keychain/KeychainServiceDriver.node.js
 ReactNativeClient/lib/services/keychain/KeychainServiceDriverBase.js
 ReactNativeClient/lib/services/ResourceEditWatcher.js
 ReactNativeClient/lib/services/SettingUtils.js
+ReactNativeClient/lib/services/UndoRedoService.js
 ReactNativeClient/lib/ShareExtension.js
 ReactNativeClient/lib/shareHandler.js
 ReactNativeClient/PluginAssetsLoader.js

CliClient/app/command-import.js

@@ -21,7 +21,11 @@ class Command extends BaseCommand {
 			.filter(m => m.type === 'importer')
 			.map(m => m.format);
 
-		return [['--format <format>', _('Source format: %s', ['auto'].concat(formats).join(', '))], ['-f, --force', _('Do not ask for confirmation.')]];
+		return [
+			['--format <format>', _('Source format: %s', ['auto'].concat(formats).join(', '))],
+			['-f, --force', _('Do not ask for confirmation.')],
+			['--output-format <output-format>', _('Output format: %s', 'md, html')],
+		];
 	}
 
 	async action(args) {
@@ -55,9 +59,9 @@ class Command extends BaseCommand {
 			this.stdout(s);
 		};
 
-		app()
-			.gui()
-			.showConsole();
+		if (args.options.outputFormat) importOptions.outputFormat = args.options.outputFormat;
+
+		app().gui().showConsole();
 		this.stdout(_('Importing notes...'));
 		const service = new InteropService();
 		const result = await service.import(importOptions);

CliClient/app/main.js

@@ -52,8 +52,6 @@ BaseItem.loadClass('Revision', Revision);
 Setting.setConstant('appId', `net.cozic.joplin${env === 'dev' ? 'dev' : ''}-cli`);
 Setting.setConstant('appType', 'cli');
 
-console.info(Setting.value('appId'));
-
 shimInit();
 
 const application = app();

CliClient/locales-build/index.js

@@ -38,42 +38,42 @@ locales['tr_TR'] = require('./tr_TR.json');
 locales['vi'] = require('./vi.json');
 locales['zh_CN'] = require('./zh_CN.json');
 locales['zh_TW'] = require('./zh_TW.json');
-stats['ar'] = {"percentDone":85};
-stats['eu'] = {"percentDone":36};
-stats['bs_BA'] = {"percentDone":79};
-stats['bg_BG'] = {"percentDone":71};
-stats['ca'] = {"percentDone":56};
-stats['hr_HR'] = {"percentDone":30};
-stats['cs_CZ'] = {"percentDone":88};
-stats['da_DK'] = {"percentDone":79};
-stats['de_DE'] = {"percentDone":96};
-stats['et_EE'] = {"percentDone":70};
+stats['ar'] = {"percentDone":84};
+stats['eu'] = {"percentDone":35};
+stats['bs_BA'] = {"percentDone":78};
+stats['bg_BG'] = {"percentDone":70};
+stats['ca'] = {"percentDone":55};
+stats['hr_HR'] = {"percentDone":29};
+stats['cs_CZ'] = {"percentDone":86};
+stats['da_DK'] = {"percentDone":78};
+stats['de_DE'] = {"percentDone":97};
+stats['et_EE'] = {"percentDone":69};
 stats['en_GB'] = {"percentDone":100};
 stats['en_US'] = {"percentDone":100};
-stats['es_ES'] = {"percentDone":95};
+stats['es_ES'] = {"percentDone":94};
 stats['eo'] = {"percentDone":40};
-stats['fr_FR'] = {"percentDone":100};
-stats['gl_ES'] = {"percentDone":46};
-stats['id_ID'] = {"percentDone":98};
+stats['fr_FR'] = {"percentDone":99};
+stats['gl_ES'] = {"percentDone":45};
+stats['id_ID'] = {"percentDone":97};
 stats['it_IT'] = {"percentDone":95};
+stats['nl_NL'] = {"percentDone":89};
 stats['nl_BE'] = {"percentDone":36};
-stats['nl_NL'] = {"percentDone":90};
-stats['nb_NO'] = {"percentDone":93};
+stats['nb_NO'] = {"percentDone":92};
 stats['fa'] = {"percentDone":35};
-stats['pl_PL'] = {"percentDone":89};
-stats['pt_PT'] = {"percentDone":94};
-stats['pt_BR'] = {"percentDone":95};
+stats['pl_PL'] = {"percentDone":88};
+stats['pt_PT'] = {"percentDone":93};
+stats['pt_BR'] = {"percentDone":99};
 stats['ro'] = {"percentDone":36};
 stats['sl_SI'] = {"percentDone":45};
 stats['sv'] = {"percentDone":75};
-stats['th_TH'] = {"percentDone":56};
-stats['vi'] = {"percentDone":91};
-stats['tr_TR'] = {"percentDone":95};
+stats['th_TH'] = {"percentDone":55};
+stats['vi'] = {"percentDone":90};
+stats['tr_TR'] = {"percentDone":99};
 stats['el_GR'] = {"percentDone":95};
-stats['ru_RU'] = {"percentDone":93};
+stats['ru_RU'] = {"percentDone":92};
 stats['sr_RS'] = {"percentDone":76};
-stats['zh_CN'] = {"percentDone":93};
-stats['zh_TW'] = {"percentDone":94};
-stats['ja_JP'] = {"percentDone":98};
-stats['ko'] = {"percentDone":92};
+stats['zh_CN'] = {"percentDone":98};
+stats['zh_TW'] = {"percentDone":93};
+stats['ja_JP'] = {"percentDone":97};
+stats['ko'] = {"percentDone":91};
 module.exports = { locales: locales, stats: stats };

CliClient/package-lock.json

@@ -33,9 +33,9 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "acorn": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg=="
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
+      "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="
     },
     "acorn-globals": {
       "version": "4.3.4",
@@ -1161,9 +1161,9 @@
       "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
     },
     "cssstyle": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz",
-      "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "requires": {
         "cssom": "~0.3.6"
       },
@@ -1594,9 +1594,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
-      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
+      "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
       "requires": {
         "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
@@ -2111,7 +2111,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2132,12 +2133,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2152,17 +2155,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2279,7 +2285,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2291,6 +2298,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2305,6 +2313,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2312,12 +2321,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2336,6 +2347,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2425,7 +2437,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2437,6 +2450,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2522,7 +2536,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2558,6 +2573,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2577,6 +2593,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2620,12 +2637,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3730,9 +3749,9 @@
       "dev": true
     },
     "joplin-turndown": {
-      "version": "4.0.27",
-      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.27.tgz",
-      "integrity": "sha512-qwJEzpbsyXnfjYgCVXWbuf3BdbDAaP7edm5ubeVAaQ3RnaiSEB2xZLg3lubmuFOIxXnkMDMkGJC4G+qAbCW95w==",
+      "version": "4.0.28",
+      "resolved": "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.28.tgz",
+      "integrity": "sha512-wQP9OUBAkWq/VPPCJcY1EI6tSXWlGs/BJ7Ce8BZYRF/1vEk/TRHOdKmCObQrXz/0nRoLiP5xeqNvHE1nK4XbRQ==",
       "requires": {
         "css": "^2.2.4",
         "html-entities": "^1.2.1",
@@ -6611,7 +6630,7 @@
       "requires": {
         "chalk": "^2.1.0",
         "emphasize": "^1.5.0",
-        "node-emoji": "git+https://github.com/laurent22/node-emoji.git#9fa01eac463e94dde1316ef8c53089eeef4973b5",
+        "node-emoji": "git+https://github.com/laurent22/node-emoji.git",
         "slice-ansi": "^1.0.0",
         "string-width": "^2.1.1",
         "terminal-kit": "^1.13.11",
@@ -7283,9 +7302,9 @@
       }
     },
     "ws": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
-      "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
+      "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="
     },
     "xdg-basedir": {
       "version": "3.0.0",

CliClient/package.json

@@ -55,7 +55,7 @@
     "htmlparser2": "^4.1.0",
     "image-data-uri": "^2.0.0",
     "image-type": "^3.0.0",
-    "joplin-turndown": "^4.0.27",
+    "joplin-turndown": "^4.0.28",
     "joplin-turndown-plugin-gfm": "^1.0.12",
     "json-stringify-safe": "^5.0.1",
     "jssha": "^2.3.0",

CliClient/tests/EnexToHtml.js

@@ -89,20 +89,20 @@ describe('EnexToHtml', function() {
 		}],
 	});
 
-	it('fails when not given a matching resource', asyncTest(async () => {
-		// To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
-		const resources = [];
-		const inputFile = fileWithPath('en-media--image.enex');
-		const enexInput = await shim.fsDriver().readFile(inputFile);
-		const promisedOutput = enexXmlToHtml(enexInput, resources);
+	// it('fails when not given a matching resource', asyncTest(async () => {
+	// 	// To test the promise-unexpectedly-resolved case, add `audioResource` to the array.
+	// 	const resources = [];
+	// 	const inputFile = fileWithPath('en-media--image.enex');
+	// 	const enexInput = await shim.fsDriver().readFile(inputFile);
+	// 	const promisedOutput = enexXmlToHtml(enexInput, resources);
 
-		promisedOutput.then(() => {
-			// Promise should not be resolved
-			expect(false).toEqual(true);
-		}, (reason) => {
-			expect(reason)
-				.toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
-		});
-	}));
+	// 	promisedOutput.then(() => {
+	// 		// Promise should not be resolved
+	// 		expect(false).toEqual(true);
+	// 	}, (reason) => {
+	// 		expect(reason)
+	// 			.toBe('Hash with no associated resource: 89ce7da62c6b2832929a6964237e98e9');
+	// 	});
+	// }));
 
 });

CliClient/tests/MdToHtml.js

@@ -12,7 +12,7 @@ const BaseModel = require('lib/BaseModel.js');
 const { shim } = require('lib/shim');
 const MdToHtml = require('lib/joplin-renderer/MdToHtml');
 const { enexXmlToMd } = require('lib/import-enex-md-gen.js');
-const { themeStyle } = require('../../ElectronClient/theme.js');
+const { themeStyle } = require('lib/theme');
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 60 * 60 * 1000; // Can run for a while since everything is in the same test unit
 

CliClient/tests/enex_to_html/attachment.html

@@ -2,6 +2,5 @@
   <div><a href="joplin://21ca2b948f222a38802940ec7e2e5de3" hash="21ca2b948f222a38802940ec7e2e5de3" type="application/pdf" style="cursor:pointer;" alt="attachment-1">attachment-1</a></div>
   <div>
     <br>
-    <br>
   </div>
 </en-note>

CliClient/tests/enex_to_html/en-media--audio.html

@@ -8,6 +8,5 @@
   </div>
   <div>
     <br>
-    <br>
   </div>
 </en-note>

CliClient/tests/enex_to_html/en-media--image.html

@@ -4,11 +4,9 @@
   <div>
     <input type="checkbox" onclick="return false;">A test for <i>italic</i>
     <br>
-    <br>
   </div>
   <div>
     <br>
-    <br>
   </div>
   <div><i><img src=":/89ce7da62c6b2832929a6964237e98e9" hash="89ce7da62c6b2832929a6964237e98e9" type="image/jpeg" alt=""></i></div>
 </en-note>

CliClient/tests/html_to_md/list_with_style_type.html

@@ -0,0 +1,5 @@
+<ul style="list-style-type:decimal;">
+	<li>Item A</li>
+	<li>Item B</li>
+	<li>Item C</li>
+</ul>

CliClient/tests/html_to_md/list_with_style_type.md

@@ -0,0 +1,3 @@
+1.  Item A
+2.  Item B
+3.  Item C

CliClient/tests/mimeUtils.js

@@ -0,0 +1,33 @@
+/* eslint-disable no-unused-vars */
+
+require('app-module-path').addPath(__dirname);
+
+const { time } = require('lib/time-utils.js');
+const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+const mimeUtils = require('lib/mime-utils.js').mime;
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('mimeUils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('should get the file extension from the mime type', asyncTest(async () => {
+		expect(mimeUtils.toFileExtension('image/jpeg')).toBe('jpg');
+		expect(mimeUtils.toFileExtension('image/jpg')).toBe('jpg');
+		expect(mimeUtils.toFileExtension('IMAGE/JPG')).toBe('jpg');
+		expect(mimeUtils.toFileExtension('')).toBe(null);
+	}));
+
+	it('should get the mime type from the filename', asyncTest(async () => {
+		expect(mimeUtils.fromFilename('test.jpg')).toBe('image/jpeg');
+		expect(mimeUtils.fromFilename('test.JPG')).toBe('image/jpeg');
+		expect(mimeUtils.fromFilename('test.doesntexist')).toBe(null);
+		expect(mimeUtils.fromFilename('test')).toBe(null);
+	}));
+
+});

CliClient/tests/services_UndoRedoService.js

@@ -0,0 +1,86 @@
+// /* eslint-disable no-unused-vars */
+
+// require('app-module-path').addPath(__dirname);
+
+// const { asyncTest, fileContentEqual, setupDatabase, checkThrow, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('test-utils.js');
+// const KvStore = require('lib/services/KvStore.js');
+// const UndoRedoService = require('lib/services/UndoRedoService.js').default;
+
+// process.on('unhandledRejection', (reason, p) => {
+// 	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+// });
+
+// jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
+// describe('services_UndoRedoService', function() {
+
+// 	beforeEach(async (done) => {
+// 		await setupDatabaseAndSynchronizer(1);
+// 		await switchClient(1);
+// 		done();
+// 	});
+
+// 	it('should undo and redo', asyncTest(async () => {
+// 		const service = new UndoRedoService();
+
+// 		expect(service.canUndo).toBe(false);
+// 		expect(service.canRedo).toBe(false);
+
+// 		service.push('test');
+// 		expect(service.canUndo).toBe(true);
+// 		expect(service.canRedo).toBe(false);
+// 		service.push('test 2');
+// 		service.push('test 3');
+
+// 		expect(service.undo()).toBe('test 3');
+// 		expect(service.canRedo).toBe(true);
+// 		expect(service.undo()).toBe('test 2');
+// 		expect(service.undo()).toBe('test');
+
+// 		expect(checkThrow(() => service.undo())).toBe(true);
+
+// 		expect(service.canUndo).toBe(false);
+// 		expect(service.canRedo).toBe(true);
+
+// 		expect(service.redo()).toBe('test');
+// 		expect(service.canUndo).toBe(true);
+// 		expect(service.redo()).toBe('test 2');
+// 		expect(service.redo()).toBe('test 3');
+
+// 		expect(service.canRedo).toBe(false);
+
+// 		expect(checkThrow(() => service.redo())).toBe(true);
+// 	}));
+
+// 	it('should clear the redo stack when undoing', asyncTest(async () => {
+// 		const service = new UndoRedoService();
+
+// 		service.push('test');
+// 		service.push('test 2');
+// 		service.push('test 3');
+
+// 		service.undo();
+// 		expect(service.canRedo).toBe(true);
+
+// 		service.push('test 4');
+// 		expect(service.canRedo).toBe(false);
+
+// 		expect(service.undo()).toBe('test 4');
+// 		expect(service.undo()).toBe('test 2');
+// 	}));
+
+// 	it('should limit the size of the undo stack', asyncTest(async () => {
+// 		const service = new UndoRedoService();
+
+// 		for (let i = 0; i < 30; i++) {
+// 			service.push(`test${i}`);
+// 		}
+
+// 		for (let i = 0; i < 20; i++) {
+// 			service.undo();
+// 		}
+
+// 		expect(service.canUndo).toBe(false);
+// 	}));
+
+// });

CliClient/tests/test-utils.js

@@ -378,6 +378,16 @@ async function checkThrowAsync(asyncFn) {
 	return hasThrown;
 }
 
+function checkThrow(fn) {
+	let hasThrown = false;
+	try {
+		fn();
+	} catch (error) {
+		hasThrown = true;
+	}
+	return hasThrown;
+}
+
 function fileContentEqual(path1, path2) {
 	const fs = require('fs-extra');
 	const content1 = fs.readFileSync(path1, 'base64');
@@ -563,4 +573,4 @@ class TestApp extends BaseApplication {
 	}
 }
 
-module.exports = { kvStore, resourceService, resourceFetcher, tempFilePath, allSyncTargetItemsEncrypted, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest, currentClientId, id, ids, sortedIds, at, createNTestNotes, createNTestFolders, createNTestTags, TestApp };
+module.exports = { kvStore, resourceService, resourceFetcher, tempFilePath, allSyncTargetItemsEncrypted, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, checkThrow, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, asyncTest, currentClientId, id, ids, sortedIds, at, createNTestNotes, createNTestFolders, createNTestTags, TestApp };

Clipper/content_scripts/index.js

@@ -226,8 +226,9 @@
 			const nodeName = node.nodeName.toLowerCase();
 			const nodeParent = node.parentNode;
 			const nodeParentName = nodeParent ? nodeParent.nodeName.toLowerCase() : '';
+			const computedStyle = node.nodeType === 1 ? window.getComputedStyle(node) : {};
 
-			let isVisible = node.nodeType === 1 ? window.getComputedStyle(node).display !== 'none' : true;
+			let isVisible = node.nodeType === 1 ? computedStyle.display !== 'none' && computedStyle.visibility !== 'hidden' : true;
 			if (isVisible && ['script', 'noscript', 'style', 'select', 'option', 'button'].indexOf(nodeName) >= 0) isVisible = false;
 
 			// If it's a text input or a textarea and it has a value, save

Clipper/popup/postinstall.js

@@ -9,3 +9,8 @@ const sourcePath = `${__dirname}../../../ReactNativeClient/lib/randomClipperPort
 if (fs.pathExistsSync(sourcePath)) {
 	fs.copySync(sourcePath, `${__dirname}/../src/randomClipperPort.js`);
 }
+
+// These files give warnings when loading the extension in Chrome, in dev mode
+fs.removeSync(`${__dirname}/node_modules/public-encrypt/test/test_key.pem`);
+fs.removeSync(`${__dirname}/node_modules/public-encrypt/test/test_rsa_pubkey.pem`);
+fs.removeSync(`${__dirname}/node_modules/public-encrypt/test/test_rsa_privkey.pem`);

ElectronClient/InteropServiceHelper.js

@@ -4,6 +4,7 @@ const InteropService = require('lib/services/InteropService');
 const Setting = require('lib/models/Setting');
 const Note = require('lib/models/Note.js');
 const { friendlySafeFilename } = require('lib/path-utils');
+const { time } = require('lib/time-utils.js');
 const md5 = require('md5');
 const url = require('url');
 const { shim } = require('lib/shim');
@@ -108,10 +109,16 @@ class InteropServiceHelper {
 	}
 
 	static async defaultFilename(noteId, fileExtension) {
-		if (!noteId) return '';
-		const note = await Note.load(noteId);
-		// In a rare case the passed not will be null, use the id for filename
-		const filename = friendlySafeFilename(note ? note.title : noteId, 100);
+		// Default filename is just the date
+		const date = time.formatMsToLocal(new Date().getTime(), time.dateFormat());
+		let filename = friendlySafeFilename(`${date}`, 100);
+
+		if (noteId) {
+			const note = await Note.load(noteId);
+			// In a rare case the passed note will be null, use the id for filename
+			filename = friendlySafeFilename(note ? note.title : noteId, 100);
+		}
+
 		return `${filename}.${fileExtension}`;
 	}
 

ElectronClient/global.d.ts

@@ -0,0 +1,4 @@
+// Declare codemirror module so that we can import it using the import syntax.
+// This also means it will implicitly have the any type, which is necessary because
+// of the flexible manner that codemirror is made https://discuss.codemirror.net/t/basic-codemirror-configuration-in-typescript-project/2047/2
+declare module 'codemirror';

ElectronClient/gui/ClipperConfigScreen.jsx

@@ -1,7 +1,7 @@
 const React = require('react');
 const { connect } = require('react-redux');
 const { bridge } = require('electron').remote.require('./bridge');
-const { themeStyle } = require('../theme.js');
+const { themeStyle } = require('lib/theme');
 const { _ } = require('lib/locale.js');
 const ClipperServer = require('lib/ClipperServer');
 const Setting = require('lib/models/Setting');

ElectronClient/gui/ConfigScreen.jsx

@@ -2,7 +2,7 @@ const React = require('react');
 const { connect } = require('react-redux');
 const Setting = require('lib/models/Setting.js');
 const { bridge } = require('electron').remote.require('./bridge');
-const { themeStyle } = require('../theme.js');
+const { themeStyle } = require('lib/theme');
 const pathUtils = require('lib/path-utils.js');
 const { _ } = require('lib/locale.js');
 const SyncTargetRegistry = require('lib/SyncTargetRegistry');

ElectronClient/gui/DialogButtonRow.jsx

@@ -1,6 +1,6 @@
 const React = require('react');
 const { _ } = require('lib/locale.js');
-const { themeStyle } = require('../theme.js');
+const { themeStyle } = require('lib/theme');
 
 function DialogButtonRow(props) {
 	const theme = themeStyle(props.theme);