Skip to content

Commit

Permalink
Release v0.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
amazingSurge authored and amazingSurge committed Oct 7, 2016
1 parent f40eb8b commit 2e08ab8
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 136 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-asScrollable",
"version": "0.4.2",
"version": "0.4.3",
"description": "A jquery plugin that make a block element scrollable.",
"main": "dist/jquery-asScrollable.js",
"copyright": "amazingSurge",
Expand Down Expand Up @@ -29,6 +29,6 @@
],
"dependencies": {
"jquery": ">=2.2.0",
"jquery-asScrollbar": "[email protected]:amazingSurge/jquery-asScrollbar.git"
"jquery-asScrollbar": "^0.5.3"
}
}
2 changes: 1 addition & 1 deletion dist/css/asScrollable.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* jQuery asScrollable v0.4.2
* jQuery asScrollable v0.4.3
* https://github.com/amazingSurge/jquery-asScrollable
*
* Copyright (c) amazingSurge
Expand Down
2 changes: 1 addition & 1 deletion dist/css/asScrollable.min.css

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

42 changes: 17 additions & 25 deletions dist/jquery-asScrollable.es.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* jQuery asScrollable v0.4.2
* jQuery asScrollable v0.4.3
* https://github.com/amazingSurge/jquery-asScrollable
*
* Copyright (c) amazingSurge
Expand Down Expand Up @@ -39,37 +39,29 @@ var DEFAULTS = {
/**
* Helper functions
**/
const getTime = () => {
'use strict';

function getTime() {
if (typeof window.performance !== 'undefined' && window.performance.now) {
return window.performance.now();
}
return Date.now();
};

const isPercentage = (n) => {
'use strict';
}

function isPercentage(n) {
return typeof n === 'string' && n.indexOf('%') !== -1;
};

const conventToPercentage = (n) => {
'use strict';
}

function conventToPercentage(n) {
if (n < 0) {
n = 0;
} else if (n > 1) {
n = 1;
}
return `${parseFloat(n).toFixed(4) * 100}%`;
};

const convertPercentageToFloat = (n) => {
'use strict';
}

function convertPercentageToFloat(n) {
return parseFloat(n.slice(0, -1) / 100, 10);
};
}

let isFFLionScrollbar = (() => {
'use strict';
Expand All @@ -91,7 +83,7 @@ const NAMESPACE$1 = 'asScrollable';

let instanceId = 0;

class asScrollable {
class AsScrollable {
constructor(element, options) {
this.$element = $(element);
options = this.options = $.extend({}, DEFAULTS, options || {}, this.$element.data('options') || {});
Expand Down Expand Up @@ -393,7 +385,7 @@ class asScrollable {
scrollbarWidth = this.getBrowserScrollbarWidth(direction);

this.$content.css(attributes.crossLength, `${parentLength}px`);
this.$container.css(attributes.crossLength, scrollbarWidth + parentLength +'px');
this.$container.css(attributes.crossLength, `${scrollbarWidth + parentLength}px`);

if (scrollbarWidth === 0 && isFFLionScrollbar) {
this.$container.css(attributes.ffPadding, 16);
Expand Down Expand Up @@ -845,13 +837,13 @@ class asScrollable {
}

var info = {
version:'0.4.2'
version:'0.4.3'
};

const NAMESPACE = 'asScrollable';
const OtherAsScrollable = $.fn.asScrollable;

const jQueryasScrollable = function(options, ...args) {
const jQueryAsScrollable = function(options, ...args) {
if (typeof options === 'string') {
let method = options;

Expand All @@ -874,17 +866,17 @@ const jQueryasScrollable = function(options, ...args) {

return this.each(function() {
if (!$(this).data(NAMESPACE)) {
$(this).data(NAMESPACE, new asScrollable(this, options));
$(this).data(NAMESPACE, new AsScrollable(this, options));
}
});
};

$.fn.asScrollable = jQueryasScrollable;
$.fn.asScrollable = jQueryAsScrollable;

$.asScrollable = $.extend({
setDefaults: asScrollable.setDefaults,
setDefaults: AsScrollable.setDefaults,
noConflict: function() {
$.fn.asScrollable = OtherAsScrollable;
return jQueryasScrollable;
return jQueryAsScrollable;
}
}, info);
47 changes: 20 additions & 27 deletions dist/jquery-asScrollable.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* jQuery asScrollable v0.4.2
* jQuery asScrollable v0.4.3
* https://github.com/amazingSurge/jquery-asScrollable
*
* Copyright (c) amazingSurge
Expand Down Expand Up @@ -103,40 +103,33 @@
/**
* Helper functions
**/
var getTime = function getTime() {
'use strict';

function getTime() {
if (typeof window.performance !== 'undefined' && window.performance.now) {

return window.performance.now();
}

return Date.now();
};

var isPercentage = function isPercentage(n) {
'use strict';
}

function isPercentage(n) {
return typeof n === 'string' && n.indexOf('%') !== -1;
};

var conventToPercentage = function conventToPercentage(n) {
'use strict';
}

function conventToPercentage(n) {
if (n < 0) {
n = 0;
} else if (n > 1) {
n = 1;
}

return parseFloat(n).toFixed(4) * 100 + '%';
};

var convertPercentageToFloat = function convertPercentageToFloat(n) {
'use strict';
}

function convertPercentageToFloat(n) {
return parseFloat(n.slice(0, -1) / 100, 10);
};
}

var isFFLionScrollbar = function() {
'use strict';
Expand Down Expand Up @@ -164,9 +157,9 @@

var instanceId = 0;

var asScrollable = function() {
function asScrollable(element, options) {
_classCallCheck(this, asScrollable);
var AsScrollable = function() {
function AsScrollable(element, options) {
_classCallCheck(this, AsScrollable);

this.$element = (0, _jquery2.default)(element);
options = this.options = _jquery2.default.extend({}, DEFAULTS, options || {}, this.$element.data('options') || {});
Expand Down Expand Up @@ -267,7 +260,7 @@
this.init();
}

_createClass(asScrollable, [{
_createClass(AsScrollable, [{
key: 'init',
value: function init() {
switch (this.options.direction) {
Expand Down Expand Up @@ -1038,17 +1031,17 @@
}
}]);

return asScrollable;
return AsScrollable;
}();

var info = {
version: '0.4.2'
version: '0.4.3'
};

var NAMESPACE = 'asScrollable';
var OtherAsScrollable = _jquery2.default.fn.asScrollable;

var jQueryasScrollable = function jQueryasScrollable(options) {
var jQueryAsScrollable = function jQueryAsScrollable(options) {
var _this4 = this;

for (var _len3 = arguments.length, args = Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
Expand Down Expand Up @@ -1099,20 +1092,20 @@

function() {
if (!(0, _jquery2.default)(this).data(NAMESPACE)) {
(0, _jquery2.default)(this).data(NAMESPACE, new asScrollable(this, options));
(0, _jquery2.default)(this).data(NAMESPACE, new AsScrollable(this, options));
}
}
);
};

_jquery2.default.fn.asScrollable = jQueryasScrollable;
_jquery2.default.fn.asScrollable = jQueryAsScrollable;

_jquery2.default.asScrollable = _jquery2.default.extend({
setDefaults: asScrollable.setDefaults,
setDefaults: AsScrollable.setDefaults,
noConflict: function noConflict() {
_jquery2.default.fn.asScrollable = OtherAsScrollable;

return jQueryasScrollable;
return jQueryAsScrollable;
}
}, info);
}
Expand Down
Loading

0 comments on commit 2e08ab8

Please sign in to comment.