Merge remote-tracking branch 'daning/master'

Make previous/next-page search patterns configurable.

Note: window.find does not search using a regex, so \b is not a word
delimiter!

Conflicts:
	CREDITS
	options.html
	vimiumFrontend.js

1 files changed, 24 insertions, 2 deletions

diff --git a/options.html b/options.html
index 26d41aa4..8dfd23e8 100644
--- a/options.html
+++ b/options.html
@@ -84,8 +84,8 @@
   $ = function(id) { return document.getElementById(id); };
   var defaultSettings = chrome.extension.getBackgroundPage().defaultSettings;
 
-  var editableFields = ["scrollStepSize", "excludedUrls", "linkHintCharacters",
-                        "userDefinedLinkHintCss", "keyMappings", "filterLinkHints"];
+  var editableFields = ["scrollStepSize", "excludedUrls", "linkHintCharacters", "userDefinedLinkHintCss",
+                        "keyMappings", "filterLinkHints", "previousPatterns", "nextPatterns"];
 
   var canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss"];
 
@@ -290,6 +290,28 @@
           </label>
         </td>
       </tr>
+      <tr class="advancedOption">
+        <td class="caption">Previous Patterns</td>
+        <td verticalAlign="top">
+            <div class="help">
+              <div class="example">
+                  Vimium will match against these patterns to navigate to a 'previous' page.
+              </div>
+            </div>
+            <input id="previousPatterns" type="text" style="width:320px" />
+        </td>
+      </tr>
+      <tr class="advancedOption">
+        <td class="caption">Next Patterns</td>
+        <td verticalAlign="top">
+            <div class="help">
+              <div class="example">
+                  Vimium will match against these patterns to navigate to a 'next' page.
+              </div>
+            </div>
+            <input id="nextPatterns" type="text" style="width:320px" />
+        </td>
+      </tr>
     </table>
 
     <div id="buttonsPanel">