Skip to content

Commit

Permalink
Fix wrong axis when checking for blocked axis
Browse files Browse the repository at this point in the history
  • Loading branch information
chipironcin authored and Jorge Marin committed Jun 23, 2017
1 parent 757629e commit cfaa264
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dist/vanilla-tilt.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ var VanillaTilt = function () {
VanillaTilt.prototype.update = function update() {
var values = this.getValues();

this.element.style.transform = "perspective(" + this.settings.perspective + "px) " + "rotateX(" + (this.settings.axis === "x" ? 0 : values.tiltY) + "deg) " + "rotateY(" + (this.settings.axis === "y" ? 0 : values.tiltX) + "deg) " + "scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";
this.element.style.transform = "perspective(" + this.settings.perspective + "px) " + "rotateX(" + (this.settings.axis === "y" ? 0 : values.tiltY) + "deg) " + "rotateY(" + (this.settings.axis === "x" ? 0 : values.tiltX) + "deg) " + "scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";

if (this.glare) {
this.glareElement.style.transform = "rotate(" + values.angle + "deg) translate(-50%, -50%)";
Expand Down
4 changes: 2 additions & 2 deletions dist/vanilla-tilt.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ class VanillaTilt {
let values = this.getValues();

this.element.style.transform = "perspective(" + this.settings.perspective + "px) " +
"rotateX(" + (this.settings.axis === "x" ? 0 : values.tiltY) + "deg) " +
"rotateY(" + (this.settings.axis === "y" ? 0 : values.tiltX) + "deg) " +
"rotateX(" + (this.settings.axis === "y" ? 0 : values.tiltY) + "deg) " +
"rotateY(" + (this.settings.axis === "x" ? 0 : values.tiltX) + "deg) " +
"scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";

if (this.glare) {
Expand Down
4 changes: 2 additions & 2 deletions lib/vanilla-tilt.es2015.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ class VanillaTilt {
let values = this.getValues();

this.element.style.transform = "perspective(" + this.settings.perspective + "px) " +
"rotateX(" + (this.settings.axis === "x" ? 0 : values.tiltY) + "deg) " +
"rotateY(" + (this.settings.axis === "y" ? 0 : values.tiltX) + "deg) " +
"rotateX(" + (this.settings.axis === "y" ? 0 : values.tiltY) + "deg) " +
"rotateY(" + (this.settings.axis === "x" ? 0 : values.tiltX) + "deg) " +
"scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";

if (this.glare) {
Expand Down
2 changes: 1 addition & 1 deletion lib/vanilla-tilt.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ var VanillaTilt = function () {
VanillaTilt.prototype.update = function update() {
var values = this.getValues();

this.element.style.transform = "perspective(" + this.settings.perspective + "px) " + "rotateX(" + (this.settings.axis === "x" ? 0 : values.tiltY) + "deg) " + "rotateY(" + (this.settings.axis === "y" ? 0 : values.tiltX) + "deg) " + "scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";
this.element.style.transform = "perspective(" + this.settings.perspective + "px) " + "rotateX(" + (this.settings.axis === "y" ? 0 : values.tiltY) + "deg) " + "rotateY(" + (this.settings.axis === "x" ? 0 : values.tiltX) + "deg) " + "scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";

if (this.glare) {
this.glareElement.style.transform = "rotate(" + values.angle + "deg) translate(-50%, -50%)";
Expand Down
4 changes: 2 additions & 2 deletions src/vanilla-tilt.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ export default class VanillaTilt {
let values = this.getValues();

this.element.style.transform = "perspective(" + this.settings.perspective + "px) " +
"rotateX(" + (this.settings.axis === "x" ? 0 : values.tiltY) + "deg) " +
"rotateY(" + (this.settings.axis === "y" ? 0 : values.tiltX) + "deg) " +
"rotateX(" + (this.settings.axis === "y" ? 0 : values.tiltY) + "deg) " +
"rotateY(" + (this.settings.axis === "x" ? 0 : values.tiltX) + "deg) " +
"scale3d(" + this.settings.scale + ", " + this.settings.scale + ", " + this.settings.scale + ")";

if (this.glare) {
Expand Down

0 comments on commit cfaa264

Please sign in to comment.