Skip to content
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

Jump to bottom

Modify for allow different duration, easing and delay for each attribute... #164

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modify for allow different duration, easing and delay for each attribute... #164

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
24 changes: 18 additions & 6 deletions jquery.transit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,17 +487,29 @@
var props = getProperties(properties);

// Account for aliases (`in` => `ease-in`).
if ($.cssEase[easing]) { easing = $.cssEase[easing]; }
//if ($.cssEase[easing]) { easing = $.cssEase[easing]; }

// Build the duration/easing/delay attributes for it.
var attribs = '' + toMS(duration) + ' ' + easing;
if (parseInt(delay, 10) > 0) { attribs += ' ' + toMS(delay); }
//var attribs = '' + toMS(duration) + ' ' + easing;
//if (parseInt(delay, 10) > 0) { attribs += ' ' + toMS(delay); }

// For more properties, add them this way:
// "margin 200ms ease, padding 200ms ease, ..."
var transitions = [];

var is_duration_array = typeof duration === 'object' ? true : false;
var is_easing_array = typeof easing === 'object' ? true : false;
var is_delay_array = typeof delay === 'object' ? true : false;

var transitions = [], attr_duration = '', attr_easing = '', attr_delay = '';
$.each(props, function(i, name) {
transitions.push(name + ' ' + attribs);
if(duration) attr_duration = toMS(is_duration_array ? duration[i] : duration);
if(easing){
attr_easing = is_easing_array ? easing[i] : easing;
if($.cssEase[attr_easing]) attr_easing = $.cssEase[attr_easing];
}
if(delay) attr_delay = toMS(is_delay_array ? delay[i] : delay);

transitions.push(name + ' ' + attr_duration + ' ' + attr_easing + ' ' + attr_delay);
});

return transitions.join(', ');
Expand Down Expand Up @@ -587,7 +599,7 @@
if (typeof duration === 'undefined') { duration = $.fx.speeds._default; }
if (typeof easing === 'undefined') { easing = $.cssEase._default; }

duration = toMS(duration);
//duration = toMS(duration);

// Build the `transition` property.
var transitionValue = getTransition(theseProperties, duration, easing, delay);
Expand Down