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

Conflicts:
	web/viewer.js

diff --cc web/viewer.js
index a3e568c7cac9122159ca4d0316023e583252e32c,121ab6d0c546bdc410a9f233129e79cccf2a289f..bdcac09d53831b34968ee7a815266e54fe62ba83
--- 1/web/viewer.js
--- 2/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) {