Electron release v1.0.103

Adds a shortcut to insert the date and time.

ElectronClient/app/app.js

@@ -183,7 +183,7 @@ class Application extends BaseApplication {
 		if (action.type == 'SETTING_UPDATE_ONE' && action.key == 'locale' || action.type == 'SETTING_UPDATE_ALL') {
 			setLocale(Setting.value('locale'));
 			// The bridge runs within the main process, with its own instance of locale.js
-			// so it needs to be set too here. 
+			// so it needs to be set too here.
 			bridge().setLocale(Setting.value('locale'));
 			this.refreshMenu();
 		}
@@ -362,7 +362,6 @@ class Application extends BaseApplication {
 					}
 				}, {
 					label: _('New notebook'),
-					accelerator: 'CommandOrControl+B',
 					screens: ['Main'],
 					click: () => {
 						this.dispatch({
@@ -442,6 +441,17 @@ class Application extends BaseApplication {
 							name: 'textItalic',
 						});
 					},
+				}, {
+					label: _('Insert Date Time'),
+					screens: ['Main'],
+					visible: false,
+					accelerator: 'CommandOrControl+Shift+T',
+					click: () => {
+						this.dispatch({
+							type: 'WINDOW_COMMAND',
+							name: 'insertDateTime',
+						});
+					},
 				}, {
 					type: 'separator',
 					screens: ['Main'],

ElectronClient/app/gui/NoteText.jsx

@@ -187,7 +187,7 @@ class NoteTextComponent extends React.Component {
 			}
 		}
 
-		return pos;		
+		return pos;
 	}
 
 	textOffsetToCursorPosition(offset, body) {
@@ -597,8 +597,8 @@ class NoteTextComponent extends React.Component {
 			const letters = ['F', 'T', 'P', 'Q', 'L', ','];
 			for (let i = 0; i < letters.length; i++) {
 				const l = letters[i];
-				cancelledKeys.push('Ctrl+' + l); 
-				cancelledKeys.push('Command+' + l); 
+				cancelledKeys.push('Ctrl+' + l);
+				cancelledKeys.push('Command+' + l);
 			}
 
 			for (let i = 0; i < cancelledKeys.length; i++) {
@@ -751,6 +751,8 @@ class NoteTextComponent extends React.Component {
 			this.commandTextBold();
 		} else if (command.name === 'textItalic') {
 			this.commandTextItalic();
+		} else if (command.name === 'insertDateTime' ) {
+			this.commandDateTime();
 		} else if (command.name === 'commandStartExternalEditing') {
 			this.commandStartExternalEditing();
 		} else {
@@ -828,8 +830,6 @@ class NoteTextComponent extends React.Component {
 	destroyExternalEditWatcher() {
 		if (!this.externalEditWatcher_) return;
 
-		console.info(this.externalEditWatcher_);
-
 		this.externalEditWatcher_.off('noteChange', this.externalEditWatcher_noteChange);
 		this.externalEditWatcher_.stopWatchingAll();
 		this.externalEditWatcher_ = null;
@@ -924,8 +924,6 @@ class NoteTextComponent extends React.Component {
 				end: { row: p.row, column: p.column + defaultText.length },
 			};
 
-			console.info('DDDDD', defaultText, newRange);
-
 			this.updateEditorWithDelay((editor) => {
 				if (defaultText && newRange) {
 					const range = this.selectionRange_;
@@ -954,6 +952,10 @@ class NoteTextComponent extends React.Component {
 		this.wrapSelectionWithStrings('*', '*', _('emphasized text'));
 	}
 
+	commandDateTime() {
+		this.wrapSelectionWithStrings(time.formatMsToLocal(new Date().getTime()));
+	}
+
 	commandTextCode() {
 		this.wrapSelectionWithStrings('`', '`');
 	}
@@ -1046,7 +1048,7 @@ class NoteTextComponent extends React.Component {
 			tooltip: _('Hyperlink'),
 			iconName: 'fa-link',
 			onClick: () => { return this.commandTextLink(); },
-		});		
+		});
 
 		toolbarItems.push({
 			tooltip: _('Code'),
@@ -1094,6 +1096,12 @@ class NoteTextComponent extends React.Component {
 			onClick: () => { return this.commandTextHorizontalRule(); },
 		});
 
+		toolbarItems.push({
+			tooltip: _('Insert Date Time'),
+			iconName: 'fa-calendar-plus-o',
+			onClick: () => { return this.commandDateTime(); },
+		});
+
 		toolbarItems.push({
 			type: 'separator',
 		});
@@ -1325,7 +1333,7 @@ class NoteTextComponent extends React.Component {
 			editorProps={{$blockScrolling: true}}
 
 			// This is buggy (gets outside the container)
-			highlightActiveLine={false}			
+			highlightActiveLine={false}
 		/>
 
 		return (

ElectronClient/app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

ElectronClient/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Joplin",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "scripts": {