Merge branch 'master' of git://github.com/mozilla/pdf.js.git into l10n

Conflicts:
	web/viewer.js
This commit is contained in:
Yury Delendik 2012-05-02 10:23:39 -05:00
commit d64c40ea4b
15 changed files with 1 additions and 4088 deletions

View file

@ -836,7 +836,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
var type = item.type;
var rect = viewport.convertToViewportRectangle(item.rect);
rect = PDFJS.Util.normalizeRect(rect);
image.src = kImageDirectory + type.toLowerCase() + '.svg';
image.src = kImageDirectory + 'annotation-' + type.toLowerCase() + '.svg';
image.alt = mozL10n.get('text_annotation_type', {type: type});
var content = document.createElement('div');
content.setAttribute('hidden', true);