diff --git a/LICENSE.txt b/LICENSE.txt index ad2020df4f..b2cdb48e83 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,14 @@ -Copyright (c) 2013, Brandon Aaron (http://brandon.aaron.sh) +Copyright 2006, 2014 jQuery Foundation and other contributors, +https://jquery.org/ + +This software consists of voluntary contributions made by many +individuals. For exact contribution history, see the revision history +available at https://github.com/jquery/jquery-mousewheel + +The following license applies to all parts of this software except as +documented below: + +==== Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -18,3 +28,10 @@ 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. + +==== + +All files located in the node_modules and external directories are +externally maintained libraries used by this software which have their +own licenses; we recommend you read them, as their terms may differ from +the terms above. diff --git a/README.md b/README.md index e64cd5f656..a03fdde898 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,6 @@ The `deltaFactor` property was added to the event object in 3.1.5 so that the ac extracted. This is a non-standard property. -## See it in action -[See the tests on Github](http://brandonaaron.github.io/jquery-mousewheel/test). - ## Using with [Browserify](http://browserify.org) Support for browserify is baked in. @@ -77,9 +74,3 @@ In your browser-side javascript: var $ = require('jquery-browserify'); require('jquery-mousewheel')($); ``` - -## License - -This plugin is licensed under the [MIT License](LICENSE.txt). - -Copyright (c) 2013 [Brandon Aaron](http://brandon.aaron.sh) diff --git a/jquery.mousewheel.js b/jquery.mousewheel.js index 6756fa6108..bf61ad0e16 100755 --- a/jquery.mousewheel.js +++ b/jquery.mousewheel.js @@ -1,9 +1,9 @@ -/*! Copyright (c) 2013 Brandon Aaron (http://brandon.aaron.sh) - * Licensed under the MIT License (LICENSE.txt). +/*! + * jQuery Mousewheel 3.1.12 * - * Version: 3.1.12 - * - * Requires: jQuery 1.2.2+ + * Copyright 2014 jQuery Foundation and other contributors + * Released under the MIT license. + * http://jquery.org/license */ (function (factory) { diff --git a/package.json b/package.json index 8fadb4b6b3..bd9903d029 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,25 @@ { "name": "jquery-mousewheel", "version": "3.1.12", - "author": "Brandon Aaron (http://brandon.aaron.sh)", + "author": { + "name": "jQuery Foundation and other contributors", + "url": "https://github.com/jquery/jquery-mousewheel/blob/master/AUTHORS.txt" + }, "description": "A jQuery plugin that adds cross-browser mouse wheel support.", - "license": "MIT", - "homepage": "https://github.com/brandonaaron/jquery-mousewheel", + "licenses": [ + { + "type": "MIT", + "url": "https://github.com/jquery/jquery-mousewheel/blob/master/LICENSE.txt" + } + ], + "homepage": "https://github.com/jquery/jquery-mousewheel", "main": "./jquery.mousewheel.js", "repository": { "type": "git", - "url": "https://github.com/brandonaaron/jquery-mousewheel.git" + "url": "https://github.com/jquery/jquery-mousewheel.git" }, "bugs": { - "url": "https://github.com/brandonaaron/jquery-mousewheel/issues" + "url": "https://github.com/jquery/jquery-mousewheel/issues" }, "keywords": [ "jquery", @@ -19,13 +27,14 @@ "wheel", "event", "mousewheel", - "plugin", + "jquery-plugin", "browser" ], "files": [ "ChangeLog.md", "jquery.mousewheel.js", - "README.md" + "README.md", + "LICENSE.txt" ], "devDependencies": { "grunt": "~0.4.1",