diff options
| author | Stephen Blott | 2014-12-19 05:38:29 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-19 05:40:09 +0000 |
| commit | 226cfb8011e83e48b9c723ebc891ad0e9a7c82ec (patch) | |
| tree | 0b3062c7ee3502a56402fd88242b62c2bdae187b | |
| parent | 107cef3ecd0bdbcaba157b53cc3d20ff5e06b94f (diff) | |
| download | vimium-226cfb8011e83e48b9c723ebc891ad0e9a7c82ec.tar.bz2 | |
Tidy cursor hider, move haveChromeVersion to utils.
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 10 | ||||
| -rw-r--r-- | lib/utils.coffee | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 6f099e54..21a05de6 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -1107,9 +1107,7 @@ Tween = CursorHider = # - # Hides the cursor when the browser scrolls, and prevent mouse from hovering while invisible. - # Disabled for Chrome versions less than 39.0.2171.71 due to a browser error. - # NOTE(smblott) onScroll and onMouseMove events come in pairs. + # Hide the cursor when the browser scrolls, and prevent mouse from hovering while invisible. # cursorHideStyle: null isScrolling: false @@ -1125,9 +1123,9 @@ CursorHider = CursorHider.isScrolling = false init: -> - # Disable for Chrome versions less than 39.0.2171.71 due to a browser error. - chromeVersion = navigator.appVersion.match(/Chrome\/(.*?) /)?[1] || "" - return if 0 <= Utils.compareVersions "39.0.2171.71", chromeVersion + # Disable cursor hiding for Chrome versions less than 39.0.2171.71 due to a suspected browser error. + # See #1345 and #1348. + return unless Utils.haveChromeVersion "39.0.2171.71" @cursorHideStyle = document.createElement("style") @cursorHideStyle.innerHTML = """ diff --git a/lib/utils.coffee b/lib/utils.coffee index 57d8a488..2efb4716 100644 --- a/lib/utils.coffee +++ b/lib/utils.coffee @@ -124,6 +124,11 @@ Utils = return 1 0 + # True if the current Chrome version is at least the required version. + haveChromeVersion: (required) -> + chromeVersion = navigator.appVersion.match(/Chrome\/(.*?) /)?[1] + chromeVersion and 0 <= Utils.compareVersions chromeVersion, required + # Zip two (or more) arrays: # - Utils.zip([ [a,b], [1,2] ]) returns [ [a,1], [b,2] ] # - Length of result is `arrays[0].length`. |