Browse Source

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

Brendan Dahl 14 years ago
parent
commit
2caa09c7fc
  1. 12
      web/compatibility.js
  2. 8
      web/viewer.js

12
web/compatibility.js

@ -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 = {});
}
});
})();

8
web/viewer.js

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

Loading…
Cancel
Save