Skip to content

Allow percentage values for translate properties #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yoannisj wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Allow percentage values for translate properties #28

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0093f4b
add possibility to use percentage values for translate properties
Nov 9, 2015
d131c42
fix indentation to be 4spaces
Nov 9, 2015
8fb15cb
fix indentation to be 6width tabs
Nov 9, 2015
fddcfa3
still not correct indentation, switch back to 4 width spaces
Nov 9, 2015
6ab30dd
manually reset indentation levels
Nov 9, 2015
d3342bb
manually reset indentation levels
Nov 9, 2015
c8060c2
Merge branch 'percentage-translates' of github.com:yoannisj/scrollme …
Nov 9, 2015
5b7aaf4
manually fix indentation levels - continued
Nov 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions jquery.scrollme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ var scrollme = ( function( $ )
effect.element.css(
{
'opacity' : opacity,
'transform' : 'translate3d( '+translatex+'px , '+translatey+'px , '+translatez+'px ) rotateX( '+rotatex+'deg ) rotateY( '+rotatey+'deg ) rotateZ( '+rotatez+'deg ) scale3d( '+scalex+' , '+scaley+' , '+scalez+' )'
'transform' : 'translate3d( '+translatex+', '+translatey+', '+translatez+') rotateX( '+rotatex+') rotateY( '+rotatey+') rotateZ( '+rotatez+') scale3d( '+scalex+' , '+scaley+' , '+scalez+' )'
} );
}
}
Expand All @@ -338,6 +338,16 @@ var scrollme = ( function( $ )

var forwards = ( to > from ) ? true : false;

// Allow use of percentage values on translate properties

var percentages = (property.indexOf('translate') >=0 && typeof value_target == 'string' && value_target.charAt(value_target.length - 1) == '%' );
var translate_unit = 'px'; // default to pixel units

if ( percentages ) {
value_target = parseFloat(value_target.slice(0, -1), 10);
translate_unit = '%';
}

// Return boundary value if outside effect boundaries

if( scroll < from && forwards ) { return value_default; }
Expand All @@ -350,17 +360,17 @@ var scrollme = ( function( $ )

var new_value = value_default + ( scroll_eased * ( value_target - value_default ) );

// Round as required
// Round as required and add appropriate unit

switch( property )
{
case 'opacity' : new_value = new_value.toFixed(2); break;
case 'translatex' : new_value = new_value.toFixed(0); break;
case 'translatey' : new_value = new_value.toFixed(0); break;
case 'translatez' : new_value = new_value.toFixed(0); break;
case 'rotatex' : new_value = new_value.toFixed(1); break;
case 'rotatey' : new_value = new_value.toFixed(1); break;
case 'rotatez' : new_value = new_value.toFixed(1); break;
case 'translatex' : new_value = new_value.toFixed(0) + translate_unit; break;
case 'translatey' : new_value = new_value.toFixed(0) + translate_unit; break;
case 'translatez' : new_value = new_value.toFixed(0) + translate_unit; break;
case 'rotatex' : new_value = new_value.toFixed(1) + 'deg'; break;
case 'rotatey' : new_value = new_value.toFixed(1) + 'deg'; break;
case 'rotatez' : new_value = new_value.toFixed(1) + 'deg'; break;
case 'scale' : new_value = new_value.toFixed(3); break;
default : break;
}
Expand Down