flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-10-30 19:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

doing magic testing...

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext-lib/iscroll-custom.js
View File

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

13
index2.html
View File

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