From 669312f49950ae1b8bc2381234c7e4fed086cd86 Mon Sep 17 00:00:00 2001 From: Brandon Aaron Date: Thu, 10 Jul 2014 11:22:35 -0400 Subject: [PATCH] Use the font-size of the element if the font-size of the parent is 0 and use 16 if both are 0 (applies when deltaMode is 1). --- ChangeLog.md | 4 ++++ jquery.mousewheel.js | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7a00439c3..77cceacdd 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Mouse Wheel ChangeLog +## 3.1.12 + +* Fix possible 0 value for line height when in delta mode 1 + ## 3.1.11 * Fix version number for package managers... diff --git a/jquery.mousewheel.js b/jquery.mousewheel.js index a7038e602..b59e4d866 100755 --- a/jquery.mousewheel.js +++ b/jquery.mousewheel.js @@ -61,11 +61,12 @@ }, getLineHeight: function(elem) { - var $parent = $(elem)['offsetParent' in $.fn ? 'offsetParent' : 'parent'](); + var $elem = $(elem), + $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent'](); if (!$parent.length) { $parent = $('body'); } - return parseInt($parent.css('fontSize'), 10); + return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16; }, getPageHeight: function(elem) {