Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3080 from Snuffleupagus/zoomButtons-disable

Browse Source 
Fix disabling of zoom buttons and add camel case button names
This commit is contained in:
Yury Delendik 2013-04-30 13:06:54 -07:00
commit 8d6aac1fe3
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/viewer.html
View File

@ -166,11 +166,11 @@ limitations under the License.
<div class="outerCenter"> <div class="outerCenter">
<div class="innerCenter" id="toolbarViewerMiddle"> <div class="innerCenter" id="toolbarViewerMiddle">
<div class="splitToolbarButton"> <div class="splitToolbarButton">
<button class="toolbarButton zoomOut" id="zoom_out" title="Zoom Out" tabindex="9" data-l10n-id="zoom_out"> <button id="zoomOut" class="toolbarButton zoomOut" title="Zoom Out" tabindex="9" data-l10n-id="zoom_out">
<span data-l10n-id="zoom_out_label">Zoom Out</span> <span data-l10n-id="zoom_out_label">Zoom Out</span>
</button> </button>
<div class="splitToolbarButtonSeparator"></div> <div class="splitToolbarButtonSeparator"></div>
<button class="toolbarButton zoomIn" id="zoom_in" title="Zoom In" tabindex="10" data-l10n-id="zoom_in"> <button id="zoomIn" class="toolbarButton zoomIn" title="Zoom In" tabindex="10" data-l10n-id="zoom_in">
<span data-l10n-id="zoom_in_label">Zoom In</span> <span data-l10n-id="zoom_in_label">Zoom In</span>
</button> </button>
</div> </div>
@ -202,13 +202,13 @@ limitations under the License.
</div> </div>
<menu type="context" id="viewerContextMenu"> <menu type="context" id="viewerContextMenu">
<menuitem label="First Page" id="first_page" <menuitem id="firstPage" label="First Page"
data-l10n-id="first_page" ></menuitem> data-l10n-id="first_page" ></menuitem>
<menuitem label="Last Page" id="last_page" <menuitem id="lastPage" label="Last Page"
data-l10n-id="last_page" ></menuitem> data-l10n-id="last_page" ></menuitem>
<menuitem label="Rotate Counter-Clockwise" id="page_rotate_ccw" <menuitem id="pageRotateCcw" label="Rotate Counter-Clockwise"
data-l10n-id="page_rotate_ccw" ></menuitem> data-l10n-id="page_rotate_ccw" ></menuitem>
<menuitem label="Rotate Clockwise" id="page_rotate_cw" <menuitem id="pageRotateCw" label="Rotate Clockwise"
data-l10n-id="page_rotate_cw" ></menuitem> data-l10n-id="page_rotate_cw" ></menuitem>
</menu> </menu>

21
web/viewer.js
View File

@ -3159,7 +3159,7 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
} }
if (PDFView.supportsIntegratedFind) { if (PDFView.supportsIntegratedFind) {
document.querySelector('#viewFind').classList.add('hidden'); document.getElementById('viewFind').classList.add('hidden');
} }
// Listen for warnings to trigger the fallback UI. Errors should be caught // Listen for warnings to trigger the fallback UI. Errors should be caught
@ -3210,12 +3210,12 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
PDFView.page++; PDFView.page++;
}); });
document.querySelector('.zoomIn').addEventListener('click', document.getElementById('zoomIn').addEventListener('click',
function() { function() {
PDFView.zoomIn(); PDFView.zoomIn();
}); });
document.querySelector('.zoomOut').addEventListener('click', document.getElementById('zoomOut').addEventListener('click',
function() { function() {
PDFView.zoomOut(); PDFView.zoomOut();
}); });
@ -3260,22 +3260,22 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
PDFView.parseScale(this.value); PDFView.parseScale(this.value);
}); });
document.getElementById('first_page').addEventListener('click', document.getElementById('firstPage').addEventListener('click',
function() { function() {
PDFView.page = 1; PDFView.page = 1;
}); });
document.getElementById('last_page').addEventListener('click', document.getElementById('lastPage').addEventListener('click',
function() { function() {
PDFView.page = PDFView.pdfDocument.numPages; PDFView.page = PDFView.pdfDocument.numPages;
}); });
document.getElementById('page_rotate_ccw').addEventListener('click', document.getElementById('pageRotateCcw').addEventListener('click',
function() { function() {
PDFView.rotatePages(-90); PDFView.rotatePages(-90);
}); });
document.getElementById('page_rotate_cw').addEventListener('click', document.getElementById('pageRotateCw').addEventListener('click',
function() { function() {
PDFView.rotatePages(90); PDFView.rotatePages(90);
}); });
@ -3421,6 +3421,9 @@ window.addEventListener('localized', function localized(evt) {
}, true); }, true);
window.addEventListener('scalechange', function scalechange(evt) { window.addEventListener('scalechange', function scalechange(evt) {
document.getElementById('zoomOut').disabled = (evt.scale === MIN_SCALE);
document.getElementById('zoomIn').disabled = (evt.scale === MAX_SCALE);
var customScaleOption = document.getElementById('customScaleOption'); var customScaleOption = document.getElementById('customScaleOption');
customScaleOption.selected = false; customScaleOption.selected = false;
@ -3437,10 +3440,6 @@ window.addEventListener('scalechange', function scalechange(evt) {
customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%'; customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
customScaleOption.selected = true; customScaleOption.selected = true;
} }
document.getElementById('zoom_out').disabled = (evt.scale === MIN_SCALE);
document.getElementById('zoom_in').disabled = (evt.scale === MAX_SCALE);
updateViewarea(); updateViewarea();
}, true); }, true);