Merge remote-tracking branch 'mozilla/master' into textsearch

Conflicts:
	l10n/en-US/viewer.properties
	web/viewer.html

l10n/en-US/viewer.properties

@@ -43,6 +43,7 @@ zoom.title=Zoom
 thumb_page_title=Page {{page}}
 thumb_page_canvas=Thumbnail of Page {{page}}
 request_password=PDF is protected by a password:
+open_file_label=Open
 search.title=Search Document
 search_label=Search
 

src/fonts.js

@@ -4952,9 +4952,9 @@ var CFFPrivateDict = (function CFFPrivateDictClosure() {
     [[12, 17], 'LanguageGroup', 'num', 0],
     [[12, 18], 'ExpansionFactor', 'num', 0.06],
     [[12, 19], 'initialRandomSeed', 'num', 0],
-    [19, 'Subrs', 'offset', null],
     [20, 'defaultWidthX', 'num', 0],
-    [21, 'nominalWidthX', 'num', 0]
+    [21, 'nominalWidthX', 'num', 0],
+    [19, 'Subrs', 'offset', null]
   ];
   var tables = null;
   function CFFPrivateDict(strings) {

test/pdfs/issue1629.pdf.link

@@ -0,0 +1 @@
+http://is.muni.cz/www/20544/noty/sbm/Taize/Adoramus_te_Christe.pdf

test/test_manifest.json

@@ -451,6 +451,13 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "issue1629",
+      "file": "pdfs/issue1629.pdf",
+      "md5": "0f2cbbf268383a377e95e6bbe36c6a9a",
+      "rounds": 1,
+      "link": true,
+      "type": "eq"
+    },
     {  "id": "issue1169",
       "file": "pdfs/issue1169.pdf",
       "md5": "3df3ed21fd43ac7fdb21e2015c8a7809",

web/viewer.css

@@ -505,6 +505,11 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
   content: url(images/toolbarButton-print.png);
 }
 
+.toolbarButton.openFile::before {
+  display: inline-block;
+  content: url(images/toolbarButton-openFile.png);
+}
+
 .toolbarButton.download::before {
   display: inline-block;
   content: url(images/toolbarButton-download.png);
@@ -989,17 +994,26 @@ canvas {
   font-size: 10px;
 }
 
-@media all and (max-width: 770px) {
+@media all and (max-width: 950px) {
-  #scaleSelectContainer, #fileInput, #pageNumberLabel {
+  html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
-    display: none;
+  html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter {
+    float: left;
+    left: 180px;
+  }
+  html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter {
+    float: right;
+    right: 180px;
   }
+}
 
+@media all and (max-width: 770px) {
   #sidebarContainer {
     top: 33px;
     z-index: 100;
   }
   #sidebarContent {
-    top: 33px;
+    top: 32px;
     background-color: hsla(0,0%,0%,.7);
   }
   #thumbnailView, #outlineView {
@@ -1013,16 +1027,6 @@ canvas {
     right: 0px;
   }
 
-  #pageNumber {
-    width: 30px;
-  }
-}
-
-@media all and (max-width: 500px) {
-  #viewBookmark {
-    display: none;
-  }
-
   html[dir='ltr'] .outerCenter {
     float: left;
     left: 180px;
@@ -1032,3 +1036,9 @@ canvas {
     right: 180px;
   }
 }
+
+@media all and (max-width: 600px) {
+  #toolbarViewerRight {
+    display: none;
+  }
+}

web/viewer.html

@@ -95,14 +95,10 @@
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
               <div id="toolbarViewerRight">
-                <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="11" />
-
-                <!--
                 <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" style="visibility: hidden; position: fixed; right: 0; top: 0" />
-                <button id="openFile" class="toolbarButton print" title="Open File" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
+                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="11" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
                    <span data-l10n-id="open_file_label">Open</span>
                 </button>
-                -->
 
                 <!--
                 <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()">

web/viewer.js

@@ -1475,7 +1475,7 @@ window.addEventListener('load', function webViewerLoad(evt) {
 
   if (PDFJS.isFirefoxExtension || !window.File || !window.FileReader ||
       !window.FileList || !window.Blob) {
-    document.getElementById('fileInput').setAttribute('hidden', 'true');
+    document.getElementById('openFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }