|
|
@ -139,16 +139,17 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
dimensions = Modernizr.csstransforms3d ? '3d' : '2d', |
|
|
|
dimensions = Modernizr.csstransforms3d ? '3d' : '2d', |
|
|
|
usingTransforms = Modernizr.csstransforms && $.browser.webkit, |
|
|
|
usingTransforms = Modernizr.csstransforms, |
|
|
|
|
|
|
|
// usingTransforms = false,
|
|
|
|
transformFnUtils = transformFnUtilsDimensional[ dimensions ]; |
|
|
|
transformFnUtils = transformFnUtilsDimensional[ dimensions ]; |
|
|
|
|
|
|
|
|
|
|
|
var _jQueryStyle = $.style; |
|
|
|
var _jQueryStyle = $.style; |
|
|
|
$.style = function ( elem, name, value ) { |
|
|
|
$.style = function ( elem, name, value ) { |
|
|
|
|
|
|
|
|
|
|
|
switch ( name ) { |
|
|
|
switch ( name ) { |
|
|
|
case 'scale' : |
|
|
|
case 'scale' : |
|
|
|
case 'translate' : |
|
|
|
case 'translate' : |
|
|
|
console.log( name ) |
|
|
|
// 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
|
|
|
@ -186,7 +187,8 @@ |
|
|
|
var _fxCur = $.fx.prototype.cur; |
|
|
|
var _fxCur = $.fx.prototype.cur; |
|
|
|
$.fx.prototype.cur = function () { |
|
|
|
$.fx.prototype.cur = function () { |
|
|
|
if ( this.prop === 'scale' ) { |
|
|
|
if ( this.prop === 'scale' ) { |
|
|
|
var currentScale = $( this.elem ).data('transform')[ this.prop ] || [ 1 ]; |
|
|
|
var data = $( this.elem ).data('transform'), |
|
|
|
|
|
|
|
currentScale = data ? 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] |
|
|
|
} |
|
|
|
} |
|
|
@ -358,6 +360,7 @@ |
|
|
|
// use plugin-ish syntax for css or animate
|
|
|
|
// use plugin-ish syntax for css or animate
|
|
|
|
var styleFn = ( props.initialized && props.opts.animate ) ? 'animate' : 'css', |
|
|
|
var styleFn = ( props.initialized && props.opts.animate ) ? 'animate' : 'css', |
|
|
|
animOpts = props.opts.animationOptions; |
|
|
|
animOpts = props.opts.animationOptions; |
|
|
|
|
|
|
|
// console.log( props.initialized, props.opts.animate, styleFn )
|
|
|
|
|
|
|
|
|
|
|
|
// process styleQueue
|
|
|
|
// process styleQueue
|
|
|
|
$.each( props.styleQueue, function( i, obj ){ |
|
|
|
$.each( props.styleQueue, function( i, obj ){ |
|
|
@ -568,12 +571,13 @@ |
|
|
|
hiddenClass : 'molequul-hidden', |
|
|
|
hiddenClass : 'molequul-hidden', |
|
|
|
hiddenStyle : { |
|
|
|
hiddenStyle : { |
|
|
|
opacity : 0, |
|
|
|
opacity : 0, |
|
|
|
scale : [ 0 ] |
|
|
|
scale : [ 0.001 ] |
|
|
|
}, |
|
|
|
}, |
|
|
|
visibleStyle : { |
|
|
|
visibleStyle : { |
|
|
|
opacity : 1, |
|
|
|
opacity : 1, |
|
|
|
scale : [ 1 ] |
|
|
|
scale : [ 1 ] |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
animate : false, |
|
|
|
animationOptions: { |
|
|
|
animationOptions: { |
|
|
|
queue: false |
|
|
|
queue: false |
|
|
|
} |
|
|
|
} |
|
|
|