diff options
| author | Stephen Blott | 2015-02-08 08:54:12 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-02-08 08:54:12 +0000 |
| commit | c7ada0369f5f49180246eec655249a85643d5df2 (patch) | |
| tree | 2049812850989c9f78f5b33951bcafdcd8a64fe1 /content_scripts/vimium_frontend.coffee | |
| parent | a656b1f52c6879bb9b4468bbaffe7664e48926c0 (diff) | |
| download | vimium-c7ada0369f5f49180246eec655249a85643d5df2.tar.bz2 | |
Refactor migration code for find-mode history.
Doing the migration in a content script is dumb. Now we do it on the
background page.
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index f6499353..76c654a6 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -41,9 +41,9 @@ settings = port: null values: {} loadedValues: 0 - valuesToLoad: ["scrollStepSize", "linkHintCharacters", "linkHintNumbers", "filterLinkHints", "hideHud", - "previousPatterns", "nextPatterns", "findModeRawQuery", "findModeRawQueryList", "regexFindMode", "userDefinedLinkHintCss", - "helpDialog_showAdvancedCommands", "smoothScroll"] + valuesToLoad: [ "scrollStepSize", "linkHintCharacters", "linkHintNumbers", "filterLinkHints", "hideHud", + "previousPatterns", "nextPatterns", "findModeRawQuery", "findModeRawQueryList", "regexFindMode", + "userDefinedLinkHintCss", "helpDialog_showAdvancedCommands", "smoothScroll" ] isLoaded: false eventListeners: {} @@ -537,24 +537,14 @@ isValidFirstKey = (keyChar) -> # queries, most recent first. FindModeHistory = getQuery: (index = 0) -> - @migration() recentQueries = settings.get "findModeRawQueryList" if index < recentQueries.length then recentQueries[index] else "" recordQuery: (query) -> - @migration() if 0 < query.length recentQueries = settings.get "findModeRawQueryList" settings.set "findModeRawQueryList", ([ query ].concat recentQueries.filter (q) -> q != query)[0..50] - # Migration (from 1.49, 2015/2/1). - # Legacy setting: findModeRawQuery (a string). - # New setting: findModeRawQueryList (a list of strings). - migration: -> - unless settings.get "findModeRawQueryList" - rawQuery = settings.get "findModeRawQuery" - settings.set "findModeRawQueryList", (if rawQuery then [ rawQuery ] else []) - # should be called whenever rawQuery is modified. updateFindModeQuery = -> # the query can be treated differently (e.g. as a plain string versus regex depending on the presence of |