Created
April 15, 2011 19:17
-
-
Save ColinCampbell/922291 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/frameworks/core_foundation/system/event.js b/frameworks/core_foundation/system/event.js | |
index 570dea5..7b3095d 100644 | |
--- a/frameworks/core_foundation/system/event.js | |
+++ b/frameworks/core_foundation/system/event.js | |
@@ -142,18 +142,14 @@ SC.mixin(SC.Event, /** @scope SC.Event */ { | |
version = parseFloat(SC.browser.version), | |
didChange = NO; | |
- if (SC.browser.webkit) { | |
- // Check Chrome first since it also responds to safari | |
- if (!SC.browser.chrome) { | |
- // Scrolling in Safari 5.0.1, which is huge for some reason | |
- if (version >= 533.17 && version <= 533.20) { | |
- deltaMultiplier = 0.004; | |
- didChange = YES; | |
+ if (SC.browser.safari) { | |
+ if (version >= 533.17) { | |
+ deltaMultiplier = 0.004; | |
+ didChange = YES; | |
+ } else if (version < 533) { | |
// Scrolling in Safari 5.0 | |
- } else if (version < 533 || version >= 534) { | |
- deltaMultiplier = 40; | |
- didChange = YES; | |
- } | |
+ deltaMultiplier = 40; | |
+ didChange = YES; | |
} | |
} else if (SC.browser.mozilla) { | |
deltaMultiplier = 10; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment