Desktop: Resolves #1502: Improved note deletion dialog

laurent22 · May 11, 2019 · 016ce3d · 016ce3d
1 parent afb3759
commit 016ce3d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/ElectronClient/app/bridge.js b/ElectronClient/app/bridge.js
@@ -77,13 +77,16 @@ class Bridge {
 		});
 	}
 
-	showConfirmMessageBox(message) {
-		const result = this.showMessageBox_(this.window(), {
+	showConfirmMessageBox(message, options = null) {
+		if (options === null) options = {};
+
+		const result = this.showMessageBox_(this.window(), Object.assign({}, {
 			type: 'question',
 			message: message,
 			cancelId: 1,
 			buttons: [_('OK'), _('Cancel')],
-		});
+		}, options));
+
 		return result === 0;
 	}
 

diff --git a/ElectronClient/app/gui/utils/NoteListUtils.js b/ElectronClient/app/gui/utils/NoteListUtils.js
@@ -127,7 +127,11 @@ class NoteListUtils {
 			msg = _('Delete these %d notes?', noteIds.length);
 		}
 
-		const ok = bridge().showConfirmMessageBox(msg);
+		const ok = bridge().showConfirmMessageBox(msg, {
+			buttons: [_('Delete'), _('Cancel')],
+			defaultId: 1,
+		});
+
 		if (!ok) return;
 		await Note.batchDelete(noteIds);
 	}

diff --git a/ReactNativeClient/lib/services/ExternalEditWatcher.js b/ReactNativeClient/lib/services/ExternalEditWatcher.js
@@ -139,8 +139,6 @@ class ExternalEditWatcher {
 
 		const watchedPaths = this.watcher_.getWatched();
 
-		console.info(noteFilename, watchedPaths);
-
 		for (let dirName in watchedPaths) {
 			if (!watchedPaths.hasOwnProperty(dirName)) continue;