Skip to content

Commit

Permalink
Ensure width, height and position values are numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsor
jsor committed Feb 17, 2018
1 parent 7e86351 commit d0377c7
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 41 deletions.
26 changes: 13 additions & 13 deletions dist/jquery.jcarousel-core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
this.vertical = this.options('vertical');

if (this.vertical == null) {
this.vertical = this.list().height() > this.list().width();
this.vertical = toFloat(this.list().height()) > toFloat(this.list().width());
}

this.rtl = this.options('rtl');
Expand Down Expand Up @@ -399,7 +399,7 @@
width;

if (this.rtl && this.relative && !this.vertical) {
pos += this.list().width() - this.clipping();
pos += toFloat(this.list().width()) - this.clipping();
}

this.items().each(function() {
Expand Down Expand Up @@ -469,10 +469,10 @@
(this.tail && this.inTail)) ? true : false;
},
clipping: function() {
return this._element['inner' + (this.vertical ? 'Height' : 'Width')]();
return toFloat(this._element['inner' + (this.vertical ? 'Height' : 'Width')]());
},
dimension: function(element) {
return element['outer' + (this.vertical ? 'Height' : 'Width')](true);
return toFloat(element['outer' + (this.vertical ? 'Height' : 'Width')](true));
},
scroll: function(target, animate, callback) {
if (this.animating) {
Expand Down Expand Up @@ -618,16 +618,16 @@
multiplier = -1;

if (this.relative) {
correction = this.list().width() - this.clipping();
correction = toFloat(this.list().width()) - this.clipping();
}
}

if (properties.left) {
properties.left = (position.left + correction + toFloat(properties.left) * multiplier) + 'px';
properties.left = (toFloat(position.left) + correction + toFloat(properties.left) * multiplier) + 'px';
}

if (properties.top) {
properties.top = (position.top + correction + toFloat(properties.top) * multiplier) + 'px';
properties.top = (toFloat(position.top) + correction + toFloat(properties.top) * multiplier) + 'px';
}

return this.move(properties, opts);
Expand Down Expand Up @@ -679,9 +679,9 @@
}

if (transforms3d) {
css.transform = 'translate3d(' + (properties.left || 0) + ',' + (properties.top || 0) + ',0)';
css.transform = 'translate3d(' + toFloat(properties.left || 0) + ',' + toFloat(properties.top || 0) + ',0)';
} else if (transforms) {
css.transform = 'translate(' + (properties.left || 0) + ',' + (properties.top || 0) + ')';
css.transform = 'translate(' + toFloat(properties.left || 0) + ',' + toFloat(properties.top || 0) + ')';
} else {
$.extend(css, properties);
}
Expand Down Expand Up @@ -726,7 +726,7 @@
this._prepare(item);

var pos = this._position(item),
currPos = this.list().position()[this.lt];
currPos = toFloat(this.list().position()[this.lt]);

if (pos === currPos) {
if ($.isFunction(callback)) {
Expand Down Expand Up @@ -755,7 +755,7 @@
var pos = this.list().position()[this.lt];

if (this.rtl && this.relative && !this.vertical) {
pos += this.list().width() - this.clipping();
pos += toFloat(this.list().width()) - this.clipping();
}

if (this.rtl && !this.vertical) {
Expand Down Expand Up @@ -964,13 +964,13 @@
},
_position: function(item) {
var first = this._first,
pos = first.position()[this.lt],
pos = toFloat(first.position()[this.lt]),
center = this.options('center'),
centerOffset = center ? (this.clipping() / 2) - (this.dimension(first) / 2) : 0;

if (this.rtl && !this.vertical) {
if (this.relative) {
pos -= this.list().width() - this.dimension(first);
pos -= toFloat(this.list().width()) - this.dimension(first);
} else {
pos -= this.clipping() - this.dimension(first);
}
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.jcarousel-core.min.js
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions dist/jquery.jcarousel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
this.vertical = this.options('vertical');

if (this.vertical == null) {
this.vertical = this.list().height() > this.list().width();
this.vertical = toFloat(this.list().height()) > toFloat(this.list().width());
}

this.rtl = this.options('rtl');
Expand Down Expand Up @@ -399,7 +399,7 @@
width;

if (this.rtl && this.relative && !this.vertical) {
pos += this.list().width() - this.clipping();
pos += toFloat(this.list().width()) - this.clipping();
}

this.items().each(function() {
Expand Down Expand Up @@ -469,10 +469,10 @@
(this.tail && this.inTail)) ? true : false;
},
clipping: function() {
return this._element['inner' + (this.vertical ? 'Height' : 'Width')]();
return toFloat(this._element['inner' + (this.vertical ? 'Height' : 'Width')]());
},
dimension: function(element) {
return element['outer' + (this.vertical ? 'Height' : 'Width')](true);
return toFloat(element['outer' + (this.vertical ? 'Height' : 'Width')](true));
},
scroll: function(target, animate, callback) {
if (this.animating) {
Expand Down Expand Up @@ -618,16 +618,16 @@
multiplier = -1;

if (this.relative) {
correction = this.list().width() - this.clipping();
correction = toFloat(this.list().width()) - this.clipping();
}
}

if (properties.left) {
properties.left = (position.left + correction + toFloat(properties.left) * multiplier) + 'px';
properties.left = (toFloat(position.left) + correction + toFloat(properties.left) * multiplier) + 'px';
}

if (properties.top) {
properties.top = (position.top + correction + toFloat(properties.top) * multiplier) + 'px';
properties.top = (toFloat(position.top) + correction + toFloat(properties.top) * multiplier) + 'px';
}

return this.move(properties, opts);
Expand Down Expand Up @@ -679,9 +679,9 @@
}

if (transforms3d) {
css.transform = 'translate3d(' + (properties.left || 0) + ',' + (properties.top || 0) + ',0)';
css.transform = 'translate3d(' + toFloat(properties.left || 0) + ',' + toFloat(properties.top || 0) + ',0)';
} else if (transforms) {
css.transform = 'translate(' + (properties.left || 0) + ',' + (properties.top || 0) + ')';
css.transform = 'translate(' + toFloat(properties.left || 0) + ',' + toFloat(properties.top || 0) + ')';
} else {
$.extend(css, properties);
}
Expand Down Expand Up @@ -726,7 +726,7 @@
this._prepare(item);

var pos = this._position(item),
currPos = this.list().position()[this.lt];
currPos = toFloat(this.list().position()[this.lt]);

if (pos === currPos) {
if ($.isFunction(callback)) {
Expand Down Expand Up @@ -755,7 +755,7 @@
var pos = this.list().position()[this.lt];

if (this.rtl && this.relative && !this.vertical) {
pos += this.list().width() - this.clipping();
pos += toFloat(this.list().width()) - this.clipping();
}

if (this.rtl && !this.vertical) {
Expand Down Expand Up @@ -964,13 +964,13 @@
},
_position: function(item) {
var first = this._first,
pos = first.position()[this.lt],
pos = toFloat(first.position()[this.lt]),
center = this.options('center'),
centerOffset = center ? (this.clipping() / 2) - (this.dimension(first) / 2) : 0;

if (this.rtl && !this.vertical) {
if (this.relative) {
pos -= this.list().width() - this.dimension(first);
pos -= toFloat(this.list().width()) - this.dimension(first);
} else {
pos -= this.clipping() - this.dimension(first);
}
Expand Down
Loading

0 comments on commit d0377c7

Please sign in to comment.