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, 11 insertions, 1 deletions

diff --git a/background_page.html b/background_page.html
index 5866ee48..7d8f749d 100644
--- a/background_page.html
+++ b/background_page.html
@@ -31,7 +31,17 @@
       ".vimiumHintMarker {\n\n}\n" +
       ".vimiumHintMarker > .matchingCharacter {\n\n}",
     excludedUrls: "http*://mail.google.com/*\n" +
-                  "http*://www.google.com/reader/*\n"
+                  "http*://www.google.com/reader/*\n",
+
+    // NOTE : If a page contains both a single angle-bracket link and a double angle-bracket link, then in
+    // most cases the single bracket link will be "prev/next page" and the double bracket link will be
+    // "first/last page", so we put the single bracket first in the pattern string so that it gets searched
+    // for first.
+
+    // "\bprev\b,\bprevious\b,\bback\b,<,←,«,≪,<<"
+    previousPatterns: "prev,previous,back,<,\u2190,\xab,\u226a,<<",
+    // "\bnext\b,\bmore\b,>,→,»,≫,>>"
+    nextPatterns: "next,more,>,\u2192,\xbb,\u226b,>>",
   };
 
   // This is the base internal link hints CSS. It's combined with the userDefinedLinkHintCss before