|
|
@ -14,7 +14,7 @@ |
|
|
|
}, |
|
|
|
}, |
|
|
|
scale : function ( scale ) { |
|
|
|
scale : function ( scale ) { |
|
|
|
return 'scale(' + scale[0] + ')'; |
|
|
|
return 'scale(' + scale[0] + ')'; |
|
|
|
}, |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
'3d' : { |
|
|
|
'3d' : { |
|
|
|
translate : function ( position ) { |
|
|
|
translate : function ( position ) { |
|
|
@ -23,7 +23,6 @@ |
|
|
|
scale : function ( scale ) { |
|
|
|
scale : function ( scale ) { |
|
|
|
return 'scale3d(' + scale[0] + ', ' + scale[0] + ', 1)'; |
|
|
|
return 'scale3d(' + scale[0] + ', ' + scale[0] + ', 1)'; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
dimensions = Modernizr.csstransforms3d ? '3d' : '2d', |
|
|
|
dimensions = Modernizr.csstransforms3d ? '3d' : '2d', |
|
|
@ -37,17 +36,16 @@ |
|
|
|
switch ( name ) { |
|
|
|
switch ( name ) { |
|
|
|
case 'scale' : |
|
|
|
case 'scale' : |
|
|
|
case 'translate' : |
|
|
|
case 'translate' : |
|
|
|
// console.log( name )
|
|
|
|
|
|
|
|
// unpack current transform data
|
|
|
|
// unpack current transform data
|
|
|
|
var data = $( elem ).data('transform') || {}; |
|
|
|
var data = $( elem ).data('transform') || {}, |
|
|
|
// extend new value over current data
|
|
|
|
// extend new value over current data
|
|
|
|
var newData = {}; |
|
|
|
newData = {}, |
|
|
|
|
|
|
|
valueFns = [], |
|
|
|
|
|
|
|
fnName; |
|
|
|
newData[ name ] = value; |
|
|
|
newData[ name ] = value; |
|
|
|
$.extend( data, newData ); |
|
|
|
$.extend( data, newData ); |
|
|
|
|
|
|
|
|
|
|
|
var valueFns = []; |
|
|
|
for ( fnName in data ) { |
|
|
|
|
|
|
|
|
|
|
|
for ( var fnName in data ) { |
|
|
|
|
|
|
|
var transformValue = data[ fnName ], |
|
|
|
var transformValue = data[ fnName ], |
|
|
|
getFn = transformFnUtils[ fnName ], |
|
|
|
getFn = transformFnUtils[ fnName ], |
|
|
|
valueFn = getFn( transformValue ); |
|
|
|
valueFn = getFn( transformValue ); |
|
|
@ -63,7 +61,7 @@ |
|
|
|
// set name to vendor specific property
|
|
|
|
// set name to vendor specific property
|
|
|
|
name = $.props.transform; |
|
|
|
name = $.props.transform; |
|
|
|
|
|
|
|
|
|
|
|
break |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// if ( name === 'transform') {
|
|
|
|
// if ( name === 'transform') {
|
|
|
@ -78,11 +76,11 @@ |
|
|
|
var data = $( this.elem ).data('transform'), |
|
|
|
var data = $( this.elem ).data('transform'), |
|
|
|
currentScale = data && data[ this.prop ] ? data[ this.prop ] : [ 1 ]; |
|
|
|
currentScale = data && data[ this.prop ] ? data[ this.prop ] : [ 1 ]; |
|
|
|
// scale value is saved as a 1 item array
|
|
|
|
// scale value is saved as a 1 item array
|
|
|
|
return currentScale[0] |
|
|
|
return currentScale[0]; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return _fxCur.apply(this, arguments); |
|
|
|
return _fxCur.apply(this, arguments); |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
$.fx.step.scale = function (fx) { |
|
|
|
$.fx.step.scale = function (fx) { |
|
|
|
$( fx.elem ).css({ scale: [ fx.now ] }); |
|
|
|
$( fx.elem ).css({ scale: [ fx.now ] }); |
|
|
|