diff options
| author | Stephen Blott | 2015-04-25 09:45:55 +0100 |
|---|---|---|
| committer | Stephen Blott | 2015-04-25 09:45:55 +0100 |
| commit | b1c27ca32fd3aa365990b959f22888c1d8d802ca (patch) | |
| tree | 80cc59c7c41c7ce63e43af13c29adae777f5df4a /tests/dom_tests | |
| parent | e7ae8e0cc5aa5d4a8c7778c4a2f88b53d7cc4111 (diff) | |
| parent | 6446cf04c7b44c3d419dc450a73b60bcaf5cdf02 (diff) | |
| download | vimium-b1c27ca32fd3aa365990b959f22888c1d8d802ca.tar.bz2 | |
Merge branch 'exclusion-rules-pushState-and-hash' of https://github.com/mrmr1993/vimium into mrmr1993-exclusion-rules-pushState-and-hash
Conflicts:
content_scripts/vimium_frontend.coffee
Diffstat (limited to 'tests/dom_tests')
| -rw-r--r-- | tests/dom_tests/chrome.coffee | 2 | ||||
| -rw-r--r-- | tests/dom_tests/dom_tests.coffee | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/dom_tests/chrome.coffee b/tests/dom_tests/chrome.coffee index 5f276649..4c9bfa52 100644 --- a/tests/dom_tests/chrome.coffee +++ b/tests/dom_tests/chrome.coffee @@ -29,3 +29,5 @@ root.chrome = set: -> onChanged: addListener: -> + extension: + inIncognitoContext: false diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee index f81982ac..bb09a0a8 100644 --- a/tests/dom_tests/dom_tests.coffee +++ b/tests/dom_tests/dom_tests.coffee @@ -1,6 +1,6 @@ # Install frontend event handlers. -initializeWhenEnabled() +installListeners() installListener = (element, event, callback) -> element.addEventListener event, (-> callback.apply(this, arguments)), true |