Skip to content

Commit 1071346

Browse files
committed
Build: Upgrade to jquery-mousewheel 3.1.12
1 parent acfda4b commit 1071346

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

Gruntfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ grunt.initConfig({
230230
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
231231

232232
"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
233+
"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",
233234

234235
"jshint/jshint.js": "jshint/dist/jshint.js",
235236
"jshint/LICENSE": "jshint/LICENSE",

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"jquery": ">=1.6"
1212
},
1313
"devDependencies": {
14-
"jquery-mousewheel": "3.1.11",
14+
"jquery-mousewheel": "3.1.12",
1515
"jshint": "2.4.4",
1616
"qunit": "1.14.0",
1717

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2013, Brandon Aaron (http://brandon.aaron.sh)
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

external/jquery-mousewheel/jquery.mousewheel.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh)
22
* Licensed under the MIT License (LICENSE.txt).
33
*
4-
* Version: 3.1.11
4+
* Version: 3.1.12
55
*
66
* Requires: jQuery 1.2.2+
77
*/
@@ -32,7 +32,7 @@
3232
}
3333

3434
var special = $.event.special.mousewheel = {
35-
version: '3.1.11',
35+
version: '3.1.12',
3636

3737
setup: function() {
3838
if ( this.addEventListener ) {
@@ -61,11 +61,12 @@
6161
},
6262

6363
getLineHeight: function(elem) {
64-
var $parent = $(elem)['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
64+
var $elem = $(elem),
65+
$parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
6566
if (!$parent.length) {
6667
$parent = $('body');
6768
}
68-
return parseInt($parent.css('fontSize'), 10);
69+
return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
6970
},
7071

7172
getPageHeight: function(elem) {

0 commit comments

Comments
 (0)