diff options
| author | mrmr1993 | 2017-05-01 00:15:51 +0100 |
|---|---|---|
| committer | mrmr1993 | 2017-05-01 00:15:51 +0100 |
| commit | 9a1b56a899575d71e07eb3466e5fbf16d5a18571 (patch) | |
| tree | 53cbbfa95ca8acf69f6c5c80737ec4803b76d659 /background_scripts | |
| parent | c3b16da8391f4c37c79611f79f0ecadaa7b3b300 (diff) | |
| download | vimium-9a1b56a899575d71e07eb3466e5fbf16d5a18571.tar.bz2 | |
FF - Fix updates from the exclusions popup
This stops |Exclusions| from holding a reference to the |value|
parameter passed to |Settings.set|. In Firefox, this object is garbage
collected when the owning context (the exclusions popup) is closed.
The fix for all such cases in the future is to switch to using
|Settings.get|, which implicitly does |JSON.parse JSON.stringify value|
and thus returns an object in the same context as |Settings|.
We could fix this generally by doing this for the
|Settings.performPostUpdateHook| call in |Settings.set| instead.
However, I'm not convinced that it warrants the overhead of a
|JSON.parse| for every |Settings.set| call.
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/exclusions.coffee | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/background_scripts/exclusions.coffee b/background_scripts/exclusions.coffee index 42d3b872..fec66f4c 100644 --- a/background_scripts/exclusions.coffee +++ b/background_scripts/exclusions.coffee @@ -20,12 +20,12 @@ Exclusions = # Make RegexpCache, which is required on the page popup, accessible via the Exclusions object. RegexpCache: RegexpCache - rules: Settings.get("exclusionRules") + rules: Settings.get "exclusionRules" # Merge the matching rules for URL, or null. In the normal case, we use the configured @rules; hence, this # is the default. However, when called from the page popup, we are testing what effect candidate new rules # would have on the current tab. In this case, the candidate rules are provided by the caller. - getRule: (url, rules=@rules) -> + getRule: (url, rules = @rules) -> matchingRules = (rule for rule in rules when rule.pattern and 0 <= url.search RegexpCache.get rule.pattern) # An absolute exclusion rule (one with no passKeys) takes priority. for rule in matchingRules @@ -47,7 +47,10 @@ Exclusions = @rules = rules.filter (rule) -> rule and rule.pattern Settings.set "exclusionRules", @rules - postUpdateHook: (@rules) -> + postUpdateHook: (rules) -> + # NOTE(mrmr1993): In FF, the |rules| argument will be garbage collected when the exclusions popup is + # closed. Do NOT store it/use it asynchronously. + @rules = Settings.get "exclusionRules" RegexpCache.clear() # Register postUpdateHook for exclusionRules setting. |