Merge remote-tracking branch 'upstream/master' into smaskscale

This commit is contained in:
Brendan Dahl 2011-12-18 17:31:51 -08:00
commit 2caa09c7fc
2 changed files with 20 additions and 0 deletions

View File

@ -205,3 +205,15 @@
});
})();
// HTMLElement dataset property
(function checkDatasetProperty() {
var div = document.createElement('div');
if ('dataset' in div)
return; // dataset property exists
Object.defineProperty(HTMLElement.prototype, 'dataset', {
get: function htmlElementDatasetGetter() {
// adding dataset field to the actual object
return (this.dataset = {});
}
});
})();

View File

@ -895,18 +895,26 @@ window.addEventListener('keydown', function keydown(evt) {
return; // ignoring if the 'controls' element is focused
curElement = curElement.parentNode;
}
var handled = false;
switch (evt.keyCode) {
case 61: // FF/Mac '='
case 107: // FF '+' and '='
case 187: // Chrome '+'
PDFView.zoomIn();
handled = true;
break;
case 109: // FF '-'
case 189: // Chrome '-'
PDFView.zoomOut();
handled = true;
break;
case 48: // '0'
PDFView.setScale(kDefaultScale, true);
handled = true;
break;
}
if (handled) {
evt.preventDefault();
}
});