From: Artur Adib <arturadib@gmail.com>
Date: Fri, 9 Dec 2011 20:38:08 +0000 (-0500)
Subject: Merge branch 'refs/heads/master' into disableworker-in-url
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8c728a884ea1f1ca14c85f190afc2c2f3f223285;p=pdf.js.git

Merge branch 'refs/heads/master' into disableworker-in-url

Conflicts:
	web/viewer.js
---

8c728a884ea1f1ca14c85f190afc2c2f3f223285
diff --cc web/viewer.js
index a3e568c,121ab6d..bdcac09
--- a/web/viewer.js
+++ b/web/viewer.js
@@@ -704,8 -741,8 +741,11 @@@ window.addEventListener('load', functio
    else
      document.getElementById('fileInput').value = null;
  
 +  if ('disableWorker' in params)
 +    PDFJS.disableWorker = params['disableWorker'] === 'true' ? true : false;
++
+   var sidebarScrollView = document.getElementById('sidebarScrollView');
+   sidebarScrollView.addEventListener('scroll', updateThumbViewArea, true);
  }, true);
  
  window.addEventListener('unload', function webViewerUnload(evt) {