Merge pull request #2233 from yurydelendik/fix-fit-page

Fixes fit-page and fullscreen
This commit is contained in:
Brendan Dahl 2012-10-15 10:03:30 -07:00
commit e0dc176d9b
2 changed files with 19 additions and 14 deletions

View File

@ -44,7 +44,7 @@ select {
#viewerContainer:-webkit-full-screen {
top: 0px;
border-top: 5px solid transparent;
border-top: 2px solid transparent;
background-color: #404040;
background-image: url(images/texture.png);
width: 100%;
@ -55,7 +55,7 @@ select {
#viewerContainer:-moz-full-screen {
top: 0px;
border-top: 5px solid transparent;
border-top: 2px solid transparent;
background-color: #404040;
background-image: url(images/texture.png);
width: 100%;
@ -64,17 +64,9 @@ select {
cursor: none;
}
:-webkit-full-screen .page:last-child {
margin-bottom: 40px;
}
:-moz-full-screen .page:last-child {
margin-bottom: 40px;
}
#viewerContainer:full-screen {
#viewerContainer:fullscreen {
top: 0px;
border-top: 5px solid transparent;
border-top: 2px solid transparent;
background-color: #404040;
background-image: url(images/texture.png);
width: 100%;
@ -83,6 +75,19 @@ select {
cursor: none;
}
:-webkit-full-screen .page {
margin-bottom: 100%;
}
:-moz-full-screen .page {
margin-bottom: 100%;
}
:fullscreen .page {
margin-bottom: 100%;
}
#viewerContainer.presentationControls {
cursor: default;
}
@ -213,7 +218,6 @@ html[dir='rtl'] #sidebarContent {
#viewerContainer {
overflow: auto;
box-shadow: inset 1px 0 0 hsla(0,0%,100%,.05);
padding-top: 30px;
position: absolute;
top: 32px;
right: 0;

View File

@ -24,6 +24,7 @@ var kUnknownScale = 0;
var kCacheSize = 20;
var kCssUnits = 96.0 / 72.0;
var kScrollbarPadding = 40;
var kVerticalPadding = 5;
var kMinScale = 0.25;
var kMaxScale = 4.0;
var kImageDirectory = './images/';
@ -719,7 +720,7 @@ var PDFView = {
var pageWidthScale = (container.clientWidth - kScrollbarPadding) /
currentPage.width * currentPage.scale / kCssUnits;
var pageHeightScale = (container.clientHeight - kScrollbarPadding) /
var pageHeightScale = (container.clientHeight - kVerticalPadding) /
currentPage.height * currentPage.scale / kCssUnits;
switch (value) {
case 'page-actual':