Skip to content

Commit

Permalink
Merge pull request #746 from slawexxx44/fix-replacing-translate3d-wit…
Browse files Browse the repository at this point in the history
…h-translateX

tranform3d replaced with transformX
  • Loading branch information
meandmax authored Oct 9, 2018
2 parents 5c9405f + f8c250f commit b569bad
Show file tree
Hide file tree
Showing 8 changed files with 383 additions and 409 deletions.
385 changes: 188 additions & 197 deletions dist/jquery.lory.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.lory.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.lory.min.js.map

Large diffs are not rendered by default.

385 changes: 188 additions & 197 deletions dist/lory.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/lory.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/lory.min.js.map

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions src/lory.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,7 @@ export function lory (slider, opts) {
if (style) {
style[prefixes.transition + 'TimingFunction'] = ease;
style[prefixes.transition + 'Duration'] = duration + 'ms';

if (prefixes.hasTranslate3d) {
style[prefixes.transform] = 'translate3d(' + to + 'px, 0, 0)';
} else {
style[prefixes.transform] = 'translate(' + to + 'px, 0)';
}
style[prefixes.transform] = 'translateX(' + to + 'px)';
}
}

Expand Down
7 changes: 2 additions & 5 deletions src/utils/detect-prefixes.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export default function detectPrefixes () {
let transform;
let transition;
let transitionEnd;
let hasTranslate3d;

(function () {
let el = document.createElement('_');
Expand Down Expand Up @@ -36,15 +35,13 @@ export default function detectPrefixes () {
}

document.body.insertBefore(el, null);
style[transform] = 'translate3d(0, 0, 0)';
hasTranslate3d = !!global.getComputedStyle(el).getPropertyValue(transform);
style[transform] = 'translateX(0)';
document.body.removeChild(el);
}());

return {
transform,
transition,
transitionEnd,
hasTranslate3d
transitionEnd
};
}

0 comments on commit b569bad

Please sign in to comment.