Move learnSpelling and forgetLearnedSpelling to appActions

Auditors: @bridiver
brave · Jul 11, 2017 · f233f7c · f233f7c
1 parent 309e703
commit f233f7c
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 98 deletions.
diff --git a/app/spellCheck.js b/app/spellCheck.js
diff --git a/app/spellChecker.js b/app/spellChecker.js
@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const electron = require('electron')
+const session = electron.session
+
+module.exports.addWord = (word) => {
+  session.defaultSession.spellChecker.addWord(word)
+}
+
+module.exports.removeWord = (word) => {
+  session.defaultSession.spellChecker.removeWord(word)
+}
diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -1469,6 +1469,20 @@ const appActions = {
       actionType: appConstants.APP_SWIPE_RIGHT,
       percent
     })
+  },
+
+  learnSpelling: function (word) {
+    dispatch({
+      actionType: appConstants.APP_LEARN_SPELLING,
+      word
+    })
+  },
+
+  forgetLearnedSpelling: function (word) {
+    dispatch({
+      actionType: appConstants.APP_FORGET_LEARNED_SPELLING,
+      word
+    })
   }
 }
 

diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
@@ -137,7 +137,9 @@ const appConstants = {
   APP_ON_CANCEL_BROWSING_DATA: _,
   APP_SET_SKIP_SYNC: _,
   APP_SWIPE_LEFT: _,
-  APP_SWIPE_RIGHT: _
+  APP_SWIPE_RIGHT: _,
+  APP_LEARN_SPELLING: _,
+  APP_FORGET_LEARNED_SPELLING: _
 }
 
 module.exports = mapValuesByKeys(appConstants)
diff --git a/js/constants/messages.js b/js/constants/messages.js
@@ -76,7 +76,6 @@ const messages = {
   GO_FORWARD: _,
   RELOAD: _,
   DETACH: _,
-  IS_MISSPELLED: _, /** @arg {string} word, the word to check */
   PASSWORD_DETAILS_UPDATED: _, /** @arg {Object} passwords app state */
   PASSWORD_SITE_DETAILS_UPDATED: _, /** @arg {Object} passwords app state */
   // Init

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -543,19 +543,17 @@ function getMisspelledSuggestions (selection, isMisspelled, suggestions) {
     if (isMisspelled) {
       template.push({
         label: locale.translation('learnSpelling'),
-        click: (item, focusedWindow) => {
-          if (focusedWindow) {
-            focusedWindow.webContents.addWord(selection)
-          }
+        click: () => {
+          appActions.learnSpelling(selection)
+          webviewActions.replace(selection)
         }
       }, CommonMenu.separatorMenuItem)
     } else {
       template.push({
         label: locale.translation('forgetLearnedSpelling'),
-        click: (item, focusedWindow) => {
-          if (focusedWindow) {
-            focusedWindow.webContents.removeWord(selection)
-          }
+        click: () => {
+          appActions.forgetLearnedSpelling(selection)
+          webviewActions.replace(selection)
         }
       }, CommonMenu.separatorMenuItem)
     }
@@ -955,11 +953,10 @@ function mainTemplateInit (nodeProps, frame, tab) {
   if (isInputField) {
     let misspelledSuggestions = []
     if (nodeProps.misspelledWord) {
-      if (nodeProps.misspelledWord === 'match-brave-custom-dictionary' && !nodeProps.dictionarySuggestions.length) {
-        misspelledSuggestions = getMisspelledSuggestions(nodeProps.selectionText, false, nodeProps.dictionarySuggestions)
-      } else {
-        misspelledSuggestions = getMisspelledSuggestions(nodeProps.selectionText, true, nodeProps.dictionarySuggestions)
-      }
+      misspelledSuggestions = getMisspelledSuggestions(nodeProps.selectionText, true, nodeProps.dictionarySuggestions)
+    } else if (nodeProps.properties.hasOwnProperty('learnedSpelling') &&
+               nodeProps.properties['learnedSpelling'] === nodeProps.selectionText) {
+      misspelledSuggestions = getMisspelledSuggestions(nodeProps.selectionText, false, nodeProps.dictionarySuggestions)
     }
 
     const editableItems = getEditableItems(nodeProps.selectionText, nodeProps.editFlags, true)

diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -28,6 +28,7 @@ const diff = require('immutablediff')
 const debounce = require('../lib/debounce')
 const path = require('path')
 const autofill = require('../../app/autofill')
+const spellChecker = require('../../app/spellChecker')
 const nativeImage = require('../../app/nativeImage')
 const filtering = require('../../app/filtering')
 const basicAuth = require('../../app/browser/basicAuth')
@@ -902,6 +903,16 @@ const handleAppAction = (action) => {
     case appConstants.APP_SWIPE_RIGHT:
       appState = appState.set('swipeRightPercent', action.percent)
       break
+    case appConstants.APP_LEARN_SPELLING:
+      if (typeof action.word === 'string') {
+        spellChecker.addWord(action.word)
+      }
+      break
+    case appConstants.APP_FORGET_LEARNED_SPELLING:
+      if (typeof action.word === 'string') {
+        spellChecker.removeWord(action.word)
+      }
+      break
     default:
   }