flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2026-01-07 11:11:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

now scaling mostly works...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-12 03:05:20 +04:00
parent 3ce208b6c4
commit 076d2a0228
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout.html
View File

@ -74,6 +74,10 @@ $(document).ready(function(){
}, },
function(k){console.log(k)})) function(k){console.log(k)}))
if(!NAVIGATE_RELATIVE_TO_VISIBLE){
$('.viewer').css({overflow: 'hidden'})
}
// expand the templates... // expand the templates...
runMagazineTemplates() runMagazineTemplates()

27
layout.js
View File

@ -19,7 +19,7 @@ var togglePageFitMode = createCSSClassToggler(
if(action == 'on'){ if(action == 'on'){
console.log('fitting pages to view...') console.log('fitting pages to view...')
var n = getPageNumber() var n = getPageNumber()
var scale = getElementScale($('.magazine')) var scale = getMagazineScale()
$('.page:not(.no-resize)').width($('.viewer').width()/scale) $('.page:not(.no-resize)').width($('.viewer').width()/scale)
setCurrentPage(n) setCurrentPage(n)
} else { } else {
@ -43,7 +43,7 @@ function getPageNumber(page){
} else { } else {
var s = $('.viewer').scrollLeft() var s = $('.viewer').scrollLeft()
var W = $('.viewer').width() var W = $('.viewer').width()
var scale = getElementScale($('.magazine')) var scale = getMagazineScale()
var cur = -1 var cur = -1
var res = $('.page').map(function(i, e){ var res = $('.page').map(function(i, e){
e = $(e) e = $(e)
@ -56,6 +56,24 @@ function getPageNumber(page){
} }
} }
function getMagazineScale(){
return getElementScale($('.magazine'))
}
function setMagazineScale(scale){
var mag = $('.magazine')
// NOTE: we are updating margins to make the scroll area adapt to new scale...
var w = mag.width()
var m = -(w - (w*scale))/2 + $('.viewer').width()/2
mag.css({
'margin-left': m,
'margin-right': m
})
setElementScale(mag, scale)
setCurrentPage()
}
/********************************************************* actions ***/ /********************************************************* actions ***/
@ -64,7 +82,7 @@ function setCurrentPage(n){
if(n == null){ if(n == null){
n = getPageNumber() n = getPageNumber()
} }
var scale = getElementScale($('.magazine')) var scale = getMagazineScale()
var l = $('.page').length var l = $('.page').length
n = n < 0 ? l - n : n n = n < 0 ? l - n : n
n = n < -l ? 0 : n n = n < -l ? 0 : n
@ -72,7 +90,8 @@ function setCurrentPage(n){
$('.current.page').removeClass('current') $('.current.page').removeClass('current')
$($('.page')[n]).addClass('current') $($('.page')[n]).addClass('current')
var cur = $('.current.page') var cur = $('.current.page')
if(USE_PAGE_ALIGN){ if(USE_PAGE_ALIGN
&& $('.page').width()*2*scale > $('.viewer').width()){
var align = getPageAlign() var align = getPageAlign()
} else { } else {
var align = 'center' var align = 'center'