Merge branch 'release/2.16.1'

RocketChat · Nov 4, 2019 · cdf6045 · cdf6045
2 parents d2915f4 + 10dd816
commit cdf6045
Show file tree

Hide file tree

Showing 6 changed files with 348 additions and 178 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,14 @@
+<a name="2.16.1"></a>
+## 2.16.1 (2019-11-04)
+
+
+### Bug Fixes
+
+- [#1365](https://github.com/RocketChat/Rocket.Chat.Electron/pull/1365) powerMonitor API usage
+- [#1366](https://github.com/RocketChat/Rocket.Chat.Electron/pull/1366) Spellchecker setup
+
+
+
 <a name="2.16.0"></a>
 # 2.16.0 (2019-10-11)
 

diff --git a/electron-builder.json b/electron-builder.json
@@ -18,7 +18,7 @@
 			"mas"
 		],
 		"icon": "build/icon.icns",
-		"bundleVersion": "58",
+		"bundleVersion": "59",
 		"helperBundleId": "chat.rocket.electron.helper",
 		"type": "distribution",
 		"artifactName": "rocketchat-${version}.${ext}",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "rocketchat",
   "description": "Official OSX, Windows, and Linux Desktop Clients for Rocket.Chat",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "author": "Rocket.Chat Support <support@rocket.chat>",
   "copyright": "© 2019, Rocket.Chat",
   "homepage": "https://rocket.chat",

diff --git a/src/preload/spellchecking.js b/src/preload/spellchecking.js
@@ -133,7 +133,14 @@ class SpellCheck {
 					.bind(null, this.enabledDictionaries)
 			);
 		} finally {
-			webFrame.setSpellCheckProvider('', false, { spellCheck: this.checker });
+			webFrame.setSpellCheckProvider('', {
+				spellCheck: (words, callback) => {
+					setTimeout(() => {
+						const misspelled = words.filter((word) => !this.checker(word));
+						callback(misspelled);
+					}, 0);
+				},
+			});
 		}
 	}
 

diff --git a/src/preload/userPresence.js b/src/preload/userPresence.js
@@ -1,7 +1,9 @@
-import { powerMonitor } from 'electron';
+import { remote } from 'electron';
 
 import { getMeteor, getTracker, getGetUserPreference, getUserPresence } from './rocketChat';
 
+const { powerMonitor } = remote;
+
 const pollUserPresence = (UserPresence, maximumIdleTime) => () => {
 	let isUserPresent = true;