diff options
| author | jez | 2011-05-14 20:34:29 -0400 |
|---|---|---|
| committer | jez | 2011-05-14 20:34:29 -0400 |
| commit | d6e059f2a3b8db7695de3851d48e62a6ca925af9 (patch) | |
| tree | 57a01d033f78f8b323e4503d33bbddbd833cd973 /background_page.html | |
| parent | 9fa550086afb0e3bb944721f0422f60ec50b69b7 (diff) | |
| parent | 1cdbf5b3ceb6a35044eff1ffbfd54ac6e63bc84a (diff) | |
| download | vimium-d6e059f2a3b8db7695de3851d48e62a6ca925af9.tar.bz2 | |
Merge branch 'bookmarks'
Conflicts:
commands.js
linkHints.js
vimiumFrontend.js
Diffstat (limited to 'background_page.html')
| -rw-r--r-- | background_page.html | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/background_page.html b/background_page.html index 5849bde3..71bbcf7a 100644 --- a/background_page.html +++ b/background_page.html @@ -27,6 +27,7 @@ scrollStepSize: 60, defaultZoomLevel: 100, linkHintCharacters: "sadfjklewcmpgh", + filterLinkHints: false, userDefinedLinkHintCss: ".vimiumHintMarker {\n\n}\n" + ".vimiumHintMarker > .matchingCharacter {\n\n}", @@ -65,7 +66,8 @@ getCurrentTabUrl: getCurrentTabUrl, getZoomLevel: getZoomLevel, saveZoomLevel: saveZoomLevel, - getSetting: getSetting + getSetting: getSetting, + getBookmarks: getBookmarks }; var sendRequestHandlers = { @@ -291,6 +293,12 @@ returnPort.postMessage({ key: args.key, value: value }); } + function getBookmarks(args, port) { + chrome.bookmarks.search(args.query, function(bookmarks) { + port.postMessage({bookmarks:bookmarks}) + }) + } + /* * Used by everyone to get settings from local storage. */ |