Option to disable suggestions (#516)

* Option to disable suggestions * fix logic for displaying search suggestions * carify boolean expressions for input suggestions * add semicolons
brookhong · Oct 11, 2017 · 5c167b1 · 5c167b1
1 parent 5068435
commit 5c167b1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -624,6 +624,7 @@ For example,
 | settings.focusOnSaved | true | Whether to focus text input after quiting from vim editor. |
 | settings.omnibarMaxResults | 10 | How many results will be listed out each page for Omnibar. |
 | settings.omnibarPosition | "middle" | Where to position Omnibar. ["middle", "bottom"] |
+| settings.omnibarSuggestion | false | Show suggestion URLs|
 | settings.omnibarSuggestionTimeout | 200 | Timeout duration before Omnibar suggestion URLs are queried, in milliseconds. Helps prevent unnecessary HTTP requests and API rate-limiting. |
 | settings.focusFirstCandidate | false | Whether to focus first candidate of matched result in Omnibar. |
 | settings.tabsThreshold | 9 | When total of opened tabs exceeds the number, Omnibar will be used for choosing tabs. |

diff --git a/content_scripts/runtime.js b/content_scripts/runtime.js
@@ -6,39 +6,40 @@ var runtime = window.runtime || (function() {
         conf: {
             lastKeys: "",
             // local part from settings
-            useLocalMarkdownAPI: true,
+            blacklistPattern: undefined,
+            caseSensitive: false,
+            clickablePat: /(https?|thunder|magnet):\/\/\S+/ig,
+            clickableSelector: "",
+            cursorAtEndOfInput: true,
+            defaultSearchEngine: "g",
+            defaultVoice: "Daniel",
+            enableAutoFocus: true,
+            experiment: false,
+            focusFirstCandidate: false,
             focusOnSaved: true,
+            hintAlign: "center",
+            historyMUOrder: true,
+            language: undefined,
+            lastQuery: "",
+            modeAfterYank: "",
+            nextLinkRegex: /(\b(next)\b)|下页|下一页|>>/i,
             omnibarMaxResults: 10,
             omnibarPosition: "middle",
+            omnibarSuggestion: true,
             omnibarSuggestionTimeout: 200,
             omnibarTabsQuery: {},
-            historyMUOrder: true,
-            tabsThreshold: 9,
-            smoothScroll: true,
-            modeAfterYank: "",
-            scrollStepSize: 70,
-            nextLinkRegex: /(\b(next)\b)|下页|下一页|>>/i,
-            prevLinkRegex: /(\b(prev|previous)\b)|上页|上一页|<</i,
             pageUrlRegex: [],
-            clickablePat: /(https?|thunder|magnet):\/\/\S+/ig,
-            hintAlign: "center",
-            defaultSearchEngine: "g",
+            prevLinkRegex: /(\b(prev|previous)\b)|上页|上一页|<</i,
+            richHintsForKeystroke: 1000,
+            scrollStepSize: 70,
             showModeStatus: false,
             showProxyInStatusBar: false,
-            richHintsForKeystroke: 1000,
             smartPageBoundary: false,
-            clickableSelector: "",
-            blacklistPattern: undefined,
+            smoothScroll: true,
             startToShowEmoji: 2,
-            focusFirstCandidate: false,
-            language: undefined,
             stealFocusOnLoad: true,
-            enableAutoFocus: true,
-            defaultVoice: "Daniel",
-            experiment: false,
-            caseSensitive: false,
-            cursorAtEndOfInput: true,
-            lastQuery: ""
+            tabsThreshold: 9,
+            useLocalMarkdownAPI: true,
         },
         runtime_handlers: {}
     }, actions = {};

diff --git a/pages/omnibar.js b/pages/omnibar.js
@@ -995,9 +995,11 @@ var SearchEngine = (function() {
         return this.activeTab;
     };
     self.onInput = function() {
-        if (!self.suggestionURL || typeof(self.listSuggestion) !== "function") {
-            return;
-        }
+        const canSuggest = self.suggestionURL && typeof(self.listSuggestion) === "function";
+        const showSuggestions = canSuggest && runtime.conf.omnibarSuggestion;
+
+        if (!showSuggestions) return false;
+
         var val = encodeURIComponent(Omnibar.input.val());
         clearPendingRequest();
         // Set a timeout before the request is dispatched so that it can be canceled if necessary.