Merge remote-tracking branch 'upstream/master'

2012-08-29 09:17:02 +08:00 · 2012-08-29 09:17:02 +08:00 · 134cec9796
commit 134cec9796
parent ea47a49dd0 b1181c1d80
1 changed files with 2 additions and 0 deletions
--- a/web/viewer.js
+++ b/web/viewer.js
@ -38,6 +38,8 @@ function scrollIntoView(element, spot) {
  while (parent.clientHeight == parent.scrollHeight) {
    offsetY += parent.offsetTop;
    parent = parent.offsetParent;
+    if (!parent)
+      return; // no need to scroll
  }
  if (spot)
    offsetY += spot.top;