aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2015-02-08 09:18:50 +0000
committerStephen Blott2015-02-08 09:24:13 +0000
commit534e460f437ade1016ddff6d7ffa2c2e6b254b17 (patch)
tree99e68fc93037cb0f5f0684ff82dec1acfe2d8612
parente7e88b10afe4329034db7a2320bc16235f25f081 (diff)
downloadvimium-534e460f437ade1016ddff6d7ffa2c2e6b254b17.tar.bz2
Incognito mode for find history.
- This commit is incomplete because, to progress, we need bc7db7473456713c8c84f324e71da93145ffa2a0.
-rw-r--r--background_scripts/main.coffee2
-rw-r--r--content_scripts/vimium_frontend.coffee17
2 files changed, 12 insertions, 7 deletions
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index c1c8dfc8..07127af9 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -382,7 +382,7 @@ root.updateActiveState = updateActiveState = (tabId) ->
setBrowserActionIcon(tabId,disabledIcon)
# Propagate the new state only if it has changed.
if (isCurrentlyEnabled != enabled || currentPasskeys != passKeys)
- chrome.tabs.sendMessage(tabId, { name: "setState", enabled: enabled, passKeys: passKeys })
+ chrome.tabs.sendMessage(tabId, { name: "setState", enabled: enabled, passKeys: passKeys, incognito: tab.incognito })
else
# We didn't get a response from the front end, so Vimium isn't running.
setBrowserActionIcon(tabId,disabledIcon)
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 004a5f96..584b7cbb 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -12,6 +12,7 @@ findModeInitialRange = null
isShowingHelpDialog = false
keyPort = null
isEnabledForUrl = true
+isIncognitoMode = false
passKeys = null
keyQueue = null
# The user's operating system.
@@ -186,6 +187,8 @@ window.initializeWhenEnabled = ->
setState = (request) ->
isEnabledForUrl = request.enabled
passKeys = request.passKeys
+ isIncognitoMode = request.incognito
+ console.log "isIncognitoMode", isIncognitoMode
initializeWhenEnabled() if isEnabledForUrl
handlerStack.bubbleEvent "registerStateChange",
enabled: isEnabledForUrl
@@ -536,14 +539,16 @@ isValidFirstKey = (keyChar) ->
# This implements a find-mode query history (using the "findModeRawQueryList" setting) as a list of raw
# queries, most recent first.
FindModeHistory =
+ rawQueryList: null
+
getQuery: (index = 0) ->
- recentQueries = settings.get "findModeRawQueryList"
- if index < recentQueries.length then recentQueries[index] else ""
+ @rawQueryList = settings.get "findModeRawQueryList" unless @rawQueryList
+ if index < @rawQueryList.length then @rawQueryList[index] else ""
- recordQuery: (query) ->
+ saveQuery: (query) ->
+ @rawQueryList = settings.get "findModeRawQueryList" unless @rawQueryList
if 0 < query.length
- recentQueries = settings.get "findModeRawQueryList"
- settings.set "findModeRawQueryList", ([ query ].concat recentQueries.filter (q) -> q != query)[0..50]
+ @rawQueryList = ([ query ].concat @rawQueryList.filter (q) -> q != query)[0..50]
# should be called whenever rawQuery is modified.
updateFindModeQuery = ->
@@ -637,7 +642,7 @@ handleEnterForFindMode = ->
exitFindMode()
focusFoundLink()
document.body.classList.add("vimiumFindMode")
- FindModeHistory.recordQuery findModeQuery.rawQuery
+ FindModeHistory.saveQuery findModeQuery.rawQuery
class FindMode extends Mode
constructor: ->