Merge pull request #355 from ueokande/search-across-pages

Search across pages

11 files changed, 94 insertions, 36 deletions

diff --git a/src/background/actions/find.js b/src/background/actions/find.js
new file mode 100644
index 0000000..8da5572
--- /dev/null
+++ b/src/background/actions/find.js
@@ -0,0 +1,10 @@
+import actions from './index';
+
+const setKeyword = (keyword) => {
+  return {
+    type: actions.FIND_SET_KEYWORD,
+    keyword,
+  };
+};
+
+export { setKeyword };
diff --git a/src/background/actions/index.js b/src/background/actions/index.js
index efe4074..2bdaaf2 100644
--- a/src/background/actions/index.js
+++ b/src/background/actions/index.js
@@ -2,4 +2,7 @@ export default {
   // Settings
   SETTING_SET_SETTINGS: 'setting.set.settings',
   SETTING_SET_PROPERTY: 'setting.set.property',
+
+  // Find
+  FIND_SET_KEYWORD: 'find.set.keyword',
 };
diff --git a/src/background/components/background.js b/src/background/components/background.js
index c4f436a..fdec8ec 100644
--- a/src/background/components/background.js
+++ b/src/background/components/background.js
@@ -2,6 +2,7 @@ import messages from 'shared/messages';
 import * as operationActions from 'background/actions/operation';
 import * as commandActions from 'background/actions/command';
 import * as settingActions from 'background/actions/setting';
+import * as findActions from 'background/actions/find';
 import * as tabActions from 'background/actions/tab';
 import * as commands from 'shared/commands';
 
@@ -23,6 +24,8 @@ export default class BackgroundComponent {
 
   onMessage(message, sender) {
     let settings = this.store.getState().setting;
+    let find = this.store.getState().find;
+
     switch (message.type) {
     case messages.BACKGROUND_OPERATION:
       return this.store.dispatch(
@@ -48,6 +51,11 @@ export default class BackgroundComponent {
     case messages.SETTINGS_RELOAD:
       this.store.dispatch(settingActions.load());
       return this.broadcastSettingsChanged();
+    case messages.FIND_GET_KEYWORD:
+      return Promise.resolve(find.keyword);
+    case messages.FIND_SET_KEYWORD:
+      this.store.dispatch(findActions.setKeyword(message.keyword));
+      return Promise.resolve({});
     }
   }
 
diff --git a/src/background/reducers/find.js b/src/background/reducers/find.js
new file mode 100644
index 0000000..4ded801
--- /dev/null
+++ b/src/background/reducers/find.js
@@ -0,0 +1,16 @@
+import actions from 'content/actions';
+
+const defaultState = {
+  keyword: null,
+};
+
+export default function reducer(state = defaultState, action = {}) {
+  switch (action.type) {
+  case actions.FIND_SET_KEYWORD:
+    return Object.assign({}, state, {
+      keyword: action.keyword,
+    });
+  default:
+    return state;
+  }
+}
diff --git a/src/background/reducers/index.js b/src/background/reducers/index.js
index dab0c62..63ff0f8 100644
--- a/src/background/reducers/index.js
+++ b/src/background/reducers/index.js
@@ -1,12 +1,15 @@
 import settingReducer from './setting';
+import findReducer from './find';
 
 // Make setting reducer instead of re-use
 const defaultState = {
   setting: settingReducer(undefined, {}),
+  find: findReducer(undefined, {}),
 };
 
 export default function reducer(state = defaultState, action = {}) {
   return Object.assign({}, state, {
     setting: settingReducer(state.setting, action),
+    find: findReducer(state.find, action),
   });
 }
diff --git a/src/content/actions/find.js b/src/content/actions/find.js
index 80d6210..c7345cc 100644
--- a/src/content/actions/find.js
+++ b/src/content/actions/find.js
@@ -5,6 +5,7 @@
 // NOTE: window.find is not standard API
 // https://developer.mozilla.org/en-US/docs/Web/API/Window/find
 
+import messages from 'shared/messages';
 import actions from 'content/actions';
 import * as consoleFrames from '../console-frames';
 
@@ -14,6 +15,13 @@ const postPatternNotFound = (pattern) => {
     'Pattern not found: ' + pattern);
 };
 
+const postPatternFound = (pattern) => {
+  return consoleFrames.postInfo(
+    window.document,
+    'Pattern found: ' + pattern,
+  );
+};
+
 const find = (string, backwards) => {
   let caseSensitive = false;
   let wrapScan = true;
@@ -24,32 +32,49 @@ const find = (string, backwards) => {
   return window.find(string, caseSensitive, backwards, wrapScan);
 };
 
-const findNext = (keyword, reset, backwards) => {
+const findNext = (currentKeyword, reset, backwards) => {
   if (reset) {
     window.getSelection().removeAllRanges();
   }
 
-  let found = find(keyword, backwards);
-  if (!found) {
-    window.getSelection().removeAllRanges();
-    found = find(keyword, backwards);
+  let promise = Promise.resolve(currentKeyword);
+  if (currentKeyword) {
+    browser.runtime.sendMessage({
+      type: messages.FIND_SET_KEYWORD,
+      keyword: currentKeyword,
+    });
+  } else {
+    promise = browser.runtime.sendMessage({
+      type: messages.FIND_GET_KEYWORD,
+    });
   }
-  if (!found) {
-    postPatternNotFound(keyword);
-  }
-  return {
-    type: actions.FIND_SET_KEYWORD,
-    keyword,
-    found,
-  };
+
+  return promise.then((keyword) => {
+    let found = find(keyword, backwards);
+    if (!found) {
+      window.getSelection().removeAllRanges();
+      found = find(keyword, backwards);
+    }
+    if (found) {
+      postPatternFound(keyword);
+    } else {
+      postPatternNotFound(keyword);
+    }
+
+    return {
+      type: actions.FIND_SET_KEYWORD,
+      keyword,
+      found,
+    };
+  });
 };
 
-const next = (keyword, reset) => {
-  return findNext(keyword, reset, false);
+const next = (currentKeyword, reset) => {
+  return findNext(currentKeyword, reset, false);
 };
 
-const prev = (keyword, reset) => {
-  return findNext(keyword, reset, true);
+const prev = (currentKeyword, reset) => {
+  return findNext(currentKeyword, reset, true);
 };
 
 export { next, prev };
diff --git a/src/content/actions/operation.js b/src/content/actions/operation.js
index 5fd0f48..71b2470 100644
--- a/src/content/actions/operation.js
+++ b/src/content/actions/operation.js
@@ -62,10 +62,7 @@ const exec = (operation, repeat, settings) => {
     return focuses.focusInput();
   case operations.URLS_YANK:
     urls.yank(window);
-    return consoleFrames.postMessage(window.document, {
-      type: messages.CONSOLE_SHOW_INFO,
-      text: 'Current url yanked',
-    });
+    return consoleFrames.postInfo(window.document, 'Current url yanked');
   case operations.URLS_PASTE:
     return urls.paste(window, operation.newTab ? operation.newTab : false);
   default:
diff --git a/src/content/components/top-content/find.js b/src/content/components/top-content/find.js
index bccf040..4d46d79 100644
--- a/src/content/components/top-content/find.js
+++ b/src/content/components/top-content/find.js
@@ -1,6 +1,5 @@
 import * as findActions from 'content/actions/find';
 import messages from 'shared/messages';
-import * as consoleFrames from '../../console-frames';
 
 export default class FindComponent {
   constructor(win, store) {
@@ -32,23 +31,11 @@ export default class FindComponent {
 
   next() {
     let state = this.store.getState().find;
-
-    if (!state.found) {
-      return consoleFrames.postError(
-        window.document,
-        'Pattern not found: ' + state.keyword);
-    }
     return this.store.dispatch(findActions.next(state.keyword, false));
   }
 
   prev() {
     let state = this.store.getState().find;
-
-    if (!state.found) {
-      return consoleFrames.postError(
-        window.document,
-        'Pattern not found: ' + state.keyword);
-    }
     return this.store.dispatch(findActions.prev(state.keyword, false));
   }
 }
diff --git a/src/content/console-frames.js b/src/content/console-frames.js
index 515ae09..0c0ec02 100644
--- a/src/content/console-frames.js
+++ b/src/content/console-frames.js
@@ -28,4 +28,11 @@ const postError = (doc, message) => {
   });
 };
 
-export { initialize, blur, postMessage, postError };
+const postInfo = (doc, message) => {
+  return postMessage(doc, {
+    type: messages.CONSOLE_SHOW_INFO,
+    text: message,
+  });
+};
+
+export { initialize, blur, postError, postInfo };
diff --git a/src/content/reducers/find.js b/src/content/reducers/find.js
index eb43c37..8d63ee5 100644
--- a/src/content/reducers/find.js
+++ b/src/content/reducers/find.js
@@ -1,7 +1,7 @@
 import actions from 'content/actions';
 
 const defaultState = {
-  keyword: '',
+  keyword: null,
   found: false,
 };
 
diff --git a/src/shared/messages.js b/src/shared/messages.js
index b7a1a7e..a404658 100644
--- a/src/shared/messages.js
+++ b/src/shared/messages.js
@@ -45,6 +45,8 @@ export default {
 
   FIND_NEXT: 'find.next',
   FIND_PREV: 'find.prev',
+  FIND_GET_KEYWORD: 'find.get.keyword',
+  FIND_SET_KEYWORD: 'find.set.keyword',
 
   OPEN_URL: 'open.url',