From 39315795c81d1e3a53f7b6ddd8493a811a623d30 Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Mon, 5 Oct 2015 19:16:49 +0100
Subject: [PATCH] PDF.js version 1.1.511

---
 bower.json            | 2 +-
 build/pdf.combined.js | 4 ++--
 build/pdf.js          | 4 ++--
 build/pdf.worker.js   | 4 ++--
 package.json          | 2 +-
 web/pdf_viewer.js     | 7 ++++---
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/bower.json b/bower.json
index 7f267fcc2..1e650921b 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.509",
+  "version": "1.1.511",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index fc156c945..47f4ca343 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.509';
-PDFJS.build = '7b44d64';
+PDFJS.version = '1.1.511';
+PDFJS.build = '42ddb71';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index 3aa5281cc..482955947 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.509';
-PDFJS.build = '7b44d64';
+PDFJS.version = '1.1.511';
+PDFJS.build = '42ddb71';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index aba3d2d02..2b6931018 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.1.509';
-PDFJS.build = '7b44d64';
+PDFJS.version = '1.1.511';
+PDFJS.build = '42ddb71';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index e8b0a4e09..131c4e23f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.509",
+  "version": "1.1.511",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index e68c50edb..58ab29cd8 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -134,13 +134,14 @@ function scrollIntoView(element, spot) {
   // hidden iframe or object). We have to scroll: if the offsetParent is not set
   // producing the error. See also animationStartedClosure.
   var parent = element.offsetParent;
-  var offsetY = element.offsetTop + element.clientTop;
-  var offsetX = element.offsetLeft + element.clientLeft;
   if (!parent) {
     console.error('offsetParent is not set -- cannot scroll');
     return;
   }
-  while (parent.clientHeight === parent.scrollHeight) {
+  var offsetY = element.offsetTop + element.clientTop;
+  var offsetX = element.offsetLeft + element.clientLeft;
+  while (parent.clientHeight === parent.scrollHeight ||
+         getComputedStyle(parent).overflow === 'hidden') {
     if (parent.dataset._scaleY) {
       offsetY /= parent.dataset._scaleY;
       offsetX /= parent.dataset._scaleX;