Skip to content

Updated to allow px, %, vw and vh units for translate properties #57

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
sambadave wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to allow px, %, vw and vh units for translate properties #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 34 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,32 @@ var scrollme = ( function( $ )

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

// Allow use of px, %, vw and vh values on translate properties

var percentages = (property.indexOf('translate') >=0 && typeof value_target == 'string' && value_target.charAt(value_target.length - 1) == '%' );
var px = (property.indexOf('translate') >=0 && typeof value_target == 'string' && value_target.substr(value_target.length - 2) == 'px' );
var vw = (property.indexOf('translate') >=0 && typeof value_target == 'string' && value_target.substr(value_target.length - 2) == 'vw' );
var vh = (property.indexOf('translate') >=0 && typeof value_target == 'string' && value_target.substr(value_target.length - 2) == 'vh' );

var translate_unit = 'px'; // default to pixel units

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

// Return boundary value if outside effect boundaries

if( scroll < from && forwards ) { return value_default; }
Expand All @@ -350,17 +376,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(2) + translate_unit; break;
case 'translatey' : new_value = new_value.toFixed(2) + translate_unit; break;
case 'translatez' : new_value = new_value.toFixed(2) + 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