From 2557c311a62ac5a58406fa06401fff9e910de269 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Thu, 7 Nov 2013 16:43:55 +0800 Subject: [PATCH] .. --- share/pdf2htmlEX.js.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/share/pdf2htmlEX.js.in b/share/pdf2htmlEX.js.in index 15aee3c..9e2ac28 100644 --- a/share/pdf2htmlEX.js.in +++ b/share/pdf2htmlEX.js.in @@ -711,15 +711,13 @@ if(ok) { var _ = this; - var scale = this.scale; - var _pos = [pos[0] * scale, pos[1] * scale] /* page should of type Page */ var transform_and_scroll = function(page) { - _pos = transform(page.ctm, _pos); + pos = transform(page.ctm, pos); if(upside_down) { - _pos[1] = page.height() - _pos[1]; + pos[1] = page.original_height - pos[1]; } - _.scroll_to(target_page_idx, _pos); + _.scroll_to(target_page_idx, pos); }; if (target_page.loaded) { @@ -739,7 +737,7 @@ /** * @param{number} page_idx - * @param{Array=} pos [x,y], where (0,0) is the top-left corner + * @param{Array=} pos [x,y] in UNSCALED COORDINATION, where (0,0) is the top-left corner */ scroll_to : function(page_idx, pos) { var target_page = this.pages[page_idx]; @@ -751,8 +749,9 @@ var cur_target_pos = target_page.position(); var container = this.container; - container.scrollLeft += pos[0] - cur_target_pos[0]; - container.scrollTop += pos[1] - cur_target_pos[1]; + var scale = this.scale; + container.scrollLeft += pos[0] * scale - cur_target_pos[0]; + container.scrollTop += pos[1] * scale - cur_target_pos[1]; }, __last_member__ : 'no comma' /*,*/