Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Xavier Fung 2012-08-02 11:54:55 +08:00
commit 85bdbe8bcf
3 changed files with 11 additions and 5 deletions

View File

@ -38,6 +38,7 @@ var Pattern = (function PatternClosure() {
// Both radial and axial shadings are handled by RadialAxial shading.
return new Shadings.RadialAxial(dict, matrix, xref, res);
default:
TODO('Unsupported shading type: ' + type);
return new Shadings.Dummy();
}
};
@ -174,7 +175,12 @@ Shadings.Dummy = (function DummyClosure() {
}
Dummy.fromIR = function Dummy_fromIR() {
return 'hotpink';
return {
type: 'Pattern',
getPattern: function Dummy_fromIR_getPattern() {
return 'hotpink';
}
};
};
Dummy.prototype = {

View File

@ -578,7 +578,7 @@ html[dir='rtl'] .dropdownToolbarButton {
margin:0;
padding:0;
border:none;
background: transparent;
background: rgba(0,0,0,0); /* Opera does not support 'transparent' <select> background */
}
.dropdownToolbarButton > select > option {

View File

@ -926,7 +926,6 @@ var PDFView = {
}
if ('page' in params) {
var pageNumber = (params.page | 0) || 1;
this.page = pageNumber;
if ('zoom' in params) {
var zoomArgs = params.zoom.split(','); // scale,left,top
// building destination array
@ -942,8 +941,9 @@ var PDFView = {
(zoomArgs[2] | 0), zoomArg];
var currentPage = this.pages[pageNumber - 1];
currentPage.scrollIntoView(dest);
} else
this.page = params.page; // simple page
} else {
this.page = pageNumber; // simple page
}
return;
}
} else if (/^\d+$/.test(hash)) // page number