flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-10-31 03:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

some refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-01-27 18:58:05 +04:00
parent d15d0cde61
commit d253ccbe1f
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
magazine.js
View File

@ -97,11 +97,13 @@ function hashChangeHandler(e){
// window resize event handler... // window resize event handler...
function viewResizeHandler(){ function viewResizeHandler(){
/*
// XXX might be good to compensate for document zoom... // XXX might be good to compensate for document zoom...
if(document.width/$(document).width() != 1){ if(document.width/$(document).width() != 1){
// XXX scale the page... // XXX scale the page...
console.log('>>> Page Zoom:', document.width/$(document).width()) console.log('>>> Page Zoom:', document.width/$(document).width())
} }
*/
//$('.splash').show() //$('.splash').show()
if(ANIMATE_WINDOW_RESIZE){ if(ANIMATE_WINDOW_RESIZE){
updateView() updateView()
@ -172,6 +174,12 @@ function swipeHandler(evt, phase, direction, distance, duration, fingers){
/********************************************************** layout ***/ /********************************************************** layout ***/
// NOTE: special cases:
// - if n is not given then it defaults to 1
// - if n > 1 and fit_to_content is not given it defaults to true
// - if n is 1 then fit_to_content bool argument controls wether:
// - the page will be stretched to viewer (false)
// - or to content (true)
function fitNPages(n, fit_to_content){ function fitNPages(n, fit_to_content){
if(n == null){ if(n == null){
n = 1 n = 1
@ -191,8 +199,8 @@ function fitNPages(n, fit_to_content){
var rW = cW var rW = cW
var scale = getPageScale() var scale = getPageScale()
// to compensate for transitions, to data sampling should be beyound // to compensate for transitions, no data sampling should be beyound
// this point, as next we will start changing things... // this point, as we will start changing things next...
if(fit_to_content){ if(fit_to_content){
page.width(cW) page.width(cW)
@ -204,17 +212,20 @@ function fitNPages(n, fit_to_content){
} }
// resulting page width... // resulting page width...
var rW = cW var rW = cW
} else { } else {
// need to calc width only... // need to calc width only...
if(W/H > (cW*n)/cH){ if(W/H > (cW*n)/cH){
scale = H/cH scale = H/cH
page.width(W/scale) page.width(W/scale)
page.height(cH) page.height(cH)
// need to calc height only... // need to calc height only...
} else if(W/H > (cW*n)/cH){ } else if(W/H > (cW*n)/cH){
scale = W/(cW*n) scale = W/(cW*n)
page.height(H/scale) page.height(H/scale)
page.width(cW) page.width(cW)
// set both width and height to defaults (content and page ratios match)... // set both width and height to defaults (content and page ratios match)...
} else { } else {
scale = W/(cW*n) scale = W/(cW*n)
@ -240,6 +251,11 @@ function fitNPages(n, fit_to_content){
/********************************************************* actions ***/ /********************************************************* actions ***/
// NOTE: if n is not given it will be set to current page number
// NOTE: if width is not given it will be set to current page width.
// NOTE: n can be:
// - page number
// - page element
// NOTE: this will fire a 'pageChanged' event on the viewer each time // NOTE: this will fire a 'pageChanged' event on the viewer each time
// it is called... // it is called...
function setCurrentPage(n, W){ function setCurrentPage(n, W){
@ -263,6 +279,7 @@ function setCurrentPage(n, W){
// XXX should this be here??? // XXX should this be here???
saveState() saveState()
// trigger the page cange event...
$('.viewer').trigger('pageChanged', n) $('.viewer').trigger('pageChanged', n)
return cur return cur
@ -450,7 +467,7 @@ function saveState(){
/******************************************************* navigator ***/ /******************************************************* navigator ***/
function makeArticleIndicator(i, article, width){ function _makeArticleIndicator(i, article, width){
var bar = $('.navigator .bar') var bar = $('.navigator .bar')
var article = $(article) var article = $(article)
var n = getPageNumber(article.children('.cover').first()) var n = getPageNumber(article.children('.cover').first())
@ -472,7 +489,7 @@ function setupArticleIndicators(W){
// cleanup... // cleanup...
$('.indicator .bar .article').remove() $('.indicator .bar .article').remove()
// set article positions... // set article positions...
articles.each(function(i, e){return makeArticleIndicator(i, e, W)}) articles.each(function(i, e){return _makeArticleIndicator(i, e, W)})
} }
@ -513,11 +530,7 @@ function updateNavigator(n){
var pW = bar.width()/pn var pW = bar.width()/pn
if(n == null){ if(n == null){
// XXX something is wrong with this... // XXX this behaves erratically if the page is zoomed...
// some times the indicator height gets set to the same value
// as its length and it works, at other times it gets the
// correct height and stops working...
// NOTE: this does not depend on source state.
var res = (-parseFloat(mag.css('left'))/(mW-PW)) * (bW-pW) var res = (-parseFloat(mag.css('left'))/(mW-PW)) * (bW-pW)
} else { } else {
res = pW*n res = pW*n