doing magic testing...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-23 00:40:00 +04:00
parent 33078ebaeb
commit 52ce720acc
2 changed files with 8 additions and 7 deletions

View File

@ -521,7 +521,7 @@ iScroll.prototype = {
if (that.options.onTouchEnd) that.options.onTouchEnd.call(that, e);
},
// XXX
// XXX go back into bounds...
_resetPos: function (time) {
var that = this,
resetX = that.x >= 0 ? 0 : that.x < that.maxScrollX ? that.maxScrollX : that.x,

View File

@ -84,13 +84,13 @@
<script>
function setTransformOrigin(elem){
function prepareTransitions(elem){
return $(elem).css({
'-webkit-transform-origin': '0 0',
'-moz-transform-origin': '0 0',
'-o-transform-origin': '0 0',
'-ms-transform-origin': '0 0',
'transform-origin': '0 0',
'-webkit-transition-property': '-webkit-transform',
'-moz-transition-property': '-moz-transform',
'-o-transition-property': '-o-transform',
'-ms-transition-property': '-ms-transform',
'transition-property': 'transform',
})
}
@ -160,6 +160,7 @@ $(document).ready(function(){
// XXX stub...
//setTransitionEasing($('.magazine'), 'ease-out')
setTransitionEasing($('.magazine'), 'cubic-bezier(0.33,0.66,0.66,1)')
prepareTransitions($('.magazine'))
runMagazineTemplates()
setCurrentPage(0)