Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Invis1ble committed Oct 9, 2016
2 parents 82b6573 + 737a0e8 commit 9076d54
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .eslintrc → .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rules:
# Best Practices
accessor-pairs: 2
block-scoped-var: 0
complexity: off
complexity: 0
consistent-return: 0
curly: 0
default-case: 0
Expand Down Expand Up @@ -148,7 +148,7 @@ rules:
max-len: 0
max-nested-callbacks: 0
max-params: 0
max-statements: off
max-statements: 0
new-cap: 0
new-parens: 0
newline-after-var: 0
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "invis1ble/scrollbox",
"description": "A lightweight jQuery custom scrollbar plugin, that triggers event when reached the defined point.",
"version": "3.0.0",
"version": "3.0.1",
"type": "component",
"keywords": [
"jquery",
Expand Down
2 changes: 1 addition & 1 deletion dist/css/scrollbox.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Scrollbox v3.0.0
* Scrollbox v3.0.1
* (c) 2013-2016, Max Invis1ble
* Licensed under MIT (https://opensource.org/licenses/mit-license.php)
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/css/scrollbox.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/js/scrollbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

/*!
* Scrollbox v3.0.0
* Scrollbox v3.0.1
* (c) 2013-2016, Max Invis1ble
* Licensed under MIT (https://opensource.org/licenses/mit-license.php)
*/

var Scrollbox = function ($) {

var NAME = 'scrollbox';
var VERSION = '3.0.0';
var VERSION = '3.0.1';
var DATA_KEY = NAME;
var JQUERY_NO_CONFLICT = $.fn[NAME];

Expand Down
4 changes: 2 additions & 2 deletions dist/js/scrollbox.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "scrollbox",
"description": "A lightweight jQuery custom scrollbar plugin, that triggers event when reached the defined point.",
"version": "3.0.0",
"version": "3.0.1",
"author": "Max Invis1ble",
"keywords": [
"jquery-plugin",
Expand Down
4 changes: 2 additions & 2 deletions src/js/scrollbox.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* Scrollbox v3.0.0
* Scrollbox v3.0.1
* (c) 2013-2016, Max Invis1ble
* Licensed under MIT (https://opensource.org/licenses/mit-license.php)
*/

const Scrollbox = (($) => {

const NAME = 'scrollbox';
const VERSION = '3.0.0';
const VERSION = '3.0.1';
const DATA_KEY = NAME;
const JQUERY_NO_CONFLICT = $.fn[NAME];

Expand Down
2 changes: 1 addition & 1 deletion src/less/scrollbox.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Scrollbox v3.0.0
* Scrollbox v3.0.1
* (c) 2013-2016, Max Invis1ble
* Licensed under MIT (https://opensource.org/licenses/mit-license.php)
*/
Expand Down

0 comments on commit 9076d54

Please sign in to comment.