Skip to content

Commit a6e8b73

Browse files
committed
Merge pull request #61 from XhmikosR/master
various
2 parents 61d8ef3 + b1dad43 commit a6e8b73

File tree

6 files changed

+70
-55
lines changed

6 files changed

+70
-55
lines changed

.jshintrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"bitwise": true,
3-
"browser" : true,
3+
"browser": true,
44
"camelcase": true,
55
"curly": true,
66
"eqeqeq": true,
@@ -9,9 +9,10 @@
99
"latedef": true,
1010
"maxerr": 50,
1111
"noarg": true,
12-
"node" : true,
12+
"node": true,
1313
"noempty": true,
1414
"plusplus": false,
15+
"quotmark": "single",
1516
"regexp": true,
1617
"strict": false,
1718
"trailing": true,

ChangeLog.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## 3.1.3
44

5-
* Include MozMousePixelScroll in the to fix list to avoid inconsistent behavior in older Firefox
5+
* Include `MozMousePixelScroll` in the to fix list to avoid inconsistent behavior in older Firefox
66

77
## 3.1.2
88

@@ -40,7 +40,7 @@
4040

4141
## 3.0.3
4242

43-
* Added deltaX and deltaY for horizontal scrolling support (Thanks to Seamus Leahy)
43+
* Added `deltaX` and `deltaY` for horizontal scrolling support (Thanks to Seamus Leahy)
4444

4545

4646
## 3.0.2
@@ -71,7 +71,7 @@
7171
## 2.1.1
7272

7373
* Updated to work with jQuery 1.1.3
74-
* Used one instead of bind to do unload event for clean up.
74+
* Used one instead of bind to do unload event for clean up
7575

7676

7777
## 2.1

Gruntfile.js

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
module.exports = function(grunt) {
22

3-
// Project configuration.
4-
grunt.initConfig({
5-
pkg: grunt.file.readJSON('package.json'),
6-
uglify: {
7-
options: {
8-
preserveComments: 'some'
9-
},
10-
build: {
11-
src: 'jquery.mousewheel.js',
12-
dest: 'build/jquery.mousewheel.min.js'
13-
}
14-
},
15-
jshint: {
16-
all: ['*.js']
17-
}
18-
});
3+
// Project configuration.
4+
grunt.initConfig({
5+
pkg: grunt.file.readJSON('package.json'),
6+
uglify: {
7+
options: {
8+
preserveComments: 'some'
9+
},
10+
build: {
11+
src: 'jquery.mousewheel.js',
12+
dest: 'build/jquery.mousewheel.min.js'
13+
}
14+
},
15+
jshint: {
16+
options: {
17+
jshintrc: '.jshintrc'
18+
},
19+
all: ['*.js']
20+
}
21+
});
1922

20-
// Load the plugin that provides the "uglify" task.
21-
grunt.loadNpmTasks('grunt-contrib-uglify');
22-
grunt.loadNpmTasks('grunt-contrib-jshint');
23+
// Load the plugin that provides the 'uglify' task.
24+
grunt.loadNpmTasks('grunt-contrib-uglify');
25+
grunt.loadNpmTasks('grunt-contrib-jshint');
2326

24-
// Default task(s).
25-
grunt.registerTask('default', ['jshint', 'uglify']);
27+
// Default task(s).
28+
grunt.registerTask('default', ['jshint', 'uglify']);
2629

2730
};

README.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# jQuery Mouse Wheel Plugin
22

3-
A jQuery plugin that adds cross-browser mouse wheel support.
3+
A [jQuery](http://jquery.com/) plugin that adds cross-browser mouse wheel support.
44

55
In order to use the plugin, simply bind the `mousewheel` event to an element.
66
It also provides two helper methods called `mousewheel` and `unmousewheel`
77
that act just like other event helper methods in jQuery. The event callback
88
receives three extra arguments which are the normalized "deltas" of the mouse wheel.
99

10-
Here is an example of using both the bind and helper method syntax.
10+
Here is an example of using both the bind and helper method syntax:
1111

1212
```js
1313
// using bind

jquery.mousewheel.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757

5858
$.fn.extend({
5959
mousewheel: function(fn) {
60-
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
60+
return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
6161
},
6262

6363
unmousewheel: function(fn) {
64-
return this.unbind("mousewheel", fn);
64+
return this.unbind('mousewheel', fn);
6565
}
6666
});
6767

@@ -76,7 +76,7 @@
7676
absDeltaXY = 0,
7777
fn;
7878
event = $.event.fix(orgEvent);
79-
event.type = "mousewheel";
79+
event.type = 'mousewheel';
8080

8181
// Old school scrollwheel delta
8282
if ( orgEvent.wheelDelta ) { delta = orgEvent.wheelDelta; }

package.json

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,38 @@
11
{
2-
"name" : "jquery-mousewheel",
3-
"version": "3.1.3",
4-
"description" : "A jQuery plugin that adds cross-browser mouse wheel support.",
5-
"main" : "./jquery.mousewheel.js",
6-
"repository" : {
7-
"type" : "git",
8-
"url" : "https://github.com/brandonaaron/jquery-mousewheel.git"
9-
},
10-
"keywords" : [ "jquery", "mouse", "wheel", "event", "mousewheel", "plugin", "browser" ],
11-
"author" : {
12-
"name" : "Brandon Aaron",
13-
"email" : "[email protected]",
14-
"url" : "http://brandonaaron.net/"
15-
},
16-
"licenses": [
17-
{
18-
"type": "MIT",
19-
"url": "https://raw.github.com/brandonaaron/jquery-mousewheel/master/LICENSE.txt"
20-
}
21-
],
22-
"devDependencies": {
23-
"grunt-contrib-jshint": "~0.2.0",
24-
"grunt-contrib-uglify": "~0.1.2",
25-
"grunt": "~0.4.0"
2+
"name": "jquery-mousewheel",
3+
"version": "3.1.3",
4+
"author": "Brandon Aaron <[email protected]> (http://brandonaaron.net/)",
5+
"description": "A jQuery plugin that adds cross-browser mouse wheel support.",
6+
"main": "./jquery.mousewheel.js",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/brandonaaron/jquery-mousewheel.git"
10+
},
11+
"bugs": {
12+
"url": "https://github.com/brandonaaron/jquery-mousewheel/issues"
13+
},
14+
"keywords": [
15+
"jquery",
16+
"mouse",
17+
"wheel",
18+
"event",
19+
"mousewheel",
20+
"plugin",
21+
"browser"
22+
],
23+
"licenses": [
24+
{
25+
"type": "MIT",
26+
"url": "https://raw.github.com/brandonaaron/jquery-mousewheel/master/LICENSE.txt"
2627
}
28+
],
29+
"devDependencies": {
30+
"grunt": "~0.4.1",
31+
"grunt-contrib-jshint": "~0.6.4",
32+
"grunt-contrib-uglify": "~0.2.4"
33+
},
34+
"readmeFilename": "README.markdown",
35+
"directories": {
36+
"test": "test"
37+
}
2738
}

0 commit comments

Comments
 (0)