Commit 99983701 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Fix the js error in IE9 when displaying PDF. Bug 1400595"

parents 51ee23cf abfe9bec
......@@ -20,7 +20,7 @@ Changes:
* Minify js files for faster loading
* Change location of sample PDF file
* Remove "open file" button
* Hide the "open file" button in the toolbar
* viewer.css additions to support viewing by non-JS users
* viewer.css tweak to get the bottom of the display to show
* viewer.css tweak to avoid horizontal scrollbar on default 3-column page layout
......
......@@ -1062,6 +1062,12 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
content: url(images/toolbarButton-print.png);
}
# Hide the 'Open File' button in the tool bar
.toolbarButton.openFile,
.secondaryToolbarButton.openFile {
display: none;
}
.toolbarButton.openFile::before,
.secondaryToolbarButton.openFile::before {
content: url(images/toolbarButton-openFile.png);
......
......@@ -6400,8 +6400,8 @@ function webViewerInitialized() {
document.getElementById('presentationMode').addEventListener('click',
SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
// document.getElementById('openFile').addEventListener('click',
// SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
document.getElementById('openFile').addEventListener('click',
SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
document.getElementById('print').addEventListener('click',
SecondaryToolbar.printClick.bind(SecondaryToolbar));
......
......@@ -84,11 +84,9 @@
<span data-l10n-id="presentation_mode_label">Presentation Mode</span>
</button>
<!--
<button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
<span data-l10n-id="open_file_label">Open</span>
</button>
-->
<button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="53" data-l10n-id="print">
<span data-l10n-id="print_label">Print</span>
......@@ -162,11 +160,11 @@
<button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
<span data-l10n-id="presentation_mode_label">Presentation Mode</span>
</button>
<!--
<button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
<span data-l10n-id="open_file_label">Open</span>
</button>
-->
<button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
<span data-l10n-id="print_label">Print</span>
</button>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment