mirror of
https://github.com/flynx/PortableMag.git
synced 2025-10-29 11:10:08 +00:00
doing magic testing...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
33078ebaeb
commit
52ce720acc
@ -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,
|
||||
|
||||
13
index2.html
13
index2.html
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user