Merge pull request #4318 from dferer/improveAnnotationsDisplay
Improved annotations' display/behavior.
This commit is contained in:
commit
01b23439a9
@ -134,7 +134,7 @@ var Page = (function PageClosure() {
|
|||||||
}.bind(this));
|
}.bind(this));
|
||||||
return promise;
|
return promise;
|
||||||
},
|
},
|
||||||
getOperatorList: function Page_getOperatorList(handler) {
|
getOperatorList: function Page_getOperatorList(handler, intent) {
|
||||||
var self = this;
|
var self = this;
|
||||||
var promise = new LegacyPromise();
|
var promise = new LegacyPromise();
|
||||||
|
|
||||||
@ -169,11 +169,12 @@ var Page = (function PageClosure() {
|
|||||||
var contentStream = data[0];
|
var contentStream = data[0];
|
||||||
|
|
||||||
|
|
||||||
var opList = new OperatorList(handler, self.pageIndex);
|
var opList = new OperatorList(intent, handler, self.pageIndex);
|
||||||
|
|
||||||
handler.send('StartRenderPage', {
|
handler.send('StartRenderPage', {
|
||||||
transparency: partialEvaluator.hasBlendModes(self.resources),
|
transparency: partialEvaluator.hasBlendModes(self.resources),
|
||||||
pageIndex: self.pageIndex
|
pageIndex: self.pageIndex,
|
||||||
|
intent: intent
|
||||||
});
|
});
|
||||||
partialEvaluator.getOperatorList(contentStream, self.resources, opList);
|
partialEvaluator.getOperatorList(contentStream, self.resources, opList);
|
||||||
pageListPromise.resolve(opList);
|
pageListPromise.resolve(opList);
|
||||||
@ -191,7 +192,7 @@ var Page = (function PageClosure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var annotationsReadyPromise = Annotation.appendToOperatorList(
|
var annotationsReadyPromise = Annotation.appendToOperatorList(
|
||||||
annotations, pageOpList, pdfManager, partialEvaluator);
|
annotations, pageOpList, pdfManager, partialEvaluator, intent);
|
||||||
annotationsReadyPromise.then(function () {
|
annotationsReadyPromise.then(function () {
|
||||||
pageOpList.flush(true);
|
pageOpList.flush(true);
|
||||||
promise.resolve(pageOpList);
|
promise.resolve(pageOpList);
|
||||||
|
|||||||