From 763bd7059af5ae692d77d41717e83d5dbba5a03e Mon Sep 17 00:00:00 2001 From: Vivien Nicolas <21@vingtetun.org> Date: Wed, 31 Aug 2011 14:17:57 +0200 Subject: [PATCH] Fix a warning when the destination link point to nothing --- fonts.js | 1 + web/viewer.js | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fonts.js b/fonts.js index 24fd35d61..02aa52601 100755 --- a/fonts.js +++ b/fonts.js @@ -80,6 +80,7 @@ var FontMeasure = (function FontMeasure() { size *= kScalePrecision; var rule = italic + ' ' + bold + ' ' + size + 'px "' + name + '"'; ctx.font = rule; + current = font; }, measureText: function fonts_measureText(text) { var width; diff --git a/web/viewer.js b/web/viewer.js index 1e016e6e9..d57e47045 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -217,11 +217,10 @@ var PageView = function(container, content, id, width, height, function setupLinks(canvas, content, scale) { function bindLink(link, dest) { - if (dest) { - link.onclick = function() { + link.onclick = function() { + if (dest) PDFView.navigateTo(dest); - return false; - }; + return false; } } var links = content.getLinks(); @@ -232,7 +231,7 @@ var PageView = function(container, content, id, width, height, link.style.width = Math.ceil(links[i].width * scale) + 'px'; link.style.height = Math.ceil(links[i].height * scale) + 'px'; link.href = links[i].url || ''; - bindLink(link, links[i].dest); + bindLink(link, ('dest' in links[i]) ? links[i].dest : null); div.appendChild(link); } }