rename styles method to css - less ambiguity over what it returns, no style/styles confusion

pull/525/head
Rich-Harris 8 years ago
parent b8affd42e9
commit 8da701936f

@ -33,7 +33,7 @@ export function wrapTransition ( node, fn, params, intro, outgroup ) {
var ease = obj.easing || linear; var ease = obj.easing || linear;
// TODO share <style> tag between all transitions? // TODO share <style> tag between all transitions?
if ( obj.styles ) { if ( obj.css ) {
var style = document.createElement( 'style' ); var style = document.createElement( 'style' );
} }
@ -58,8 +58,8 @@ export function wrapTransition ( node, fn, params, intro, outgroup ) {
this.callback = callback; this.callback = callback;
if ( obj.styles ) { if ( obj.css ) {
generateKeyframes( this.a, this.b, this.delta, this.duration, ease, obj.styles, node, style ); generateKeyframes( this.a, this.b, this.delta, this.duration, ease, obj.css, node, style );
} }
if ( !this.running ) { if ( !this.running ) {
@ -74,13 +74,13 @@ export function wrapTransition ( node, fn, params, intro, outgroup ) {
}, },
done: function () { done: function () {
if ( obj.tick ) obj.tick( intro ? 1 : 0 ); if ( obj.tick ) obj.tick( intro ? 1 : 0 );
if ( obj.styles ) document.head.removeChild( style ); if ( obj.css ) document.head.removeChild( style );
this.callback(); this.callback();
this.running = false; this.running = false;
}, },
abort: function () { abort: function () {
if ( !intro && obj.tick ) obj.tick( 1 ); // reset styles for intro if ( !intro && obj.tick ) obj.tick( 1 ); // reset css for intro
if ( obj.styles ) document.head.removeChild( style ); if ( obj.css ) document.head.removeChild( style );
this.running = false; this.running = false;
} }
}; };

Loading…
Cancel
Save