diff options
Diffstat (limited to 'external/jquery-mousewheel')
| -rw-r--r-- | external/jquery-mousewheel/LICENSE.txt | 20 | ||||
| -rw-r--r-- | external/jquery-mousewheel/jquery.mousewheel.js | 9 |
2 files changed, 25 insertions, 4 deletions
diff --git a/external/jquery-mousewheel/LICENSE.txt b/external/jquery-mousewheel/LICENSE.txt new file mode 100644 index 000000000..ad2020df4 --- /dev/null +++ b/external/jquery-mousewheel/LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2013, Brandon Aaron (http://brandon.aaron.sh) + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/external/jquery-mousewheel/jquery.mousewheel.js b/external/jquery-mousewheel/jquery.mousewheel.js index 70340a57a..6756fa610 100644 --- a/external/jquery-mousewheel/jquery.mousewheel.js +++ b/external/jquery-mousewheel/jquery.mousewheel.js @@ -1,7 +1,7 @@ /*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh) * Licensed under the MIT License (LICENSE.txt). * - * Version: 3.1.11 + * Version: 3.1.12 * * Requires: jQuery 1.2.2+ */ @@ -32,7 +32,7 @@ } var special = $.event.special.mousewheel = { - version: '3.1.11', + version: '3.1.12', setup: function() { if ( this.addEventListener ) { @@ -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) { |