hash
stringlengths 40
40
| date
stringdate 2018-01-15 01:43:19
2024-04-02 15:49:23
| author
stringclasses 18
values | commit_message
stringlengths 10
72
| is_merge
bool 1
class | git_diff
stringlengths 132
6.87M
| type
stringclasses 11
values | masked_commit_message
stringlengths 4
58
|
|---|---|---|---|---|---|---|---|
d21062022678206ad15bfdbc40b7f25a49993dc6
|
2018-04-27 15:57:20
|
CRIMX
|
refactor(content): wrap buttons for menu bar icons
| false
|
diff --git a/src/content/components/MenuBar/_style.scss b/src/content/components/MenuBar/_style.scss
index 1b8cd692b..7338164b6 100644
--- a/src/content/components/MenuBar/_style.scss
+++ b/src/content/components/MenuBar/_style.scss
@@ -3,11 +3,37 @@
align-items: center;
position: relative;
height: 30px;
- padding-left: 6px;
font-size: 14px;
background-color: rgb(92, 175, 158);
}
+.panel-MenuBar_Btn {
+ width: 30px;
+ height: 30px;
+ padding: 8px;
+ border: none;
+ background: transparent;
+ cursor: pointer;
+ user-select: none;
+ transition: background 0.2s;
+
+ &:hover {
+ outline: none;
+ background: rgba(0, 0, 0, 0.05);
+ }
+
+ &:disabled {
+ svg {
+ fill: #80d0bf;
+ }
+
+ &:hover {
+ cursor: unset;
+ background: transparent;
+ }
+ }
+}
+
.panel-MenuBar_DragArea {
flex: 1.5;
align-self: stretch;
@@ -31,12 +57,17 @@
}
%panel-MenuBar_Icon {
- width: 30px;
- height: 30px;
- padding: 8px;
+ width: 100%;
+ height: 100%;
fill: #fff;
- cursor: pointer;
- user-select: none;
+}
+
+.panel-MenuBar_IconBack {
+ @extend %panel-MenuBar_Icon;
+}
+
+.panel-MenuBar_IconNext {
+ @extend %panel-MenuBar_Icon;
}
.panel-MenuBar_IconSearch {
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index 5ba386953..94d67cc91 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -1,12 +1,12 @@
import './_style.scss'
-import React, { KeyboardEvent, MouseEvent } from 'react'
+import React from 'react'
import { translate } from 'react-i18next'
import { message } from '@/_helpers/browser-api'
import { TranslationFunction } from 'i18next'
import { MsgType, MsgOpenUrl, MsgSelection } from '@/typings/message'
export interface MenuBarDispatchers {
- readonly handleDragStart: (e: MouseEvent<HTMLDivElement>) => any
+ readonly handleDragStart: (e: React.MouseEvent<HTMLDivElement>) => any
readonly searchText: ({ info }: { info: string }) => any
readonly addToNotebook: () => any
readonly removeFromNotebook: () => any
@@ -80,19 +80,19 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
this.setState({ text: e.currentTarget.value })
}
- handleSearchBoxKeyUp = (e: KeyboardEvent<HTMLInputElement>) => {
+ handleSearchBoxKeyUp = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (this.state.text && e.key === 'Enter') {
this.props.searchText({ info: this.state.text })
}
}
- handleIconSearchClick = (e: MouseEvent<SVGElement>) => {
+ handleIconSearchClick = (e: React.MouseEvent<SVGElement>) => {
if (this.state.text) {
this.props.searchText({ info: this.state.text })
}
}
- handleIconFavClick = (e: MouseEvent<SVGElement>) => {
+ handleIconFavClick = (e: React.MouseEvent<SVGElement>) => {
switch (e.button) {
case 0: // main button
if (this.props.isFav) {
@@ -113,6 +113,10 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
}
}
+ blurAfterClick (e: React.MouseEvent<HTMLButtonElement>) {
+ e.currentTarget.blur()
+ }
+
componentDidMount () {
const input = this.inputRef.current
if (input) {
@@ -133,6 +137,24 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
return (
<header className='panel-MenuBar'>
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconBack'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 477.175 477.175'
+ >
+ <path d='M145.188 238.575l215.5-215.5c5.3-5.3 5.3-13.8 0-19.1s-13.8-5.3-19.1 0l-225.1 225.1c-5.3 5.3-5.3 13.8 0 19.1l225.1 225c2.6 2.6 6.1 4 9.5 4s6.9-1.3 9.5-4c5.3-5.3 5.3-13.8 0-19.1l-215.4-215.5z'/>
+ </svg>
+ </button>
+
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconNext'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 477.175 477.175'
+ >
+ <path d='M360.731 229.075l-225.1-225.1c-5.3-5.3-13.8-5.3-19.1 0s-5.3 13.8 0 19.1l215.5 215.5-215.5 215.5c-5.3 5.3-5.3 13.8 0 19.1 2.6 2.6 6.1 4 9.5 4 3.4 0 6.9-1.3 9.5-4l225.1-225.1c5.3-5.2 5.3-13.8.1-19z'/>
+ </svg>
+ </button>
+
<input type='text'
className='panel-MenuBar_SearchBox'
ref={this.inputRef}
@@ -141,72 +163,86 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
value={this.state.text}
/>
- <svg
- className='panel-MenuBar_IconSearch'
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 52.966 52.966'
- onClick={this.handleIconSearchClick}
- >
- <title>{t('tipSearchText')}</title>
- <path d='M51.704 51.273L36.844 35.82c3.79-3.8 6.14-9.04 6.14-14.82 0-11.58-9.42-21-21-21s-21 9.42-21 21 9.42 21 21 21c5.082 0 9.747-1.817 13.383-4.832l14.895 15.49c.196.206.458.308.72.308.25 0 .5-.093.694-.28.398-.382.41-1.015.028-1.413zM21.984 40c-10.478 0-19-8.523-19-19s8.522-19 19-19 19 8.523 19 19-8.525 19-19 19z'/>
- </svg>
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconSearch'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 52.966 52.966'
+ onClick={this.handleIconSearchClick}
+ >
+ <title>{t('tipSearchText')}</title>
+ <path d='M51.704 51.273L36.844 35.82c3.79-3.8 6.14-9.04 6.14-14.82 0-11.58-9.42-21-21-21s-21 9.42-21 21 9.42 21 21 21c5.082 0 9.747-1.817 13.383-4.832l14.895 15.49c.196.206.458.308.72.308.25 0 .5-.093.694-.28.398-.382.41-1.015.028-1.413zM21.984 40c-10.478 0-19-8.523-19-19s8.522-19 19-19 19 8.523 19 19-8.525 19-19 19z'/>
+ </svg>
+ </button>
<div className='panel-MenuBar_DragArea' onMouseDown={this.props.handleDragStart} />
- <svg
- className='panel-MenuBar_IconSettings'
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 612 612'
- onClick={this.openSettings}
- >
- <title>{t('tipOpenSettings')}</title>
- <path d='M0 97.92v24.48h612V97.92H0zm0 220.32h612v-24.48H0v24.48zm0 195.84h612V489.6H0v24.48z'/>
- </svg>
-
- <svg
- className={`panel-MenuBar_IconFav ${isFav ? 'isActive' : ''}`}
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'
- onClick={this.handleIconFavClick}
- >
- <title>{t('tipAddToNotebook')}</title>
- <path d='M23.6 2c-3.363 0-6.258 2.736-7.599 5.594-1.342-2.858-4.237-5.594-7.601-5.594-4.637 0-8.4 3.764-8.4 8.401 0 9.433 9.516 11.906 16.001 21.232 6.13-9.268 15.999-12.1 15.999-21.232 0-4.637-3.763-8.401-8.4-8.401z'></path>
- </svg>
-
- <svg
- className='panel-MenuBar_IconHistory'
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'
- onClick={this.openHistory}
- >
- <title>{t('tipOpenHistory')}</title>
- <path d='M34.688 3.315c-15.887 0-28.812 12.924-28.81 28.73-.012.25-.157 4.434 1.034 8.94l-3.88-2.262c-.965-.56-2.193-.235-2.76.727-.557.96-.233 2.195.728 2.755l9.095 5.302c.02.01.038.013.056.022.1.05.2.09.31.12.07.02.14.05.21.07.09.02.176.02.265.03.06.003.124.022.186.022.036 0 .07-.01.105-.015.034 0 .063.007.097.004.05-.003.097-.024.146-.032.097-.017.19-.038.28-.068.08-.028.157-.06.23-.095.086-.04.165-.085.24-.137.074-.046.14-.096.206-.15.07-.06.135-.125.198-.195.06-.067.11-.135.16-.207.026-.04.062-.07.086-.11.017-.03.017-.067.032-.1.03-.053.07-.1.096-.16l3.62-8.96c.417-1.03-.08-2.205-1.112-2.622-1.033-.413-2.207.083-2.624 1.115l-1.86 4.6c-1.24-4.145-1.1-8.406-1.093-8.523C9.92 18.455 21.04 7.34 34.7 7.34c13.663 0 24.78 11.116 24.78 24.78S48.357 56.9 34.694 56.9c-1.114 0-2.016.902-2.016 2.015s.9 2.02 2.012 2.02c15.89 0 28.81-12.925 28.81-28.81 0-15.89-12.923-28.814-28.81-28.814z'/>
- <path d='M33.916 36.002c.203.084.417.114.634.13.045.002.09.026.134.026.236 0 .465-.054.684-.134.06-.022.118-.054.177-.083.167-.08.32-.18.463-.3.03-.023.072-.033.103-.07L48.7 22.98c.788-.79.788-2.064 0-2.852-.787-.788-2.062-.788-2.85 0l-11.633 11.63-10.44-4.37c-1.032-.432-2.208.052-2.64 1.08-.43 1.027.056 2.208 1.08 2.638L33.907 36c.002 0 .006 0 .01.002z'/>
- </svg>
-
- <svg
- className='panel-MenuBar_IconShare'
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 58.999 58.999'
- onClick={shareImg}
- >
- <title>{t('tipShareImg')}</title>
- <path d='M19.48 12.02c.255 0 .51-.1.706-.294L28.5 3.413V39c0 .552.446 1 1 1s1-.448 1-1V3.412l8.27 8.272c.392.39 1.024.39 1.415 0s.39-1.023 0-1.414L30.207.294C30.115.2 30.004.127 29.88.076c-.244-.1-.52-.1-.764 0-.123.05-.234.125-.326.217l-10.018 10.02c-.39.39-.39 1.022 0 1.413.195.196.45.293.707.293z'/>
- <path d='M36.5 16c-.554 0-1 .446-1 1s.446 1 1 1h13v39h-40V18h13c.552 0 1-.448 1-1s-.448-1-1-1h-15v43h44V16h-15z'/>
- </svg>
-
- <svg
- className={`panel-MenuBar_IconPin ${isPinned ? 'isActive' : ''}`}
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 53.011 53.011'
- onClick={pinPanel}
- >
- <title>{t('tipPinPanel')}</title>
- <path d='M52.963 21.297c-.068-.33-.297-.603-.61-.727-8.573-3.416-16.172-.665-18.36.288L19.113 8.2C19.634 3.632 17.17.508 17.06.372c-.18-.22-.442-.356-.725-.372-.282-.006-.56.09-.76.292L.32 15.546c-.202.2-.308.48-.29.765.015.285.152.55.375.727 2.775 2.202 6.35 2.167 7.726 2.055l12.722 14.953c-.868 2.23-3.52 10.27-.307 18.337.124.313.397.54.727.61.067.013.135.02.202.02.263 0 .518-.104.707-.293l14.57-14.57 13.57 13.57c.196.194.452.292.708.292s.512-.098.707-.293c.39-.392.39-1.024 0-1.415l-13.57-13.57 14.527-14.528c.237-.238.34-.58.27-.91zm-17.65 15.458L21.89 50.18c-2.437-8.005.993-15.827 1.03-15.91.158-.352.1-.764-.15-1.058L9.31 17.39c-.19-.225-.473-.352-.764-.352-.05 0-.103.004-.154.013-.036.007-3.173.473-5.794-.954l13.5-13.5c.604 1.156 1.39 3.26.964 5.848-.058.346.07.697.338.924l15.785 13.43c.31.262.748.31 1.105.128.077-.04 7.378-3.695 15.87-1.017L35.313 36.754z'/>
- </svg>
-
- <svg
- className='panel-MenuBar_IconClose'
- width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 31.112 31.112'
- onClick={this.closePanel}
- >
- <title>{t('tipClosePanel')}</title>
- <path d='M31.112 1.414L29.698 0 15.556 14.142 1.414 0 0 1.414l14.142 14.142L0 29.698l1.414 1.414L15.556 16.97l14.142 14.142 1.414-1.414L16.97 15.556'/>
- </svg>
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconSettings'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 612 612'
+ onClick={this.openSettings}
+ >
+ <title>{t('tipOpenSettings')}</title>
+ <path d='M0 97.92v24.48h612V97.92H0zm0 220.32h612v-24.48H0v24.48zm0 195.84h612V489.6H0v24.48z'/>
+ </svg>
+ </button>
+
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className={`panel-MenuBar_IconFav ${isFav ? 'isActive' : ''}`}
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'
+ onClick={this.handleIconFavClick}
+ >
+ <title>{t('tipAddToNotebook')}</title>
+ <path d='M23.6 2c-3.363 0-6.258 2.736-7.599 5.594-1.342-2.858-4.237-5.594-7.601-5.594-4.637 0-8.4 3.764-8.4 8.401 0 9.433 9.516 11.906 16.001 21.232 6.13-9.268 15.999-12.1 15.999-21.232 0-4.637-3.763-8.401-8.4-8.401z'></path>
+ </svg>
+ </button>
+
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconHistory'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'
+ onClick={this.openHistory}
+ >
+ <title>{t('tipOpenHistory')}</title>
+ <path d='M34.688 3.315c-15.887 0-28.812 12.924-28.81 28.73-.012.25-.157 4.434 1.034 8.94l-3.88-2.262c-.965-.56-2.193-.235-2.76.727-.557.96-.233 2.195.728 2.755l9.095 5.302c.02.01.038.013.056.022.1.05.2.09.31.12.07.02.14.05.21.07.09.02.176.02.265.03.06.003.124.022.186.022.036 0 .07-.01.105-.015.034 0 .063.007.097.004.05-.003.097-.024.146-.032.097-.017.19-.038.28-.068.08-.028.157-.06.23-.095.086-.04.165-.085.24-.137.074-.046.14-.096.206-.15.07-.06.135-.125.198-.195.06-.067.11-.135.16-.207.026-.04.062-.07.086-.11.017-.03.017-.067.032-.1.03-.053.07-.1.096-.16l3.62-8.96c.417-1.03-.08-2.205-1.112-2.622-1.033-.413-2.207.083-2.624 1.115l-1.86 4.6c-1.24-4.145-1.1-8.406-1.093-8.523C9.92 18.455 21.04 7.34 34.7 7.34c13.663 0 24.78 11.116 24.78 24.78S48.357 56.9 34.694 56.9c-1.114 0-2.016.902-2.016 2.015s.9 2.02 2.012 2.02c15.89 0 28.81-12.925 28.81-28.81 0-15.89-12.923-28.814-28.81-28.814z'/>
+ <path d='M33.916 36.002c.203.084.417.114.634.13.045.002.09.026.134.026.236 0 .465-.054.684-.134.06-.022.118-.054.177-.083.167-.08.32-.18.463-.3.03-.023.072-.033.103-.07L48.7 22.98c.788-.79.788-2.064 0-2.852-.787-.788-2.062-.788-2.85 0l-11.633 11.63-10.44-4.37c-1.032-.432-2.208.052-2.64 1.08-.43 1.027.056 2.208 1.08 2.638L33.907 36c.002 0 .006 0 .01.002z'/>
+ </svg>
+ </button>
+
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconShare'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 58.999 58.999'
+ onClick={shareImg}
+ >
+ <title>{t('tipShareImg')}</title>
+ <path d='M19.48 12.02c.255 0 .51-.1.706-.294L28.5 3.413V39c0 .552.446 1 1 1s1-.448 1-1V3.412l8.27 8.272c.392.39 1.024.39 1.415 0s.39-1.023 0-1.414L30.207.294C30.115.2 30.004.127 29.88.076c-.244-.1-.52-.1-.764 0-.123.05-.234.125-.326.217l-10.018 10.02c-.39.39-.39 1.022 0 1.413.195.196.45.293.707.293z'/>
+ <path d='M36.5 16c-.554 0-1 .446-1 1s.446 1 1 1h13v39h-40V18h13c.552 0 1-.448 1-1s-.448-1-1-1h-15v43h44V16h-15z'/>
+ </svg>
+ </button>
+
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className={`panel-MenuBar_IconPin ${isPinned ? 'isActive' : ''}`}
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 53.011 53.011'
+ onClick={pinPanel}
+ >
+ <title>{t('tipPinPanel')}</title>
+ <path d='M52.963 21.297c-.068-.33-.297-.603-.61-.727-8.573-3.416-16.172-.665-18.36.288L19.113 8.2C19.634 3.632 17.17.508 17.06.372c-.18-.22-.442-.356-.725-.372-.282-.006-.56.09-.76.292L.32 15.546c-.202.2-.308.48-.29.765.015.285.152.55.375.727 2.775 2.202 6.35 2.167 7.726 2.055l12.722 14.953c-.868 2.23-3.52 10.27-.307 18.337.124.313.397.54.727.61.067.013.135.02.202.02.263 0 .518-.104.707-.293l14.57-14.57 13.57 13.57c.196.194.452.292.708.292s.512-.098.707-.293c.39-.392.39-1.024 0-1.415l-13.57-13.57 14.527-14.528c.237-.238.34-.58.27-.91zm-17.65 15.458L21.89 50.18c-2.437-8.005.993-15.827 1.03-15.91.158-.352.1-.764-.15-1.058L9.31 17.39c-.19-.225-.473-.352-.764-.352-.05 0-.103.004-.154.013-.036.007-3.173.473-5.794-.954l13.5-13.5c.604 1.156 1.39 3.26.964 5.848-.058.346.07.697.338.924l15.785 13.43c.31.262.748.31 1.105.128.077-.04 7.378-3.695 15.87-1.017L35.313 36.754z'/>
+ </svg>
+ </button>
+
+ <button className='panel-MenuBar_Btn' onClick={this.blurAfterClick}>
+ <svg
+ className='panel-MenuBar_IconClose'
+ width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 31.112 31.112'
+ onClick={this.closePanel}
+ >
+ <title>{t('tipClosePanel')}</title>
+ <path d='M31.112 1.414L29.698 0 15.556 14.142 1.414 0 0 1.414l14.142 14.142L0 29.698l1.414 1.414L15.556 16.97l14.142 14.142 1.414-1.414L16.97 15.556'/>
+ </svg>
+ </button>
</header>
)
}
|
refactor
|
wrap buttons for menu bar icons
|
164ba5d05cbd830d4b5eb7fe122c344c9815e744
|
2018-05-21 16:04:58
|
CRIMX
|
style(dicts): rename macmillan entry
| false
|
diff --git a/src/components/dictionaries/macmillan/engine.js b/src/components/dictionaries/macmillan/engine.ts
similarity index 100%
rename from src/components/dictionaries/macmillan/engine.js
rename to src/components/dictionaries/macmillan/engine.ts
|
style
|
rename macmillan entry
|
e9dc335cc6d59533739a7c45395edfdce21ec6cc
|
2020-06-04 09:35:46
|
crimx
|
refactor(sync-services): add anki input styles
| false
|
diff --git a/src/background/sync-manager/services/ankiconnect/index.ts b/src/background/sync-manager/services/ankiconnect/index.ts
index b748f6eaf..f0a8ef6c0 100644
--- a/src/background/sync-manager/services/ankiconnect/index.ts
+++ b/src/background/sync-manager/services/ankiconnect/index.ts
@@ -381,52 +381,56 @@ function cardText(front: boolean, nf: string[]) {
function cardCss() {
return `.card {
-font-family: arial;
-font-size: 20px;
-text-align: center;
-color: #333;
-background-color: white;
+ font-family: arial;
+ font-size: 20px;
+ text-align: center;
+ color: #333;
+ background-color: white;
}
a {
-color: #5caf9e;
+ color: #5caf9e;
+}
+
+input {
+ border: 1px solid #eee;
}
section {
-margin: 1em 0;
+ margin: 1em 0;
}
.trans {
-border: 1px solid #eee;
-padding: 0.5em;
+ border: 1px solid #eee;
+ padding: 0.5em;
}
.trans_title {
-display: block;
-font-size: 0.9em;
-font-weight: bold;
+ display: block;
+ font-size: 0.9em;
+ font-weight: bold;
}
.trans_content {
-margin-bottom: 0.5em;
+ margin-bottom: 0.5em;
}
.cloze {
-font-weight: bold;
-color: #f9690e;
+ font-weight: bold;
+ color: #f9690e;
}
.tsource {
-position: relative;
-font-size: .8em;
+ position: relative;
+ font-size: .8em;
}
.tsource img {
-height: .7em;
+ height: .7em;
}
.tsource a {
-text-decoration: none;
+ text-decoration: none;
}
.typeGood {
|
refactor
|
add anki input styles
|
52bbecf847b8a77dc2cb17e4777266e1299b79eb
|
2019-09-28 14:49:32
|
crimx
|
fix(panel): remove Firefox button inner border
| false
|
diff --git a/src/content/components/MenuBar/FloatBox.scss b/src/content/components/MenuBar/FloatBox.scss
index 7c4a2d8bb..f54351727 100644
--- a/src/content/components/MenuBar/FloatBox.scss
+++ b/src/content/components/MenuBar/FloatBox.scss
@@ -44,6 +44,10 @@
&:focus {
background: rgba(215, 214, 214, 0.25);
}
+
+ &::-moz-focus-inner {
+ border: 0;
+ }
}
.menuBar-FloatBoxEntry {
|
fix
|
remove Firefox button inner border
|
f0d6f534032326b036c2a94362f24c01301c5747
|
2021-05-31 21:04:32
|
crimx
|
refactor: add safari mac app
| false
|
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/Info.plist b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/Info.plist
new file mode 100644
index 00000000..6751afa4
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/Info.plist
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleDisplayName</key>
+ <string>Saladict - Pop-up Dictionary and Page Translator Extension</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+ <key>NSExtension</key>
+ <dict>
+ <key>NSExtensionPointIdentifier</key>
+ <string>com.apple.Safari.web-extension</string>
+ <key>NSExtensionPrincipalClass</key>
+ <string>$(PRODUCT_MODULE_NAME).SafariWebExtensionHandler</string>
+ </dict>
+</dict>
+</plist>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/SafariWebExtensionHandler.swift b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/SafariWebExtensionHandler.swift
new file mode 100644
index 00000000..3d926478
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/SafariWebExtensionHandler.swift
@@ -0,0 +1,26 @@
+//
+// SafariWebExtensionHandler.swift
+// Saladict - Pop-up Dictionary and Page Translator Extension
+//
+// Created by Jack Wong on 2021/5/31.
+//
+
+import SafariServices
+import os.log
+
+let SFExtensionMessageKey = "message"
+
+class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
+
+ func beginRequest(with context: NSExtensionContext) {
+ let item = context.inputItems[0] as! NSExtensionItem
+ let message = item.userInfo?[SFExtensionMessageKey]
+ os_log(.default, "Received message from browser.runtime.sendNativeMessage: %@", message as! CVarArg)
+
+ let response = NSExtensionItem()
+ response.userInfo = [ SFExtensionMessageKey: [ "Response to": message ] ]
+
+ context.completeRequest(returningItems: [response], completionHandler: nil)
+ }
+
+}
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements
new file mode 100644
index 00000000..f2ef3ae0
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator Extension/Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.app-sandbox</key>
+ <true/>
+ <key>com.apple.security.files.user-selected.read-only</key>
+ <true/>
+</dict>
+</plist>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.pbxproj b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..2f305bb9
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.pbxproj
@@ -0,0 +1,538 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 50;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 774E83BB266526B4006B5030 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 774E83BA266526B4006B5030 /* AppDelegate.swift */; };
+ 774E83BE266526B4006B5030 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 774E83BC266526B4006B5030 /* Main.storyboard */; };
+ 774E83C0266526B4006B5030 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 774E83BF266526B4006B5030 /* ViewController.swift */; };
+ 774E83C2266526B7006B5030 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 774E83C1266526B7006B5030 /* Assets.xcassets */; };
+ 774E83C9266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 774E83C8266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+ 774E83CE266526B7006B5030 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 774E83CD266526B7006B5030 /* Cocoa.framework */; };
+ 774E83D1266526B7006B5030 /* SafariWebExtensionHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 774E83D0266526B7006B5030 /* SafariWebExtensionHandler.swift */; };
+ 774E83E8266526B8006B5030 /* popup.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83DE266526B8006B5030 /* popup.html */; };
+ 774E83E9266526B8006B5030 /* word-editor.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83DF266526B8006B5030 /* word-editor.html */; };
+ 774E83EA266526B8006B5030 /* notebook.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E0266526B8006B5030 /* notebook.html */; };
+ 774E83EB266526B8006B5030 /* quick-search.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E1266526B8006B5030 /* quick-search.html */; };
+ 774E83EC266526B8006B5030 /* history.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E2266526B8006B5030 /* history.html */; };
+ 774E83ED266526B8006B5030 /* manifest.json in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E3266526B8006B5030 /* manifest.json */; };
+ 774E83EE266526B8006B5030 /* options.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E4266526B8006B5030 /* options.html */; };
+ 774E83EF266526B8006B5030 /* _locales in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E5266526B8006B5030 /* _locales */; };
+ 774E83F0266526B8006B5030 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E6266526B8006B5030 /* assets */; };
+ 774E83F1266526B8006B5030 /* audio-control.html in Resources */ = {isa = PBXBuildFile; fileRef = 774E83E7266526B8006B5030 /* audio-control.html */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+ 774E83CA266526B7006B5030 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 774E83AE266526B4006B5030 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 774E83C7266526B7006B5030;
+ remoteInfo = "Saladict - Pop-up Dictionary and Page Translator Extension";
+ };
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ 774E83D9266526B7006B5030 /* Embed App Extensions */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 13;
+ files = (
+ 774E83C9266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension.appex in Embed App Extensions */,
+ );
+ name = "Embed App Extensions";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ 774E83B6266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Saladict - Pop-up Dictionary and Page Translator.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 774E83B9266526B4006B5030 /* Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements"; sourceTree = "<group>"; };
+ 774E83BA266526B4006B5030 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+ 774E83BD266526B4006B5030 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+ 774E83BF266526B4006B5030 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+ 774E83C1266526B7006B5030 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+ 774E83C3266526B7006B5030 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 774E83C8266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "Saladict - Pop-up Dictionary and Page Translator Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 774E83CD266526B7006B5030 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+ 774E83D0266526B7006B5030 /* SafariWebExtensionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariWebExtensionHandler.swift; sourceTree = "<group>"; };
+ 774E83D2266526B7006B5030 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 774E83D3266526B7006B5030 /* Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements"; sourceTree = "<group>"; };
+ 774E83DE266526B8006B5030 /* popup.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = popup.html; path = ../../../build/safari/popup.html; sourceTree = "<group>"; };
+ 774E83DF266526B8006B5030 /* word-editor.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "word-editor.html"; path = "../../../build/safari/word-editor.html"; sourceTree = "<group>"; };
+ 774E83E0266526B8006B5030 /* notebook.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = notebook.html; path = ../../../build/safari/notebook.html; sourceTree = "<group>"; };
+ 774E83E1266526B8006B5030 /* quick-search.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "quick-search.html"; path = "../../../build/safari/quick-search.html"; sourceTree = "<group>"; };
+ 774E83E2266526B8006B5030 /* history.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = history.html; path = ../../../build/safari/history.html; sourceTree = "<group>"; };
+ 774E83E3266526B8006B5030 /* manifest.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = manifest.json; path = ../../../build/safari/manifest.json; sourceTree = "<group>"; };
+ 774E83E4266526B8006B5030 /* options.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = options.html; path = ../../../build/safari/options.html; sourceTree = "<group>"; };
+ 774E83E5266526B8006B5030 /* _locales */ = {isa = PBXFileReference; lastKnownFileType = folder; name = _locales; path = ../../../build/safari/_locales; sourceTree = "<group>"; };
+ 774E83E6266526B8006B5030 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = ../../../build/safari/assets; sourceTree = "<group>"; };
+ 774E83E7266526B8006B5030 /* audio-control.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "audio-control.html"; path = "../../../build/safari/audio-control.html"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 774E83B3266526B4006B5030 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 774E83C5266526B7006B5030 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 774E83CE266526B7006B5030 /* Cocoa.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 774E83AD266526B4006B5030 = {
+ isa = PBXGroup;
+ children = (
+ 774E83B8266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator */,
+ 774E83CF266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension */,
+ 774E83CC266526B7006B5030 /* Frameworks */,
+ 774E83B7266526B4006B5030 /* Products */,
+ );
+ sourceTree = "<group>";
+ };
+ 774E83B7266526B4006B5030 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 774E83B6266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator.app */,
+ 774E83C8266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension.appex */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 774E83B8266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator */ = {
+ isa = PBXGroup;
+ children = (
+ 774E83B9266526B4006B5030 /* Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements */,
+ 774E83BA266526B4006B5030 /* AppDelegate.swift */,
+ 774E83BC266526B4006B5030 /* Main.storyboard */,
+ 774E83BF266526B4006B5030 /* ViewController.swift */,
+ 774E83C1266526B7006B5030 /* Assets.xcassets */,
+ 774E83C3266526B7006B5030 /* Info.plist */,
+ );
+ path = "Saladict - Pop-up Dictionary and Page Translator";
+ sourceTree = "<group>";
+ };
+ 774E83CC266526B7006B5030 /* Frameworks */ = {
+ isa = PBXGroup;
+ children = (
+ 774E83CD266526B7006B5030 /* Cocoa.framework */,
+ );
+ name = Frameworks;
+ sourceTree = "<group>";
+ };
+ 774E83CF266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension */ = {
+ isa = PBXGroup;
+ children = (
+ 774E83DD266526B8006B5030 /* Resources */,
+ 774E83D0266526B7006B5030 /* SafariWebExtensionHandler.swift */,
+ 774E83D2266526B7006B5030 /* Info.plist */,
+ 774E83D3266526B7006B5030 /* Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements */,
+ );
+ path = "Saladict - Pop-up Dictionary and Page Translator Extension";
+ sourceTree = "<group>";
+ };
+ 774E83DD266526B8006B5030 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ 774E83DE266526B8006B5030 /* popup.html */,
+ 774E83DF266526B8006B5030 /* word-editor.html */,
+ 774E83E0266526B8006B5030 /* notebook.html */,
+ 774E83E1266526B8006B5030 /* quick-search.html */,
+ 774E83E2266526B8006B5030 /* history.html */,
+ 774E83E3266526B8006B5030 /* manifest.json */,
+ 774E83E4266526B8006B5030 /* options.html */,
+ 774E83E5266526B8006B5030 /* _locales */,
+ 774E83E6266526B8006B5030 /* assets */,
+ 774E83E7266526B8006B5030 /* audio-control.html */,
+ );
+ name = Resources;
+ path = "Saladict - Pop-up Dictionary and Page Translator Extension";
+ sourceTree = SOURCE_ROOT;
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 774E83B5266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 774E83DA266526B7006B5030 /* Build configuration list for PBXNativeTarget "Saladict - Pop-up Dictionary and Page Translator" */;
+ buildPhases = (
+ 774E83B2266526B4006B5030 /* Sources */,
+ 774E83B3266526B4006B5030 /* Frameworks */,
+ 774E83B4266526B4006B5030 /* Resources */,
+ 774E83D9266526B7006B5030 /* Embed App Extensions */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ 774E83CB266526B7006B5030 /* PBXTargetDependency */,
+ );
+ name = "Saladict - Pop-up Dictionary and Page Translator";
+ productName = "Saladict - Pop-up Dictionary and Page Translator";
+ productReference = 774E83B6266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator.app */;
+ productType = "com.apple.product-type.application";
+ };
+ 774E83C7266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 774E83D6266526B7006B5030 /* Build configuration list for PBXNativeTarget "Saladict - Pop-up Dictionary and Page Translator Extension" */;
+ buildPhases = (
+ 774E83C4266526B7006B5030 /* Sources */,
+ 774E83C5266526B7006B5030 /* Frameworks */,
+ 774E83C6266526B7006B5030 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = "Saladict - Pop-up Dictionary and Page Translator Extension";
+ productName = "Saladict - Pop-up Dictionary and Page Translator Extension";
+ productReference = 774E83C8266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension.appex */;
+ productType = "com.apple.product-type.app-extension";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 774E83AE266526B4006B5030 /* Project object */ = {
+ isa = PBXProject;
+ attributes = {
+ LastSwiftUpdateCheck = 1240;
+ LastUpgradeCheck = 1240;
+ TargetAttributes = {
+ 774E83B5266526B4006B5030 = {
+ CreatedOnToolsVersion = 12.4;
+ };
+ 774E83C7266526B7006B5030 = {
+ CreatedOnToolsVersion = 12.4;
+ };
+ };
+ };
+ buildConfigurationList = 774E83B1266526B4006B5030 /* Build configuration list for PBXProject "Saladict - Pop-up Dictionary and Page Translator" */;
+ compatibilityVersion = "Xcode 9.3";
+ developmentRegion = en;
+ hasScannedForEncodings = 0;
+ knownRegions = (
+ en,
+ Base,
+ );
+ mainGroup = 774E83AD266526B4006B5030;
+ productRefGroup = 774E83B7266526B4006B5030 /* Products */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 774E83B5266526B4006B5030 /* Saladict - Pop-up Dictionary and Page Translator */,
+ 774E83C7266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 774E83B4266526B4006B5030 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 774E83C2266526B7006B5030 /* Assets.xcassets in Resources */,
+ 774E83BE266526B4006B5030 /* Main.storyboard in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 774E83C6266526B7006B5030 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 774E83EE266526B8006B5030 /* options.html in Resources */,
+ 774E83EB266526B8006B5030 /* quick-search.html in Resources */,
+ 774E83EF266526B8006B5030 /* _locales in Resources */,
+ 774E83F0266526B8006B5030 /* assets in Resources */,
+ 774E83EC266526B8006B5030 /* history.html in Resources */,
+ 774E83F1266526B8006B5030 /* audio-control.html in Resources */,
+ 774E83E8266526B8006B5030 /* popup.html in Resources */,
+ 774E83E9266526B8006B5030 /* word-editor.html in Resources */,
+ 774E83ED266526B8006B5030 /* manifest.json in Resources */,
+ 774E83EA266526B8006B5030 /* notebook.html in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 774E83B2266526B4006B5030 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 774E83C0266526B4006B5030 /* ViewController.swift in Sources */,
+ 774E83BB266526B4006B5030 /* AppDelegate.swift in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ 774E83C4266526B7006B5030 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 774E83D1266526B7006B5030 /* SafariWebExtensionHandler.swift in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+ 774E83CB266526B7006B5030 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 774E83C7266526B7006B5030 /* Saladict - Pop-up Dictionary and Page Translator Extension */;
+ targetProxy = 774E83CA266526B7006B5030 /* PBXContainerItemProxy */;
+ };
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+ 774E83BC266526B4006B5030 /* Main.storyboard */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 774E83BD266526B4006B5030 /* Base */,
+ );
+ name = Main.storyboard;
+ sourceTree = "<group>";
+ };
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+ 774E83D4266526B7006B5030 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = dwarf;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.15;
+ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+ MTL_FAST_MATH = YES;
+ ONLY_ACTIVE_ARCH = YES;
+ SDKROOT = macosx;
+ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ };
+ name = Debug;
+ };
+ 774E83D5266526B7006B5030 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_NONNULL = YES;
+ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+ CLANG_CXX_LIBRARY = "libc++";
+ CLANG_ENABLE_MODULES = YES;
+ CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_ENABLE_OBJC_WEAK = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+ CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ COPY_PHASE_STRIP = NO;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ ENABLE_NS_ASSERTIONS = NO;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ GCC_C_LANGUAGE_STANDARD = gnu11;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.15;
+ MTL_ENABLE_DEBUG_INFO = NO;
+ MTL_FAST_MATH = YES;
+ SDKROOT = macosx;
+ SWIFT_COMPILATION_MODE = wholemodule;
+ SWIFT_OPTIMIZATION_LEVEL = "-O";
+ };
+ name = Release;
+ };
+ 774E83D7266526B7006B5030 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_ENTITLEMENTS = "Saladict - Pop-up Dictionary and Page Translator Extension/Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements";
+ CODE_SIGN_STYLE = Automatic;
+ INFOPLIST_FILE = "Saladict - Pop-up Dictionary and Page Translator Extension/Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/../Frameworks",
+ "@executable_path/../../../../Frameworks",
+ );
+ MACOSX_DEPLOYMENT_TARGET = 10.14;
+ PRODUCT_BUNDLE_IDENTIFIER = "com.crimx.saladict.Saladict---Pop-up-Dictionary-and-Page-Translator.Extension";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ SWIFT_VERSION = 5.0;
+ };
+ name = Debug;
+ };
+ 774E83D8266526B7006B5030 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ CODE_SIGN_ENTITLEMENTS = "Saladict - Pop-up Dictionary and Page Translator Extension/Saladict___Pop_up_Dictionary_and_Page_Translator_Extension.entitlements";
+ CODE_SIGN_STYLE = Automatic;
+ INFOPLIST_FILE = "Saladict - Pop-up Dictionary and Page Translator Extension/Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/../Frameworks",
+ "@executable_path/../../../../Frameworks",
+ );
+ MACOSX_DEPLOYMENT_TARGET = 10.14;
+ PRODUCT_BUNDLE_IDENTIFIER = "com.crimx.saladict.Saladict---Pop-up-Dictionary-and-Page-Translator.Extension";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SKIP_INSTALL = YES;
+ SWIFT_VERSION = 5.0;
+ };
+ name = Release;
+ };
+ 774E83DB266526B7006B5030 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+ CODE_SIGN_ENTITLEMENTS = "Saladict - Pop-up Dictionary and Page Translator/Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements";
+ CODE_SIGN_STYLE = Automatic;
+ COMBINE_HIDPI_IMAGES = YES;
+ INFOPLIST_FILE = "Saladict - Pop-up Dictionary and Page Translator/Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/../Frameworks",
+ );
+ MACOSX_DEPLOYMENT_TARGET = 10.14;
+ PRODUCT_BUNDLE_IDENTIFIER = "com.crimx.saladict.Saladict---Pop-up-Dictionary-and-Page-Translator";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 5.0;
+ };
+ name = Debug;
+ };
+ 774E83DC266526B7006B5030 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+ CODE_SIGN_ENTITLEMENTS = "Saladict - Pop-up Dictionary and Page Translator/Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements";
+ CODE_SIGN_STYLE = Automatic;
+ COMBINE_HIDPI_IMAGES = YES;
+ INFOPLIST_FILE = "Saladict - Pop-up Dictionary and Page Translator/Info.plist";
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/../Frameworks",
+ );
+ MACOSX_DEPLOYMENT_TARGET = 10.14;
+ PRODUCT_BUNDLE_IDENTIFIER = "com.crimx.saladict.Saladict---Pop-up-Dictionary-and-Page-Translator";
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 5.0;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 774E83B1266526B4006B5030 /* Build configuration list for PBXProject "Saladict - Pop-up Dictionary and Page Translator" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 774E83D4266526B7006B5030 /* Debug */,
+ 774E83D5266526B7006B5030 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 774E83D6266526B7006B5030 /* Build configuration list for PBXNativeTarget "Saladict - Pop-up Dictionary and Page Translator Extension" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 774E83D7266526B7006B5030 /* Debug */,
+ 774E83D8266526B7006B5030 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 774E83DA266526B7006B5030 /* Build configuration list for PBXNativeTarget "Saladict - Pop-up Dictionary and Page Translator" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 774E83DB266526B7006B5030 /* Debug */,
+ 774E83DC266526B7006B5030 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 774E83AE266526B4006B5030 /* Project object */;
+}
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000..919434a6
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+ version = "1.0">
+ <FileRef
+ location = "self:">
+ </FileRef>
+</Workspace>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDEDidComputeMac32BitWarning</key>
+ <true/>
+</dict>
+</plist>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/xcuserdata/crimx.xcuserdatad/UserInterfaceState.xcuserstate b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/xcuserdata/crimx.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 00000000..72b85049
Binary files /dev/null and b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/project.xcworkspace/xcuserdata/crimx.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/xcuserdata/crimx.xcuserdatad/xcschemes/xcschememanagement.plist b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/xcuserdata/crimx.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 00000000..10aa81d4
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator.xcodeproj/xcuserdata/crimx.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>Saladict - Pop-up Dictionary and Page Translator.xcscheme_^#shared#^_</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+</dict>
+</plist>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/AppDelegate.swift b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/AppDelegate.swift
new file mode 100644
index 00000000..0e241943
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/AppDelegate.swift
@@ -0,0 +1,25 @@
+//
+// AppDelegate.swift
+// Saladict - Pop-up Dictionary and Page Translator
+//
+// Created by Jack Wong on 2021/5/31.
+//
+
+import Cocoa
+
+@main
+class AppDelegate: NSObject, NSApplicationDelegate {
+
+ func applicationDidFinishLaunching(_ notification: Notification) {
+ // Insert code here to initialize your application
+ }
+
+ func applicationWillTerminate(_ notification: Notification) {
+ // Insert code here to tear down your application
+ }
+
+ func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
+ return true
+ }
+
+}
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AccentColor.colorset/Contents.json b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 00000000..eb878970
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+ "colors" : [
+ {
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/Contents.json b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000..c3233781
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,60 @@
+{
+ "images" : [
+ {
+ "size" : "16x16",
+ "idiom" : "mac",
+ "filename" : "icon-16.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "16x16"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "32x32"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "32x32"
+ },
+ {
+ "size" : "128x128",
+ "idiom" : "mac",
+ "filename" : "icon-128.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "128x128"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "256x256"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "256x256"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "512x512"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "512x512"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/icon-128.png b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/icon-128.png
new file mode 100644
index 00000000..a8edff6a
Binary files /dev/null and b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/icon-128.png differ
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/icon-16.png b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/icon-16.png
new file mode 100644
index 00000000..ecff7873
Binary files /dev/null and b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/AppIcon.appiconset/icon-16.png differ
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/Contents.json b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/Contents.json
new file mode 100644
index 00000000..73c00596
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Base.lproj/Main.storyboard b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Base.lproj/Main.storyboard
new file mode 100644
index 00000000..28f22b17
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Base.lproj/Main.storyboard
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16085" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+ <dependencies>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16085"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <scenes>
+ <!--Application-->
+ <scene sceneID="JPo-4y-FX3">
+ <objects>
+ <application id="hnw-xV-0zn" sceneMemberID="viewController">
+ <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+ <items>
+ <menuItem title="Saladict - Pop-up Dictionary and Page Translator" id="1Xt-HY-uBw">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <menu key="submenu" title="Saladict - Pop-up Dictionary and Page Translator" systemMenu="apple" id="uQy-DD-JDr">
+ <items>
+ <menuItem title="About Saladict - Pop-up Dictionary and Page Translator" id="5kV-Vb-QxS">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
+ <menuItem title="Hide Saladict - Pop-up Dictionary and Page Translator" keyEquivalent="h" id="Olw-nP-bQN">
+ <connections>
+ <action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Show All" id="Kd2-mp-pUS">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
+ <menuItem title="Quit Saladict - Pop-up Dictionary and Page Translator" keyEquivalent="q" id="4sb-4s-VLi">
+ <connections>
+ <action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Help" id="wpr-3q-Mcd">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
+ <items>
+ <menuItem title="Saladict - Pop-up Dictionary and Page Translator Help" keyEquivalent="?" id="FKE-Sm-Kum">
+ <connections>
+ <action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ </items>
+ </menu>
+ <connections>
+ <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
+ </connections>
+ </application>
+ <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="target"/>
+ <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+ <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="76" y="-134"/>
+ </scene>
+ <!--Window Controller-->
+ <scene sceneID="R2V-B0-nI4">
+ <objects>
+ <windowController showSeguePresentationStyle="single" id="B8D-0N-5wS" sceneMemberID="viewController">
+ <window key="window" title="Saladict - Pop-up Dictionary and Page Translator" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="IQv-IB-iLA">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+ <windowCollectionBehavior key="collectionBehavior" fullScreenNone="YES"/>
+ <rect key="contentRect" x="196" y="240" width="480" height="270"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+ <connections>
+ <outlet property="delegate" destination="B8D-0N-5wS" id="98r-iN-zZc"/>
+ </connections>
+ </window>
+ <connections>
+ <segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
+ </connections>
+ </windowController>
+ <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="75" y="250"/>
+ </scene>
+ <!--View Controller-->
+ <scene sceneID="hIz-AP-VOD">
+ <objects>
+ <viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
+ <view key="view" id="m2S-Jp-Qdl">
+ <rect key="frame" x="0.0" y="0.0" width="480" height="344"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="42" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZLV-xE-AGT">
+ <rect key="frame" x="0.0" y="34" width="480" height="265"/>
+ <subviews>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="FWV-e2-WQh" userLabel="IconView">
+ <rect key="frame" x="176" y="137" width="128" height="128"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" image="AppIcon" id="Hhb-TZ-Dhg"/>
+ </imageView>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EB0-ac-UZR">
+ <rect key="frame" x="38" y="63" width="404" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="lessThanOrEqual" constant="400" id="pZE-0p-Ce8"/>
+ </constraints>
+ <textFieldCell key="cell" alignment="center" title="App Name's extension is currently off. You can turn it on in Safari Extensions preferences." id="S7v-7o-3vW">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ooh-eV-eLQ">
+ <rect key="frame" x="79" y="-7" width="322" height="32"/>
+ <buttonCell key="cell" type="push" title="Quit and Open Safari Extensions Preferences…" alternateTitle="Install" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingMiddle" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Srx-0j-A4D">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ <connections>
+ <action selector="openSafariExtensionPreferences:" target="XfG-lQ-9wD" id="vKk-Xb-MPh"/>
+ </connections>
+ </buttonCell>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="ZLV-xE-AGT" secondAttribute="trailing" id="7aD-Ze-9ed"/>
+ <constraint firstItem="ZLV-xE-AGT" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" constant="45" id="AJ3-sx-ZQx"/>
+ <constraint firstAttribute="bottom" secondItem="ZLV-xE-AGT" secondAttribute="bottom" constant="34" id="KVY-ss-lTJ"/>
+ <constraint firstItem="ZLV-xE-AGT" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" id="mT6-ee-vkp"/>
+ </constraints>
+ </view>
+ <connections>
+ <outlet property="appNameLabel" destination="EB0-ac-UZR" id="SDO-j1-PQa"/>
+ </connections>
+ </viewController>
+ <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="75" y="655"/>
+ </scene>
+ </scenes>
+ <resources>
+ <image name="AppIcon" width="128" height="128"/>
+ </resources>
+</document>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Info.plist b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Info.plist
new file mode 100644
index 00000000..cfbbdb70
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIconFile</key>
+ <string></string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>$(PRODUCT_NAME)</string>
+ <key>CFBundlePackageType</key>
+ <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+ <key>NSMainStoryboardFile</key>
+ <string>Main</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements
new file mode 100644
index 00000000..f2ef3ae0
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/Saladict___Pop_up_Dictionary_and_Page_Translator.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.app-sandbox</key>
+ <true/>
+ <key>com.apple.security.files.user-selected.read-only</key>
+ <true/>
+</dict>
+</plist>
diff --git a/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/ViewController.swift b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/ViewController.swift
new file mode 100644
index 00000000..e55eb712
--- /dev/null
+++ b/mac-app/Saladict - Pop-up Dictionary and Page Translator/Saladict - Pop-up Dictionary and Page Translator/ViewController.swift
@@ -0,0 +1,51 @@
+//
+// ViewController.swift
+// Saladict - Pop-up Dictionary and Page Translator
+//
+// Created by Jack Wong on 2021/5/31.
+//
+
+import Cocoa
+import SafariServices.SFSafariApplication
+import SafariServices.SFSafariExtensionManager
+
+let appName = "Saladict - Pop-up Dictionary and Page Translator"
+let extensionBundleIdentifier = "com.crimx.saladict.Saladict---Pop-up-Dictionary-and-Page-Translator.Extension"
+
+class ViewController: NSViewController {
+
+ @IBOutlet var appNameLabel: NSTextField!
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ self.appNameLabel.stringValue = appName
+ SFSafariExtensionManager.getStateOfSafariExtension(withIdentifier: extensionBundleIdentifier) { (state, error) in
+ guard let state = state, error == nil else {
+ // Insert code to inform the user that something went wrong.
+ return
+ }
+
+ DispatchQueue.main.async {
+ if (state.isEnabled) {
+ self.appNameLabel.stringValue = "\(appName)'s extension is currently on."
+ } else {
+ self.appNameLabel.stringValue = "\(appName)'s extension is currently off. You can turn it on in Safari Extensions preferences."
+ }
+ }
+ }
+ }
+
+ @IBAction func openSafariExtensionPreferences(_ sender: AnyObject?) {
+ SFSafariApplication.showPreferencesForExtension(withIdentifier: extensionBundleIdentifier) { error in
+ guard error == nil else {
+ // Insert code to inform the user that something went wrong.
+ return
+ }
+
+ DispatchQueue.main.async {
+ NSApplication.shared.terminate(nil)
+ }
+ }
+ }
+
+}
diff --git a/src/manifest/safari.manifest.json b/src/manifest/safari.manifest.json
new file mode 100644
index 00000000..b5c83e1a
--- /dev/null
+++ b/src/manifest/safari.manifest.json
@@ -0,0 +1,12 @@
+{
+ "background": {
+ "persistent": true
+ },
+ "options_ui": {
+ "chrome_style": false
+ },
+ "optional_permissions": [
+ "background"
+ ],
+ "incognito": "split"
+}
|
refactor
|
add safari mac app
|
872b371c18cb3b828d0742f8e786cda615b9c6f1
|
2019-03-02 17:11:51
|
CRIMX
|
refactor(dicts): update select styles
| false
|
diff --git a/src/components/dictionaries/hjdict/View.tsx b/src/components/dictionaries/hjdict/View.tsx
index 68f256320..22a492f8b 100644
--- a/src/components/dictionaries/hjdict/View.tsx
+++ b/src/components/dictionaries/hjdict/View.tsx
@@ -17,10 +17,10 @@ function renderLex (props: ViewPorps<HjdictResult>) {
const { header, entries } = props.result as HjdictResultLex
return (
<div className='dictHjdict-Entry' onClick={e => handleClick(e, props.recalcBodyHeight)}>
+ {renderLangSelect(props)}
{header && (
<header className='word-details-header' dangerouslySetInnerHTML={{ __html: header }} />
)}
- {renderLangSelect(props)}
{entries.map((entry, i) => (
<div dangerouslySetInnerHTML={{ __html: entry }} key={i} />
))}
@@ -45,10 +45,13 @@ function renderLangSelect (props: ViewPorps<HjdictResult>) {
const { langCode } = props.result
return (
- <select onChange={e => props.searchText({
- id: 'hjdict',
- payload: { langCode: e.target.value },
- })}>
+ <select
+ style={{ width: '100%' }}
+ onChange={e => props.searchText({
+ id: 'hjdict',
+ payload: { langCode: e.target.value },
+ })}
+ >
{langSelectList.map(lang => (
<option key={lang} value={lang} selected={lang === langCode}>{
props.t(`dict:hjdict_chsas-${lang}`)
diff --git a/src/components/dictionaries/naver/View.tsx b/src/components/dictionaries/naver/View.tsx
index e4308af7d..36ddb8dff 100644
--- a/src/components/dictionaries/naver/View.tsx
+++ b/src/components/dictionaries/naver/View.tsx
@@ -14,10 +14,13 @@ export default class DictNaver extends React.PureComponent<ViewPorps<NaverResult
return (
<>
- <select onChange={e => searchText({
- id: 'naver',
- payload: { lang: e.target.value },
- })}>
+ <select
+ style={{ width: '100%' }}
+ onChange={e => searchText({
+ id: 'naver',
+ payload: { lang: e.target.value },
+ })}
+ >
{this.langSelectList.map(([langCode, locale]) => (
<option key={langCode} value={langCode} selected={lang === langCode}>
{locale}
diff --git a/src/components/dictionaries/wikipedia/View.tsx b/src/components/dictionaries/wikipedia/View.tsx
index 4e745edb9..9d33ed582 100644
--- a/src/components/dictionaries/wikipedia/View.tsx
+++ b/src/components/dictionaries/wikipedia/View.tsx
@@ -60,7 +60,10 @@ export default class DictBing extends React.PureComponent<ViewPorps<WikipediaRes
const { langList, langSelector } = this.props.result
if (langList) {
return (
- <select onChange={this.handleSelectChanged}>
+ <select
+ style={{ width: '100%' }}
+ onChange={this.handleSelectChanged}
+ >
<option key='' value='' selected>{this.props.t('chooseLang')}</option>
{langList.map(item => (
<option key={item.url} value={item.url}>{item.title}</option>
diff --git a/src/panel/index.scss b/src/panel/index.scss
index 4c049e461..e3d8fe70d 100644
--- a/src/panel/index.scss
+++ b/src/panel/index.scss
@@ -10,6 +10,14 @@
\*-----------------------------------------------*/
@import '../_sass_global/reset';
+/*-----------------------------------------------*\
+ Base
+\*-----------------------------------------------*/
+select {
+ background: transparent;
+ height: 2em;
+}
+
/*-----------------------------------------------*\
Components
\*-----------------------------------------------*/
|
refactor
|
update select styles
|
9b4790d6dce1eb3b45a0a34d5c8621dca11248ad
|
2018-06-07 12:22:15
|
CRIMX
|
feat(dicts): add google options
| false
|
diff --git a/src/app-config/dicts.ts b/src/app-config/dicts.ts
index f3705c72f..24d5647dc 100644
--- a/src/app-config/dicts.ts
+++ b/src/app-config/dicts.ts
@@ -214,6 +214,10 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
+ },
+ /** Optional dict custom options. Can only be boolean or number. */
+ options: {
+ cnfirst: false
}
},
guoyu: {
diff --git a/src/components/dictionaries/google/_locales.json b/src/components/dictionaries/google/_locales.json
index 9fec6be17..b5465d91c 100644
--- a/src/components/dictionaries/google/_locales.json
+++ b/src/components/dictionaries/google/_locales.json
@@ -3,5 +3,12 @@
"en": "Google Translation",
"zh_CN": "谷歌翻译",
"zh_TW": "谷歌翻譯"
+ },
+ "options": {
+ "cnfirst": {
+ "en": "Use google.cn first",
+ "zh_CN": "优先使用 google.cn",
+ "zh_TW": "優先使用 google.cn"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/components/dictionaries/google/engine.ts b/src/components/dictionaries/google/engine.ts
index fd54a45e4..94fd323f1 100644
--- a/src/components/dictionaries/google/engine.ts
+++ b/src/components/dictionaries/google/engine.ts
@@ -11,6 +11,7 @@ export default function search (
text: string,
config: AppConfig,
): Promise<GoogleSearchResult> {
+ const options = config.dicts.all.google.options
const chCode = config.langCode === 'zh-TW' ? 'zh-TW' : 'zh-CN'
let sl = 'auto'
let tl = chCode
@@ -22,9 +23,15 @@ export default function search (
tl = chCode
}
- return fetchWithToken('https://translate.google.com', sl, tl, text)
- .catch(() => fetchWithToken('https://translate.google.cn', sl, tl, text))
- .catch(() => fetchWithoutToken(sl, tl, text))
+ if (options.cnfirst) {
+ return fetchWithToken('https://translate.google.cn', sl, tl, text)
+ .catch(() => fetchWithToken('https://translate.google.com', sl, tl, text))
+ .catch(() => fetchWithoutToken(sl, tl, text))
+ } else {
+ return fetchWithToken('https://translate.google.com', sl, tl, text)
+ .catch(() => fetchWithToken('https://translate.google.cn', sl, tl, text))
+ .catch(() => fetchWithoutToken(sl, tl, text))
+ }
}
function fetchWithToken (base: string, sl: string, tl: string, text: string): Promise<GoogleSearchResult> {
diff --git a/src/options/Options.vue b/src/options/Options.vue
index 2ca25fda9..fe5e8fe38 100644
--- a/src/options/Options.vue
+++ b/src/options/Options.vue
@@ -171,6 +171,18 @@ export default {
config: {
deep: true,
handler () {
+ // patch update google config
+ const { google } = this.config.dicts.all
+ if (!google.page.includes(this.config.langCode) ||
+ (google.options.cnfirst && !google.page.includes('google.cn')) ||
+ (!google.options.cnfirst && !google.page.includes('google.com'))
+ ) {
+ google.page = google.options.cnfirst
+ ? `https://translate.google.cn/#auto/${this.$store.config.langCode}/%s`
+ : `https://translate.google.com/#auto/${this.$store.config.langCode}/%s`
+ return
+ }
+
storage.sync.set({config: this.config})
.then(() => {
this.isShowConfigUpdated = true
|
feat
|
add google options
|
cf4da586ea55cf3a69b52a7a105d5503a0682349
|
2021-08-21 14:20:47
|
dependabot[bot]
|
build(deps): bump dns-packet from 1.3.1 to 1.3.4 (#1340)
| false
|
diff --git a/yarn.lock b/yarn.lock
index 47e14adf..f2c14d2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6096,9 +6096,9 @@ dns-equal@^1.0.0:
integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
dns-packet@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
- integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+ integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
dependencies:
ip "^1.1.0"
safe-buffer "^5.0.1"
|
build
|
bump dns-packet from 1.3.1 to 1.3.4 (#1340)
|
6f9d535d03817eeec004d9fef941c5c0c4d875c9
|
2020-04-24 23:12:14
|
crimx
|
chore: workaround firefox linter
| false
|
diff --git a/scripts/firefox-fix.js b/scripts/firefox-fix.js
index 6772b0a81..11e594593 100644
--- a/scripts/firefox-fix.js
+++ b/scripts/firefox-fix.js
@@ -22,7 +22,8 @@ async function main() {
)
const staticChunkIds = await getStaticChunks(htmlTexts)
- const dynamicChunks = (await fs.readdir(path.join(ffPath, 'assets')))
+ const allChunks = await fs.readdir(path.join(ffPath, 'assets'))
+ const dynamicChunks = allChunks
.filter(name => {
const m = /^([^.]+)\.[^.]+\.js$/.exec(name)
if (m) {
@@ -74,6 +75,18 @@ async function main() {
)
})
)
+
+ // urgh
+ // https://github.com/mozilla/addons-linter/issues/2498
+ const runtime = allChunks.find(filename => filename.startsWith('runtime.'))
+ const runtimePath = path.join(ffPath, 'assets', runtime)
+ await fs.outputFile(
+ runtimePath,
+ (await fs.readFile(runtimePath, 'utf8')).replace(
+ /import\(/g,
+ 'saladictImport('
+ )
+ )
}
async function getStaticChunks(htmls) {
|
chore
|
workaround firefox linter
|
9f9983f3be9e12d565c22f94e5e697c8ad9afd4f
|
2018-09-04 20:48:14
|
CRIMX
|
fix(panel): fix mta box toggling on update
| false
|
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index 658d836da..371c20264 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -73,6 +73,14 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
return this.props.searchText(arg)
}
+ showMtaBox = (isShow: boolean) => {
+ this.setState({
+ mtaBoxHeight: isShow
+ ? window.innerHeight * this.props.panelMaxHeightRatio * 0.4
+ : 0
+ })
+ }
+
toggleMtaBox = (e?: React.MouseEvent<HTMLButtonElement>) => {
if (e) { e.currentTarget.blur() }
this.setState(preState => {
@@ -111,7 +119,7 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
mtaAutoUnfold === 'always' ||
mtaAutoUnfold === 'popup' && isSaladictPopupPage
) {
- this.toggleMtaBox()
+ this.showMtaBox(true)
}
setTimeout(() => {
@@ -134,10 +142,13 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
this.props.updateItemHeight('_mtabox', this.state.mtaBoxHeight)
}
- if (Boolean(prevProps.mtaAutoUnfold) !== Boolean(this.props.mtaAutoUnfold)) {
- if (this.props.mtaAutoUnfold !== 'popup' || isSaladictPopupPage) {
- this.toggleMtaBox()
- }
+ const { mtaAutoUnfold } = this.props
+ if (prevProps.mtaAutoUnfold !== mtaAutoUnfold) {
+ this.showMtaBox(
+ mtaAutoUnfold === 'once' ||
+ mtaAutoUnfold === 'always' ||
+ mtaAutoUnfold === 'popup' && isSaladictPopupPage
+ )
}
}
|
fix
|
fix mta box toggling on update
|
60951dae74101230a2b254b3d00b2f3450b56b2c
|
2020-05-09 19:08:37
|
crimx
|
refactor(options): add marks for utools
| false
|
diff --git a/src/options/components/MainEntry.tsx b/src/options/components/MainEntry.tsx
index 956c395d3..1e8a62788 100644
--- a/src/options/components/MainEntry.tsx
+++ b/src/options/components/MainEntry.tsx
@@ -81,6 +81,7 @@ export const MainEntry: FC = () => {
<Col style={{ flex: '1' }}>
<Layout style={{ padding: 24 }}>
<Layout.Content
+ data-option-content={entry} // for utools hiding unused options
style={{
padding: 24,
backgroundColor: 'var(--opt-background-color)'
|
refactor
|
add marks for utools
|
d73ba3811fdb2483c143a93d1b24ece0381db603
|
2019-01-19 02:42:19
|
CRIMX
|
refactor(options): add page profiles
| false
|
diff --git a/package.json b/package.json
index 7fa5c43db..e0ed7989e 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
"react-dom": "^16.4.0",
"react-i18next": "^7.6.0",
"react-redux": "^5.0.7",
+ "react-sortable-hoc": "^1.4.0",
"react-transition-group": "^2.3.1",
"redux": "^3.7.2",
"redux-thunk": "^2.2.0",
diff --git a/src/_helpers/config-manager.ts b/src/_helpers/config-manager.ts
index 6d651a7e8..c1477a3cc 100644
--- a/src/_helpers/config-manager.ts
+++ b/src/_helpers/config-manager.ts
@@ -17,6 +17,7 @@ import { concat } from 'rxjs/observable/concat'
import { map } from 'rxjs/operators/map'
import { fromEventPattern } from 'rxjs/observable/fromEventPattern'
import { mergeConfig } from '@/app-config/merge-config'
+import { TranslationFunction } from 'i18next'
export interface StorageChanged<T> {
newValue: T,
@@ -74,12 +75,33 @@ export async function initConfig (): Promise<AppConfig> {
return (activeConfigID && modes.find(m => m.id === activeConfigID)) || modes[0]
}
-export async function resetConfig () {
+export async function resetAllConfigs () {
const ids = (await storage.sync.get('configProfileIDs')).configProfileIDs || []
await storage.sync.remove(['configProfileIDs', 'activeConfigID', ...ids])
return initConfig()
}
+export async function getConfig (id: string): Promise<AppConfig | undefined> {
+ return (await storage.sync.get(id))[id]
+}
+
+/**
+ * Update config
+ */
+export function updateConfig (config: AppConfig): Promise<void> {
+ if (process.env.DEV_BUILD) {
+ storage.sync.get('configProfileIDs')
+ .then(({ configProfileIDs }) => {
+ if (!configProfileIDs || -1 === configProfileIDs.indexOf(config.id)) {
+ if (process.env.NODE_ENV === 'production') {
+ console.error('Update Config Error: Not exist', config)
+ }
+ }
+ })
+ }
+ return storage.sync.set({ [config.id]: config })
+}
+
export async function addConfig (config: AppConfig): Promise<void> {
const { configProfileIDs } = await storage.sync.get<{ configProfileIDs: string[] }>('configProfileIDs')
if (process.env.DEV_BUILD) {
@@ -114,7 +136,7 @@ export async function removeConfig (id: string): Promise<void> {
export async function getActiveConfig (): Promise<AppConfig> {
const { activeConfigID } = await storage.sync.get('activeConfigID')
if (activeConfigID) {
- const config = (await storage.sync.get(activeConfigID))[activeConfigID]
+ const config = await getConfig(activeConfigID)
if (config) {
return config
}
@@ -122,6 +144,11 @@ export async function getActiveConfig (): Promise<AppConfig> {
return appConfigFactory()
}
+/**
+ * Update the config under the current mode
+ */
+export const updateActiveConfig = updateConfig
+
/**
* This is mainly for ordering
*/
@@ -158,23 +185,6 @@ export function updateActiveConfigID (id: string): Promise<void> {
return storage.sync.set({ activeConfigID: id })
}
-/**
- * Update the config under the current mode
- */
-export function updateActiveConfig (config: AppConfig): Promise<void> {
- if (process.env.DEV_BUILD) {
- storage.sync.get('configProfileIDs')
- .then(({ configProfileIDs }) => {
- if (!configProfileIDs || -1 === configProfileIDs.indexOf(config.id)) {
- if (process.env.NODE_ENV === 'production') {
- console.error('Update Config Error: Not exist', config)
- }
- }
- })
- }
- return storage.sync.set({ [config.id]: config })
-}
-
export function addConfigIDListListener (
cb: (changes: StorageChanged<string[]>) => any
) {
diff --git a/src/_locales/common/messages.json b/src/_locales/common/messages.json
index 14544a2a5..a06ca3b0a 100644
--- a/src/_locales/common/messages.json
+++ b/src/_locales/common/messages.json
@@ -2,7 +2,7 @@
"add": {
"en": "Add",
"zh_CN": "添加",
- "zh_TW": "添加"
+ "zh_TW": "新增"
},
"cancel": {
"en": "Cancel",
@@ -19,6 +19,11 @@
"zh_CN": "删除",
"zh_TW": "删除"
},
+ "edit": {
+ "en": "Edit",
+ "zh_CN": "编辑",
+ "zh_TW": "編輯"
+ },
"rename": {
"en": "Rename",
"zh_CN": "重命名",
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index 67e540ca0..b88bffd84 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -44,16 +44,16 @@
"zh_CN": "右键菜单",
"zh_TW": "右鍵菜單"
},
- "nav_DictPanel": {
- "en": "Dict Panel",
- "zh_CN": "查词面板",
- "zh_TW": "字典介面"
- },
"nav_Dictioneries": {
"en": "Dictioneries",
"zh_CN": "词典设置",
"zh_TW": "字典設定"
},
+ "nav_DictPanel": {
+ "en": "Dict Panel",
+ "zh_CN": "查词面板",
+ "zh_TW": "字典介面"
+ },
"nav_General": {
"en": "General",
"zh_CN": "基本选项",
@@ -159,26 +159,46 @@
"zh_CN": "添加同步",
"zh_TW": "添加同步"
},
- "sync_delete_confirm": {
- "en": "Delete?",
- "zh_CN": "清空同步设置？",
- "zh_TW": "清空同步設定？"
+ "profiles_add_name": {
+ "en": "Add Profile Name",
+ "zh_CN": "新增情景模式名称",
+ "zh_TW": "新增情景模式名稱"
},
- "sync_error_url": {
- "en": "Not a valid url.",
- "zh_CN": "不正确的超链接格式。",
- "zh_TW": "不正確的超連結格式。"
+ "profiles_delete_confirm": {
+ "en": "Delete Profile \"{{name}}\". Confirm?",
+ "zh_CN": "「{{name}}」将被删除，确认？",
+ "zh_TW": "「{{name}}」將被刪除，確認？"
+ },
+ "profiles_edit_name": {
+ "en": "Change Profile Name",
+ "zh_CN": "更改情景模式名称",
+ "zh_TW": "更改情景模式名稱"
+ },
+ "profiles_help": {
+ "en": "Settings under different Profiles are independent. One may switch profiles by hovering on the menu icon on the Dictionary Panel. Or focus on the icon then hit <kbd>↓</kbd>.",
+ "zh_CN": "每个模式下的设置都是独立的，互不干扰。鼠标悬浮在查词面板的菜单图标上可快速切换，或者焦点选中菜单图标然后按<kbd>↓</kbd>。",
+ "zh_TW": "每個模式下的设置都是獨立的，互不干擾。滑鼠懸浮在字典介面的選單圖示上可快速切換，或者焦點選中選單圖示然後按<kbd>↓</kbd>。"
},
"sync_close_confirm": {
"en": "Settings not saved. Close?",
"zh_CN": "设置未保存，关闭？",
"zh_TW": "設定未儲存，關閉？"
},
+ "sync_delete_confirm": {
+ "en": "Delete?",
+ "zh_CN": "清空同步设置？",
+ "zh_TW": "清空同步設定？"
+ },
"sync_description": {
"en": "Sync settings.",
"zh_CN": "数据同步设置。",
"zh_TW": "資料同步設定。"
},
+ "sync_error_url": {
+ "en": "Not a valid url.",
+ "zh_CN": "不正确的超链接格式。",
+ "zh_TW": "不正確的超連結格式。"
+ },
"sync_notebook_title": {
"en": "Notebook Sync",
"zh_CN": "生词本同步",
diff --git a/src/options/components/options/Profiles/EditNameModal.tsx b/src/options/components/options/Profiles/EditNameModal.tsx
new file mode 100644
index 000000000..2d224a8b5
--- /dev/null
+++ b/src/options/components/options/Profiles/EditNameModal.tsx
@@ -0,0 +1,40 @@
+import React from 'react'
+
+import { FormComponentProps } from 'antd/lib/form'
+import { Form, Input, Modal } from 'antd'
+
+export interface EditNameModalProps extends FormComponentProps {
+ title: string
+ show: boolean
+ name: string
+ onClose: (value?: string) => void
+}
+
+export class EditNameModal extends React.Component<EditNameModalProps> {
+ render () {
+ const { title, onClose, name, show } = this.props
+ const { getFieldDecorator, getFieldValue } = this.props.form
+
+ return (
+ <Modal
+ visible={show}
+ title={title}
+ destroyOnClose
+ onOk={() => onClose(getFieldValue('profile_name'))}
+ onCancel={() => onClose()}
+ >
+ <Form>
+ <Form.Item>{
+ getFieldDecorator('profile_name', {
+ initialValue: name,
+ })(
+ <Input autoFocus />
+ )
+ }</Form.Item>
+ </Form>
+ </Modal>
+ )
+ }
+}
+
+export default Form.create()(EditNameModal)
diff --git a/src/options/components/options/Profiles/index.tsx b/src/options/components/options/Profiles/index.tsx
new file mode 100644
index 000000000..51628480c
--- /dev/null
+++ b/src/options/components/options/Profiles/index.tsx
@@ -0,0 +1,247 @@
+import React from 'react'
+import { Props } from '../typings'
+import { AppConfig, appConfigFactory, AppConfigMutable } from '@/app-config'
+import {
+ SortableContainer,
+ SortableElement,
+ SortableHandle,
+ arrayMove,
+ SortEnd,
+} from 'react-sortable-hoc'
+import {
+ getProfileName,
+ addConfig,
+ getConfig,
+ updateConfig,
+ removeConfig,
+ getConfigIDList,
+ updateConfigIDList,
+ getActiveConfigID,
+ updateActiveConfigID,
+} from '@/_helpers/config-manager'
+import EditNameModal from './EditNameModal'
+
+import { Card, List, Button, Radio, Col, message, Icon, Tooltip } from 'antd'
+import { RadioChangeEvent } from 'antd/lib/radio'
+
+const btnSylte: React.CSSProperties = {
+ marginLeft: 10,
+ padding: 0,
+ lineHeight: 1,
+ border: 'none',
+}
+
+const itemStyle: React.CSSProperties = {
+ width: '100%',
+ display: 'flex',
+ justifyContent: 'space-between',
+ alignItems: 'center',
+}
+
+export type ProfilesProps = Props
+
+interface ProfilesState {
+ selected: string,
+ list: AppConfig[]
+ editingConfig: AppConfig | null
+ showEditNameModal: boolean
+ showAddProfileModal: boolean
+}
+
+export class Profiles extends React.Component<ProfilesProps, ProfilesState> {
+ state: ProfilesState = {
+ selected: '',
+ list: [],
+ editingConfig: null,
+ showEditNameModal: false,
+ showAddProfileModal: false,
+ }
+
+ DragHandle = SortableHandle(() => (
+ <Icon
+ title={this.props.t('common:sort')}
+ style={{ cursor: 'move' }}
+ type='bars'
+ />
+ ))
+
+ ProfileListItem = SortableElement<{ config: AppConfig }>(({ config }) => (
+ <List.Item>
+ <div style={itemStyle}>
+ <div>
+ <Radio value={config.id} />
+ {getProfileName(config.name, this.props.t)}
+ </div>
+ <div>
+ {React.createElement(this.DragHandle)}
+ <Button
+ title={this.props.t('common:edit')}
+ style={btnSylte}
+ shape='circle'
+ size='small'
+ icon='edit'
+ onClick={() => this.setState({
+ showEditNameModal: true,
+ editingConfig: config,
+ })}
+ />
+ <Button
+ title={this.props.t('common:delete')}
+ style={btnSylte}
+ shape='circle'
+ size='small'
+ icon='close'
+ disabled={config.id === this.state.selected}
+ onClick={() => this.deleteItem(config)}
+ />
+ </div>
+ </div>
+ </List.Item>
+ ))
+
+ ProfileList = SortableContainer<{ list: AppConfig[] }>(({ list }) => (
+ <List
+ size='large'
+ dataSource={list}
+ renderItem={(config: AppConfig, index: number) => React.createElement(
+ this.ProfileListItem, { config, index }
+ )}
+ />
+ ))
+
+ constructor (props: ProfilesProps) {
+ super(props)
+ getConfigIDList().then(async idList => {
+ if (!idList) { return }
+ this.setState({
+ list: (await Promise.all(idList.map(getConfig))).filter(Boolean) as AppConfig[]
+ })
+ })
+ getActiveConfigID().then(selected => {
+ this.setState({ selected })
+ })
+ }
+
+ handleProfileSelect = ({ target: { value } }: RadioChangeEvent) => {
+ this.setState({ selected: value })
+ updateActiveConfigID(value)
+ }
+
+ deleteItem = async ({ name, id }: AppConfig) => {
+ const { t } = this.props
+ if (confirm(t('profiles_delete_confirm', { name: getProfileName(name, t) }))) {
+ await removeConfig(id)
+ this.setState(({ list }) => ({
+ list: list.filter(config => config.id !== id),
+ }))
+ message.destroy()
+ message.success(t('msg_updated'))
+ }
+ }
+
+ handleAddProfileClose = async (name?: string) => {
+ if (name) {
+ const config = appConfigFactory() as AppConfigMutable
+ config.name = name
+ await addConfig(config)
+ this.setState(({ list }) => ({
+ list: [...list, config],
+ showAddProfileModal: false,
+ }))
+ message.destroy()
+ message.success(this.props.t('msg_updated'))
+ } else {
+ this.setState({ showAddProfileModal: false })
+ }
+ }
+
+ handleEditNameClose = async (name?: string) => {
+ const { editingConfig, list, selected } = this.state
+ if (name && editingConfig) {
+ const newConfig = {
+ ...editingConfig,
+ name,
+ }
+ await updateConfig(newConfig)
+ this.setState({
+ list: list.map(config => config === editingConfig ? newConfig : config),
+ editingConfig: null,
+ })
+ if (newConfig.id !== selected) {
+ // active config alert is handled by global
+ message.destroy()
+ message.success(this.props.t('msg_updated'))
+ }
+ } else {
+ this.setState({
+ editingConfig: null,
+ showEditNameModal: false,
+ })
+ }
+ }
+
+ handleSortEnd = ({ oldIndex, newIndex }: SortEnd) => {
+ this.setState(({ list }) => {
+ const newList = arrayMove(list, oldIndex, newIndex)
+ updateConfigIDList(newList.map(config => config.id))
+ .then(() => {
+ message.destroy()
+ message.success(this.props.t('msg_updated'))
+ })
+ return { list: newList }
+ })
+ }
+
+ render () {
+ const { t } = this.props
+ const {
+ selected,
+ list,
+ editingConfig,
+ showEditNameModal,
+ showAddProfileModal,
+ } = this.state
+
+ return (
+ <Col span={12}>
+ <Card title={t('nav_Profiles')}>
+ <p dangerouslySetInnerHTML={{ __html: t('profiles_help') }} />
+ <Radio.Group
+ value={selected}
+ onChange={this.handleProfileSelect}
+ style={{ display: 'block', marginBottom: 10 }}
+ >
+ {React.createElement(this.ProfileList, {
+ useDragHandle: true,
+ onSortEnd: this.handleSortEnd,
+ list,
+ })}
+ </Radio.Group>
+ {list.length <= 10 &&
+ <Button
+ type='dashed'
+ style={{ width: '100%' }}
+ onClick={() => this.setState({ showAddProfileModal: true })}
+ >
+ <Icon type='plus' /> {t('common:add')}
+ </Button>
+ }
+ </Card>
+ <EditNameModal
+ title={t('profiles_add_name')}
+ show={showAddProfileModal}
+ name=''
+ onClose={this.handleAddProfileClose}
+ />
+ <EditNameModal
+ title={t('profiles_edit_name')}
+ show={showEditNameModal}
+ name={editingConfig ? getProfileName(editingConfig.name, t) : ''}
+ onClose={this.handleEditNameClose}
+ />
+ </Col>
+ )
+ }
+}
+
+export default Profiles
diff --git a/yarn.lock b/yarn.lock
index 6e16f091a..85641d45f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,13 @@
esutils "^2.0.2"
js-tokens "^3.0.0"
+"@babel/runtime@^7.2.0":
+ version "7.2.0"
+ resolved "http://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
+ integrity sha1-sD5C7t31iY4AZG5MhA+ge6jcrX8=
+ dependencies:
+ regenerator-runtime "^0.12.0"
+
"@commitlint/cli@^6.0.2":
version "6.2.0"
resolved "http://registry.npm.taobao.org/@commitlint/cli/download/@commitlint/cli-6.2.0.tgz#b2f8190eb08ccd78eea65114b864f3c65eca466a"
@@ -4671,7 +4678,7 @@ intersperse@^1.0.0:
resolved "http://registry.npm.taobao.org/intersperse/download/intersperse-1.0.0.tgz#f2561fb1cfef9f5277cc3347a22886b4351a5181"
integrity sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE=
-invariant@^2.0.0, invariant@^2.2.2:
+invariant@^2.0.0, invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "http://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
dependencies:
@@ -8062,6 +8069,15 @@ react-slick@~0.23.1:
prettier "^1.14.3"
resize-observer-polyfill "^1.5.0"
+react-sortable-hoc@^1.4.0:
+ version "1.4.0"
+ resolved "http://registry.npm.taobao.org/react-sortable-hoc/download/react-sortable-hoc-1.4.0.tgz#b477ce700ba755754200a1dabd36e588e2f5608d"
+ integrity sha1-tHfOcAunVXVCAKHavTbliOL1YI0=
+ dependencies:
+ "@babel/runtime" "^7.2.0"
+ invariant "^2.2.4"
+ prop-types "^15.5.7"
+
react-test-renderer@^16.0.0-0:
version "16.4.0"
resolved "http://registry.npm.taobao.org/react-test-renderer/download/react-test-renderer-16.4.0.tgz#0dbe0e24263e94e1830c7afb1f403707fad313a3"
@@ -8243,6 +8259,11 @@ regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+regenerator-runtime@^0.12.0:
+ version "0.12.1"
+ resolved "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+ integrity sha1-+hpxVEdkwDb4xJsToIsllMn4oN4=
+
regenerator-transform@^0.10.0:
version "0.10.1"
resolved "http://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
|
refactor
|
add page profiles
|
0e9982e5a8f39e615bb12afb4e24d75efb582965
|
2018-05-18 22:53:28
|
CRIMX
|
test(panel): update snapshots
| false
|
diff --git a/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap b/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
index 033cb8137..e34c57674 100644
--- a/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
+++ b/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
@@ -96,7 +96,7 @@ exports[`Component/content/MenuBar should render correctly 1`] = `
</button>
<button
className="panel-MenuBar_Btn"
- disabled={false}
+ disabled={true}
onClick={[Function]}
>
<svg
@@ -275,7 +275,7 @@ exports[`Component/content/MenuBar should render correctly with fav and pin 1`]
</button>
<button
className="panel-MenuBar_Btn"
- disabled={false}
+ disabled={true}
onClick={[Function]}
>
<svg
|
test
|
update snapshots
|
6208d05e8d880d8c81f73c4f02768a484a863ce2
|
2020-04-04 02:04:34
|
crimx
|
refactor(wordpage): rewrite word table
| false
|
diff --git a/src/_helpers/record-manager.ts b/src/_helpers/record-manager.ts
index a5505affb..f5072c8e5 100644
--- a/src/_helpers/record-manager.ts
+++ b/src/_helpers/record-manager.ts
@@ -85,9 +85,9 @@ export function getWords(
config: {
itemsPerPage?: number
pageNum?: number
- filters: { [field: string]: string[] | undefined }
- sortField?: string
- sortOrder?: 'ascend' | 'descend' | false
+ filters: { [field: string]: (string | number)[] | null | undefined }
+ sortField?: string | number | (string | number)[]
+ sortOrder?: 'ascend' | 'descend' | false | null
searchText?: string
}
) {
diff --git a/src/background/database.ts b/src/background/database.ts
index 4a367babf..85d8a673a 100644
--- a/src/background/database.ts
+++ b/src/background/database.ts
@@ -140,9 +140,15 @@ export async function getWords({
sortOrder = 'descend',
searchText
}: Message<'GET_WORDS'>['payload']): Promise<MessageResponse<'GET_WORDS'>> {
- const collection = db[area].orderBy(sortField)
-
- if (sortOrder === 'descend') {
+ const collection = db[area].orderBy(
+ sortField
+ ? Array.isArray(sortField)
+ ? sortField.map(str => String(str))
+ : String(sortField)
+ : 'date'
+ )
+
+ if (!sortOrder || sortOrder === 'descend') {
collection.reverse()
}
diff --git a/src/components/WordPage/WordTable.tsx b/src/components/WordPage/WordTable.tsx
new file mode 100644
index 000000000..5c729dc46
--- /dev/null
+++ b/src/components/WordPage/WordTable.tsx
@@ -0,0 +1,168 @@
+import React, { FC, ReactNode, useMemo } from 'react'
+import i18next, { TFunction } from 'i18next'
+import { Button, Tooltip } from 'antd'
+import Table, { ColumnsType, TableProps } from 'antd/lib/table'
+import { Word, DBArea } from '@/_helpers/record-manager'
+import { message } from '@/_helpers/browser-api'
+import { useTranslate } from '@/_helpers/i18n'
+
+export const colSelectionWidth = 48
+const colDateWidth = 150
+const colEditWidth = 80
+const fixedWidth = colSelectionWidth + colDateWidth + colEditWidth
+const colTextWidth = `calc((100vw - ${fixedWidth}px) / 7)`
+const restWidth = `calc((100vw - ${fixedWidth}px) * 2 / 7)`
+
+export interface WordTableProps
+ extends Pick<
+ TableProps<Word>,
+ 'dataSource' | 'pagination' | 'rowSelection' | 'onChange' | 'loading'
+ > {
+ area: DBArea
+}
+
+export const WordTable: FC<WordTableProps> = props => {
+ const { t } = useTranslate('wordpage')
+
+ const tableColumns = useMemo<ColumnsType<Word>>(
+ () => [
+ {
+ title: t('column.word'),
+ dataIndex: 'text',
+ key: 'text',
+ width: colTextWidth,
+ align: 'center',
+ sorter: true,
+ filters: [
+ { text: t('filterWord.chs'), value: 'ch' },
+ { text: t('filterWord.eng'), value: 'en' },
+ { text: t('filterWord.word'), value: 'word' },
+ { text: t('filterWord.phrase'), value: 'phra' }
+ ]
+ },
+ {
+ title: t('column.source'),
+ dataIndex: 'context',
+ key: 'context',
+ width: restWidth,
+ align: 'center',
+ render: renderSource
+ },
+ {
+ title: t('column.trans'),
+ dataIndex: 'trans',
+ key: 'trans',
+ width: restWidth,
+ render: renderTrans
+ },
+ {
+ title: t('column.note'),
+ dataIndex: 'note',
+ key: 'note',
+ width: restWidth,
+ render: renderNote
+ },
+ {
+ title: t('column.date'),
+ dataIndex: 'date',
+ key: 'date',
+ width: colDateWidth,
+ align: 'center',
+ sorter: true,
+ render: renderDate
+ },
+ {
+ title: t(`column.${props.area === 'notebook' ? 'edit' : 'add'}`),
+ key: 'edit',
+ align: 'center',
+ render: (_, record) => renderEdit(t, props.area, record)
+ }
+ ],
+ [t, props.area]
+ )
+
+ return (
+ <Table
+ rowKey="date"
+ columns={tableColumns}
+ bordered={true}
+ showHeader={true}
+ dataSource={props.dataSource}
+ pagination={props.pagination}
+ rowSelection={props.rowSelection}
+ onChange={props.onChange}
+ loading={props.loading}
+ />
+ )
+}
+
+function renderSource(_: any, record: Word): ReactNode {
+ return (
+ <React.Fragment key={record.date}>
+ {record.context && (
+ <p className="wordpage-Record_Context">{record.context}</p>
+ )}
+ {record.title && (
+ <p className="wordpage-Source_Footer">
+ {record.favicon && (
+ <img className="wordpage-Record_Favicon" src={record.favicon} />
+ )}
+ <span className="wordpage-Record_Title">{record.title}</span>
+ </p>
+ )}
+ </React.Fragment>
+ )
+}
+
+function renderParagraphs(text?: string): ReactNode {
+ if (!text) {
+ return ''
+ }
+ return text.split('\n').map((line, i) => <div key={i}>{line}</div>)
+}
+
+function renderTrans(_: any, record: Word): ReactNode {
+ return renderParagraphs(record.trans)
+}
+
+function renderNote(_: any, record: Word): ReactNode {
+ return renderParagraphs(record.note)
+}
+
+function renderDate(datenum: number): ReactNode {
+ const date = new Date(datenum)
+ return (
+ <Tooltip
+ key={datenum}
+ placement="topRight"
+ title={date.toLocaleString(i18next.language)}
+ >
+ <>{date.toLocaleDateString(i18next.language)}</>
+ </Tooltip>
+ )
+}
+
+function renderEdit(t: TFunction, area: DBArea, record: Word): ReactNode {
+ return (
+ <Button
+ key={record.date}
+ size="small"
+ onClick={() => {
+ const word = {
+ ...record,
+ // give it a new date if it's from history
+ date: area === 'notebook' ? record.date : Date.now()
+ }
+ // wait till selection ends
+ setTimeout(() => {
+ message.self.send({
+ type: 'UPDATE_WORD_EDITOR_WORD',
+ payload: { word }
+ })
+ }, 500)
+ }}
+ >
+ {t(`column.${area === 'notebook' ? 'edit' : 'add'}`)}
+ </Button>
+ )
+}
diff --git a/src/components/WordPage/index.tsx b/src/components/WordPage/index.tsx
index b0ecc3ae7..590bd7b8c 100644
--- a/src/components/WordPage/index.tsx
+++ b/src/components/WordPage/index.tsx
@@ -1,33 +1,35 @@
-import React, { FC, useState, useEffect } from 'react'
-import App from './App'
-import 'antd/dist/antd.css'
+import React, { FC, useState } from 'react'
+import { Layout } from 'antd'
+import { from } from 'rxjs'
+import { scan, switchMap, startWith, debounceTime } from 'rxjs/operators'
+import { useObservableCallback, useSubscription } from 'observable-hooks'
+import { DBArea, getWords, Word, deleteWords } from '@/_helpers/record-manager'
+import { Header } from './Header'
+import { WordTableProps, colSelectionWidth, WordTable } from './WordTable'
-import { Provider as ProviderRedux } from 'react-redux'
-import createStore from '@/content/redux/create'
+import './_style.scss'
-import SaladBowlContainer from '@/content/components/SaladBowl/SaladBowl.container'
-import DictPanelContainer from '@/content/components/DictPanel/DictPanel.container'
-import WordEditorContainer from '@/content/components/WordEditor/WordEditor.container'
+const ITEMS_PER_PAGE = 200
-import i18next from 'i18next'
-import { I18nextProvider as ProviderI18next } from 'react-i18next'
-import { i18nLoader, I18nContextProvider } from '@/_helpers/i18n'
+type TableInfo = Pick<
+ WordTableProps,
+ 'dataSource' | 'pagination' | 'rowSelection' | 'loading'
+>
-import { ConfigProvider as ProviderAntdConfig } from 'antd'
-import zh_CN from 'antd/lib/locale-provider/zh_CN'
-import zh_TW from 'antd/lib/locale-provider/zh_TW'
-import en_US from 'antd/lib/locale-provider/en_US'
-
-import { DBArea } from '@/_helpers/record-manager'
-import { createConfigStream } from '@/_helpers/config-manager'
-import { reportGA } from '@/_helpers/analytics'
-
-const reduxStore = createStore()
+interface FetchWordsConfig {
+ itemsPerPage?: number
+ pageNum?: number
+ filters: { [field: string]: (string | number)[] | null | undefined }
+ sortField?: string | number | (string | number)[]
+ sortOrder?: 'ascend' | 'descend' | false | null
+ searchText: string
+}
-const antdLocales = {
- 'zh-CN': zh_CN,
- 'zh-TW': zh_TW,
- en: en_US
+const initialFetchWordsConfig: Readonly<FetchWordsConfig> = {
+ searchText: '',
+ itemsPerPage: ITEMS_PER_PAGE,
+ pageNum: 1,
+ filters: {}
}
export interface WordPageProps {
@@ -35,45 +37,120 @@ export interface WordPageProps {
}
export const WordPage: FC<WordPageProps> = props => {
- const [locale, setLocale] = useState('zh-CN')
-
- useEffect(() => {
- createConfigStream().subscribe(config => {
- if (locale !== config.langCode && antdLocales[config.langCode]) {
- setLocale(config.langCode)
- }
- if (config.analytics) {
- reportGA(`/wordpage/${props.area}`)
+ const [searchText, setSearchText] = useState('')
+ const [tableInfo, setTableInfo] = useState<TableInfo>(() => ({
+ dataSource: [],
+ pagination: {
+ current: 1,
+ pageSize: ITEMS_PER_PAGE,
+ defaultPageSize: ITEMS_PER_PAGE,
+ total: 0
+ },
+ rowSelection: {
+ selectedRowKeys: [],
+ columnWidth: colSelectionWidth,
+ onChange: (selectedRowKeys, selectedRows) => {
+ setTableInfo(lastInfo => ({
+ rowSelection: {
+ ...lastInfo.rowSelection,
+ selectedRowKeys
+ },
+ selectedRows
+ }))
}
- })
- }, [])
+ },
+ loading: false
+ }))
- return (
- <I18nContextProvider>
- <ProviderI18next i18n={i18next}>
- <ProviderAntdConfig locale={antdLocales[locale]}>
- <App area={props.area} locale={locale} />
- </ProviderAntdConfig>
- </ProviderI18next>
- <ProviderRedux store={reduxStore}>
- <SaladBowlContainer />
- <DictPanelContainer />
- <WordEditorContainer />
- </ProviderRedux>
- </I18nContextProvider>
+ const [fetchWords, fetchWords$] = useObservableCallback<
+ { total: number; words: Word[] } | null,
+ Partial<FetchWordsConfig>
+ >(config$ =>
+ config$.pipe(
+ scan(
+ (lastConfig, config) => ({ ...lastConfig, ...config }),
+ initialFetchWordsConfig
+ ),
+ debounceTime(200),
+ switchMap(config =>
+ from(
+ getWords(props.area, config).catch(e => {
+ console.error(e)
+ return { total: 0, words: [] }
+ })
+ ).pipe(startWith(null))
+ ),
+ startWith(null)
+ )
)
-}
-
-export default WordPage
-export async function getLocaledWordPage(area: DBArea) {
- const i18n = await i18nLoader()
- i18n.loadNamespaces(['common', 'wordpage', 'content'])
- i18n.setDefaultNamespace('wordpage')
+ useSubscription(fetchWords$, response => {
+ setTableInfo(lastInfo => ({
+ ...lastInfo,
+ ...(response
+ ? {
+ pagination: {
+ ...lastInfo.pagination,
+ total: response.total
+ },
+ dataSource: response.words,
+ loading: false
+ }
+ : { loading: true })
+ }))
+ })
return (
- <I18nContextProvider>
- <WordPage area={area} />
- </I18nContextProvider>
+ <Layout className="wordpage-Container">
+ <Header
+ area={props.area}
+ searchText={searchText}
+ totalCount={10}
+ selectedCount={12}
+ onSearchTextChanged={text => {
+ setSearchText(text)
+ fetchWords({ searchText: text })
+ }}
+ onExport={() => {}}
+ onDelete={key => {
+ const keys =
+ key === 'selected'
+ ? tableInfo.rowSelection?.selectedRowKeys?.map(date =>
+ Number(date)
+ )
+ : key === 'page'
+ ? tableInfo.dataSource?.map(({ date }) => date)
+ : undefined
+ deleteWords(props.area, keys).then(() => fetchWords({}))
+ }}
+ />
+ <Layout.Content>
+ <WordTable
+ area={props.area}
+ {...tableInfo}
+ onChange={(pagination, filters, sorter) => {
+ window.scrollTo(0, 0)
+
+ setTableInfo(lastInfo => ({
+ pagination: {
+ ...lastInfo.pagination,
+ current: pagination.current || 1
+ }
+ }))
+
+ const realSorter = Array.isArray(sorter) ? sorter[0] : sorter
+
+ fetchWords({
+ itemsPerPage: pagination?.pageSize || ITEMS_PER_PAGE,
+ pageNum: pagination?.current || 1,
+ filters: filters,
+ sortField: realSorter?.field,
+ sortOrder: realSorter?.order,
+ searchText
+ })
+ }}
+ />
+ </Layout.Content>
+ </Layout>
)
}
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 52b23041a..e25f064db 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -128,9 +128,9 @@ export type MessageConfig = MessageConfigType<{
area: DBArea
itemsPerPage?: number
pageNum?: number
- filters?: { [field: string]: string[] | undefined }
- sortField?: string
- sortOrder?: 'ascend' | 'descend' | false
+ filters?: { [field: string]: (string | number)[] | null | undefined }
+ sortField?: string | number | (string | number)[]
+ sortOrder?: 'ascend' | 'descend' | false | null
searchText?: string
}
response: {
|
refactor
|
rewrite word table
|
bd240604f4c5926755b5efa44d45c80095ac9041
|
2018-04-25 18:13:36
|
CRIMX
|
feat(content): add relationships between bowl and panel
| false
|
diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
index 51f4d81bd..e9dc25edb 100644
--- a/src/content/components/DictPanelPortal/index.tsx
+++ b/src/content/components/DictPanelPortal/index.tsx
@@ -11,7 +11,9 @@ import { Omit } from '@/typings/helpers'
export type DictPanelPortalDispatchers = Omit<
DictPanelDispatchers,
'updateItemHeight' | 'updateDragArea'
->
+> & {
+ showPanel: (flag: boolean) => any
+}
export interface DictPanelPortalProps extends DictPanelPortalDispatchers {
readonly isFav: boolean
@@ -23,7 +25,10 @@ export interface DictPanelPortalProps extends DictPanelPortalDispatchers {
}
type DictPanelState= {
+ /** copy current props to compare with the next props */
readonly propsSelection: SelectionState | null
+
+ readonly isNewSelection: boolean
readonly x: number
readonly y: number
readonly height: number
@@ -38,6 +43,8 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
state = {
propsSelection: null,
+
+ isNewSelection: false,
x: 0,
y: 0,
height: 30
@@ -50,7 +57,7 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
const newSelection = nextProps.selection
if (newSelection !== prevState.propsSelection) {
// only re-calculate position when new selection is made
- const newState = { propsSelection: newSelection }
+ const newState = { propsSelection: newSelection, isNewSelection: true }
if (newSelection.selectionInfo.text && !nextProps.isPinned) {
// restore height
@@ -91,7 +98,7 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
return newState
}
- return null
+ return { isNewSelection: false }
}
frameDidMount = (frame: HTMLIFrameElement) => {
@@ -101,11 +108,13 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
mountEL = () => {
this.root.appendChild(this.el)
this.isMount = true
+ this.props.showPanel(true)
}
unmountEL = () => {
this.root.removeChild(this.el)
this.isMount = false
+ this.props.showPanel(false)
}
frameWillUnmount = () => {
@@ -131,25 +140,23 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
const { selection, config, isPinned, isMouseOnBowl } = this.props
- const { x, y, height } = this.state
+ const { x, y, height, isNewSelection } = this.state
const { direct, ctrl, icon, double } = config.mode
- const shouldShow: boolean = Boolean(
- this.isMount
- ? isPinned || selection.selectionInfo.text
- : isMouseOnBowl || (
- selection.selectionInfo.text && (
- direct ||
- (double && selection.dbClick) ||
- (ctrl && selection.ctrlKey)
- )
+ const shouldShow = (
+ (this.isMount && !isNewSelection) ||
+ isPinned ||
+ isMouseOnBowl ||
+ (selection.selectionInfo.text && (
+ direct ||
+ (double && selection.dbClick) ||
+ (ctrl && selection.ctrlKey)
)
+ )
)
- if (shouldShow) {
- if (!this.isMount) {
- this.mountEL()
- }
+ if (shouldShow && !this.isMount) {
+ this.mountEL()
}
return ReactDOM.createPortal(
diff --git a/src/content/containers/DictPanelContainer.tsx b/src/content/containers/DictPanelContainer.tsx
index 5f93bb6a9..d0e7ce7ae 100644
--- a/src/content/containers/DictPanelContainer.tsx
+++ b/src/content/containers/DictPanelContainer.tsx
@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
import DictPanelPortal, { DictPanelPortalProps, DictPanelPortalDispatchers } from '../components/DictPanelPortal'
import { StoreState } from '../redux/modules'
import { searchText } from '../redux/modules/dictionaries'
-import { addToNotebook, removeFromNotebook, pinPanel } from '../redux/modules/widget'
+import { addToNotebook, removeFromNotebook, pinPanel, showPanel } from '../redux/modules/widget'
export const mapStateToProps = ({
config,
@@ -21,6 +21,7 @@ export const mapStateToProps = ({
}
export const mapDispatchToProps: { [k in keyof DictPanelPortalDispatchers]: Function } = {
+ showPanel,
searchText,
addToNotebook,
diff --git a/src/content/containers/SaladBowlContainer.tsx b/src/content/containers/SaladBowlContainer.tsx
index 0a9127309..b9d179bf2 100644
--- a/src/content/containers/SaladBowlContainer.tsx
+++ b/src/content/containers/SaladBowlContainer.tsx
@@ -7,12 +7,14 @@ import { searchText } from '../redux/modules/dictionaries'
export const mapStateToProps = ({ config, selection, widget }: StoreState) => {
const { direct, ctrl, icon, double } = config.mode
const shouldShow = (
- selection.selectionInfo.text &&
- icon &&
- !widget.isPinned &&
- !direct &&
- !(double && selection.dbClick) &&
- !(ctrl && selection.ctrlKey)
+ widget.isMouseOnBowl || (
+ selection.selectionInfo.text &&
+ icon &&
+ !widget.isPanelShow &&
+ !direct &&
+ !(double && selection.dbClick) &&
+ !(ctrl && selection.ctrlKey)
+ )
)
return {
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
index 1847325ff..9989ccd3e 100644
--- a/src/content/redux/modules/widget.ts
+++ b/src/content/redux/modules/widget.ts
@@ -8,7 +8,8 @@ import { StoreState } from './index'
export const enum Actions {
PIN = 'widget/PIN',
FAV_WORD = 'dicts/FAV_WORD',
- MOUSE_ON_BOWL = 'disct/MOUSE_ON_BOWL'
+ MOUSE_ON_BOWL = 'disct/MOUSE_ON_BOWL',
+ SHOW_PANEL = 'disct/SHOW_PANEL',
}
/*-----------------------------------------------*\
@@ -19,12 +20,14 @@ export type WidgetState = {
readonly isPinned: boolean
readonly isFav: boolean
readonly isMouseOnBowl: boolean
+ readonly isPanelShow: boolean
}
const initState: WidgetState = {
isPinned: false,
isFav: false,
isMouseOnBowl: false,
+ isPanelShow: false,
}
export default function reducer (state = initState, action): WidgetState {
@@ -39,6 +42,10 @@ export default function reducer (state = initState, action): WidgetState {
return state.isMouseOnBowl === action.payload
? state
: { ...state, isMouseOnBowl: action.payload }
+ case Actions.SHOW_PANEL:
+ return state.isPanelShow === action.payload
+ ? state
+ : { ...state, isPanelShow: action.payload }
default:
return state
}
@@ -62,6 +69,10 @@ export function mouseOnBowl (payload: boolean): Action {
return ({ type: Actions.MOUSE_ON_BOWL, payload })
}
+export function showPanel (payload: boolean): Action {
+ return ({ type: Actions.SHOW_PANEL, payload })
+}
+
/*-----------------------------------------------*\
Side Effects
\*-----------------------------------------------*/
|
feat
|
add relationships between bowl and panel
|
d95a51d45ade34ca4aeb1e44f99916f88a99abe5
|
2019-01-24 00:00:18
|
CRIMX
|
refactor(options): remove imgs
| false
|
diff --git a/src/options/assets/alipay.svg b/src/options/assets/alipay.svg
deleted file mode 100644
index 1051c6362..000000000
--- a/src/options/assets/alipay.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <rect width="32" height="32" style="stroke-width: 2.158; fill: rgb(1, 159, 232);" rx="4.688" ry="4.688"/>
- <path d="M 13.848 5.704 L 13.786 7.735 L 5.598 7.735 L 5.598 9.292 L 13.89 9.292 L 13.89 11.985 L 7.05 11.985 L 7.05 13.457 L 13.994 13.395 L 20.96 13.331 L 20.834 13.83 C 20.525 15.033 19.197 18.246 18.948 18.352 C 18.803 18.391 17.787 18.161 16.647 17.831 C 13.186 16.774 11.463 16.463 9.121 16.463 C 6.738 16.482 5.185 16.916 3.69 17.976 C 0.79 20.049 0.56 24.113 3.254 26.371 C 6.118 28.778 10.802 29.006 15.05 26.934 C 16.564 26.205 19.281 24.24 20.194 23.223 L 20.566 22.787 L 21.747 23.368 C 22.929 23.97 30.226 27.348 31.47 27.866 L 32.131 28.157 L 32.131 22.826 L 30.328 22.352 C 28.691 21.917 24.505 20.609 23.156 20.09 L 22.639 19.883 L 23.32 18.473 C 24.048 17.022 25.498 12.916 25.498 12.318 C 25.498 12.026 25.083 11.984 21.87 11.984 L 18.242 11.984 L 18.242 9.292 L 26.951 9.292 L 26.951 7.922 C 26.951 7.862 24.981 7.818 22.597 7.839 L 18.242 7.861 L 18.242 3.692 L 13.911 3.692 L 13.848 5.704 Z M 13.038 19.221 C 14.117 19.594 15.546 20.173 16.212 20.526 L 17.413 21.168 L 16.752 21.998 C 16.379 22.455 15.528 23.242 14.825 23.76 C 12.461 25.522 10.262 26.204 7.442 26.039 C 4.5 25.875 2.925 24.671 2.738 22.436 C 2.613 21.046 2.925 20.258 3.878 19.533 C 5.08 18.619 6.055 18.412 8.71 18.473 C 10.741 18.538 11.385 18.662 13.039 19.22 Z" style="fill: rgb(255, 255, 255); stroke-width: 0.987;"/>
-</svg>
\ No newline at end of file
diff --git a/src/options/assets/bitcoin.svg b/src/options/assets/bitcoin.svg
deleted file mode 100644
index a29217d14..000000000
--- a/src/options/assets/bitcoin.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <rect width="32" height="32" style="stroke-width: 2.158; fill: rgb(247, 147, 27);" rx="6.593" ry="6.593"/>
- <path d="M 22.652 11.761 C 22.825 13.523 22.082 14.584 20.916 15.179 C 22.851 15.642 24.072 16.795 23.833 19.379 C 23.527 22.599 21.142 23.46 17.724 23.646 L 17.724 27.026 L 15.683 27.026 L 15.683 23.698 C 15.166 23.698 14.623 23.698 14.067 23.684 L 14.067 27.026 L 12.024 27.026 L 12.024 23.646 C 11.547 23.646 11.072 23.633 10.582 23.633 L 7.931 23.633 L 8.342 21.207 C 9.839 21.233 9.811 21.207 9.811 21.207 C 10.38 21.207 10.538 20.798 10.58 20.532 L 10.58 15.206 L 10.79 15.206 C 10.71 15.192 10.632 15.192 10.58 15.192 L 10.58 11.388 C 10.498 10.964 10.234 10.487 9.397 10.487 C 9.397 10.487 9.424 10.462 7.927 10.487 L 7.927 8.313 L 10.737 8.329 C 11.147 8.329 11.584 8.329 12.02 8.313 L 12.02 4.975 L 14.065 4.975 L 14.065 8.248 C 14.608 8.236 15.152 8.221 15.681 8.221 L 15.681 4.975 L 17.721 4.975 L 17.721 8.314 C 20.347 8.54 22.426 9.351 22.651 11.762 Z M 19.803 18.983 C 19.803 16.358 15.483 16.744 14.106 16.744 L 14.106 21.222 C 15.485 21.222 19.804 21.513 19.804 18.983 Z M 18.863 12.674 C 18.863 10.275 15.259 10.634 14.106 10.634 L 14.106 14.701 C 15.259 14.701 18.865 14.967 18.865 12.672 Z" style="stroke-width: 0.689; fill: rgb(255, 255, 255);"/>
-</svg>
\ No newline at end of file
diff --git a/src/options/assets/ko-fi.svg b/src/options/assets/ko-fi.svg
deleted file mode 100644
index 17dce01f5..000000000
--- a/src/options/assets/ko-fi.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <rect width="32" height="32" style="stroke-width: 2.158; fill: rgb(110, 146, 163);" rx="4.688" ry="4.688"/>
- <g id="layer1" transform="matrix(1, 0, 0, 1, -341.9098606281452, -324.06873768299545)">
- <g id="g40" transform="matrix(1.1421528,0,0,-1.1421528,265.93398,460.73095)">
- <g id="g4184" transform="matrix(1, 0, 0, 1, -0.102861, 0.16624)">
- <path id="path38" style="fill: rgb(255, 255, 255); fill-opacity: 1; fill-rule: nonzero; stroke: none;" d="M 88.824 104.099 C 87.861 103.979 87.079 104.069 87.079 104.069 L 87.079 109.962 L 88.914 109.962 C 88.914 109.962 90.958 109.39 90.958 107.226 C 90.958 105.242 89.935 104.46 88.824 104.099 M 93.892 108.235 C 93.09 112.472 88.853 112.999 88.853 112.999 L 69.877 112.999 C 69.25 112.999 69.174 112.172 69.174 112.172 C 69.174 112.172 69.089 104.576 69.15 99.911 C 69.32 97.399 71.833 97.141 71.833 97.141 C 71.833 97.141 80.405 97.166 84.241 97.191 C 86.769 97.634 87.023 99.852 86.998 101.066 C 91.51 100.815 94.694 103.998 93.892 108.235"/>
- <path id="path42" style="fill: rgb(255, 95, 95); fill-opacity: 1; fill-rule: nonzero; stroke: none;" d="M 77.941 100.446 C 78.137 100.348 78.262 100.47 78.262 100.47 C 78.262 100.47 81.13 103.087 82.422 104.594 C 83.57 105.942 83.646 108.215 81.672 109.064 C 79.699 109.912 78.076 108.065 78.076 108.065 C 76.668 109.614 74.538 109.535 73.552 108.488 C 72.567 107.44 72.911 105.641 73.646 104.639 C 74.336 103.701 77.37 100.997 77.829 100.539 C 77.829 100.539 77.863 100.505 77.941 100.446"/>
- </g>
- </g>
- </g>
-</svg>
\ No newline at end of file
diff --git a/src/options/assets/paypal.svg b/src/options/assets/paypal.svg
deleted file mode 100644
index 42d6d276e..000000000
--- a/src/options/assets/paypal.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <rect width="32" height="32" style="stroke-width: 2.158; fill: rgb(1, 156, 222);" rx="7.325" ry="7.325"/>
- <path d="M 24.029 11.936 C 23.075 16.173 20.125 18.413 15.476 18.413 L 13.929 18.413 L 12.856 25.24 L 11.56 25.24 L 11.489 25.68 C 11.447 25.97 11.67 26.233 11.963 26.233 L 15.271 26.233 C 15.665 26.233 15.995 25.948 16.06 25.56 L 16.09 25.392 L 16.714 21.439 L 16.757 21.226 C 16.815 20.837 17.151 20.553 17.542 20.553 L 18.034 20.553 C 21.238 20.553 23.751 19.25 24.485 15.488 C 24.76 14.055 24.659 12.841 24.032 11.936 Z" style="stroke-width: 0.639; fill: rgb(255, 255, 255);"/>
- <path d="M 22.051 7.311 C 21.104 6.232 19.389 5.767 17.2 5.767 L 10.841 5.767 C 10.392 5.767 10.007 6.091 9.939 6.534 L 7.289 23.328 C 7.24 23.663 7.494 23.962 7.83 23.962 L 11.758 23.962 L 12.746 17.708 L 12.715 17.899 C 12.783 17.457 13.162 17.135 13.611 17.135 L 15.479 17.135 C 19.144 17.135 22.012 15.647 22.852 11.34 C 22.877 11.212 22.898 11.086 22.913 10.967 C 23.164 9.377 22.913 8.289 22.051 7.308 Z" style="stroke-width: 0.639; fill: rgb(255, 255, 255);"/>
-</svg>
\ No newline at end of file
diff --git a/src/options/assets/qrcode/alipay.png b/src/options/assets/qrcode/alipay.png
deleted file mode 100644
index f98fe2c85..000000000
Binary files a/src/options/assets/qrcode/alipay.png and /dev/null differ
diff --git a/src/options/assets/qrcode/wechat.png b/src/options/assets/qrcode/wechat.png
deleted file mode 100644
index b12f08200..000000000
Binary files a/src/options/assets/qrcode/wechat.png and /dev/null differ
diff --git a/src/options/assets/shadows-into-light.ttf b/src/options/assets/shadows-into-light.ttf
deleted file mode 100644
index 903e32be5..000000000
Binary files a/src/options/assets/shadows-into-light.ttf and /dev/null differ
diff --git a/src/options/assets/wechat.svg b/src/options/assets/wechat.svg
deleted file mode 100644
index fb123bd10..000000000
--- a/src/options/assets/wechat.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
- <rect width="32" height="32" style="stroke-width: 2.158; fill: rgb(36, 170, 56);" rx="4.688" ry="4.688"/>
- <path d="M 10.957 11.059 C 10.957 10.435 10.548 10.026 9.924 10.026 C 9.311 10.026 8.687 10.435 8.687 11.06 C 8.687 11.673 9.312 12.082 9.925 12.082 C 10.549 12.082 10.959 11.672 10.959 11.059 Z M 19.396 16.817 C 19.396 16.408 18.987 15.999 18.362 15.999 C 17.953 15.999 17.545 16.408 17.545 16.817 C 17.545 17.237 17.953 17.645 18.362 17.645 C 18.987 17.645 19.396 17.239 19.396 16.817 Z M 16.713 11.059 C 16.713 10.435 16.306 10.026 15.693 10.026 C 15.067 10.026 14.455 10.435 14.455 11.06 C 14.455 11.673 15.068 12.082 15.693 12.082 C 16.306 12.082 16.714 11.672 16.714 11.059 Z M 23.927 16.817 C 23.927 16.408 23.507 15.999 22.893 15.999 C 22.485 15.999 22.076 16.408 22.076 16.817 C 22.076 17.237 22.482 17.645 22.892 17.645 C 23.507 17.645 23.927 17.239 23.927 16.817 Z M 20.906 12.308 C 20.644 12.274 20.382 12.263 20.111 12.263 C 16.204 12.263 13.114 15.181 13.114 18.769 C 13.114 19.37 13.205 19.952 13.377 20.496 C 13.114 20.517 12.865 20.53 12.604 20.53 C 11.57 20.53 10.753 20.326 9.719 20.121 L 6.847 21.562 L 7.663 19.089 C 5.608 17.646 4.37 15.784 4.37 13.524 C 4.37 9.606 8.073 6.529 12.603 6.529 C 16.647 6.529 20.201 8.993 20.906 12.308 Z M 27.629 18.678 C 27.629 20.53 26.402 22.177 24.744 23.414 L 25.367 25.471 L 23.108 24.234 C 22.28 24.436 21.451 24.653 20.633 24.653 C 16.714 24.653 13.636 21.973 13.636 18.678 C 13.636 15.385 16.714 12.707 20.633 12.707 C 24.335 12.707 27.629 15.386 27.629 18.68 Z" style="fill: rgb(255, 255, 255); stroke-width: 0.727;"/>
-</svg>
\ No newline at end of file
|
refactor
|
remove imgs
|
ef31abab72bc397e5d10c354bfd04d225bfd8fab
|
2019-12-05 14:08:58
|
crimx
|
refactor(settings): pdf sniff off by default
| false
|
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
index 94de4d544..034b57130 100644
--- a/src/app-config/index.ts
+++ b/src/app-config/index.ts
@@ -80,7 +80,7 @@ function _getDefaultConfig() {
fontSize: 13,
/** sniff pdf request */
- pdfSniff: true,
+ pdfSniff: false,
/** URLs, [regexp.source, match_pattern] */
pdfWhitelist: [] as [string, string][],
/** URLs, [regexp.source, match_pattern] */
|
refactor
|
pdf sniff off by default
|
5a05d2927d55f85b3025a5360433b9d4265d977d
|
2019-02-12 20:04:50
|
CRIMX
|
chore(release): 6.24.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b450cf0ad..af20db12b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.24.0"></a>
+# [6.24.0](https://github.com/crimx/ext-saladict/compare/v6.23.1...v6.24.0) (2019-02-12)
+
+
+### Bug Fixes
+
+* **selection:** fixed [#296](https://github.com/crimx/ext-saladict/issues/296) ([1f9b6a6](https://github.com/crimx/ext-saladict/commit/1f9b6a6))
+* fix typo ([129e863](https://github.com/crimx/ext-saladict/commit/129e863))
+* **options:** add syncConfig ([51a9e57](https://github.com/crimx/ext-saladict/commit/51a9e57))
+
+
+### Features
+
+* **config:** add baidu to ctxTrans ([a2c1fda](https://github.com/crimx/ext-saladict/commit/a2c1fda))
+* **dicts:** add baidu ([a9fecee](https://github.com/crimx/ext-saladict/commit/a9fecee))
+* add analytics ([48582bd](https://github.com/crimx/ext-saladict/commit/48582bd))
+
+
+
<a name="6.23.1"></a>
## [6.23.1](https://github.com/crimx/ext-saladict/compare/v6.23.0...v6.23.1) (2019-01-28)
diff --git a/package.json b/package.json
index d8277fdaf..1a51c74f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.23.1",
+ "version": "6.24.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.24.0
|
86eec631f7318ce70afc2c50c5d123ba7a5edd46
|
2018-05-28 14:18:13
|
CRIMX
|
fix(panel): record search text on options page
| false
|
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
index 569fa8723..c7a8abfb9 100644
--- a/src/content/redux/modules/dictionaries.ts
+++ b/src/content/redux/modules/dictionaries.ts
@@ -263,10 +263,6 @@ export function startUpAction (): DispatcherThunk {
} else {
listenTrpleCtrl(dispatch, getState)
}
-
- if (isSaladictOptionsPage) {
- dispatch(searchText({ info: getDefaultSelectionInfo({ text: 'salad' }) }))
- }
}
}
@@ -284,6 +280,10 @@ export function searchText (arg?: { id?: DictID, info?: SelectionInfo }): Dispat
// try to unfold a dict when the panel first popup
if (!info || !info.text) { return }
+ if (isSaladictOptionsPage) {
+ window.__SALADICT_LAST_SEARCH__ = info.text
+ }
+
dispatch(isInNotebook(info))
const requestID = arg && arg.id
|
fix
|
record search text on options page
|
47ef11b62adb1decad845285c178053a0bb5cb4b
|
2018-05-13 01:05:00
|
CRIMX
|
fix(panel): keep dict height unchanged when there is nothing
| false
|
diff --git a/src/content/components/DictItem/_style.scss b/src/content/components/DictItem/_style.scss
index fc3976968..f104b0bea 100644
--- a/src/content/components/DictItem/_style.scss
+++ b/src/content/components/DictItem/_style.scss
@@ -38,16 +38,16 @@
}
.panel-DictItem_BodyMesure {
- padding: 10px 0;
-
// clear margin collapsing which seems to causing flickering
// when changing the parent height
+ overflow: hidden;
+
> *:first-child {
- margin-top: 0 !important;
+ margin-top: 10px !important;
}
> *:last-child {
- margin-bottom: 0 !important;
+ margin-bottom: 10px !important;
}
}
|
fix
|
keep dict height unchanged when there is nothing
|
8c6cfac442ffd630bb3ea13f7534e11fe93b0d2b
|
2018-10-12 07:54:09
|
CRIMX
|
chore(release): 6.17.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 080a727b0..b3953fe28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.17.1"></a>
+## [6.17.1](https://github.com/crimx/ext-saladict/compare/v6.17.0...v6.17.1) (2018-10-12)
+
+
+### Bug Fixes
+
+* **panel:** fix panel not showing if animation is off ([a533f59](https://github.com/crimx/ext-saladict/commit/a533f59))
+* **panel:** fix search text loading on standalone panel ([828e315](https://github.com/crimx/ext-saladict/commit/828e315))
+
+
+
<a name="6.17.0"></a>
# [6.17.0](https://github.com/crimx/ext-saladict/compare/v6.16.1...v6.17.0) (2018-10-11)
diff --git a/package.json b/package.json
index 8a5a6cef8..00e3b5152 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.17.0",
+ "version": "6.17.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.17.1
|
0d2cb24683a01eb837c2a222d92362f703a891d4
|
2018-10-28 10:46:22
|
CRIMX
|
test(dicts): update test
| false
|
diff --git a/src/components/__fake__/devDict.tsx b/src/components/__fake__/devDict.tsx
index f6bba66cb..cf4064933 100644
--- a/src/components/__fake__/devDict.tsx
+++ b/src/components/__fake__/devDict.tsx
@@ -43,7 +43,7 @@ const searchText = (...args) => console.log('searchText', ...args)
const recalcBodyHeight = (...args) => console.log('recalcBodyHeight', ...args)
export default function setupEnv ({ dict, style = true, text = 'salad' }: EnvConfig) {
- const search = require('../dictionaries/' + dict + '/engine').default
+ const search = require('../dictionaries/' + dict + '/engine').search
const View = translate()(require('../dictionaries/' + dict + '/View').default)
if (style) {
diff --git a/test/specs/components/dictionaries/google/response/f.txt b/test/specs/components/dictionaries/google/response/f.txt
index dfc7031ce..a981e9467 100644
--- a/test/specs/components/dictionaries/google/response/f.txt
+++ b/test/specs/components/dictionaries/google/response/f.txt
@@ -1 +1 @@
-[[["不要温柔地进入那个晚安。","Do not go gentle into that good night.",null,null,3],["愤怒，对光明的消逝愤怒。","Rage, rage against the dying of the light.",null,null,1]],null,"en",null,null,null,1,null,[["en"],null,[1],["en"]]]
\ No newline at end of file
+[[["“当你不需要的时候，这就是你所读到的东西，当你无法帮助它时，它将决定你将会是什么。”\n","“It is what you read when you don't have to that determines what you will be when you can't help it.”\n",null,null,3],["- 奥斯卡·王尔德\n","― Oscar Wilde\n",null,null,1],["成功一夜成名需要很长时间。","It takes a long time to become an overnight success.",null,null,3],[null,null,"“Dāng nǐ bù xūyào de shíhòu, zhè jiùshì nǐ suǒ dú dào de dōngxī, dāng nǐ wúfǎ bāngzhù tā shí, tā jiāng juédìng nǐ jiāng huì shì shénme.”\n- Àosīkǎ·wáng'ěrdé\nchénggōng yīyè chéngmíng xūyào hěn cháng shíjiān."]],null,"en",null,null,[["“It is what you read when you don't have to that determines what you will be when you can't help it.”",null,[["“当你不需要的时候，这就是你所读到的东西，当你无法帮助它时，它将决定你将会是什么。”",0,true,false],["“这是决定你会什么，当你不能帮助它你读什么，当你不具备的。”",0,true,false]],[[0,101]],"“It is what you read when you don't have to that determines what you will be when you can't help it.”",0,0],["\n",null,null,[[0,1]],"\n",0,0],["― Oscar Wilde",null,[["- 奥斯卡·王尔德",1000,true,false],["- 奥斯卡，王尔德（人名",1000,true,false],[" - 奥斯卡王尔德",0,true,false],[" - 王尔德",0,true,false]],[[0,13]],"― Oscar Wilde",0,0],["\n",null,null,[[0,1]],"\n",0,0],["It takes a long time to become an overnight success.",null,[["成功一夜成名需要很长时间。",0,true,false],["这需要很长的时间来一鸣惊人。",0,true,false]],[[0,52]],"It takes a long time to become an overnight success.",0,0]],1,null,[["en"],null,[1],["en"]]]
|
test
|
update test
|
0c632178733dd32cbd0a5aaab2aad31207a237b1
|
2020-06-11 20:50:33
|
crimx
|
fix(dicts): add macmillan american
| false
|
diff --git a/src/components/dictionaries/macmillan/engine.ts b/src/components/dictionaries/macmillan/engine.ts
index af300c25f..58d370cdc 100644
--- a/src/components/dictionaries/macmillan/engine.ts
+++ b/src/components/dictionaries/macmillan/engine.ts
@@ -16,11 +16,13 @@ import {
} from '../helpers'
import { DictConfigs } from '@/app-config'
-export const getSrcPage: GetSrcPageFunction = text => {
- return `http://www.macmillandictionary.com/dictionary/british/${text
- .trim()
- .split(/\s+/)
- .join('-')}`
+export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
+ const lang =
+ profile.dicts.all.macmillan.options.locale === 'us' ? 'american' : 'british'
+ return (
+ `http://www.macmillandictionary.com/dictionary/${lang}/` +
+ encodeURIComponent(text.toLocaleLowerCase().replace(/[^A-Za-z0-9]+/g, '-'))
+ )
}
const HOST = 'http://www.macmillandictionary.com'
@@ -59,7 +61,7 @@ export interface MacmillanPayload {
href?: string
}
-export const search: SearchFunction<MacmillanResult, MacmillanPayload> = (
+export const search: SearchFunction<MacmillanResult, MacmillanPayload> = async (
text,
config,
profile,
@@ -68,9 +70,7 @@ export const search: SearchFunction<MacmillanResult, MacmillanPayload> = (
const options = profile.dicts.all.macmillan.options
return fetchMacmillanDom(
- payload.href ||
- 'http://www.macmillandictionary.com/dictionary/british/' +
- text.toLocaleLowerCase().replace(/[^A-Za-z0-9]+/g, '-')
+ payload.href || (await getSrcPage(text, config, profile))
)
.catch(handleNetWorkError)
.then(doc => checkResult(doc, options))
|
fix
|
add macmillan american
|
86add3236ad5b2d3cebd524f6cff7ca55ba3f564
|
2019-03-04 08:31:10
|
CRIMX
|
fix: correct lang selection
| false
|
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
index 42a128916..c96d1c701 100644
--- a/src/content/redux/modules/dictionaries.ts
+++ b/src/content/redux/modules/dictionaries.ts
@@ -341,7 +341,14 @@ export function searchText (
selectionLang.french && (isContainFrench(info.text) || isTextContainEng) ||
selectionLang.spanish && (isContainSpanish(info.text) || isTextContainEng) ||
selectionLang.deutsch && (isContainDeutsch(info.text) || isTextContainEng) ||
- selectionLang.others
+ selectionLang.others &&
+ !isTextContainChs &&
+ !isTextContainEng &&
+ !isContainJapanese(info.text) &&
+ !isContainKorean(info.text) &&
+ !isContainFrench(info.text) &&
+ !isContainSpanish(info.text) &&
+ !isContainDeutsch(info.text)
)
if (isValidSelection) {
diff --git a/src/options/components/options/Dictionaries/EditDictModal.tsx b/src/options/components/options/Dictionaries/EditDictModal.tsx
index 655c3a4e2..002f4139c 100644
--- a/src/options/components/options/Dictionaries/EditDictModal.tsx
+++ b/src/options/components/options/Dictionaries/EditDictModal.tsx
@@ -6,6 +6,7 @@ import { DictItem } from '@/app-config/dicts'
import { InputNumberGroup } from '../../InputNumberGroup'
import { FormComponentProps } from 'antd/lib/form'
+import { CheckboxChangeEvent } from 'antd/lib/checkbox'
import { Form, Modal, Switch, Checkbox, Radio } from 'antd'
export type EditDictModalProps = Props & FormComponentProps & {
@@ -14,6 +15,55 @@ export type EditDictModalProps = Props & FormComponentProps & {
}
export class EditDictModal extends React.Component<EditDictModalProps> {
+ langs = {
+ 'chs': {
+ on: [],
+ off: ['japanese', 'korean'],
+ },
+ 'eng': {
+ on: [],
+ off: ['french', 'spanish', 'deutsch'],
+ },
+ 'japanese': {
+ on: ['chs'],
+ off: [],
+ },
+ 'korean': {
+ on: ['chs'],
+ off: [],
+ },
+ 'french': {
+ on: ['eng'],
+ off: [],
+ },
+ 'spanish': {
+ on: ['eng'],
+ off: [],
+ },
+ 'deutsch': {
+ on: ['eng'],
+ off: [],
+ },
+ 'others': {
+ on: [],
+ off: [],
+ },
+ }
+
+ handleLangSelChanged = (e: CheckboxChangeEvent) => {
+ const { checked } = e.target
+ const arr = this.langs[e.target.name!][checked ? 'on' : 'off']
+ if (arr.length > 0) {
+ const dictPath = `profile#dicts#all#${this.props.dictID}`
+ this.props.form.setFieldsValue(
+ arr.reduce((o: object, lang: string) => {
+ o[`${dictPath}#selectionLang#${lang}`] = checked
+ return o
+ }, {})
+ )
+ }
+ }
+
renderMoreOptions = (dictID: DictID) => {
const { t, profile } = this.props
const { getFieldDecorator } = this.props.form
@@ -120,22 +170,17 @@ export class EditDictModal extends React.Component<EditDictModalProps> {
{...formItemModalLayout}
label={t('dict_sel_lang')}
help={t('dict_sel_lang_help')}
- >{[
- 'eng',
- 'chs',
- 'japanese',
- 'korean',
- 'french',
- 'spanish',
- 'deutsch',
- 'others',
- ].map(lang => (
+ >{
+ Object.keys(this.langs).map(lang => (
<Form.Item key={lang} className='form-item-inline'>{
getFieldDecorator(`${dictPath}#selectionLang#${lang}`, {
initialValue: allDict[dictID].selectionLang[lang],
valuePropName: 'checked',
})(
- <Checkbox>{t(`common:lang_${lang}`)}</Checkbox>
+ <Checkbox
+ name={lang}
+ onChange={this.handleLangSelChanged}
+ >{t(`common:lang_${lang}`)}</Checkbox>
)
}</Form.Item>
))
diff --git a/src/options/components/options/SearchModes/index.tsx b/src/options/components/options/SearchModes/index.tsx
index 6d0cef8b1..be052d9ef 100644
--- a/src/options/components/options/SearchModes/index.tsx
+++ b/src/options/components/options/SearchModes/index.tsx
@@ -5,11 +5,60 @@ import SearchMode from './SearchMode'
import { InputNumberGroup } from '../../InputNumberGroup'
import { FormComponentProps } from 'antd/lib/form'
+import { CheckboxChangeEvent } from 'antd/lib/checkbox'
import { Form, Switch, Checkbox } from 'antd'
export type SearchModesProps = Props & FormComponentProps
export class SearchModes extends React.Component<SearchModesProps> {
+ langs = {
+ 'chinese': {
+ on: [],
+ off: ['japanese', 'korean'],
+ },
+ 'english': {
+ on: [],
+ off: ['french', 'spanish', 'deutsch'],
+ },
+ 'japanese': {
+ on: ['chinese'],
+ off: [],
+ },
+ 'korean': {
+ on: ['chinese'],
+ off: [],
+ },
+ 'french': {
+ on: ['english'],
+ off: [],
+ },
+ 'spanish': {
+ on: ['english'],
+ off: [],
+ },
+ 'deutsch': {
+ on: ['english'],
+ off: [],
+ },
+ 'others': {
+ on: [],
+ off: [],
+ },
+ }
+
+ handleLangSelChanged = (e: CheckboxChangeEvent) => {
+ const { checked } = e.target
+ const arr = this.langs[e.target.name!][checked ? 'on' : 'off']
+ if (arr.length > 0) {
+ this.props.form.setFieldsValue(
+ arr.reduce((o: object, lang: string) => {
+ o[`config#language#${lang}`] = checked
+ return o
+ }, {})
+ )
+ }
+ }
+
render () {
const { t, config } = this.props
const { getFieldDecorator } = this.props.form
@@ -32,22 +81,17 @@ export class SearchModes extends React.Component<SearchModesProps> {
{...formItemLayout}
label={t('opt_sel_lang')}
help={t('opt_sel_lang_help')}
- >{[
- 'chinese',
- 'english',
- 'japanese',
- 'korean',
- 'french',
- 'spanish',
- 'deutsch',
- 'others',
- ].map(lang => (
+ >{
+ Object.keys(this.langs).map(lang => (
<Form.Item key={lang} className='form-item-inline'>{
getFieldDecorator(`config#language#${lang}`, {
initialValue: config.language[lang],
valuePropName: 'checked',
})(
- <Checkbox>{t(`common:lang_${lang}`)}</Checkbox>
+ <Checkbox
+ name={lang}
+ onChange={this.handleLangSelChanged}
+ >{t(`common:lang_${lang}`)}</Checkbox>
)
}</Form.Item>
))
diff --git a/src/selection/helper.ts b/src/selection/helper.ts
index f2980e27d..6df025062 100644
--- a/src/selection/helper.ts
+++ b/src/selection/helper.ts
@@ -157,7 +157,14 @@ export function isSelectionLangValid (
language.french && (isContainFrench(text) || isContainEng) ||
language.spanish && (isContainSpanish(text) || isContainEng) ||
language.deutsch && (isContainDeutsch(text) || isContainEng) ||
- language.others
+ language.others &&
+ !isContainChs &&
+ !isContainEng &&
+ !isContainJapanese(text) &&
+ !isContainKorean(text) &&
+ !isContainFrench(text) &&
+ !isContainSpanish(text) &&
+ !isContainDeutsch(text)
)
}
|
fix
|
correct lang selection
|
fef2dc0c1e9c14b44584c3473d4b7b8817bf5267
|
2020-07-11 15:18:11
|
crimx
|
refactor: add isDarkMode sass mixins
| false
|
diff --git a/src/_sass_shared/_global/_mixins.scss b/src/_sass_shared/_global/_mixins.scss
index 46b9511c8..97e81f1bb 100644
--- a/src/_sass_shared/_global/_mixins.scss
+++ b/src/_sass_shared/_global/_mixins.scss
@@ -29,3 +29,11 @@
@content;
}
}
+
+// Usage
+// @include isDarkMode { ... }
+@mixin isDarkMode($modifiers...) {
+ @include atRoot('.darkMode', $modifiers...) {
+ @content;
+ }
+}
diff --git a/src/components/FloatBox/FloatBox.scss b/src/components/FloatBox/FloatBox.scss
index d1a42ad11..13ccb189b 100644
--- a/src/components/FloatBox/FloatBox.scss
+++ b/src/components/FloatBox/FloatBox.scss
@@ -9,6 +9,10 @@
box-shadow: 0px 4px 31px -8px rgba(0, 0, 0, 0.8);
font-size: var(--panel-font-size);
+ @include isDarkMode {
+ background: #2d3338;
+ }
+
@include isAnimate {
transition: width 0.4s, height 0.4s;
}
@@ -56,6 +60,17 @@
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
+
+ @include isDarkMode {
+ border: 1px solid transparent;
+ border-radius: 5px;
+
+ &:focus,
+ &:hover {
+ border-color: #1abc9c;
+ background-color: #29615a;
+ }
+ }
}
.floatBox-Select {
@@ -148,23 +163,6 @@
}
}
-.darkMode {
- .floatBox-Container {
- background: #2d3338;
- }
-
- .floatBox-Item {
- border: 1px solid transparent;
- border-radius: 5px;
-
- &:focus,
- &:hover {
- border-color: #1abc9c;
- background-color: #29615a;
- }
- }
-}
-
// Firefox fix
@-moz-document url-prefix() {
.floatBox-Container {
diff --git a/src/content/components/DictItem/DictItemHead.scss b/src/content/components/DictItem/DictItemHead.scss
index 0b4fd16c8..c45b707a8 100644
--- a/src/content/components/DictItem/DictItemHead.scss
+++ b/src/content/components/DictItem/DictItemHead.scss
@@ -57,6 +57,14 @@
&:active {
background-color: var(--color-divider);
}
+
+ @include isDarkMode {
+ &:hover,
+ &:focus,
+ &:active {
+ background-color: #2d3338;
+ }
+ }
}
.dictItemHead-EmptyArea {
@@ -134,17 +142,3 @@
transform: scale(1);
}
}
-
-/*-----------------------------------------------*\
- States
-\*-----------------------------------------------*/
-
-.darkMode {
- .dictItemHead-Menus_Btn {
- &:hover,
- &:focus,
- &:active {
- background-color: #2d3338;
- }
- }
-}
diff --git a/src/content/components/WordEditor/Notes.scss b/src/content/components/WordEditor/Notes.scss
index a6d9eac43..17aa6a302 100644
--- a/src/content/components/WordEditor/Notes.scss
+++ b/src/content/components/WordEditor/Notes.scss
@@ -46,6 +46,13 @@
0 0 8px rgba(102, 175, 233, 0.6);
}
}
+
+ @include isDarkMode {
+ input,
+ textarea {
+ border-color: #8b8b8b;
+ }
+ }
}
.wordEditorNote_Help {
@@ -78,15 +85,6 @@
}
}
-.darkMode {
- .wordEditorNote {
- input,
- textarea {
- border-color: #8b8b8b;
- }
- }
-}
-
.notes-fade-appear,
.notes-fade-enter {
opacity: 0;
|
refactor
|
add isDarkMode sass mixins
|
98b8867bcfa46be173ff544d240c83e457e39368
|
2019-10-09 00:41:04
|
crimx
|
chore(release): 7.1.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9be882c20..042fd37fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [7.1.1](https://github.com/crimx/ext-saladict/compare/v7.1.0...v7.1.1) (2019-10-08)
+
+
+### Bug Fixes
+
+* **panel:** save word without confirm ([#500](https://github.com/crimx/ext-saladict/issues/500)) ([3d77d97](https://github.com/crimx/ext-saladict/commit/3d77d97))
+* **selection:** only detect left click ([fc3797d](https://github.com/crimx/ext-saladict/commit/fc3797d)), closes [#502](https://github.com/crimx/ext-saladict/issues/502)
+* **selection:** prevent unexpected in-panel selection ([3c057ce](https://github.com/crimx/ext-saladict/commit/3c057ce)), closes [#498](https://github.com/crimx/ext-saladict/issues/498)
+
+
+
## [7.1.0](https://github.com/crimx/ext-saladict/compare/v7.0.4...v7.1.0) (2019-10-03)
diff --git a/package.json b/package.json
index 328fbfad5..64b144f32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.1.0",
+ "version": "7.1.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.1.1
|
54d4fe30ddd0a62f0c41bc7423bf0eb3c3a9309e
|
2020-09-02 22:49:39
|
crimx
|
fix(options): fix dict title overflows on small screens
| false
|
diff --git a/src/options/components/Entries/Dictionaries/DictTitle/_style.scss b/src/options/components/Entries/Dictionaries/DictTitle/_style.scss
index 6f1063f50..5721fa9e2 100644
--- a/src/options/components/Entries/Dictionaries/DictTitle/_style.scss
+++ b/src/options/components/Entries/Dictionaries/DictTitle/_style.scss
@@ -1,3 +1,12 @@
+.saladict-dict-title {
+ word-break: break-all;
+
+ & > * {
+ word-break: keep-all;
+ white-space: nowrap;
+ }
+}
+
.saladict-dict-title-icon {
width: 1.3em;
height: 1.3em;
@@ -5,7 +14,7 @@
vertical-align: text-bottom;
}
-.saladict-dict-title {
+.saladict-dict-title-link {
color: currentColor;
}
diff --git a/src/options/components/Entries/Dictionaries/DictTitle/index.tsx b/src/options/components/Entries/Dictionaries/DictTitle/index.tsx
index d3c0a1e31..542d87c75 100644
--- a/src/options/components/Entries/Dictionaries/DictTitle/index.tsx
+++ b/src/options/components/Entries/Dictionaries/DictTitle/index.tsx
@@ -18,30 +18,34 @@ export const DictTitle: FC<DictTitleProps> = ({ dictID, dictLangs }) => {
const title = t(`dicts:${dictID}.name`)
return (
- <span>
- <img
- className="saladict-dict-title-icon"
- src={require('@/components/dictionaries/' + dictID + '/favicon.png')}
- alt={`logo ${title}`}
- />
- <a
- className="saladict-dict-title"
- href="#"
- onClick={e => {
- e.stopPropagation()
- e.preventDefault()
- openDictSrcPage(dictID, dictLangs)
- }}
- >
- {title}
- </a>
- {dictLangs.split('').map((c, i) =>
- +c ? (
- <span className="saladict-dict-langs-char" key={langCodes[i]}>
- {t(`dict.lang.${langCodes[i]}`)}
- </span>
- ) : null
- )}
+ <span className="saladict-dict-title">
+ <span>
+ <img
+ className="saladict-dict-title-icon"
+ src={require('@/components/dictionaries/' + dictID + '/favicon.png')}
+ alt={`logo ${title}`}
+ />
+ <a
+ className="saladict-dict-title-link"
+ href="#"
+ onClick={e => {
+ e.stopPropagation()
+ e.preventDefault()
+ openDictSrcPage(dictID, dictLangs)
+ }}
+ >
+ {title}
+ </a>
+ </span>
+ <span>
+ {dictLangs.split('').map((c, i) =>
+ +c ? (
+ <span className="saladict-dict-langs-char" key={langCodes[i]}>
+ {t(`dict.lang.${langCodes[i]}`)}
+ </span>
+ ) : null
+ )}
+ </span>
</span>
)
}
diff --git a/src/options/components/SortableList/_style.scss b/src/options/components/SortableList/_style.scss
index 51e793434..9391b3181 100644
--- a/src/options/components/SortableList/_style.scss
+++ b/src/options/components/SortableList/_style.scss
@@ -15,3 +15,7 @@
}
}
}
+
+.sortable-list-item-btns {
+ min-width: fit-content;
+}
diff --git a/src/options/components/SortableList/index.tsx b/src/options/components/SortableList/index.tsx
index d5daaa19a..2f0b58d84 100644
--- a/src/options/components/SortableList/index.tsx
+++ b/src/options/components/SortableList/index.tsx
@@ -99,7 +99,7 @@ export function SortableList(props: SortableListProps) {
) : (
<Radio value={item.value}>{item.title}</Radio>
)}
- <div>
+ <div className="sortable-list-item-btns">
<SwapOutlined
rotate={90}
title={t('sort')}
|
fix
|
fix dict title overflows on small screens
|
bd75e6571054f7205b4728fed605d8adfb1d3868
|
2019-08-21 13:45:43
|
crimx
|
refactor(content): redux intergation
| false
|
diff --git a/src/_helpers/record-manager.ts b/src/_helpers/record-manager.ts
index fc77ba4cd..a5505affb 100644
--- a/src/_helpers/record-manager.ts
+++ b/src/_helpers/record-manager.ts
@@ -51,7 +51,7 @@ export function newWord(word?: Partial<Word>): Word {
export function isInNotebook(word: Word): Promise<boolean> {
return message
- .send({ type: 'IS_IN_NOTEBOOK', payload: word })
+ .send<'IS_IN_NOTEBOOK'>({ type: 'IS_IN_NOTEBOOK', payload: word })
.catch(logError(false))
}
@@ -67,8 +67,11 @@ export async function deleteWords(
await message.send({ type: 'DELETE_WORDS', payload: { area, dates } })
}
-export function getWordsByText(area: DBArea, text: string): Promise<Word[]> {
- return message.send({
+export function getWordsByText(
+ area: DBArea,
+ text: string
+): Promise<readonly Word[]> {
+ return message.send<'GET_WORDS_BY_TEXT'>({
type: 'GET_WORDS_BY_TEXT',
payload: {
area,
@@ -88,7 +91,7 @@ export function getWords(
searchText?: string
}
) {
- return message.send({
+ return message.send<'GET_WORDS'>({
type: 'GET_WORDS',
payload: {
area,
diff --git a/src/content/components/MenuBar/MenuBar.container.tsx b/src/content/components/MenuBar/MenuBar.container.tsx
new file mode 100644
index 000000000..7a3c62363
--- /dev/null
+++ b/src/content/components/MenuBar/MenuBar.container.tsx
@@ -0,0 +1,73 @@
+import { connect } from 'react-redux'
+import { MenuBar, MenuBarProps } from './MenuBar'
+import { StoreState, StoreAction } from '@/content/redux/modules'
+import { Dispatch } from 'redux'
+import { isStandalonePage } from '@/_helpers/saladict'
+import { newWord } from '@/_helpers/record-manager'
+
+type Dispatchers =
+ | 'searchText'
+ | 'updateText'
+ | 'addToNoteBook'
+ | 'updateHistoryIndex'
+ | 'togglePin'
+ | 'onClose'
+ | 'onDragAreaMouseDown'
+ | 'onDragAreaTouchStart'
+
+const mapStateToProps = (
+ state: StoreState
+): Omit<MenuBarProps, Dispatchers> => ({
+ text: state.text,
+ isInNotebook: state.isFav,
+ shouldFocus:
+ !state.isExpandMtaBox &&
+ (state.isQSPanel || state.renderedDicts.length <= 0 || isStandalonePage()),
+ enableSuggest: state.config.searchSuggests,
+ histories: state.searchHistory,
+ historyIndex: state.historyIndex,
+ profiles: state.profiles,
+ activeProfileId: state.activeProfile.id,
+ isPinned: state.isPinned
+})
+
+const mapDispatchToProps = (
+ dispatch: Dispatch<StoreAction>
+): Pick<MenuBarProps, Dispatchers> => ({
+ searchText: text => {
+ dispatch({
+ type: 'SEARCH_START',
+ payload: {
+ word: newWord({
+ text,
+ title: 'Saladict',
+ favicon: 'https://saladict.crimx.com/favicon.ico'
+ })
+ }
+ })
+ },
+ updateText: text => {
+ dispatch({ type: 'UPDATE_TEXT', payload: text })
+ },
+ addToNoteBook: () => {
+ dispatch({ type: 'ADD_TO_NOTEBOOK' })
+ },
+ updateHistoryIndex: index => {
+ dispatch({ type: 'UPDATE_HISTORY_INDEX', payload: index })
+ },
+ togglePin: () => {
+ dispatch({ type: 'TOGGLE_PIN' })
+ },
+ onClose: () => {
+ dispatch({ type: 'CLOSE_PANEL' })
+ },
+ onDragAreaMouseDown: () => {},
+ onDragAreaTouchStart: () => {}
+})
+
+export const MenuBarContainer = connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(MenuBar)
+
+export default MenuBarContainer
diff --git a/src/content/components/MenuBar/MenuBar.stories.tsx b/src/content/components/MenuBar/MenuBar.stories.tsx
index fe1ce4496..91044c3dd 100644
--- a/src/content/components/MenuBar/MenuBar.stories.tsx
+++ b/src/content/components/MenuBar/MenuBar.stories.tsx
@@ -65,7 +65,7 @@ storiesOf('Content Scripts|Dict Panel/Menubar', module)
searchText={action('Search Text')}
isInNotebook={boolean('Is In Notebook', false)}
addToNoteBook={action('Add to Notebook')}
- isFocusInputOnMount={true}
+ shouldFocus={true}
enableSuggest={boolean('Enable Suggest', true)}
histories={histories}
historyIndex={number('History Index', 0)}
diff --git a/src/content/components/MenuBar/MenuBar.tsx b/src/content/components/MenuBar/MenuBar.tsx
index 3a2c8871f..0dc599df4 100644
--- a/src/content/components/MenuBar/MenuBar.tsx
+++ b/src/content/components/MenuBar/MenuBar.tsx
@@ -29,7 +29,7 @@ export interface MenuBarProps {
isInNotebook: boolean
addToNoteBook: () => any
- isFocusInputOnMount: boolean
+ shouldFocus: boolean
enableSuggest: boolean
histories: Word[]
@@ -65,7 +65,7 @@ export const MenuBar: FC<MenuBarProps> = props => {
<SearchBox
t={t}
text={props.text}
- isFocusOnMount={props.isFocusInputOnMount}
+ shouldFocus={props.shouldFocus}
enableSuggest={props.enableSuggest}
onInput={props.updateText}
onSearch={props.searchText}
diff --git a/src/content/components/MenuBar/SearchBox.tsx b/src/content/components/MenuBar/SearchBox.tsx
index 7b319dc22..eae78a26b 100644
--- a/src/content/components/MenuBar/SearchBox.tsx
+++ b/src/content/components/MenuBar/SearchBox.tsx
@@ -6,17 +6,17 @@ import {
useObservableState,
useObservable
} from 'observable-hooks'
-import { identity, merge } from 'rxjs'
+import { identity, merge, combineLatest } from 'rxjs'
import { focusBlur } from '@/_helpers/observables'
import { Suggest } from './Suggest'
-import { filter } from 'rxjs/operators'
+import { filter, map } from 'rxjs/operators'
export interface SearchBoxProps {
t: i18next.TFunction
/** Search box text */
text: string
- /** Focus search box on mount */
- isFocusOnMount: boolean
+ /** Focus search box */
+ shouldFocus: boolean
/** Show suggest panel when typing */
enableSuggest: boolean
onInput: (text: string) => any
@@ -41,14 +41,23 @@ export const SearchBox: FC<SearchBoxProps> = props => {
const [onShowSugget, onShowSugget$] = useObservableCallback<boolean>(identity)
- const shouldShowSuggest = useObservableState(
- useObservable(() =>
- merge(
- // only show suggest when start typing
- searchBoxFocusBlur$.pipe(filter(isFocus => !isFocus)),
- suggestFocusBlur$,
- onShowSugget$
- )
+ const isShowSuggest = useObservableState(
+ useObservable(
+ inputs$ =>
+ combineLatest(
+ inputs$,
+ merge(
+ // only show suggest when start typing
+ searchBoxFocusBlur$.pipe(filter(isFocus => !isFocus)),
+ suggestFocusBlur$,
+ onShowSugget$
+ )
+ ).pipe(
+ map(([[enableSuggest, text], shouldShowSuggest]) =>
+ Boolean(enableSuggest && text && shouldShowSuggest)
+ )
+ ),
+ [props.enableSuggest, props.text] as [boolean, string]
),
false
)
@@ -59,11 +68,11 @@ export const SearchBox: FC<SearchBoxProps> = props => {
const suggestRef = useRef<HTMLDivElement>(null)
useEffect(() => {
- if (props.isFocusOnMount && inputRef.current) {
+ if (props.shouldFocus && !isShowSuggest && inputRef.current) {
inputRef.current.focus()
inputRef.current.select()
}
- }, [])
+ }) // Run on every update
const focusInput = () => {
if (inputRef.current) {
@@ -108,7 +117,7 @@ export const SearchBox: FC<SearchBoxProps> = props => {
<CSSTransition
classNames="menuBar-SearchBox_Suggest"
- in={!!(props.enableSuggest && shouldShowSuggest && props.text)}
+ in={isShowSuggest}
timeout={100}
mountOnEnter={true}
unmountOnExit={true}
diff --git a/src/content/components/MtaBox/MtaBox.container.tsx b/src/content/components/MtaBox/MtaBox.container.tsx
new file mode 100644
index 000000000..c40159728
--- /dev/null
+++ b/src/content/components/MtaBox/MtaBox.container.tsx
@@ -0,0 +1,36 @@
+import { connect } from 'react-redux'
+import { MtaBox, MtaBoxProps } from './MtaBox'
+import { StoreState, StoreAction } from '@/content/redux/modules'
+import { Dispatch } from 'redux'
+import { newWord } from '@/_helpers/record-manager'
+
+type Dispatchers = 'searchText' | 'onInput' | 'onDrawerToggle'
+
+const mapStateToProps = (
+ state: StoreState
+): Omit<MtaBoxProps, Dispatchers> => ({
+ expand: state.isExpandMtaBox,
+ maxHeight: state.config.panelMaxHeightRatio * window.innerHeight,
+ text: state.text
+})
+
+const mapDispatchToProps = (
+ dispatch: Dispatch<StoreAction>
+): Pick<MtaBoxProps, Dispatchers> => ({
+ searchText: text => {
+ dispatch({ type: 'SEARCH_START', payload: { word: newWord({ text }) } })
+ },
+ onInput: text => {
+ dispatch({ type: 'UPDATE_TEXT', payload: text })
+ },
+ onDrawerToggle: () => {
+ dispatch({ type: 'TOGGLE_MTA_BOX' })
+ }
+})
+
+export const MtaBoxContainer = connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(MtaBox)
+
+export default MtaBoxContainer
diff --git a/src/content/components/SaladBowl/SaladBowl.container.tsx b/src/content/components/SaladBowl/SaladBowl.container.tsx
index 271869f43..f33b67f44 100644
--- a/src/content/components/SaladBowl/SaladBowl.container.tsx
+++ b/src/content/components/SaladBowl/SaladBowl.container.tsx
@@ -8,19 +8,19 @@ type Dispatchers = 'onChange'
const mapStateToProps = (
state: StoreState
): Omit<SaladBowlPortalProps, Dispatchers> => ({
- show: state.widget.isShowDictPanel,
+ show: state.isShowDictPanel,
mouseX: state.selection.mouseX,
mouseY: state.selection.mouseY,
- withAnimation: state.config.config.animation,
- enableHover: state.config.config.bowlHover
+ withAnimation: state.config.animation,
+ enableHover: state.config.bowlHover
})
const mapDispatchToProps = (
dispatch: Dispatch<StoreAction>
): Pick<SaladBowlPortalProps, Dispatchers> => ({
- onChange: (active: boolean) => {
+ onChange: active => {
if (active) {
- dispatch({ type: 'WIDGET/BOWL_ACTIVATED' })
+ dispatch({ type: 'BOWL_ACTIVATED' })
}
}
})
diff --git a/src/content/redux/create.ts b/src/content/redux/create.ts
index ba79ea3e0..e96fd7a46 100644
--- a/src/content/redux/create.ts
+++ b/src/content/redux/create.ts
@@ -1,37 +1,39 @@
import { createStore, applyMiddleware, compose } from 'redux'
-import thunk from 'redux-thunk'
-import rootReducer, { StoreState } from './modules'
+import { createEpicMiddleware } from 'redux-observable'
+import { Observable } from 'rxjs'
+import { map, distinctUntilChanged } from 'rxjs/operators'
-import { startUpAction as configStartUp, updateConfig } from './modules/config'
-import { startUpAction as selectionStartUp } from './modules/selection'
-import { startUpAction as widgetStartUp } from './modules/widget'
-import { startUpAction as dictionariesStartUp } from './modules/dictionaries'
+import get from 'lodash/get'
import { message } from '@/_helpers/browser-api'
-import { MsgType, MsgIsPinned, MsgQueryPanelState } from '@/typings/message'
import { getConfig } from '@/_helpers/config-manager'
import { getActiveProfile } from '@/_helpers/profile-manager'
-import { Observable } from 'rxjs/Observable'
-import { map } from 'rxjs/operators/map'
-import { distinctUntilChanged } from 'rxjs/operators/distinctUntilChanged'
+import { rootReducer, StoreState, StoreAction } from './modules'
+import { init } from './modules/init'
+import { epics } from './modules/epics'
-import get from 'lodash/get'
+const epicMiddleware = createEpicMiddleware<
+ StoreAction,
+ StoreAction,
+ StoreState
+>()
export default () => {
- const composeEnhancers = window['__REDUX_DEVTOOLS_EXTENSION_COMPOSE__'] || compose
+ const composeEnhancers =
+ window['__REDUX_DEVTOOLS_EXTENSION_COMPOSE__'] || compose
- const store = createStore<StoreState>(
- rootReducer as any,
- composeEnhancers(applyMiddleware(thunk))
+ const store = createStore(
+ rootReducer,
+ composeEnhancers(applyMiddleware(epicMiddleware))
)
+ epicMiddleware.run(epics)
+
Promise.all([getConfig(), getActiveProfile()]).then(([config, profile]) => {
- store.dispatch<any>(updateConfig({ ...config, ...profile }))
- store.dispatch<any>(configStartUp())
- store.dispatch<any>(selectionStartUp())
- store.dispatch<any>(widgetStartUp())
- store.dispatch<any>(dictionariesStartUp())
+ store.dispatch({ type: 'NEW_CONFIG', payload: config })
+ store.dispatch({ type: 'NEW_PROFILE', payload: profile })
+ init(store.dispatch, store.getState)
})
// sync state
@@ -39,23 +41,26 @@ export default () => {
store.subscribe(() => observer.next(store.getState()))
})
- storeState$.pipe(
- map(state => state.widget.isPinned),
- distinctUntilChanged()
- ).subscribe(isPinned => {
- message.self.send<MsgIsPinned>({
- type: MsgType.IsPinned,
- isPinned,
+ storeState$
+ .pipe(
+ map(state => state.isPinned),
+ distinctUntilChanged()
+ )
+ .subscribe(isPinned => {
+ message.self.send({
+ type: 'PIN_STATE',
+ payload: isPinned
+ })
})
- })
- message.addListener<MsgQueryPanelState>(MsgType.QueryPanelState, queryStoreState)
- message.self.addListener<MsgQueryPanelState>(MsgType.QueryPanelState, queryStoreState)
+ message.addListener('QUERY_PANEL_STATE', queryStoreState)
+ message.self.addListener('QUERY_PANEL_STATE', queryStoreState)
- function queryStoreState ({ path }: MsgQueryPanelState) {
- return Promise.resolve(path && typeof path === 'string'
- ? get(store.getState(), path)
- : store.getState()
+ function queryStoreState({ payload: path }: { payload?: string }) {
+ return Promise.resolve(
+ path && typeof path === 'string'
+ ? get(store.getState(), path)
+ : store.getState()
)
}
diff --git a/src/content/redux/modules/action-catalog.ts b/src/content/redux/modules/action-catalog.ts
index be1afdfed..f644e257f 100644
--- a/src/content/redux/modules/action-catalog.ts
+++ b/src/content/redux/modules/action-catalog.ts
@@ -1,5 +1,5 @@
import { AppConfig, DictID } from '@/app-config'
-import { Profile } from '@/app-config/profiles'
+import { Profile, ProfileIDList } from '@/app-config/profiles'
import { Message } from '@/typings/message'
import { Word } from '@/_helpers/record-manager'
@@ -8,7 +8,11 @@ export type ActionCatalog = {
payload: AppConfig
}
- NEW_PROFILE: {
+ NEW_PROFILES: {
+ payload: ProfileIDList
+ }
+
+ NEW_ACTIVE_PROFILE: {
payload: Profile
}
@@ -28,13 +32,28 @@ export type ActionCatalog = {
Dict Panel
\* ------------------------------------------------ */
+ UPDATE_TEXT: {
+ payload: string
+ }
+
+ TOGGLE_MTA_BOX: {}
+
+ TOGGLE_PIN: {}
+
CLOSE_PANEL: {}
+ UPDATE_HISTORY_INDEX: {
+ payload: number
+ }
+
/** Is current word in Notebook */
WORD_IN_NOTEBOOK: {
payload: boolean
}
+ // Add the latest history item to Notebook
+ ADD_TO_NOTEBOOK: {}
+
SEARCH_START: {
payload?: {
/** Search with specific dict */
diff --git a/src/content/redux/modules/epics/index.ts b/src/content/redux/modules/epics/index.ts
index 07c6f3c0d..993f915e9 100644
--- a/src/content/redux/modules/epics/index.ts
+++ b/src/content/redux/modules/epics/index.ts
@@ -1,5 +1,8 @@
import { combineEpics } from 'redux-observable'
-import { mapTo } from 'rxjs/operators'
+import { mapTo, mergeMap, filter } from 'rxjs/operators'
+
+import { saveWord } from '@/_helpers/record-manager'
+
import { StoreAction, StoreState } from '../'
import { ofType } from '../../utils/operators'
@@ -13,6 +16,26 @@ export const epics = combineEpics<StoreAction, StoreAction, StoreState>(
ofType('BOWL_ACTIVATED'),
mapTo({ type: 'SEARCH_START' })
),
+ (action$, state$) =>
+ action$.pipe(
+ ofType('ADD_TO_NOTEBOOK'),
+ mergeMap(async () => {
+ const word =
+ state$.value.searchHistory[state$.value.searchHistory.length - 1]
+ if (word) {
+ try {
+ await saveWord('notebook', word)
+ return true
+ } catch (e) {
+ return false
+ }
+ }
+ return false
+ }),
+ // dim icon if failed
+ filter(isSuccess => !isSuccess),
+ mapTo({ type: 'WORD_IN_NOTEBOOK', payload: false })
+ ),
newSelectionEpic,
searchStartEpic
)
diff --git a/src/content/redux/modules/index.ts b/src/content/redux/modules/index.ts
index 0d6176a3b..b1922ce82 100644
--- a/src/content/redux/modules/index.ts
+++ b/src/content/redux/modules/index.ts
@@ -4,7 +4,7 @@ import { ActionCatalog } from './action-catalog'
import { Action, ActionType, ActionHandler } from '../utils/types'
import { reducer } from './reducer'
-export type StoreState = typeof initState
+export type StoreState = ReturnType<typeof initState>
export type StoreActionCatalog = ActionCatalog
diff --git a/src/content/redux/modules/init.ts b/src/content/redux/modules/init.ts
index 9abd70f41..67d741407 100644
--- a/src/content/redux/modules/init.ts
+++ b/src/content/redux/modules/init.ts
@@ -1,6 +1,9 @@
import { Init } from '../utils/types'
import { addConfigListener } from '@/_helpers/config-manager'
-import { addActiveProfileListener } from '@/_helpers/profile-manager'
+import {
+ addActiveProfileListener,
+ createProfileIDListStream
+} from '@/_helpers/profile-manager'
import {
isPopupPage,
isQuickSearchPage,
@@ -21,7 +24,11 @@ export const init: Init<StoreActionCatalog, StoreState> = (
})
addActiveProfileListener(({ newProfile }) => {
- dispatch({ type: 'NEW_PROFILE', payload: newProfile })
+ dispatch({ type: 'NEW_ACTIVE_PROFILE', payload: newProfile })
+ })
+
+ createProfileIDListStream().subscribe(idlist => {
+ dispatch({ type: 'NEW_PROFILES', payload: idlist })
})
message.addListener(msg => {
@@ -113,7 +120,12 @@ export const init: Init<StoreActionCatalog, StoreState> = (
}
}
-/** Dict Panel show that is triggered by anything other than selection */
+/**
+ * Summoned panel could be the dict panel
+ * 1. in Standalone Quick Search page.
+ * 2. in Popup page (Browser Action).
+ * 3. triggered by triple ctrl shortcut.
+ */
async function summonedPanelInit(
dispatch: Dispatch<StoreAction>,
word: Word | null,
diff --git a/src/content/redux/modules/reducer/index.ts b/src/content/redux/modules/reducer/index.ts
index 53f669abb..aca61f980 100644
--- a/src/content/redux/modules/reducer/index.ts
+++ b/src/content/redux/modules/reducer/index.ts
@@ -1,4 +1,8 @@
-import { isOptionsPage, isStandalonePage } from '@/_helpers/saladict'
+import {
+ isStandalonePage,
+ isPopupPage,
+ isQuickSearchPage
+} from '@/_helpers/saladict'
import { createReducer } from '../../utils/createReducer'
import { initState } from '../state'
import { ActionCatalog } from '../action-catalog'
@@ -6,117 +10,159 @@ import { searchStart } from './search-start.handler'
import { newSelection } from './new-selection.handler'
import { openQSPanel } from './open-qs-panel.handler'
-export const reducer = createReducer<typeof initState, ActionCatalog>(
- initState,
- {
- NEW_CONFIG: (state, { payload }) => {
- const url = window.location.href
- return {
- ...state,
- config: payload,
- isTempDisabled:
- payload.blacklist.some(([r]) => new RegExp(r).test(url)) &&
- payload.whitelist.every(([r]) => !new RegExp(r).test(url))
- }
- },
-
- NEW_PROFILE: (state, { payload }) => ({
+export const reducer = createReducer<
+ ReturnType<typeof initState>,
+ ActionCatalog
+>(initState(), {
+ NEW_CONFIG: (state, { payload }) => {
+ const url = window.location.href
+ return {
...state,
- activeProfile: payload,
- renderedDicts: state.renderedDicts.filter(({ id }) =>
- payload.dicts.selected.includes(id)
- )
- }),
-
- NEW_SELECTION: newSelection,
-
- TEMP_DISABLED_STATE: (state, { payload }) =>
- payload
- ? {
- ...state,
- isTempDisabled: true,
- isPinned: false,
- shouldPanelShow: false,
- shouldBowlShow: false
- }
- : {
- ...state,
- isTempDisabled: false
- },
-
- BOWL_ACTIVATED: state => ({
- ...state,
- isShowBowl: false,
- isShowDictPanel: true
- }),
-
- CLOSE_PANEL: state =>
- isOptionsPage() || isStandalonePage()
- ? state
- : {
- ...state,
- isPinned: false,
- isShowBowl: false,
- isShowDictPanel: false
- },
-
- WORD_IN_NOTEBOOK: (state, { payload }) => ({
- ...state,
- isFav: payload
- }),
-
- SEARCH_START: searchStart,
-
- SEARCH_END: (state, { payload }) => {
- if (state.renderedDicts.every(({ id }) => id !== payload.id)) {
- // this dict is for auto-pronunciation only
- return state
- }
-
- return {
- ...state,
- renderedDicts: state.renderedDicts.map(d =>
- d.id === payload.id
- ? {
- id: d.id,
- searchStatus: 'FINISH',
- searchResult: payload.result
- }
- : d
- )
- }
- },
-
- SUMMONED_PANEL_INIT: (state, { payload }) => ({
+ config: payload,
+ isTempDisabled:
+ payload.blacklist.some(([r]) => new RegExp(r).test(url)) &&
+ payload.whitelist.every(([r]) => !new RegExp(r).test(url))
+ }
+ },
+
+ NEW_PROFILES: (state, { payload }) => ({
+ ...state,
+ profiles: payload
+ }),
+
+ NEW_ACTIVE_PROFILE: (state, { payload }) => ({
+ ...state,
+ activeProfile: payload,
+ isExpandMtaBox:
+ payload.mtaAutoUnfold === 'once' ||
+ payload.mtaAutoUnfold === 'always' ||
+ (payload.mtaAutoUnfold === 'popup' && isPopupPage()),
+ renderedDicts: state.renderedDicts.filter(({ id }) =>
+ payload.dicts.selected.includes(id)
+ )
+ }),
+
+ NEW_SELECTION: newSelection,
+
+ TEMP_DISABLED_STATE: (state, { payload }) =>
+ payload
+ ? {
+ ...state,
+ isTempDisabled: true,
+ isPinned: false,
+ // keep showing if it's standalone page
+ isShowDictPanel: isStandalonePage(),
+ isShowBowl: false,
+ // also reset quick search panel state
+ isQSPanel: isQuickSearchPage()
+ }
+ : {
+ ...state,
+ isTempDisabled: false
+ },
+
+ BOWL_ACTIVATED: state => ({
+ ...state,
+ isShowBowl: false,
+ isShowDictPanel: true
+ }),
+
+ UPDATE_TEXT: (state, { payload }) => ({
+ ...state,
+ text: payload
+ }),
+
+ TOGGLE_MTA_BOX: state => ({
+ ...state,
+ isExpandMtaBox: !state.isExpandMtaBox
+ }),
+
+ TOGGLE_PIN: state => ({
+ ...state,
+ isPinned: !state.isPinned
+ }),
+
+ CLOSE_PANEL: state =>
+ isStandalonePage()
+ ? state
+ : {
+ ...state,
+ isPinned: false,
+ isShowBowl: false,
+ isShowDictPanel: false,
+ isQSPanel: isQuickSearchPage()
+ },
+
+ UPDATE_HISTORY_INDEX: (state, { payload }) => ({
+ ...state,
+ historyIndex: payload
+ }),
+
+ WORD_IN_NOTEBOOK: (state, { payload }) => ({
+ ...state,
+ isFav: payload
+ }),
+
+ ADD_TO_NOTEBOOK: state => ({
+ ...state,
+ // epic will set this back to false if transation failed
+ isFav: true
+ }),
+
+ SEARCH_START: searchStart,
+
+ SEARCH_END: (state, { payload }) => {
+ if (state.renderedDicts.every(({ id }) => id !== payload.id)) {
+ // this dict is for auto-pronunciation only
+ return state
+ }
+
+ return {
...state,
- text: payload,
- historyIndex: 0,
- isShowDictPanel: true,
- isShowBowl: false
- }),
-
- QS_PANEL_CHANGED: (state, { payload }) => {
- if (state.withQSPanel === payload) {
- return state
- }
-
- // hide panel on otehr pages and leave just quick search panel
- return payload
- ? {
- ...state,
- withQSPanel: payload,
- isPinned: false,
- shouldPanelShow: false,
- shouldBowlShow: false
- }
- : {
- ...state,
- withQSPanel: payload
- }
- },
-
- OPEN_QS_PANEL: openQSPanel
- }
-)
+ renderedDicts: state.renderedDicts.map(d =>
+ d.id === payload.id
+ ? {
+ id: d.id,
+ searchStatus: 'FINISH',
+ searchResult: payload.result
+ }
+ : d
+ )
+ }
+ },
+
+ SUMMONED_PANEL_INIT: (state, { payload }) => ({
+ ...state,
+ text: payload,
+ historyIndex: 0,
+ isShowDictPanel: true,
+ isShowBowl: false
+ }),
+
+ QS_PANEL_CHANGED: (state, { payload }) => {
+ if (state.withQSPanel === payload) {
+ return state
+ }
+
+ // hide panel on otehr pages and leave just quick search panel
+ return payload
+ ? {
+ ...state,
+ withQSPanel: payload,
+ isPinned: false,
+ // no hiding if it's browser action page
+ isShowDictPanel: isPopupPage(),
+ isShowBowl: false,
+ isQSPanel: false
+ }
+ : {
+ ...state,
+ withQSPanel: payload,
+ isQSPanel: isQuickSearchPage()
+ }
+ },
+
+ OPEN_QS_PANEL: openQSPanel
+})
export default reducer
diff --git a/src/content/redux/modules/reducer/open-qs-panel.handler.ts b/src/content/redux/modules/reducer/open-qs-panel.handler.ts
index 41e936cdd..948036cf5 100644
--- a/src/content/redux/modules/reducer/open-qs-panel.handler.ts
+++ b/src/content/redux/modules/reducer/open-qs-panel.handler.ts
@@ -51,6 +51,7 @@ export const openQSPanel: StoreActionHandler<'OPEN_QS_PANEL'> = state => {
return {
...state,
+ isQSPanel: true,
isShowDictPanel: true,
// skip reconciliation with negative values
dictPanelCord: {
diff --git a/src/content/redux/modules/reducer/search-start.handler.ts b/src/content/redux/modules/reducer/search-start.handler.ts
index ced815efd..923dc13d3 100644
--- a/src/content/redux/modules/reducer/search-start.handler.ts
+++ b/src/content/redux/modules/reducer/search-start.handler.ts
@@ -1,5 +1,6 @@
import { StoreActionHandler } from '..'
import { checkSupportedLangs, countWords } from '@/_helpers/lang-check'
+import { isPopupPage } from '@/_helpers/saladict'
export const searchStart: StoreActionHandler<'SEARCH_START'> = (
state,
@@ -24,6 +25,9 @@ export const searchStart: StoreActionHandler<'SEARCH_START'> = (
return {
...state,
+ isExpandMtaBox:
+ activeProfile.mtaAutoUnfold === 'always' ||
+ (activeProfile.mtaAutoUnfold === 'popup' && isPopupPage()),
searchHistory: shouldAddHistory
? [...searchHistory, payload!.word!]
: searchHistory,
diff --git a/src/content/redux/modules/state.ts b/src/content/redux/modules/state.ts
index 0c1e9f868..16393534f 100644
--- a/src/content/redux/modules/state.ts
+++ b/src/content/redux/modules/state.ts
@@ -1,10 +1,16 @@
import { newWord, Word } from '@/_helpers/record-manager'
import { getDefaultConfig, DictID } from '@/app-config'
-import { getDefaultProfile } from '@/app-config/profiles'
+import { getDefaultProfile, ProfileIDList } from '@/app-config/profiles'
+import {
+ isQuickSearchPage,
+ isStandalonePage,
+ isOptionsPage
+} from '@/_helpers/saladict'
-export const initState = {
- activeProfile: getDefaultProfile(),
+export const initState = () => ({
config: getDefaultConfig(),
+ profiles: [] as ProfileIDList,
+ activeProfile: getDefaultProfile(),
selection: {
word: newWord(),
mouseX: 0,
@@ -17,13 +23,17 @@ export const initState = {
instant: false,
force: false
},
- isShowBowl: false,
- isShowDictPanel: false,
/** Temporary disable Saladict */
isTempDisabled: false,
- isPinned: false,
+ /** Is current panel a Quick Search Panel */
+ isQSPanel: isQuickSearchPage(),
/** is a standalone quick search panel running */
withQSPanel: false,
+ isShowWordEditor: false,
+ isShowBowl: false,
+ isShowDictPanel: isStandalonePage() || isOptionsPage(),
+ isExpandMtaBox: false,
+ isPinned: isOptionsPage(),
/** Is current word in Notebook */
isFav: false,
/** Pass negative value to skip the reconciliation */
@@ -43,6 +53,6 @@ export const initState = {
searchHistory: [] as Word[],
/** User can view back search history */
historyIndex: 0
-}
+})
export default initState
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 3eb3fc7ec..3353fdb4e 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -110,6 +110,7 @@ export type MessageConfig = {
area: DBArea
text: string
}
+ response: Word[]
}
GET_WORDS: {
|
refactor
|
redux intergation
|
5b44995156e90dad405320f78c478f982ded6f68
|
2020-03-06 20:28:36
|
crimx
|
refactor(dicts): language detection
| false
|
diff --git a/src/components/dictionaries/baidu/engine.ts b/src/components/dictionaries/baidu/engine.ts
index fff49393b..0bc35b7e3 100644
--- a/src/components/dictionaries/baidu/engine.ts
+++ b/src/components/dictionaries/baidu/engine.ts
@@ -3,7 +3,7 @@ import {
SearchFunction,
MachineTranslatePayload,
GetSrcPageFunction,
- getMachineTranslateTl
+ getMTArgs
} from '../helpers'
import { Baidu } from '@opentranslate/baidu'
import { BaiduLanguage } from './config'
@@ -41,18 +41,16 @@ export type BaiduResult = MachineTranslateResult<'baidu'>
export const search: SearchFunction<
BaiduResult,
MachineTranslatePayload<BaiduLanguage>
-> = async (text, config, profile, payload) => {
- const options = profile.dicts.all.baidu.options
-
+> = async (rawText, config, profile, payload) => {
const translator = getTranslator()
- let sl = payload.sl || (await translator.detect(text))
- const tl =
- payload.tl || getMachineTranslateTl(sl, profile.dicts.all.baidu, config)
-
- if (payload.isPDF && !options.pdfNewline) {
- text = text.replace(/\n+/g, ' ')
- }
+ const { sl, tl, text } = await getMTArgs(
+ translator,
+ rawText,
+ profile.dicts.all.baidu,
+ config,
+ payload
+ )
try {
const result = await translator.translate(text, sl, tl)
diff --git a/src/components/dictionaries/caiyun/engine.ts b/src/components/dictionaries/caiyun/engine.ts
index e2020c450..1c00d956f 100644
--- a/src/components/dictionaries/caiyun/engine.ts
+++ b/src/components/dictionaries/caiyun/engine.ts
@@ -3,7 +3,7 @@ import {
SearchFunction,
MachineTranslatePayload,
GetSrcPageFunction,
- getMachineTranslateTl
+ getMTArgs
} from '../helpers'
import { isContainChinese, isContainJapanese } from '@/_helpers/lang-check'
import { Caiyun } from '@opentranslate/caiyun'
@@ -31,37 +31,16 @@ export type CaiyunResult = MachineTranslateResult<'caiyun'>
export const search: SearchFunction<
CaiyunResult,
MachineTranslatePayload<CaiyunLanguage>
-> = async (text, config, profile, payload) => {
- const options = profile.dicts.all.caiyun.options
-
+> = async (rawText, config, profile, payload) => {
const translator = getTranslator()
- let sl = payload.sl || (await translator.detect(text))
- let tl =
- payload.tl || getMachineTranslateTl(sl, profile.dicts.all.caiyun, config)
-
- if (sl === tl) {
- if (isContainJapanese(text)) {
- sl = 'ja'
- if (tl === 'ja') {
- tl = config.langCode.startsWith('zh') ? 'zh-CN' : 'en'
- }
- } else if (isContainChinese(text)) {
- sl = 'zh-CN'
- if (tl === 'zh-CN') {
- tl = 'en'
- }
- } else {
- sl = 'en'
- if (tl === 'en') {
- tl = 'zh-CN'
- }
- }
- }
-
- if (payload.isPDF && !options.pdfNewline) {
- text = text.replace(/\n+/g, ' ')
- }
+ const { sl, tl, text } = await getMTArgs(
+ translator,
+ rawText,
+ profile.dicts.all.caiyun,
+ config,
+ payload
+ )
try {
const result = await translator.translate(text, sl, tl)
diff --git a/src/components/dictionaries/google/engine.ts b/src/components/dictionaries/google/engine.ts
index e45a773b0..c165315c5 100644
--- a/src/components/dictionaries/google/engine.ts
+++ b/src/components/dictionaries/google/engine.ts
@@ -3,7 +3,7 @@ import {
SearchFunction,
MachineTranslatePayload,
GetSrcPageFunction,
- getMachineTranslateTl
+ getMTArgs
} from '../helpers'
import { Google } from '@opentranslate/google'
import { GoogleLanguage } from './config'
@@ -27,18 +27,18 @@ export type GoogleResult = MachineTranslateResult<'google'>
export const search: SearchFunction<
GoogleResult,
MachineTranslatePayload<GoogleLanguage>
-> = async (text, config, profile, payload) => {
+> = async (rawText, config, profile, payload) => {
const options = profile.dicts.all.google.options
const translator = getTranslator()
- const sl = payload.sl || (await translator.detect(text))
- const tl =
- payload.tl || getMachineTranslateTl(sl, profile.dicts.all.google, config)
-
- if (payload.isPDF && !options.pdfNewline) {
- text = text.replace(/\n+/g, ' ')
- }
+ const { sl, tl, text } = await getMTArgs(
+ translator,
+ rawText,
+ profile.dicts.all.baidu,
+ config,
+ payload
+ )
try {
const result = await translator.translate(text, sl, tl, {
diff --git a/src/components/dictionaries/helpers.ts b/src/components/dictionaries/helpers.ts
index e87c895f1..a7a47080c 100644
--- a/src/components/dictionaries/helpers.ts
+++ b/src/components/dictionaries/helpers.ts
@@ -9,6 +9,7 @@ import { useSubscription, useObservableCallback } from 'observable-hooks'
import { debounceTime, map, tap } from 'rxjs/operators'
import { Observable } from 'rxjs'
import { Language } from '@opentranslate/languages'
+import { Translator } from '@opentranslate/translator'
/** Fetch and parse dictionary search result */
export interface SearchFunction<Result, Payload = {}> {
@@ -89,40 +90,54 @@ export interface MachineTranslateResult<ID extends DictID> {
}
}
-export function getMachineTranslateTl(
- sl: Language,
+/**
+ * Get Machine Translate arguments
+ */
+export async function getMTArgs(
+ translator: Translator,
+ text: string,
{
options,
options_sel
}: {
- options: { tl: 'default' | Language }
+ options: { tl: 'default' | Language; pdfNewline?: boolean }
options_sel: { tl: ReadonlyArray<'default' | Language> }
},
- config: AppConfig
-): Language {
+ config: AppConfig,
+ payload: {
+ sl?: Language
+ tl?: Language
+ isPDF?: boolean
+ }
+): Promise<{ sl: Language; tl: Language; text: string }> {
+ if (payload.isPDF && !options.pdfNewline) {
+ text = text.replace(/\n+/g, ' ')
+ }
+
+ let sl = payload.sl || (await translator.detect(text))
let tl: Language | '' = ''
- if (options.tl === 'default') {
+ if (payload.tl) {
+ tl = payload.tl
+ } else if (options.tl === 'default') {
if (options_sel.tl.includes(config.langCode)) {
tl = config.langCode
- } else {
- tl =
- options_sel.tl.find((lang): lang is Language => lang !== 'default') ||
- ''
}
} else {
tl = options.tl
}
- if (!tl || sl === tl) {
- if (!tl.startsWith('en')) {
- return 'en'
- }
+ if (!tl) {
+ tl =
+ options_sel.tl.find((lang): lang is Language => lang !== 'default') ||
+ 'en'
+ }
- return config.langCode.startsWith('zh') ? config.langCode : 'zh-CN'
+ if (sl === tl && !payload.sl) {
+ sl = 'auto'
}
- return tl
+ return { sl, tl, text }
}
/**
diff --git a/src/components/dictionaries/sogou/engine.ts b/src/components/dictionaries/sogou/engine.ts
index 28ff3e8fc..5a96994eb 100644
--- a/src/components/dictionaries/sogou/engine.ts
+++ b/src/components/dictionaries/sogou/engine.ts
@@ -3,7 +3,7 @@ import {
MachineTranslateResult,
SearchFunction,
GetSrcPageFunction,
- getMachineTranslateTl
+ getMTArgs
} from '../helpers'
import { Sogou } from '@opentranslate/sogou'
import { SogouLanguage } from './config'
@@ -41,18 +41,16 @@ export type SogouResult = MachineTranslateResult<'sogou'>
export const search: SearchFunction<
SogouResult,
MachineTranslatePayload<SogouLanguage>
-> = async (text, config, profile, payload) => {
- const options = profile.dicts.all.sogou.options
-
+> = async (rawText, config, profile, payload) => {
const translator = getTranslator()
- const sl = payload.sl || (await translator.detect(text))
- const tl =
- payload.tl || getMachineTranslateTl(sl, profile.dicts.all.sogou, config)
-
- if (payload.isPDF && !options.pdfNewline) {
- text = text.replace(/\n+/g, ' ')
- }
+ const { sl, tl, text } = await getMTArgs(
+ translator,
+ rawText,
+ profile.dicts.all.baidu,
+ config,
+ payload
+ )
try {
const result = await translator.translate(text, sl, tl)
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index d50d78257..5fede26b6 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -3,7 +3,7 @@ import {
MachineTranslateResult,
SearchFunction,
GetSrcPageFunction,
- getMachineTranslateTl
+ getMTArgs
} from '../helpers'
import { Tencent } from '@opentranslate/tencent'
import { TencentLanguage } from './config'
@@ -41,18 +41,16 @@ export type TencentResult = MachineTranslateResult<'tencent'>
export const search: SearchFunction<
TencentResult,
MachineTranslatePayload<TencentLanguage>
-> = async (text, config, profile, payload) => {
- const options = profile.dicts.all.tencent.options
-
+> = async (rawText, config, profile, payload) => {
const translator = getTranslator()
- const sl = payload.sl || (await translator.detect(text))
- const tl =
- payload.tl || getMachineTranslateTl(sl, profile.dicts.all.tencent, config)
-
- if (payload.isPDF && !options.pdfNewline) {
- text = text.replace(/\n+/g, ' ')
- }
+ const { sl, tl, text } = await getMTArgs(
+ translator,
+ rawText,
+ profile.dicts.all.baidu,
+ config,
+ payload
+ )
try {
const result = await translator.translate(text, sl, tl)
diff --git a/src/components/dictionaries/youdaotrans/engine.ts b/src/components/dictionaries/youdaotrans/engine.ts
index 38d6f1f9c..84351c13f 100644
--- a/src/components/dictionaries/youdaotrans/engine.ts
+++ b/src/components/dictionaries/youdaotrans/engine.ts
@@ -3,7 +3,7 @@ import {
MachineTranslateResult,
SearchFunction,
GetSrcPageFunction,
- getMachineTranslateTl
+ getMTArgs
} from '../helpers'
import { Youdao } from '@opentranslate/youdao'
import { YoudaotransLanguage } from './config'
@@ -32,19 +32,16 @@ export type YoudaotransResult = MachineTranslateResult<'youdaotrans'>
export const search: SearchFunction<
YoudaotransResult,
MachineTranslatePayload<YoudaotransLanguage>
-> = async (text, config, profile, payload) => {
- const options = profile.dicts.all.youdaotrans.options
-
+> = async (rawText, config, profile, payload) => {
const translator = getTranslator()
- const sl = payload.sl || (await translator.detect(text))
- const tl =
- payload.tl ||
- getMachineTranslateTl(sl, profile.dicts.all.youdaotrans, config)
-
- if (payload.isPDF && !options.pdfNewline) {
- text = text.replace(/\n+/g, ' ')
- }
+ const { sl, tl, text } = await getMTArgs(
+ translator,
+ rawText,
+ profile.dicts.all.youdaotrans,
+ config,
+ payload
+ )
try {
const result = await translator.translate(text, sl, tl)
|
refactor
|
language detection
|
f20885c553ca562b4668dc6e1f463fcc22b6a6c7
|
2019-08-04 12:23:05
|
crimx
|
refactor(storybook): hide select when there is only one search text
| false
|
diff --git a/src/components/dictionaries/dictionaries.stories.tsx b/src/components/dictionaries/dictionaries.stories.tsx
index a278fdef4..8b73797d9 100644
--- a/src/components/dictionaries/dictionaries.stories.tsx
+++ b/src/components/dictionaries/dictionaries.stories.tsx
@@ -73,11 +73,14 @@ function Dict(props: {
props.dictID +
'/engine.ts') as { search: SearchFunction<any> }
- const searchText = select(
- 'Search Text',
- mockSearchTexts.reduce((o, t) => ((o[t] = t), o), {}),
- mockSearchTexts[0]
- )
+ const searchText =
+ mockSearchTexts.length > 1
+ ? select(
+ 'Search Text',
+ mockSearchTexts.reduce((o, t) => ((o[t] = t), o), {}),
+ mockSearchTexts[0]
+ )
+ : mockSearchTexts[0]
const [status, setStatus] = useState<'IDLE' | 'SEARCHING' | 'FINISH'>('IDLE')
const [result, setResult] = useState<any>(null)
|
refactor
|
hide select when there is only one search text
|
e0679f51f1a98c80da3e8ea9a2d16b99fb82ea18
|
2018-09-09 13:40:11
|
CRIMX
|
test(env): update fake fetch response wrapper
| false
|
diff --git a/config/fake-env/fake-ajax.js b/config/fake-env/fake-ajax.js
index 6cc17df27..20143f019 100644
--- a/config/fake-env/fake-ajax.js
+++ b/config/fake-env/fake-ajax.js
@@ -323,10 +323,14 @@ window.fetch = (url, ...args) => {
// return Promise.resolve(data.response)
let delay = window['FAKE_AJAX_DELAY']
if (typeof delay === 'undefined') {
- delay = 100 + Math.random() * 3000
+ delay = Math.random() * 3000
}
return new Promise(resolve => setTimeout(() =>
- resolve(data.response), delay)
+ resolve(Object.assign({
+ ok: true,
+ status: 200,
+ statusText: 'ok',
+ }, data.response)), delay)
)
}
}
|
test
|
update fake fetch response wrapper
|
e143cd4948a58815e962d930050f20ac8f45fd1f
|
2020-04-28 11:16:00
|
crimx
|
docs: typo
| false
|
diff --git a/README.md b/README.md
index 6f8a0aa61..5396d4e42 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
Chrome/Firefox WebExtension. Feature-rich inline translator with PDF support.
-[【中文说明】](./RAEDME-zh.md)Chrome/Firefox 浏览器插件，网页划词翻译。
+[【中文说明】](./README-zh.md)Chrome/Firefox 浏览器插件，网页划词翻译。
<p align="center">
<a href="https://github.com/crimx/ext-saladict/releases/" target="_blank"><img src="https://raw.githubusercontent.com/wiki/crimx/ext-saladict/images/notebook.gif" /></a>
|
docs
|
typo
|
b996c873300e244cbadf51017ed3d3f507ea635d
|
2018-12-20 16:34:49
|
CRIMX
|
fix(dicts): update cambridge parser Closes #266
| false
|
diff --git a/src/components/dictionaries/cambridge/engine.ts b/src/components/dictionaries/cambridge/engine.ts
index fa33ff183..b57b829ae 100644
--- a/src/components/dictionaries/cambridge/engine.ts
+++ b/src/components/dictionaries/cambridge/engine.ts
@@ -68,21 +68,20 @@ function handleDOM (
const $posHeader = $entry.querySelector('.pos-header')
if ($posHeader) {
- $posHeader.querySelectorAll('.pron-info').forEach($pron => {
+ Array.from($posHeader.children).forEach($pron => {
const $btn = $pron.querySelector<HTMLSpanElement>('.audio_play_button')
- if ($btn) {
- if ($btn.dataset.srcMp3) {
- const pron = $btn.dataset.srcMp3.replace(/^\//, 'https://dictionary.cambridge.org/')
- const phsym = getText($pron)
- entry.prons.push({ phsym, pron })
-
- if (!audio.uk && phsym.includes('uk')) {
- audio.uk = pron
- }
-
- if (!audio.us && phsym.includes('us')) {
- audio.us = pron
- }
+ if (!$btn) { return }
+ if ($btn.dataset.srcMp3) {
+ const pron = $btn.dataset.srcMp3.replace(/^\//, 'https://dictionary.cambridge.org/')
+ const phsym = getText($pron)
+ entry.prons.push({ phsym, pron })
+
+ if (!audio.uk && phsym.includes('uk')) {
+ audio.uk = pron
+ }
+
+ if (!audio.us && phsym.includes('us')) {
+ audio.us = pron
}
}
$pron.remove()
|
fix
|
update cambridge parser Closes #266
|
5d49ba7cec58e431a7a48117b4f1ac00889276b1
|
2020-03-18 22:15:37
|
crimx
|
style: wording
| false
|
diff --git a/src/components/dictionaries/cobuild/View.tsx b/src/components/dictionaries/cobuild/View.tsx
index cfbfa80d4..88eb994b5 100644
--- a/src/components/dictionaries/cobuild/View.tsx
+++ b/src/components/dictionaries/cobuild/View.tsx
@@ -2,7 +2,10 @@ import React, { FC, useState } from 'react'
import { Speaker } from '@/components/Speaker'
import StarRates from '@/components/StarRates'
import { COBUILDResult, COBUILDCibaResult, COBUILDColResult } from './engine'
-import { ViewPorps, useVerticalScroll } from '@/components/dictionaries/helpers'
+import {
+ ViewPorps,
+ useHorizontalScroll
+} from '@/components/dictionaries/helpers'
export const DictCOBUILD: FC<ViewPorps<COBUILDResult>> = ({ result }) => {
switch (result.type) {
@@ -53,7 +56,7 @@ function renderCiba(result: COBUILDCibaResult) {
function renderCol(result: COBUILDColResult) {
const [curSection, setCurSection] = useState(result.sections[0])
- const tabsRef = useVerticalScroll<HTMLDivElement>()
+ const tabsRef = useHorizontalScroll<HTMLDivElement>()
return (
<div className="dictCOBUILD-ColEntry">
diff --git a/src/components/dictionaries/helpers.ts b/src/components/dictionaries/helpers.ts
index faaec6522..5ca6d23f7 100644
--- a/src/components/dictionaries/helpers.ts
+++ b/src/components/dictionaries/helpers.ts
@@ -367,11 +367,11 @@ export function getFullLink(host: string, el: Element, attr: string): string {
}
/**
- * Vertically scroll a list of items
+ * Horizontally scroll a list of items
* React event listener doesn't support passive arguemnt.
*/
-export const useVerticalScroll = <T extends HTMLElement>() => {
- const [onWheel, onWHeel$] = useObservableCallback(_useVerticalScrollOnWheel)
+export const useHorizontalScroll = <T extends HTMLElement>() => {
+ const [onWheel, onWHeel$] = useObservableCallback(_useHorizontalScrollOnWheel)
useSubscription(onWHeel$)
const tabsRef = useRef<T>(null)
@@ -388,7 +388,7 @@ export const useVerticalScroll = <T extends HTMLElement>() => {
return tabsRef
}
-function _useVerticalScrollOnWheel(event$: Observable<WheelEvent>) {
+function _useHorizontalScrollOnWheel(event$: Observable<WheelEvent>) {
return event$.pipe(
map(e => {
e.stopPropagation()
|
style
|
wording
|
635cccae9ae0d472741f380d7ce869a1d8618b47
|
2019-03-17 11:36:56
|
CRIMX
|
style(dicts): update shanbay test
| false
|
diff --git a/test/specs/background/sync-manager/services/webdav.spec.ts b/test/specs/background/sync-manager/services/webdav.spec.ts
index 93cde5b5b..ace86e13b 100644
--- a/test/specs/background/sync-manager/services/webdav.spec.ts
+++ b/test/specs/background/sync-manager/services/webdav.spec.ts
@@ -1,7 +1,7 @@
import * as helpersMock from '@/background/sync-manager/__mocks__/helpers'
import { NotebookFile } from '@/background/sync-manager/interface'
import { getDefaultSelectionInfo } from '@/_helpers/selection'
-import { Service, SyncConfig } from '@/background/sync-manager/services/webdav'
+import { Service, SyncConfig, SyncMeta } from '@/background/sync-manager/services/webdav'
import { Word } from '@/_helpers/record-manager'
jest.mock('@/background/sync-manager/helpers')
@@ -103,7 +103,7 @@ describe('Sync service WebDAV', () => {
const service = new Service()
service.config = config
- await service.upload({ force: true })
+ await service.add({ force: true })
expect(fetchInit.upload).toHaveBeenCalledTimes(1)
expect(fetchInit.upload).lastCalledWith(
@@ -520,7 +520,7 @@ describe('Sync service WebDAV', () => {
createDir: jest.fn(() => new Response())
}
- helpers.getMeta.mockImplementationOnce((): Promise<Meta> => Promise.resolve({
+ helpers.getMeta.mockImplementationOnce((): Promise<SyncMeta> => Promise.resolve({
timestamp: file.timestamp - 100,
etag: etagLocal
}))
|
style
|
update shanbay test
|
4e374715f9adc1fede471339eafbc407819e5868
|
2019-07-31 15:14:38
|
crimx
|
refactor: machine translation template
| false
|
diff --git a/src/components/MachineTrans/_style.scss b/src/components/MachineTrans/MachineTrans.scss
similarity index 91%
rename from src/components/MachineTrans/_style.scss
rename to src/components/MachineTrans/MachineTrans.scss
index 8bb27c6f6..082d52909 100644
--- a/src/components/MachineTrans/_style.scss
+++ b/src/components/MachineTrans/MachineTrans.scss
@@ -1,3 +1,5 @@
+@import '@/components/Speaker/Speaker.scss';
+
.MachineTrans-Text {
.icon-Speaker {
position: absolute;
@@ -32,6 +34,8 @@
color: #f9690e;
opacity: 0;
cursor: pointer;
+ background: transparent;
+ border: none;
&:hover {
text-decoration: underline;
@@ -42,6 +46,10 @@
display: flex;
position: relative;
z-index: 100;
+
+ select {
+ background: transparent;
+ }
}
.MachineTrans-LangSwitch_Titles,
diff --git a/src/components/MachineTrans/MachineTrans.stories.tsx b/src/components/MachineTrans/MachineTrans.stories.tsx
new file mode 100644
index 000000000..4077ccbd2
--- /dev/null
+++ b/src/components/MachineTrans/MachineTrans.stories.tsx
@@ -0,0 +1,42 @@
+import React from 'react'
+import { storiesOf } from '@storybook/react'
+import { withInfo } from '@storybook/addon-info'
+import { action } from '@storybook/addon-actions'
+import { withKnobs } from '@storybook/addon-knobs'
+import { withLocalStyle, withSaladictPanel } from '@/_helpers/storybook'
+import { MachineTrans } from './MachineTrans'
+
+storiesOf('Content Scripts|Components', module)
+ .addDecorator(
+ withInfo({
+ inline: true,
+ header: false
+ })
+ )
+ .addDecorator(withKnobs)
+ .addDecorator(withSaladictPanel)
+ .addDecorator(withLocalStyle(require('./MachineTrans.scss')))
+ .addDecorator(withLocalStyle(require('@/_sass_global/_reset.scss')))
+ .add('MachineTrans', () => {
+ return (
+ <MachineTrans
+ result={{
+ id: 'baidu',
+ sl: 'en',
+ tl: 'zh',
+ langcodes: ['zh', 'cht', 'en'],
+ searchText: {
+ text:
+ 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem quo necessitatibus voluptatem nobis, autem minima? Praesentium at est, eos reprehenderit, voluptatem obcaecati id quasi natus rem voluptatum temporibus pariatur omnis.',
+ audio: 'https://example.com'
+ },
+ trans: {
+ text:
+ 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Exercitationem quo necessitatibus voluptatem nobis, autem minima? Praesentium at est, eos reprehenderit, voluptatem obcaecati id quasi natus rem voluptatum temporibus pariatur omnis.'
+ }
+ }}
+ searchText={action('Search Text')}
+ recalcBodyHeight={action('Re-calc Body Height')}
+ />
+ )
+ })
diff --git a/src/components/MachineTrans/MachineTrans.tsx b/src/components/MachineTrans/MachineTrans.tsx
new file mode 100644
index 000000000..f9f213d05
--- /dev/null
+++ b/src/components/MachineTrans/MachineTrans.tsx
@@ -0,0 +1,135 @@
+import React, { FC, useState } from 'react'
+import { CSSTransition } from 'react-transition-group'
+import { debounce } from 'rxjs/operators'
+import { timer } from 'rxjs'
+import { useObservableCallback, useSubscription } from 'observable-hooks'
+import Speaker from '@/components/Speaker'
+import {
+ ViewPorps,
+ MachineTranslateResult
+} from '@/components/dictionaries/helpers'
+import { DictID } from '@/app-config'
+import { useTranslate } from '@/_helpers/i18n'
+import { hover } from '@/_helpers/observables'
+
+type TTextSource =
+ | MachineTranslateResult<DictID>['searchText']
+ | MachineTranslateResult<DictID>['trans']
+
+/** text with a speaker at the beginning */
+const TText: FC<{ source: TTextSource }> = ({ source }) =>
+ source.text ? (
+ <div className="MachineTrans-Lines">
+ <Speaker src={source.audio} />
+ {source.text.split('\n').map((line, i) => (
+ <p key={i}>{line}</p>
+ ))}
+ </div>
+ ) : null
+
+/** Template for machine translations */
+export const MachineTrans: FC<
+ ViewPorps<MachineTranslateResult<DictID>>
+> = props => {
+ const { trans, searchText, langcodes, tl, sl } = props.result
+ const { t } = useTranslate(['content', 'langcode'])
+
+ const [isShowLang, setShowLang] = useState(false)
+ const [onMouseOverOut, isShowLang$] = useObservableCallback<
+ boolean,
+ React.MouseEvent<HTMLElement>
+ >(events$ =>
+ hover(events$).pipe(debounce(isOver => (isOver ? timer(500) : timer(800))))
+ )
+ useSubscription(isShowLang$, setShowLang)
+
+ return (
+ <div>
+ <div className="MachineTrans-Text">
+ <TText source={trans} />
+ {searchText.text.length <= 100 ? (
+ <TText source={searchText} />
+ ) : (
+ <p>
+ <details>
+ <summary onClick={props.recalcBodyHeight}>
+ {t('machineTrans.stext')}
+ </summary>
+ <TText source={searchText} />
+ </details>
+ </p>
+ )}
+ </div>
+
+ <div className="MachineTrans-LangSwitchWrap">
+ <button
+ className={`MachineTrans-LangSwitchBtn${
+ isShowLang ? '' : ' isActive'
+ }`}
+ onClick={() => setShowLang(true)}
+ onMouseOver={onMouseOverOut}
+ onMouseLeave={onMouseOverOut}
+ >
+ {t('machineTrans.switch')}
+ </button>
+ <CSSTransition
+ classNames="MachineTrans-LangSwitch"
+ in={isShowLang}
+ timeout={200}
+ appear
+ mountOnEnter
+ unmountOnExit
+ onEntered={props.recalcBodyHeight}
+ onExited={props.recalcBodyHeight}
+ >
+ {renderLangSwitch}
+ </CSSTransition>
+ </div>
+ </div>
+ )
+
+ function renderLangSwitch() {
+ return (
+ <div
+ className="MachineTrans-LangSwitch"
+ onMouseOver={onMouseOverOut}
+ onMouseLeave={onMouseOverOut}
+ >
+ <div className="MachineTrans-LangSwitch_Titles">
+ <span>{`${t('machineTrans.tl')}: `}</span>
+ <span>{`${t('machineTrans.sl')}: `}</span>
+ </div>
+ <div className="MachineTrans-LangSwitch_Selects">
+ <select name="tl" value={tl} onChange={handleLangChanged}>
+ {langcodes.map(code => (
+ <option key={code} value={code}>
+ {code} {t('langcode:' + code)}
+ </option>
+ ))}
+ </select>
+ <select name="sl" value={sl} onChange={handleLangChanged}>
+ <option key="auto" value="auto">
+ {t('machineTrans.auto')}
+ </option>
+ {langcodes.map(code => (
+ <option key={code} value={code}>
+ {code} {t('langcode:' + code)}
+ </option>
+ ))}
+ </select>
+ </div>
+ </div>
+ )
+ }
+
+ function handleLangChanged(e: React.ChangeEvent<HTMLSelectElement>) {
+ props.searchText({
+ id: props.result.id,
+ payload: {
+ sl,
+ tl,
+ [e.currentTarget.name]: e.currentTarget.value
+ }
+ })
+ }
+}
diff --git a/src/components/MachineTrans/index.tsx b/src/components/MachineTrans/index.tsx
deleted file mode 100644
index 783bfef2e..000000000
--- a/src/components/MachineTrans/index.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import React from 'react'
-import CSSTransition from 'react-transition-group/CSSTransition'
-import Speaker from '@/components/Speaker'
-import { ViewPorps, MachineTranslateResult } from '@/components/dictionaries/helpers'
-import { DictID } from '@/app-config'
-
-export default class MachineTrans extends React.PureComponent<ViewPorps<MachineTranslateResult<DictID>>> {
- state = {
- sl: this.props.result.sl,
- tl: this.props.result.tl,
- isShowLang: false,
- }
-
- _showLangTimeout: any
-
- showLang = () => {
- this.setState({ isShowLang: true })
- }
-
- hideLang = () => {
- this.setState({ isShowLang: false })
- }
-
- showLangDelay = () => {
- clearTimeout(this._showLangTimeout)
- if (this.state.isShowLang) { return }
- this._showLangTimeout = setTimeout(this.showLang, 500)
- }
-
- hideLangDelay = () => {
- clearTimeout(this._showLangTimeout)
- if (!this.state.isShowLang) { return }
- this._showLangTimeout = setTimeout(this.hideLang, 800)
- }
-
- handleLangChanged = (e: React.ChangeEvent<HTMLSelectElement>) => {
- this.setState(
- { [e.currentTarget.name]: e.currentTarget.value },
- () => {
- this.props.searchText({
- id: this.props.result.id,
- payload: {
- sl: this.state.sl,
- tl: this.state.tl
- },
- })
- }
- )
- }
-
- renderLangSwitch = () => {
- const { t } = this.props
- const { langcodes } = this.props.result
-
- return (
- <div
- className='MachineTrans-LangSwitch'
- onMouseOver={this.showLangDelay}
- onMouseLeave={this.hideLangDelay}
- >
- <div className='MachineTrans-LangSwitch_Titles'>
- <span>{t('machineTransTL')}{': '}</span>
- <span>{t('machineTransSL')}{': '}</span>
- </div>
- <div className='MachineTrans-LangSwitch_Selects'>
- <select name='tl' value={this.state.tl} onChange={this.handleLangChanged}>
- {langcodes.map(code => (
- <option key={code} value={code}>{code} {t('langcode:' + code)}</option>
- ))}
- </select>
- <select name='sl' value={this.state.sl} onChange={this.handleLangChanged}>
- <option key='auto' value='auto'>{t('machineTransAuto')}</option>
- {langcodes.map(code => (
- <option key={code} value={code}>{code} {t('langcode:' + code)}</option>
- ))}
- </select>
- </div>
- </div>
- )
- }
-
- render () {
- const { t } = this.props
- const {
- trans,
- searchText,
- } = this.props.result
- const { isShowLang } = this.state
-
- return (
- <>
- <div className='MachineTrans-Text'>
- <TText source={trans} />
- {searchText.text.length <= 100
- ? <TText source={searchText} />
- : (
- <p>
- <details>
- <summary onClick={this.props.recalcBodyHeight}>{
- t('machineTransStext')
- }</summary>
- <TText source={searchText} />
- </details>
- </p>
- )
- }
- </div>
- <div className='MachineTrans-LangSwitchWrap'>
- <button
- className={`MachineTrans-LangSwitchBtn${isShowLang ? '' : ' isActive'}`}
- style={{ opacity: isShowLang ? 0 : 1 }}
- onClick={this.showLang}
- onMouseOver={this.showLangDelay}
- onMouseLeave={this.hideLangDelay}
- >{t('machineTransSwitch')}</button>
- <CSSTransition
- classNames='MachineTrans-LangSwitch'
- in={isShowLang}
- timeout={200}
- appear
- mountOnEnter
- unmountOnExit
- onEntered={this.props.recalcBodyHeight}
- onExited={this.props.recalcBodyHeight}
- >
- {this.renderLangSwitch}
- </CSSTransition>
- </div>
- </>
- )
- }
-}
-
-type TTextSource = MachineTranslateResult<DictID>['searchText'] |
- MachineTranslateResult<DictID>['trans']
-
-function TText ({ source }: { source: TTextSource }) {
- if (!source.text) {
- return null
- }
- return (
- <div className='MachineTrans-Lines'>
- <Speaker src={source.audio} />
- {source.text.split('\n').map(
- (line, i) => <p key={i}>{line}</p>
- )}
- </div>
- )
-}
|
refactor
|
machine translation template
|
0ca4ba81767cecc96861cf9f0507b1c187470495
|
2018-04-25 16:38:27
|
CRIMX
|
chore(package): update rxjs to 6 and switch to react-spring
| false
|
diff --git a/package.json b/package.json
index 3a1e6ed4f..fc6328320 100644
--- a/package.json
+++ b/package.json
@@ -51,11 +51,11 @@
"react": "^16.3.1",
"react-dom": "^16.3.1",
"react-i18next": "^7.6.0",
- "react-motion": "^0.5.2",
"react-redux": "^5.0.7",
+ "react-spring": "4.2.1-beta.1",
"redux": "^3.7.2",
"redux-thunk": "^2.2.0",
- "rxjs": "^5.5.6",
+ "rxjs": "^6.0.0",
"vue": "^2.5.13",
"vue-plugin-webextension-i18n": "^0.1.0",
"vue-qriously": "^1.1.1",
@@ -106,7 +106,7 @@
"postcss-safe-important": "^1.1.0",
"raf": "3.4.0",
"react-dev-utils": "^5.0.0",
- "rxjs-tslint-rules": "^3.6.0",
+ "rxjs-tslint-rules": "^4.0.0",
"sass-loader": "^6.0.6",
"semver": "^5.4.1",
"sinon-chrome": "^2.2.4",
diff --git a/tsconfig.json b/tsconfig.json
index 4e1a79cba..afbfe69f0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,7 @@
"allowSyntheticDefaultImports": true,
"baseUrl": "./",
"jsx": "react",
- "lib": ["es6", "dom"],
+ "lib": ["es6", "dom", "dom.iterable"],
"module": "es2015",
"moduleResolution": "node",
"noImplicitAny": false,
diff --git a/tslint.json b/tslint.json
index f6c0a55ac..bf7af4b4f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -6,10 +6,9 @@
"strict-type-predicates": false,
"no-floating-promises": false,
- "rxjs-no-add": { "severity": "error" },
- "rxjs-no-operator": { "severity": "error" },
- "rxjs-no-patched": { "severity": "error" },
- "rxjs-no-wholesale": { "severity": "error" }
+ "rxjs-ban-observables": { "severity": "error" },
+ "rxjs-ban-operators": { "severity": "error" },
+ "rxjs-no-internal": { "severity": "error" }
},
"defaultSeverity": "warning"
}
diff --git a/yarn.lock b/yarn.lock
index 0e646c928..fc1c19bc5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,13 @@
esutils "^2.0.2"
js-tokens "^3.0.0"
+"@babel/runtime@^7.0.0-beta.44":
+ version "7.0.0-beta.46"
+ resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.46.tgz#466a9c0498f6d12d054a185981eef742d59d4871"
+ dependencies:
+ core-js "^2.5.3"
+ regenerator-runtime "^0.11.1"
+
"@commitlint/cli@^6.0.2":
version "6.1.3"
resolved "https://registry.npmjs.org/@commitlint/cli/-/cli-6.1.3.tgz#4606e138b05b43034dc84af15da18e2139058537"
@@ -2144,6 +2151,10 @@ core-js@^2.4.0, core-js@^2.5.0:
version "2.5.3"
resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+core-js@^2.5.3:
+ version "2.5.5"
+ resolved "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
+
[email protected], core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -6715,7 +6726,7 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"
-prop-types@^15.5.8, prop-types@^15.6.0:
+prop-types@^15.6.0:
version "15.6.1"
resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
dependencies:
@@ -6822,7 +6833,7 @@ quick-lru@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
[email protected], raf@^3.1.0, raf@^3.4.0:
[email protected], raf@^3.4.0:
version "3.4.0"
resolved "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
dependencies:
@@ -6929,14 +6940,6 @@ react-is@^16.3.1:
version "16.3.1"
resolved "https://registry.npmjs.org/react-is/-/react-is-16.3.1.tgz#ee66e6d8283224a83b3030e110056798488359ba"
-react-motion@^0.5.2:
- version "0.5.2"
- resolved "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"
- dependencies:
- performance-now "^0.2.0"
- prop-types "^15.5.8"
- raf "^3.1.0"
-
react-reconciler@^0.7.0:
version "0.7.0"
resolved "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
@@ -6957,6 +6960,12 @@ react-redux@^5.0.7:
loose-envify "^1.1.0"
prop-types "^15.6.0"
[email protected]:
+ version "4.2.1-beta.1"
+ resolved "https://registry.npmjs.org/react-spring/-/react-spring-4.2.1-beta.1.tgz#736a340df0509278ec4efda65c825ffd6d02c4f2"
+ dependencies:
+ "@babel/runtime" "^7.0.0-beta.44"
+
react-test-renderer@^16.0.0-0:
version "16.3.1"
resolved "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.3.1.tgz#d9257936d8535bd40f57f3d5a84e7b0452fb17f2"
@@ -7117,7 +7126,7 @@ regenerator-runtime@^0.10.5:
version "0.10.5"
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-regenerator-runtime@^0.11.0:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
version "0.11.1"
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
@@ -7450,19 +7459,19 @@ rx@^4.1.0:
version "4.1.0"
resolved "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-rxjs-tslint-rules@^3.6.0:
- version "3.15.0"
- resolved "https://registry.npmjs.org/rxjs-tslint-rules/-/rxjs-tslint-rules-3.15.0.tgz#ea52a096b78567c5b4195426f3f0a1f63c71d540"
+rxjs-tslint-rules@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.npmjs.org/rxjs-tslint-rules/-/rxjs-tslint-rules-4.0.0.tgz#60f60a2884b2a790403796e714f28e2e7ece391f"
dependencies:
decamelize "^2.0.0"
resolve "^1.4.0"
tslib "^1.8.0"
-rxjs@^5.5.6:
- version "5.5.7"
- resolved "https://registry.npmjs.org/rxjs/-/rxjs-5.5.7.tgz#afb3d1642b069b2fbf203903d6501d1acb4cda27"
+rxjs@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
dependencies:
- symbol-observable "1.0.1"
+ tslib "^1.9.0"
[email protected], safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.1"
@@ -8135,10 +8144,6 @@ svgo@^0.7.0:
sax "~1.2.1"
whet.extend "~0.9.9"
[email protected]:
- version "1.0.1"
- resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-
symbol-observable@^1.0.3:
version "1.2.0"
resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -8377,7 +8382,7 @@ tsconfig@^7.0.0:
strip-bom "^3.0.0"
strip-json-comments "^2.0.0"
-tslib@^1.0.0, tslib@^1.8.0, tslib@^1.8.1:
+tslib@^1.0.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.9.0"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
|
chore
|
update rxjs to 6 and switch to react-spring
|
52d8fb20dd9d53a83b0c1f807102220977aa9e0d
|
2020-07-12 13:09:21
|
crimx
|
fix(panel): move saladict-theme down under darkMode
| false
|
diff --git a/src/_helpers/storybook.tsx b/src/_helpers/storybook.tsx
index 7f9620436..26cc947e4 100644
--- a/src/_helpers/storybook.tsx
+++ b/src/_helpers/storybook.tsx
@@ -117,36 +117,40 @@ export function withSaladictPanel(options: WithSaladictPanelOptions) {
return (
<root.div style={{ width, margin: '10px auto' }}>
- <style>{require('@/_sass_shared/_reset.scss').toString()}</style>
- <style>{require('@/_sass_shared/_theme.scss').toString()}</style>
<div
className={classNames('dictPanel-Root', 'saladict-theme', {
isAnimate: withAnimation,
darkMode
})}
- style={{
- color: options.color,
- backgroundColor: options.backgroundColor,
- fontSize,
- width,
- height,
- '--panel-font-size': fontSize + 'px',
- '--panel-width': `${width}px`,
- '--panel-max-height': `${number(
- 'Panel Max Hegiht',
- window.innerHeight
- )}px`
- }}
- // bug https://github.com/storybookjs/storybook/issues/6569
- onKeyDown={e => e.stopPropagation()}
>
- {options.head}
- {story({
- width,
- height,
- fontSize,
- withAnimation
- })}
+ <style>{require('@/_sass_shared/_reset.scss').toString()}</style>
+ <style>{require('@/_sass_shared/_theme.scss').toString()}</style>
+ <div
+ className="dictPanel-Root saladict-theme"
+ style={{
+ color: options.color,
+ backgroundColor: options.backgroundColor,
+ fontSize,
+ width,
+ height,
+ '--panel-font-size': fontSize + 'px',
+ '--panel-width': `${width}px`,
+ '--panel-max-height': `${number(
+ 'Panel Max Hegiht',
+ window.innerHeight
+ )}px`
+ }}
+ // bug https://github.com/storybookjs/storybook/issues/6569
+ onKeyDown={e => e.stopPropagation()}
+ >
+ {options.head}
+ {story({
+ width,
+ height,
+ fontSize,
+ withAnimation
+ })}
+ </div>
</div>
</root.div>
)
diff --git a/src/_sass_shared/_theme.scss b/src/_sass_shared/_theme.scss
index 0fce6c4a9..b0a1feace 100644
--- a/src/_sass_shared/_theme.scss
+++ b/src/_sass_shared/_theme.scss
@@ -8,7 +8,7 @@
--color-font-grey: #666;
--color-divider: #ddd;
- &.darkMode {
+ @include isDarkMode {
background-color: #222;
color: #ddd;
--color-brand: #1e947e;
diff --git a/src/components/Waveform/Waveform.tsx b/src/components/Waveform/Waveform.tsx
index 64838047e..dc63705d3 100644
--- a/src/components/Waveform/Waveform.tsx
+++ b/src/components/Waveform/Waveform.tsx
@@ -313,91 +313,89 @@ export class Waveform extends React.PureComponent<
render() {
return (
- <div
- className={classNames('saladict-waveformWrap', 'saladict-theme', {
- darkMode: this.props.darkMode
- })}
- >
- <div ref={this.containerRef} />
- <div className="saladict-waveformCtrl">
- <button
- type="button"
- className="saladict-waveformPlay"
- title="Play/Pause"
- onClick={this.togglePlay}
- >
- <div
- className={`saladict-waveformPlay_FG${
- this.state.isPlaying ? ' isPlaying' : ''
- }`}
- />
- </button>
- <NumberEditor
- className="saladict-waveformSpeed"
- title="Speed"
- value={this.state.speed}
- min={0.1} // too low could cause error
- max={3}
- step={0.005}
- decimals={3}
- onValueChange={this.updateSpeed}
- />
- <label className="saladict-waveformBtn_label" title="Loop">
- {this.state.loop ? (
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 512 512"
- fill="var(--color-font)"
- >
- <path d="M23.242 388.417l162.59 120.596v-74.925h300.281l-.297-240.358-89.555-.239-.44 150.801H185.832l.81-75.934-163.4 120.06z" />
- <path d="M490.884 120.747L328.294.15l.001 74.925H28.013l.297 240.358 89.555.239.44-150.801h209.99l-.81 75.934 163.4-120.06z" />
- </svg>
- ) : (
- <svg
- viewBox="0 0 512 512"
- xmlns="http://www.w3.org/2000/svg"
- fill="var(--color-divider)"
- >
- <path d="M 23.242 388.417 L 23.243 388.417 L 23.242 388.418 Z M 23.243 388.418 L 186.642 268.358 L 185.832 344.292 L 283.967 344.292 L 331.712 434.088 L 185.832 434.088 L 185.832 509.013 Z M 395.821 344.292 L 396.261 193.491 L 485.816 193.73 L 486.113 434.088 L 388.064 434.088 L 340.319 344.292 Z" />
- <path d="M 490.884 120.747 L 490.883 120.746 L 490.885 120.745 Z M 490.883 120.746 L 327.485 240.805 L 328.295 164.871 L 244.267 164.871 L 196.521 75.075 L 328.295 75.075 L 328.294 0.15 Z M 118.305 164.871 L 117.865 315.672 L 28.31 315.433 L 28.013 75.075 L 141.077 75.075 L 188.823 164.871 Z" />
- <rect
- x="525.825"
- y="9.264"
- width="45.879"
- height="644.398"
- transform="matrix(0.882947, -0.469472, 0.469472, 0.882947, -403.998657, 225.106232)"
- />
- </svg>
- )}
- <input
- type="checkbox"
- checked={this.state.loop}
- onChange={this.toggleLoop}
- />
- </label>
- {!isFirefox && ( // @TOFIX SoundTouch bug with Firefox
- <label
- className="saladict-waveformPitch saladict-waveformBtn_label"
- title="Pitch Stretch"
+ <div className={classNames({ darkMode: this.props.darkMode })}>
+ <div className="saladict-waveformWrap saladict-theme">
+ <div ref={this.containerRef} />
+ <div className="saladict-waveformCtrl">
+ <button
+ type="button"
+ className="saladict-waveformPlay"
+ title="Play/Pause"
+ onClick={this.togglePlay}
>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 467.987 467.987"
- fill={
- this.state.pitchStretch
- ? 'var(--color-font)'
- : 'var(--color-divider)'
- }
- >
- <path d="M70.01 146.717h47.924V321.27H70.01zM210.032 146.717h47.924V321.27h-47.924zM350.053 146.717h47.924V321.27h-47.924zM0 196.717h47.924v74.553H0zM280.042 196.717h47.924v74.553h-47.924zM420.063 196.717h47.924v74.553h-47.924zM140.021 96.717h47.924V371.27h-47.924z" />
- </svg>
+ <div
+ className={`saladict-waveformPlay_FG${
+ this.state.isPlaying ? ' isPlaying' : ''
+ }`}
+ />
+ </button>
+ <NumberEditor
+ className="saladict-waveformSpeed"
+ title="Speed"
+ value={this.state.speed}
+ min={0.1} // too low could cause error
+ max={3}
+ step={0.005}
+ decimals={3}
+ onValueChange={this.updateSpeed}
+ />
+ <label className="saladict-waveformBtn_label" title="Loop">
+ {this.state.loop ? (
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 512 512"
+ fill="var(--color-font)"
+ >
+ <path d="M23.242 388.417l162.59 120.596v-74.925h300.281l-.297-240.358-89.555-.239-.44 150.801H185.832l.81-75.934-163.4 120.06z" />
+ <path d="M490.884 120.747L328.294.15l.001 74.925H28.013l.297 240.358 89.555.239.44-150.801h209.99l-.81 75.934 163.4-120.06z" />
+ </svg>
+ ) : (
+ <svg
+ viewBox="0 0 512 512"
+ xmlns="http://www.w3.org/2000/svg"
+ fill="var(--color-divider)"
+ >
+ <path d="M 23.242 388.417 L 23.243 388.417 L 23.242 388.418 Z M 23.243 388.418 L 186.642 268.358 L 185.832 344.292 L 283.967 344.292 L 331.712 434.088 L 185.832 434.088 L 185.832 509.013 Z M 395.821 344.292 L 396.261 193.491 L 485.816 193.73 L 486.113 434.088 L 388.064 434.088 L 340.319 344.292 Z" />
+ <path d="M 490.884 120.747 L 490.883 120.746 L 490.885 120.745 Z M 490.883 120.746 L 327.485 240.805 L 328.295 164.871 L 244.267 164.871 L 196.521 75.075 L 328.295 75.075 L 328.294 0.15 Z M 118.305 164.871 L 117.865 315.672 L 28.31 315.433 L 28.013 75.075 L 141.077 75.075 L 188.823 164.871 Z" />
+ <rect
+ x="525.825"
+ y="9.264"
+ width="45.879"
+ height="644.398"
+ transform="matrix(0.882947, -0.469472, 0.469472, 0.882947, -403.998657, 225.106232)"
+ />
+ </svg>
+ )}
<input
type="checkbox"
- checked={this.state.pitchStretch}
- onChange={this.togglePitchStretch}
+ checked={this.state.loop}
+ onChange={this.toggleLoop}
/>
</label>
- )}
+ {!isFirefox && ( // @TOFIX SoundTouch bug with Firefox
+ <label
+ className="saladict-waveformPitch saladict-waveformBtn_label"
+ title="Pitch Stretch"
+ >
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 467.987 467.987"
+ fill={
+ this.state.pitchStretch
+ ? 'var(--color-font)'
+ : 'var(--color-divider)'
+ }
+ >
+ <path d="M70.01 146.717h47.924V321.27H70.01zM210.032 146.717h47.924V321.27h-47.924zM350.053 146.717h47.924V321.27h-47.924zM0 196.717h47.924v74.553H0zM280.042 196.717h47.924v74.553h-47.924zM420.063 196.717h47.924v74.553h-47.924zM140.021 96.717h47.924V371.27h-47.924z" />
+ </svg>
+ <input
+ type="checkbox"
+ checked={this.state.pitchStretch}
+ onChange={this.togglePitchStretch}
+ />
+ </label>
+ )}
+ </div>
</div>
</div>
)
diff --git a/src/content/components/DictPanel/DictPanelStandalone.tsx b/src/content/components/DictPanel/DictPanelStandalone.tsx
index aa9d27ebd..364acf618 100644
--- a/src/content/components/DictPanel/DictPanelStandalone.tsx
+++ b/src/content/components/DictPanel/DictPanelStandalone.tsx
@@ -22,33 +22,34 @@ export const DictPanelStandalone: FC<DictPanelStandaloneProps> = props => {
const rootElRef = useRef<HTMLDivElement | null>(null)
return (
- // an extra layer for float box
+ // an extra layer as float box offest parent
<div
- ref={rootElRef}
- className={classnames('dictPanel-FloatBox-Container', 'saladict-theme', {
+ className={classnames('dictPanel-FloatBox-Container', {
isAnimate: props.withAnimation,
darkMode: props.darkMode
})}
>
- {props.panelCSS ? <style>{props.panelCSS}</style> : null}
- <div
- className={`dictPanel-Root ${SALADICT_PANEL}`}
- style={{
- width: props.width,
- height: props.height,
- '--panel-width': props.width,
- '--panel-max-height': props.height,
- '--panel-font-size': props.fontSize + 'px'
- }}
- >
- <div className="dictPanel-Head">{props.menuBar}</div>
- <HoverBoxContext.Provider value={rootElRef}>
- <div className="dictPanel-Body fancy-scrollbar">
- {props.mtaBox}
- {props.dictList}
- </div>
- </HoverBoxContext.Provider>
- {props.waveformBox}
+ <div ref={rootElRef} className="saladict-theme">
+ {props.panelCSS ? <style>{props.panelCSS}</style> : null}
+ <div
+ className={`dictPanel-Root ${SALADICT_PANEL}`}
+ style={{
+ width: props.width,
+ height: props.height,
+ '--panel-width': props.width,
+ '--panel-max-height': props.height,
+ '--panel-font-size': props.fontSize + 'px'
+ }}
+ >
+ <div className="dictPanel-Head">{props.menuBar}</div>
+ <HoverBoxContext.Provider value={rootElRef}>
+ <div className="dictPanel-Body fancy-scrollbar">
+ {props.mtaBox}
+ {props.dictList}
+ </div>
+ </HoverBoxContext.Provider>
+ {props.waveformBox}
+ </div>
</div>
</div>
)
diff --git a/src/content/components/WordEditor/WordEditorPanel.stories.tsx b/src/content/components/WordEditor/WordEditorPanel.stories.tsx
index da0c94569..6b87dab84 100644
--- a/src/content/components/WordEditor/WordEditorPanel.stories.tsx
+++ b/src/content/components/WordEditor/WordEditorPanel.stories.tsx
@@ -32,43 +32,45 @@ storiesOf('Content Scripts|WordEditor', module)
const darkMode = boolean('Dark Mode', false)
return (
- <div
- className={classNames('saladict-theme', { darkMode })}
- style={{
- display: 'flex',
- justifyContent: 'center',
- padding: '20px 0'
- }}
- >
- <WordEditorPanel
- containerWidth={number('Panel X', 450 + 100)}
- btns={
- boolean('With Buttons', true)
- ? [
- {
- type: 'normal',
- title: 'Normal Button',
- onClick: action('Normal button clicked')
- },
- {
- type: 'primary',
- title: 'Primary Button',
- onClick: action('Primary button clicked')
- }
- ]
- : undefined
- }
- title={text('Title', faker.random.word())}
- onClose={action('Close')}
+ <div className={classNames({ darkMode })}>
+ <div
+ className="saladict-theme"
+ style={{
+ display: 'flex',
+ justifyContent: 'center',
+ padding: '20px 0'
+ }}
>
- <div style={{ padding: 10 }}>
- {text('Content', faker.lorem.paragraphs())
- .split('\n')
- .map((paragraph, index) => (
- <p key={index}>{paragraph}</p>
- ))}
- </div>
- </WordEditorPanel>
+ <WordEditorPanel
+ containerWidth={number('Panel X', 450 + 100)}
+ btns={
+ boolean('With Buttons', true)
+ ? [
+ {
+ type: 'normal',
+ title: 'Normal Button',
+ onClick: action('Normal button clicked')
+ },
+ {
+ type: 'primary',
+ title: 'Primary Button',
+ onClick: action('Primary button clicked')
+ }
+ ]
+ : undefined
+ }
+ title={text('Title', faker.random.word())}
+ onClose={action('Close')}
+ >
+ <div style={{ padding: 10 }}>
+ {text('Content', faker.lorem.paragraphs())
+ .split('\n')
+ .map((paragraph, index) => (
+ <p key={index}>{paragraph}</p>
+ ))}
+ </div>
+ </WordEditorPanel>
+ </div>
</div>
)
},
|
fix
|
move saladict-theme down under darkMode
|
a3e1658fdd2e70af326e31573c7b071d8c0297b1
|
2020-02-23 22:49:07
|
crimx
|
refactor(dicts): remove oald
| false
|
diff --git a/src/app-config/dicts.ts b/src/app-config/dicts.ts
index b23ce2eec..a0531322e 100644
--- a/src/app-config/dicts.ts
+++ b/src/app-config/dicts.ts
@@ -19,7 +19,6 @@ import longman from '@/components/dictionaries/longman/config'
import macmillan from '@/components/dictionaries/macmillan/config'
import mojidict from '@/components/dictionaries/mojidict/config'
import naver from '@/components/dictionaries/naver/config'
-import oald from '@/components/dictionaries/oald/config'
import shanbay from '@/components/dictionaries/shanbay/config'
import sogou from '@/components/dictionaries/sogou/config'
import tencent from '@/components/dictionaries/tencent/config'
@@ -56,7 +55,6 @@ export function getAllDicts() {
macmillan: macmillan(),
mojidict: mojidict(),
naver: naver(),
- oald: oald(),
shanbay: shanbay(),
sogou: sogou(),
tencent: tencent(),
@@ -125,10 +123,10 @@ export type DictItem<
? DictItemWithOptions
: DictItemWithOptions<Options> &
((Key extends any
- ? Options[Key] extends string
- ? Key
- : never
- : never) extends never
+ ? Options[Key] extends string
+ ? Key
+ : never
+ : never) extends never
? {}
: {
options_sel: {
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
index 17ce4f417..eae857b1b 100644
--- a/src/app-config/index.ts
+++ b/src/app-config/index.ts
@@ -276,7 +276,7 @@ function _getDefaultConfig() {
'eudic',
'longman',
'macmillan',
- 'oald',
+ 'lexico',
'urban',
'websterlearner',
'youdao'
diff --git a/src/app-config/merge-profile.ts b/src/app-config/merge-profile.ts
index 933aaa8a3..2e433aef8 100644
--- a/src/app-config/merge-profile.ts
+++ b/src/app-config/merge-profile.ts
@@ -106,7 +106,9 @@ export function mergeProfile(
set(base, [path, 'selected'], [])
} else {
const allDict = get(base, [path, 'all'])
- const arr = selected.filter(id => allDict[id])
+ const arr = selected
+ .map(id => (id === 'olad' ? 'lexico' : id))
+ .filter(id => allDict[id])
if (arr.length > 0) {
set(base, [path, 'selected'], arr)
}
diff --git a/src/app-config/profiles.ts b/src/app-config/profiles.ts
index f6e787fa3..b4adcc1fc 100644
--- a/src/app-config/profiles.ts
+++ b/src/app-config/profiles.ts
@@ -139,7 +139,7 @@ export function scholar(): ProfileStorage {
'etymonline',
'cnki',
'macmillan',
- 'oald',
+ 'lexico',
'websterlearner',
'google',
'youdaotrans',
@@ -160,7 +160,7 @@ export function scholar(): ProfileStorage {
deutsch: false,
others: false
}
- allDict.oald.defaultUnfold = {
+ allDict.lexico.defaultUnfold = {
matchAll: false,
english: false,
chinese: false,
diff --git a/src/components/dictionaries/oald/View.tsx b/src/components/dictionaries/oald/View.tsx
deleted file mode 100644
index 36667fdb6..000000000
--- a/src/components/dictionaries/oald/View.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React, { FC } from 'react'
-import Speaker from '@/components/Speaker'
-import { OALDResult, OALDResultLex, OALDResultRelated } from './engine'
-import { ViewPorps } from '@/components/dictionaries/helpers'
-
-export const DictOALD: FC<ViewPorps<OALDResult>> = ({ result }) => {
- switch (result.type) {
- case 'lex':
- return renderLex(result)
- case 'related':
- return renderRelated(result)
- default:
- return null
- }
-}
-
-function renderLex(result: OALDResultLex) {
- return (
- <>
- {result.items.map(entry => (
- <section
- key={entry.title}
- className="dictOALD-Entry"
- onClick={e => {
- const target = e.nativeEvent.target as HTMLSpanElement
- if (target.classList && target.classList.contains('heading')) {
- ;(target.parentElement as HTMLDivElement).classList.toggle(
- 'is-active'
- )
- }
- }}
- >
- <header className="dictOALD-Header">
- <div
- className="webtop-g"
- dangerouslySetInnerHTML={{ __html: entry.title }}
- />
- {entry.prons.length > 0 && (
- <div className="pron-gs ei-g">
- {entry.prons.map(p => (
- <React.Fragment key={p.phsym}>
- <span
- className="pron-g"
- dangerouslySetInnerHTML={{ __html: p.phsym }}
- />
- <Speaker src={p.pron} />
- </React.Fragment>
- ))}
- </div>
- )}
- </header>
- <span
- className="h-g"
- dangerouslySetInnerHTML={{ __html: entry.defs }}
- />
- </section>
- ))}
- </>
- )
-}
-
-function renderRelated(result: OALDResultRelated) {
- return (
- <>
- <p>Did you mean:</p>
- <ul
- className="dictOALD-Related"
- dangerouslySetInnerHTML={{ __html: result.list }}
- />
- </>
- )
-}
-
-export default DictOALD
diff --git a/src/components/dictionaries/oald/_locales.json b/src/components/dictionaries/oald/_locales.json
deleted file mode 100644
index 8e78dacb8..000000000
--- a/src/components/dictionaries/oald/_locales.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "name": {
- "en": "OALD",
- "zh-CN": "牛津高阶",
- "zh-TW": "牛津高階"
- },
- "options": {
- "related": {
- "en": "Show related results",
- "zh-CN": "失败时显示备选",
- "zh-TW": "失敗時顯示備選"
- }
- }
-}
diff --git a/src/components/dictionaries/oald/_style.shadow.scss b/src/components/dictionaries/oald/_style.shadow.scss
deleted file mode 100644
index f92942bb4..000000000
--- a/src/components/dictionaries/oald/_style.shadow.scss
+++ /dev/null
@@ -1,3854 +0,0 @@
-ol {
- list-style-type: decimal;
- padding-left: 20px;
-}
-
-img.icon {
- vertical-align: text-bottom;
- margin-top: 0;
- margin-right: 2px;
- margin-left: 0;
- margin-bottom: 0;
-}
-
-div.icon {
- display: inline;
- font-weight: lighter;
- font-size: 7pt;
- text-transform: uppercase;
- color: #fff;
- padding: 0 0.6em 0.2em 0.6em;
-}
-
-div.icon-helpsym {
- background-color: transparent;
- font-weight: bold;
- color: #276e98;
- font-variant: small-caps;
-}
-
-div.icon-pvsym {
- font-weight: lighter;
- color: #078d8f;
- font-size: 1.38em;
- text-indent: -1em;
-}
-
-div.icon-oppsym {
- color: #c00b19;
- background-color: transparent;
- font-size: 0.85em;
- padding: 0;
- text-transform: lowercase;
-}
-
-div.icon-idsym {
- font-weight: lighter;
- color: #35338a;
- font-size: 1.46em;
-}
-
-div.icon-synsym {
- background-color: transparent;
- font-weight: normal !important;
- color: #c00b19;
- text-transform: lowercase;
- font-size: 0.85em;
- padding: 0 !important;
-}
-
-.labelsAbout {
- text-align: left;
- border: 0px none;
- width: 100%;
-}
-
-.labelsAbout .pron-usonly:hover {
- background-repeat: no-repeat;
- background-position: left bottom;
-}
-
-.labelsAbout .pron-usonly {
- width: 29px;
- height: 30px;
- border: 0;
- background-repeat: no-repeat;
- background-position: left top;
-}
-
-.sup,
-sup {
- vertical-align: super;
- font-size: 65%;
-}
-
-.sub {
- vertical-align: sub;
- font-size: 65%;
-}
-
-button.key {
- height: 15px;
- width: 8px;
- padding: 0px;
- margin: 0px;
- cursor: normal;
- padding: 0px;
- border: 0px;
- margin-right: 5px;
- margin-top: 5px;
- background-repeat: no-repeat;
- vertical-align: top;
-}
-
-.block-g {
- float: right;
-}
-
-.clear {
- clear: both;
- height: 2px;
-}
-
-#entryContent .side {
- float: right;
- width: 164px;
- text-align: center;
- margin-bottom: 0px;
-}
-
-.ColloPanel,
-.ThesPanel {
- font-size: 80%;
- text-align: left;
- display: block;
- border-radius: 9px 9px 9px 9px;
- border-style: solid;
- border-color: blue;
- margin: 15px;
- border-width: 1px;
- padding: 3px;
- column-count: 3;
- column-gap: 0em;
- -moz-column-count: 3;
- -moz-column-gap: 0em;
- -webkit-column-count: 3;
- -webkit-column-gap: 0em;
- background-color: #fff;
-}
-
-ul.sketch {
- margin-top: 0px;
- margin-left: -20px;
-}
-
-.ColloPanel .xr,
-.ThesPanel .xr {
- font-weight: bold;
- font-size: 130%;
- display: list-item;
- list-style-type: square;
- color: #5ba7da;
- margin-left: 20px;
-}
-
-.CorpusHeader {
- display: block;
- padding: 3px;
- font-size: 120%;
- background-color: #00315a;
- color: white;
- border-top-left-radius: 9px;
-}
-
-.ColloHeader {
- display: block;
- color: white;
- font-weight: bold;
- background-color: #5ba7da;
- font-size: 100%;
- text-transform: uppercase;
- margin-left: 2px;
- margin-top: 2px;
- padding: 3px;
-}
-
-.search-term {
- font-weight: bold;
-}
-
-#results-container-all ul li {
- margin-bottom: 7px;
-}
-
-#browse > div {
- margin-bottom: 7px;
-}
-
-#browse #result ul {
- padding: 0;
-}
-
-#browse_lists {
- margin-top: 16px;
-}
-
-#browse_lists ul {
- margin-bottom: 10px;
-}
-
-.grey-grad,
-.idsym-g,
-.ui-grad dt,
-.z_idsym {
- box-shadow: 0 50px 50px -30px white inset;
- background-color: #cccccc;
- border: 1px solid #cccccc;
-}
-
-.webtop-g h2 {
- font-size: 1.5em;
- font-weight: bold;
- padding: 0;
- display: inline-block;
-}
-
-.top-container {
- background-color: #ecf5ff;
- margin-right: -250px;
- margin-left: -28px;
- margin-bottom: 10px;
- padding: 0 250px 0 28px;
- clear: both;
-}
-
-.btn.prac-pron {
- display: none;
-}
-
-.oxford3000,
-.academic {
- display: inline-block;
- background-size: 100%;
- background-repeat: no-repeat;
- width: 30px;
- height: 30px;
- margin: 0 0 -8px;
- position: relative;
- top: -5px;
-}
-
-.oxford3000:hover,
-.academic:hover {
- text-decoration: none;
-}
-
-.entry-header .share-this-entry {
- margin: 0;
- padding-top: 0;
- display: table;
-}
-
-.entry-header .responsive_entry_center_left {
- margin-bottom: 0 !important;
- display: table-cell;
- float: none;
-}
-
-.entry-header .responsive_entry_center_left_premium {
- margin-bottom: 0 !important;
- display: table-cell;
- float: none;
-}
-
-.entry-header {
- margin: 7px 0;
- display: table;
-}
-
-.responsive_entry_center p.definition-title,
-.responsive_entry_center_left_premium p.definition-title {
- font-size: 0.85em;
- padding-bottom: 0px;
- margin-bottom: 0;
- display: table-cell;
- vertical-align: bottom;
-}
-
-.share-this-entry .right-colum {
- margin: 0;
- padding-top: 0 !important;
-}
-
-.share-this-entry .col_middle_left,
-.share-this-entry .right-colum {
- display: table-cell;
-}
-
-.social-wrap {
- width: 180px;
- height: 28px;
- padding: 2px 0;
-}
-
-.social-wrap a {
- display: inline-block;
- width: 24px;
- height: 24px;
- padding: 0;
- margin: 1px 0 0 0;
- border: 0;
- background: #4577bf;
- background-size: auto 100%;
- cursor: pointer;
- border-radius: 30px;
-}
-
-.social-wrap a:hover {
- background-color: #0d3880;
-}
-
-#plusone-box {
- display: inline-block;
- vertical-align: top;
- margin: 1px 0 0 1px;
-}
-
-.stumbleupon-btn {
- background-position: -48px 0 !important;
-}
-
-.diigo-btn {
- background-position: -72px 0 !important;
-}
-
-.email-btn {
- background-position: -96px 0 !important;
-}
-
-#ox-enlarge {
- float: right;
- position: relative;
- z-index: 10;
- clear: both;
-}
-
-#ox-enlarge a.topic {
- display: block;
- text-align: right;
- position: relative;
- padding: 2px;
- margin: 0 0 12px 12px;
-}
-
-#ox-enlarge a.topic:hover {
- text-decoration: none;
- outline: none;
-}
-
-#ox-enlarge .ox-enlarge-label {
- display: none;
-}
-
-.relatedentries {
- max-height: 200px;
- text-align: left;
- color: #8f0610;
-}
-
-.relatedentries ul {
- margin: 0;
- padding: 0 0 0 10px;
-}
-
-.relatedentries a {
- color: #000;
-}
-
-#rightcolumn h4.no-rule {
- margin-top: 0;
- border-bottom: 0 none;
-}
-
-.no-rule {
- border-bottom: 0;
- margin-bottom: 0;
-}
-
-dd {
- overflow: hidden;
- -webkit-transition: max-height 0.5s;
- -moz-transition: max-height 0.5s;
- transition: max-height 0.5s;
- max-height: 4000px;
-}
-
-dd.deep {
- max-height: 9000px;
-}
-
-.hide + dd,
-.hide + dd.deep {
- max-height: 0;
-}
-
-.ui-grad dt,
-.ui-grad dd {
- margin-top: -1px;
-}
-
-.ui-grad ul {
- margin-left: 14px;
- margin-right: 14px;
- padding: 0;
-}
-
-.ui-grad dd {
- border: 1px solid #cccccc;
-}
-
-.ui-grad dt:first-child {
- border-radius: 8px 8px 0 0;
- margin-top: 0;
-}
-
-.ui-grad dt {
- padding: 5px 6px 5px 6px;
- color: #444444;
-}
-
-.ui-grad dt.hide:hover {
- cursor: pointer;
-}
-
-.ui-grad dt:not(.hide):before {
- content: none;
-}
-
-.ui-grad dt:not(.hide) {
- padding: 6px 14px 5px;
-}
-
-.accordion dl {
- margin: 0;
-}
-
-.accordion .more {
- display: none;
-}
-
-.accordion .show .more {
- display: block;
-}
-
-.accordion dt:before {
- vertical-align: baseline;
- content: '';
- display: inline-block;
- margin-right: 6px;
- margin-left: -2px;
- margin-bottom: -1px;
- width: 13px;
- height: 13px;
-}
-
-.see-more {
- display: block;
- padding: 6px;
- text-align: center;
- border-top: 1px solid #aaaaaa;
- color: grey;
-}
-
-.list-col a,
-.list-col span.selected {
- display: block;
- padding-top: 3px;
- padding-bottom: 4px;
- font-weight: normal;
-}
-
-.list-col {
- padding-left: 0;
-}
-
-.list-col .selected {
- color: #282828;
- padding-left: 7px;
- padding-right: 7px;
- background-color: #dddddd;
- border-radius: 4px;
- margin: 3px -7px 4px;
-}
-
-.list-col h6 {
- border-bottom: 1px solid silver;
-}
-
-.topic-explore p {
- color: rgba(0, 0, 0, 0.7);
- font-size: 1.15em;
-}
-
-.topic-explore > h3 {
- font-size: 1.31em;
- font-weight: bold;
- margin: 0 0 7px;
- padding: 0;
-}
-
-.topic-explore h4 {
- border-top: 1px solid #c0c0c0;
- border-bottom: 1px solid #c0c0c0;
- padding: 8px 0;
-}
-
-.topic-explore ul {
- padding-left: 0px;
-}
-
-.topic-explore h6 {
- border: 0px none;
- margin: 8px 0px 0px 0px;
-}
-
-.topic-explore h6 a {
- font-size: 1.15em;
- font-weight: bold;
- color: rgba(0, 0, 0, 0.7);
-}
-
-.list-nested > li {
- display: inline-block;
- padding-right: 15px;
-}
-
-.list-nested-pool > li {
- background-color: grey;
- border-bottom: 1px solid white;
-}
-
-.list-nested-pool ul {
- padding: 3px 0 4px;
- background: #efefef;
- background: white;
-}
-
-.wordpool {
- margin-top: 14px;
- padding-left: 8px;
-}
-
-.wordpool li {
- display: inline-block;
- margin: 0;
- padding: 0 14px 7px 0;
-}
-
-.wordpool a,
-.wordpool span {
- font-weight: normal;
-}
-
-.wordpool-active span {
- font-weight: bold;
-}
-
-.section.partner {
- margin-top: 2em;
-}
-
-.wordlist-page p {
- max-width: 700px;
-}
-
-.wordlist-info-page {
- margin-bottom: 14px;
-}
-
-.wordlist-info-page .oxford3000-blue,
-.wordlist-info-page .academic-blue {
- width: 20px;
- height: 20px;
-}
-
-.wordlist-info-page ul {
- padding-left: 20px;
- list-style-type: disc;
- margin-bottom: 7px;
-}
-
-.middle_wrap > h1 {
- margin-top: 7px;
-}
-
-.open-close dt:hover {
- color: #0d3880;
-}
-
-.ui-plain {
- max-width: 700px;
-}
-
-.ui-plain dl:first-child {
- border-top: 1px solid grey;
-}
-
-.ui-plain dt {
- padding: 7px 7px 7px 21px;
- color: #282828;
- font-weight: bold;
- cursor: pointer;
-}
-
-.ui-plain dt:before {
- content: '';
- position: absolute;
- width: 13px;
- height: 24px;
- margin: -7px 0 0 -21px;
-}
-
-.ui-plain dt.hide:before {
- background-position: 0 -50px;
-}
-
-.ui-plain dd {
- border-bottom: 1px solid silver;
-}
-
-.ui-plain dt:before {
- position: relative;
- margin-right: 8px;
- display: inline-block;
-}
-
-.topic-desc {
- max-width: 750px;
-}
-
-.oxford3000-blue,
-.academic-blue {
- display: inline-block;
- background-size: 100%;
- background-repeat: no-repeat;
- width: 30px;
- height: 30px;
- margin: -8px 0 -5px;
-}
-
-.topic-dt .side-selector__left ul ul ul ul li > a {
- margin-left: -62px;
- padding-left: 40px;
- margin-top: 2px;
- text-decoration: none;
- background-color: #efefef;
- background-color: white;
-}
-
-.side-selector {
- border-radius: 7px;
- overflow: hidden;
- background-color: #eee;
- border: 1px solid #cccccc;
-}
-
-.side-selector__left,
-.side-selector__right {
- padding: 0 0;
- width: 40%;
- float: left;
-}
-
-.side-selector__right {
- width: 60%;
- float: left;
- background-color: white;
-}
-
-.side-selector__right .sound.audio_play_button {
- margin: 0;
-}
-
-.side-selector__left ul ul ul ul li.is-revealed > a {
- background-color: #4577bf;
- color: white;
-}
-
-.side-selector__left .ei-g {
- margin-top: 0;
-}
-
-.side-selector__left .top-container {
- margin: 0;
- padding: 0;
- background-color: transparent;
-}
-
-.side-selector__left .top-g {
- padding: 0;
-}
-
-.side-selector__left .webtop-g {
- margin: 0 -7px;
- padding: 6px 7px;
-}
-
-.side-selector__left .link-right {
- padding-top: 7px;
-}
-
-#entries-selector {
- padding: 7px;
-}
-
-#entries-selector ul {
- list-style-type: none;
- padding: 0;
-}
-
-#entries-selector .wl-select {
- padding: 0 7px 0 21px;
- margin: -7px;
-}
-
-#entries-selector a,
-#entries-selector span {
- padding: 7px 14px;
- margin-bottom: 2px;
- display: block;
- text-decoration: none;
- text-align: center;
- border-radius: 7px;
- font-weight: bold;
-}
-
-#entries-selector a:hover {
- background-color: #4577bf;
- color: white;
-}
-
-#entries-selector .currentpage a,
-#entries-selector .currentpage span {
- background-color: #07255e;
- color: white;
-}
-
-#entries-selector select {
- appearance: none;
- border: none;
- font-size: 1.15em;
- outline: none;
- margin: 0;
- padding: 8px 15px 9px;
- background-color: transparent;
- width: 100%;
- color: white;
-}
-
-.hideoverflow {
- overflow: hidden;
-}
-
-.outer {
- position: relative;
- left: 50%;
- float: left;
-}
-
-.inner {
- position: relative;
- left: -50%;
- float: left;
-}
-
-.wl-nav {
- border-color: silver;
- border: 0;
-}
-
-.wl-nav a,
-.wl-nav span {
- display: inline-block;
- padding: 10px 15px;
- border-right: 1px solid silver;
- color: #444444;
- font-weight: normal;
-}
-
-.wl-nav li:hover {
- box-shadow: 0 -50px 50px -30px white inset;
- background-color: #cccccc;
-}
-
-.wl-nav li:hover a {
- text-decoration: none;
-}
-
-.wl-nav li.activepage {
- background-color: white;
-}
-
-.wl-nav li.activepage:hover {
- background-color: white !important;
- box-shadow: none;
-}
-
-.currentpage a {
- color: #890017;
-}
-
-.currentpage a .pos {
- font-weight: normal;
-}
-
-.paging_links {
- padding: 0;
-}
-
-.paging_links li:last-child a {
- border-right: 0;
-}
-
-.paging_links .page_range {
- font-weight: bolder;
- margin-right: 30px;
- display: inline-block;
-}
-
-.paging_links .page_info {
- display: inline-block;
- margin-right: 30px;
-}
-
-#entrylist1 a {
- font-weight: bold;
-}
-
-.result-list1 {
- padding: 4px 0;
- list-style-type: none;
-}
-
-.wordlist-oxford3000 li {
- padding: 7px;
-}
-
-.soundList {
- display: inline;
-}
-
-.lang-study-page .pron-g {
- white-space: normal;
-}
-
-.lang-col {
- width: 48%;
- float: left;
- padding-right: 12px;
-}
-
-.mid-grad-bottom,
-.wl-table tr:first-child {
- background: #00123c;
- background: -webkit-gradient(
- linear,
- left top,
- left bottom,
- color-stop(0%, #07255e),
- color-stop(100%, #00123c)
- );
- background: -webkit-linear-gradient(top, #07255e 0%, #00123c 100%);
- background: -moz-linear-gradient(top, #07255e 0%, #00123c 100%);
- background: -ms-linear-gradient(top, #07255e 0%, #00123c 100%);
- background: linear-gradient(to bottom, #07255e 0%, #00123c 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$blue2', endColorstr='$blue1', GradientType=0);
-}
-
-.pale-grad,
-.wl-table tr {
- background: #ffffff;
- background: -moz-linear-gradient(top, white 0%, #eee 100%);
- background: -webkit-gradient(
- linear,
- left top,
- left bottom,
- color-stop(0%, white),
- color-stop(100%, #eee)
- );
- background: -webkit-linear-gradient(top, white 0%, #eee 100%);
- background: -o-linear-gradient(top, white 0%, #eee 100%);
- background: -ms-linear-gradient(top, white 0%, #eee 100%);
- background: linear-gradient(to bottom, white 0%, #eee 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);
-}
-
-.wl-table .delete-btn a:before {
- pointer-events: all;
-}
-
-.wl-table .btn.delete-btn:hover a:before {
- background-position: -1px bottom;
-}
-
-.wl-sub-head {
- background: #4577bf;
- background: -moz-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: -webkit-gradient(
- linear,
- left top,
- left bottom,
- color-stop(0%, #4577bf),
- color-stop(100%, #345c95)
- );
- background: -webkit-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: -o-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: -ms-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: linear-gradient(to bottom, #4577bf 0%, #345c95 100%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4577bf', endColorstr='#345c95', GradientType=0);
- color: #ffffff;
-}
-
-.btn.test-btn a,
-.btn.delete-btn a {
- padding-left: 28px;
-}
-
-.wl-table {
- width: 100%;
- margin-top: 10px;
- margin-bottom: 12px;
- border: 1px solid #cccccc;
- border-collapse: separate;
-}
-
-.wl-table .wl-col1 {
- text-align: left;
- font-size: 1.23em;
-}
-
-.wl-table tr th {
- color: white;
- vertical-align: middle;
-}
-
-.wl-table th,
-.wl-table td {
- text-align: center;
- padding: 12px;
-}
-
-.wl-table.wl-edit .wl-col2 {
- font-style: italic;
-}
-
-.wl-table.wl-edit .wl-col3 {
- text-align: left;
-}
-
-.wl-table .wl-col1 a {
- padding-right: 12px;
- text-align: left;
- font-size: 1.23em;
- font-weight: bold;
-}
-
-.entry-word {
- font-weight: bold;
- color: #4577bf;
- margin-left: 10px;
-}
-
-.hide-delete-icon {
- display: none;
-}
-
-.premium .hide-delete-icon {
- display: block;
-}
-
-h1.my-wordlist-titles {
- margin: 7px 0 21px;
-}
-
-h2.my-wordlist-titles {
- font-size: 2.77em;
- color: #4577bf;
- font-weight: bold;
- padding-left: 0;
- margin-top: 6px;
- margin-bottom: 24px;
-}
-
-h3.my-wordlist-titles {
- font-size: 1.23em;
- font-weight: bold;
- margin: 0;
- padding: 0;
- color: #0d3880;
-}
-
-h4.my-wordlist-titles {
- font-weight: bold;
- margin-bottom: 6px;
-}
-
-h5.my-wordlist-titles {
- font-size: 1.38em;
- margin: 0 0 7px;
- font-weight: bold;
-}
-
-.mywordlist-container {
- padding-left: 15px;
-}
-
-.mywordlist-container > .entry > span.h {
- display: none;
-}
-
-.senseinfo {
- margin-bottom: 6px;
-}
-
-.senseinfo .sense_check_box {
- margin-right: 6px;
-}
-
-#wordlist-select {
- margin-bottom: 7px;
-}
-
-.test__question-count {
- margin: -7px -14px 14px;
- padding: 5px 12px;
- background-color: #4577bf;
- color: white;
-}
-
-.test__definition {
- font-size: 1.69em;
- color: #07255e;
- max-width: 650px;
- font-size: 1.38em;
-}
-
-.test__definition__wrap {
- margin-top: 14px;
- margin-bottom: 14px;
-}
-
-.test__definition__wrap .pos {
- margin-bottom: 6px;
- font-size: 1.15em;
- font-weight: normal;
-}
-
-.test__definition__wrap p {
- display: table-cell;
- padding-right: 14px;
-}
-
-.test__form,
-#add-wordlist {
- display: table;
- width: 100%;
- margin-bottom: 0;
- vertical-align: top;
- padding-bottom: 10px;
-}
-
-.test__form .test__answer {
- font-size: 1.15em;
- width: 350px;
- float: left;
- margin-bottom: 7px;
- margin-right: 14px;
-}
-
-.test_submit_testme {
- float: left;
-}
-
-.test__form input[type='text'] {
- border: none;
- font-size: 1.23em;
- padding: 0 10px;
- height: 30px;
- border-radius: 6px;
- background-color: white;
- box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5) inset;
- color: grey;
- width: 100%;
-}
-
-.test__form #add-wordlist .test__submit {
- float: left;
-}
-
-.result {
- display: table-cell;
- vertical-align: middle;
-}
-
-.test__attempt,
-.test__useranswer,
-.test__skipped {
- display: inline-block;
- font-size: 2em;
- font-weight: bold;
- width: 100%;
- margin-left: -30px;
- padding-left: 30px;
-}
-
-.test__skipped {
- font-size: 1.85em;
-}
-
-.test__attempt {
- color: #c1272d;
-}
-
-.test__useranswer {
- color: #037531;
-}
-
-.test__correctanswer {
- font-weight: bold;
- color: #07255e;
-}
-
-.test__incorrect,
-.test__correct {
- width: 24px;
- height: 24px;
- background: #c1272d;
- background-size: 100%;
- border-radius: 24px;
- border: 2px solid white;
- vertical-align: top;
- text-indent: -9999px;
- display: inline-block;
- margin-right: 5px;
-}
-
-.test__correct {
- background-color: #037531;
-}
-
-.test__skipped,
-.test__correcthead {
- text-transform: capitalize;
-}
-
-.test__form .test__answer,
-.test__form .test__submit,
-.test__form .test__skip,
-#check-answer .test__form .test__next,
-#check-answer .test__form .test__quit {
- display: table-cell;
- vertical-align: top;
-}
-
-.test__form .test__submit,
-.test__form .test__next {
- padding-right: 5px;
-}
-
-.test__next,
-.test__quit {
- float: left;
-}
-
-.mywordlist-warnings,
-.error {
- display: none;
- color: #c73b2a;
-}
-
-.mywordlist-warnings#wait,
-.mywordlist-warnings#test-loading,
-.mywordlist-warnings#test-saving-score,
-.mywordlist-warnings#supp {
- color: #00123c;
-}
-
-.mywordlist-warnings#wait:before,
-.mywordlist-warnings#test-loading:before,
-.mywordlist-warnings#test-saving-score:before,
-.mywordlist-warnings#supp:before {
- bottom: -2px;
- content: '';
- display: inline-block;
- margin-right: 8px;
- position: relative;
-}
-
-.mywordlist-warnings#wait:before {
- content: '';
-}
-
-#pronunciation .responsive_row:first-child {
- margin-bottom: 0;
-}
-
-.entry-source {
- color: white;
-}
-
-h2.entry-word {
- font-weight: bold;
- color: #4577bf;
- font-size: 2.77em;
- margin-bottom: 7px;
- margin-top: 18px;
- display: block;
-}
-
-h2 .pos {
- margin-bottom: 6px;
- font-size: 1.15em;
- font-weight: normal;
-}
-
-.pron__wrap h3,
-.pron_row {
- max-width: 700px;
-}
-
-.pron__wrap h3 {
- font-size: 1.38em;
- color: #4577bf;
- margin-top: 12px;
- margin-bottom: 0;
- padding-bottom: 3px;
- padding-left: 0px;
- border-bottom: 1px solid silver;
-}
-
-.pron__wrap {
- max-width: 700px;
-}
-
-.pron__wrap h5 {
- margin-top: 12px;
- margin-bottom: 0;
- padding-bottom: 3px;
- padding-left: 0px;
- border-bottom: 1px solid silver;
-}
-
-.pron_row {
- padding: 0;
- height: 39px;
-}
-
-.pron_row .sound {
- vertical-align: middle;
-}
-
-.pron_row * {
- display: inline-block;
-}
-
-.pron_row .pron_button {
- border: 1px solid black;
- padding: 4px;
- margin-right: 15px;
-}
-
-.pron_row .pron_button .pron_button_icon {
- border: 1px solid black;
- width: 30px;
- height: 20px;
-}
-
-.pron_row .pron_button_wrapper {
- padding: 4px;
- display: inline-block;
- background-color: #00123c;
- height: 34px;
- margin-left: 7px;
- border-radius: 18px;
- display: none;
- vertical-align: middle;
- box-shadow: 0 38px 38px -38px #e0f2fd inset;
-}
-
-.pron_row .btn:hover,
-.pron_row input[type='submit']:hover,
-.pron_row .btn.inactive,
-.pron_row input.inactive[type='submit'] {
- box-shadow: none;
- border-width: 0;
-}
-
-.pron_row .pron_button_record,
-.pron_row .pron_button_play,
-.pron_row .pron_button_stop,
-.pron_row .pron_record_stop,
-.pron_row .pron_play_stop {
- width: 24px;
- height: 24px;
- display: block;
- float: left;
- margin-right: 6px;
- background-repeat: no-repeat;
- background-position: center center;
- border-radius: 12px;
- background-color: silver;
-}
-
-.pron_row .button_is_active {
- background-color: #0d3880;
- box-shadow: 0 30px 30px -30px #45689f inset;
-}
-
-.pron_row .button_is_playing {
- background-color: #579a27;
- box-shadow: 0 30px 30px -30px #45689f inset;
-}
-
-.pron_row .button_is_active.pron_button_record:hover,
-.pron_row .button_is_active.pron_button_play:hover,
-.pron_row .button_is_active.pron_button_stop:hover {
- background-color: #00123c;
-}
-
-.pron_row.active .pron_button_wrapper {
- display: inline-block;
-}
-
-#pronunciation xr-gs,
-#pronunciation res-g {
- display: none;
-}
-
-#topic-list dd ul {
- padding-left: 0;
-}
-
-#topic-list dd ul li {
- padding-bottom: 7px;
-}
-
-#topic-list dd {
- border: none;
- margin-left: 21px;
-}
-
-#topic-list dt {
- font-weight: normal;
-}
-
-.topic-desc {
- margin: 7px 0 7px 0;
-}
-
-.word-list li {
- display: inline-block;
- padding: 0 14px 7px 0;
-}
-
-.video-page-wrap h4 {
- margin: 14px 0 7px;
-}
-
-.video-player,
-.video-player__text {
- display: table-cell;
- vertical-align: middle;
-}
-
-.video-player__text {
- padding-right: 7px;
-}
-
-.video-player {
- padding-right: 14px;
- height: 130px;
- width: 230px;
-}
-
-.video-player iframe {
- display: block;
-}
-
-.video__wrap {
- display: table-row;
- width: 100%;
- float: left;
- margin-bottom: 3px;
- background-color: #efefef;
-}
-
-.video__wrap p {
- margin-bottom: 0;
-}
-
-.video__wrap a {
- display: block;
-}
-
-.video__wrap:last-child {
- margin-bottom: 0;
-}
-
-.video__wrap.full-width {
- width: 100%;
- display: block;
- float: none;
-}
-
-.premium-h {
- position: relative;
- margin-bottom: 12px;
-}
-
-.premium-h .h {
- position: absolute;
- color: #ffffff;
- left: 20px;
- bottom: 10px;
-}
-
-.premium-h-img {
- width: 100%;
- height: auto;
-}
-
-.res-g > .unbox {
- background-color: rgba(199, 110, 6, 0.1);
- display: block;
- margin: 12px 0 18px 0;
- position: relative;
- overflow: hidden;
- border-left: 3px solid #c76e06;
-}
-
-.res-g > .unbox > .heading {
- background-color: rgba(199, 110, 6, 0.2);
- display: block;
- padding: 6px 12px 6px 12px;
- font-size: 1.19em;
- position: relative;
- overflow: hidden;
-}
-
-.res-g > .unbox > .body {
- display: block;
- padding: 12px 18px 12px 18px;
- position: relative;
- overflow: hidden;
-}
-
-.main-container #wotd-box {
- max-width: 300px;
- margin-left: auto;
- margin-right: auto;
-}
-
-*,
-*:before,
-*:after {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-.entry {
- font-size: 1.15em;
- color: #333;
- margin-bottom: 15px;
-}
-
-.entry a:hover {
- font-weight: normal;
-}
-
-.sans-italic,
-.etym_i,
-.geo,
-.pos,
-.reg,
-.subj,
-.wfp,
-.xpos,
-.webtop-g .pos + .pnc,
-.collapse .ff,
-.collapse[title^='AWL Collocations'] .er {
- font-style: italic;
-}
-
-.sans-rom,
-.def,
-.dh,
-.dtxt,
-.footer,
-.frac-g,
-.gl,
-.gram,
-.li,
-li.sn-g:before,
-.ndv,
-.shcut,
-.st,
-.td,
-.use,
-.xr-g,
-.wfo .wrap,
-.wfo pnc.wrap,
-.vp .prefix,
-.vp pnc.prefix {
- font-weight: normal;
- font-style: normal;
-}
-
-.sans-bold,
-.cf,
-.dhb,
-.dr,
-.id,
-.idm,
-.if,
-.pv,
-.th,
-.v,
-.ve,
-.vp,
-.wfo,
-.wfw,
-.xh,
-.xw {
- font-weight: bold;
- font-style: normal;
-}
-
-.sans-bolditalic {
- font-weight: bold;
- font-style: italic;
-}
-
-.sans-sc,
-.sc,
-.xr-gs .prefix,
-.xr-gs pnc.prefix {
- font-variant: small-caps;
-}
-
-.serif-bolditalic,
-.cl,
-.x .eb {
- font-weight: bold;
- font-style: italic;
-}
-
-.serif-italic,
-.wx {
- font-style: italic;
-}
-
-.serif-rom,
-.def-qt {
- font-weight: normal;
- font-style: normal;
-}
-
-.italic,
-.ei {
- font-style: italic;
-}
-
-.bold,
-.eb {
- font-weight: bold;
- font-style: normal;
-}
-
-.bolditalic,
-.ebi {
- font-weight: bold;
- font-style: italic;
-}
-
-.entry-box-style,
-.un,
-.collapse {
- background-color: rgba(199, 110, 6, 0.1);
- display: block;
- margin: 12px 0 18px 0;
- position: relative;
- overflow: hidden;
-}
-
-#entryContent:not(.ocoll) .top-container .entry-box-style,
-#entryContent:not(.ocoll) .top-container .un,
-#entryContent:not(.ocoll) .top-container .collapse {
- background-color: rgba(69, 119, 191, 0.1);
- border-left: 3px solid #4577bf;
-}
-
-#entryContent:not(.ocoll) .top-container .entry-box-style-heading:hover,
-#entryContent:not(.ocoll) .top-container .collapse .heading:hover,
-.collapse #entryContent:not(.ocoll) .top-container .heading:hover,
-#entryContent:not(.ocoll) .top-container .entry-box-style-heading:active,
-#entryContent:not(.ocoll) .top-container .collapse .heading:active,
-.collapse #entryContent:not(.ocoll) .top-container .heading:active,
-#entryContent:not(.ocoll) .top-container .unbox.is-active .heading,
-.unbox.is-active #entryContent:not(.ocoll) .top-container .heading,
-#entryContent:not(.ocoll) .top-container .entry-box-style-heading:focus,
-#entryContent:not(.ocoll) .top-container .collapse .heading:focus,
-.collapse #entryContent:not(.ocoll) .top-container .heading:focus {
- background-color: rgba(69, 119, 191, 0.2);
-}
-
-#entryContent:not(.ocoll) .top-container .unbox.is-active .heading:before {
- background-position: center -92px;
-}
-
-.entry-box-style-heading,
-.collapse .heading,
-.collapse pnc.heading {
- padding: 6px 12px 6px 12px;
- margin: -12px -18px -12px -18px;
- font-size: 1.19em;
- user-select: none;
-}
-
-.entry-box-style-heading:hover,
-.collapse .heading:hover,
-.entry-box-style-heading:active,
-.collapse .heading:active,
-.unbox.is-active .heading,
-.unbox.is-active pnc.heading,
-.entry-box-style-heading:focus,
-.collapse .heading:focus {
- background-color: rgba(199, 110, 6, 0.2);
-}
-
-.blockquote {
- background-color: rgba(199, 110, 6, 0.1);
- display: block;
- padding: 12px 18px 12px 18px;
- margin: 18px;
- position: relative;
-}
-
-.bre,
-.name {
- display: none;
-}
-
-.cf {
- display: inline;
-}
-
-.def {
- display: inline;
-}
-
-.dr {
- font-size: 1.23em;
-}
-
-.dr-g {
- display: block;
- margin-top: 18px;
- margin-left: 16px;
- position: relative;
-}
-
-.dr-g:before {
- content: '';
- left: -18px;
- position: absolute;
- top: 5px;
- width: 14px;
- height: 14px;
- background-size: 14px auto;
-}
-
-.dr-gs {
- display: block;
-}
-
-.eph {
- display: inline-block;
-}
-
-.esu {
- font-size: smaller;
- vertical-align: super;
-}
-
-.footer {
- font-size: 1em;
-}
-
-.frac-g {
- position: relative;
- top: -3px;
-}
-
-.frac-g:before {
- content: '/';
- position: absolute;
- left: 4px;
- top: -3px;
-}
-
-.gram-g {
- color: #767676;
-}
-
-.h-g {
- margin-bottom: 15px;
-}
-
-.hm,
-pnc.hm,
-.xhm {
- font-size: smaller;
- margin-left: 1px;
- position: relative;
- top: -5.25px;
-}
-
-.hm-g {
- display: block;
-}
-
-.idm {
- font-size: 1.23em;
-}
-
-.idm-g,
-.pv-g {
- margin: 12px 18px 12px 18px;
- display: block;
-}
-
-.idm-gs,
-.pv-gs,
-.wf-g {
- border: 1px solid rgba(199, 110, 6, 0.4);
- border-radius: 10px 10px 0 0;
- display: block;
- margin: 18px 10px 18px 0;
- overflow: hidden;
-}
-
-.label-g {
- color: #767676;
- font-weight: normal;
-}
-
-li.sn-g:before {
- color: #00123c;
- padding-right: 6px;
- position: absolute;
- text-align: right;
- left: -8px;
- width: 24px;
-}
-
-.ndv {
- color: #00837d;
-}
-
-.pron-g {
- white-space: nowrap;
-}
-
-.pron-g[geo~='br'] .prefix {
- color: #07255e;
-}
-
-.pron-g[geo~='n_am'] .prefix {
- color: #8f0610;
-}
-
-.pron-gs {
- display: inline;
-}
-
-.pv {
- display: inline;
- font-size: 1.23em;
-}
-
-.pvarr:before {
- content: '';
- width: 15px;
- height: 11px;
- background-size: 15px auto;
- display: inline-block;
-}
-
-.shcut {
- font-size: 1.26em;
- display: block;
- margin-top: 1em;
- border-bottom: 1px solid rgba(199, 110, 6, 0.5);
-}
-
-.sn-g {
- display: block;
- position: relative;
- margin-top: 12px;
-}
-
-.sn-g[ox3000='y'] .oxford3000 {
- background-color: #4577bf;
- border-radius: 12px;
- width: 20px;
- height: 20px;
- margin: 0 6px 3px 0;
- position: static;
- vertical-align: middle;
-}
-
-.sn-gs,
-.res-g {
- display: block;
-}
-
-.un {
- padding: 12px 18px 12px 18px;
- text-indent: 0;
-}
-
-.vp {
- margin-right: 12px;
-}
-
-.vp-g {
- display: block;
-}
-
-.wf-g {
- border-color: rgba(69, 119, 191, 0.4);
- margin: 6px 0 6px 0;
- padding: 6px 12px 6px 12px;
- display: inline-block;
-}
-
-.wfw-g {
- display: block;
-}
-
-.wx {
- text-decoration: line-through;
-}
-
-.x-g {
- display: block;
- position: relative;
- margin-top: 6px;
- margin-left: 1em;
- padding-left: 1em;
-}
-
-.x-g:before {
- content: '\2022';
- left: 0;
- position: absolute;
-}
-
-.x-gs {
- display: block;
-}
-
-.xr-gs {
- display: block;
- margin-top: 6px;
-}
-
-.z_n {
- padding-right: 6px !important;
-}
-
-.nbsp,
-.side-panel > div,
-.vp-gs > div,
-.top-g .pos-g,
-.z_n + .z,
-.z_gr_br,
-#ox-enlarge + .z,
-.h-g + .z,
-.pron-gs .wrap,
-li.sn-g > .num,
-span[hide~='y'],
-.top-container br {
- display: none;
-}
-
-.entry-in-other-dict a {
- font-weight: normal;
-}
-
-.webtop-g .pos {
- margin-left: 6px;
-}
-
-.webtop-g a:last-of-type {
- margin-right: 4px;
-}
-
-.top-g .clear {
- margin-top: 6px;
-}
-
-.top-g .btn {
- margin-bottom: 13px;
-}
-
-.top-g .btn:hover:not(.inactive) a:before {
- background-position: 0 bottom;
-}
-
-.top-g .def {
- display: block;
-}
-
-.top-g > .pron-gs {
- display: block;
-}
-
-.top-g .v-gs:not([type~='sym']) {
- display: block;
-}
-
-.top-container + .pv-gs,
-.top-container + .wf-g {
- border-width: 0;
- margin: -12px 0 0 0;
- overflow: auto;
-}
-
-.top-container + .pv-gs .pv-g,
-.top-container + .wf-g .pv-g {
- margin: 12px 0 18px 0;
-}
-
-.top-container + .pv-gs .pv,
-.top-container + .wf-g .pv {
- margin-left: 0;
-}
-
-.top-container + .pv-gs > .heading,
-.top-container + .wf-g > .heading {
- display: none;
-}
-
-.top-container + .pv-gs .heading,
-.top-container + .wf-g .heading {
- color: #333;
- font-size: 1.19em;
- padding: 6px 12px 6px 12px;
-}
-
-.top-container + .pv-gs .xr-gs,
-.top-container + .wf-g .xr-gs {
- margin-top: 6px;
-}
-
-.top-container + .pv-gs .xr-gs:before,
-.top-container + .wf-g .xr-gs:before {
- display: inline;
-}
-
-.top-container + .pv-gs .Ref,
-.top-container + .wf-g .Ref {
- display: inline;
- margin: 0;
-}
-
-.if-g .pron-gs {
- display: inline;
-}
-
-ol.h-g,
-ol.pv-g,
-ol.idm-g {
- list-style-type: none;
- padding-left: 0;
- counter-reset: num;
-}
-
-ol.h-g li.sn-g,
-ol.pv-g li.sn-g,
-ol.idm-g li.sn-g {
- padding-left: 24px;
-}
-
-ol.h-g li.sn-g:before,
-ol.pv-g li.sn-g:before,
-ol.idm-g li.sn-g:before {
- content: counter(num) ' ';
- counter-increment: num;
-}
-
-ol.h-g > .res-g,
-ol.h-g .sn-gs > .xr-gs,
-ol.pv-g > .res-g,
-ol.pv-g .sn-gs > .xr-gs,
-ol.idm-g > .res-g,
-ol.idm-g .sn-gs > .xr-gs {
- margin-left: 24px;
-}
-
-.def .xr-gs {
- display: inline;
-}
-
-.def .xr-gs:before {
- display: none;
-}
-
-.x-g .cf {
- margin-right: 6px;
-}
-
-.xr-gs:before {
- content: '';
- margin-right: 4px;
- position: relative;
- top: -1px;
- width: 13px;
- height: 9px;
- background-size: 13px auto;
- display: inline-block;
-}
-
-.xr-gs[xref_type='external']:before {
- background-repeat: no-repeat;
- height: 18px;
- width: 18px;
- background-size: 18px auto;
- vertical-align: middle;
- margin-right: 8px;
-}
-
-.xr-gs[xref_type='external'] .prefix {
- font-variant: inherit;
-}
-
-.ndv .xh {
- font-weight: normal;
-}
-
-.sep + .sep {
- display: none;
-}
-
-.idm-gs > .heading,
-.idm-gs pnc.heading,
-.pv-gs > .heading,
-.pv-gs pnc.heading {
- display: block;
- font-size: 1.38em;
- padding: 12px 18px 0 18px;
- color: #c76e06;
-}
-
-.idm-gs > .xr-gs,
-.pv-gs > .xr-gs {
- margin: 12px 0 12px 0;
-}
-
-.idm-gs .un,
-.pv-gs .un {
- margin-left: 18px;
- margin-right: 18px;
-}
-
-.pv-gs > .xr-gs {
- margin-top: 0;
-}
-
-.pv-gs > .xr-gs:before {
- display: none;
-}
-
-.pv-gs .xr-gs > .heading {
- margin-bottom: 6px;
- display: block;
- font-size: 1.38em;
- padding: 12px 18px 0 18px;
- color: #c76e06;
-}
-
-.pv-gs > .xr-gs .Ref {
- display: block;
- margin: 6px 18px;
-}
-
-.pv-gs > .xr-gs .Ref .pvarr:before {
- content: '';
- width: 15px;
- height: 11px;
- background-size: 15px auto;
- display: inline-block;
-}
-
-.idm-g .top-container,
-.pv-g .top-container {
- padding: 0;
- margin: 0 0 -6px 0;
- background-color: transparent;
-}
-
-.idm-g .top-container .clear,
-.idm-g .top-container .btn,
-.idm-g .top-container br,
-.pv-g .top-container .clear,
-.pv-g .top-container .btn,
-.pv-g .top-container br {
- display: none;
-}
-
-.idm-g .v-gs,
-.pv-g .v-gs {
- display: block;
-}
-
-.idm-g .idm + .label-g,
-.pv-g .idm + .label-g {
- margin-left: 6px;
-}
-
-.wfo .sym_first:after,
-.wfo pnc.sym_first:after {
- content: ' ';
-}
-
-.blockquote .p {
- display: block;
- margin: 0;
-}
-
-.blockquote .wrap {
- display: none;
-}
-
-.blockquote:before,
-.blockquote:after,
-.blockquote pnc.wrap_open,
-.blockquote pnc.wrap_close {
- color: #c76e06;
- font-size: 6.15em;
- position: absolute;
-}
-
-.blockquote:before,
-.blockquote pnc.wrap_open {
- left: -20px;
- position: absolute;
- top: 24px;
-}
-
-.blockquote:after,
-.blockquote pnc.wrap_close {
- right: -20px;
- bottom: 0;
-}
-
-.blockquote:before {
- content: '\201C';
-}
-
-.blockquote:after {
- content: '\201D';
-}
-
-.frac-g .num {
- font-size: smaller;
- position: relative;
- top: -5px;
- margin-right: 3px;
-}
-
-.frac-g .den {
- font-size: smaller;
- vertical-align: sub;
-}
-
-.un .x-gs {
- display: inline;
-}
-
-.dr-gs .top-container {
- background-color: transparent;
- margin: 0;
- padding: 0;
-}
-
-.dr-gs .clear {
- display: none;
-}
-
-.dr-gs .sn-g {
- margin-top: 6px;
-}
-
-.dr-gs .sym_first {
- margin-right: 6px;
-}
-
-.dr-gs .oxford3000 {
- width: 25px;
- height: 25px;
- top: -2px;
-}
-
-.dr-gs .academic {
- width: 25px;
- height: 25px;
- top: -2px;
-}
-
-.dr-gs .pos-g {
- display: inline;
-}
-
-.dr-gs .top-g > span {
- margin-right: 4px;
-}
-
-.entry[dict~='oaad'] .collapse[title^='Grammar'] .p {
- margin-top: 3px;
- margin-left: 16px;
- position: relative;
- display: block;
-}
-
-.entry[dict~='oaad'] .collapse[title^='Grammar'] .p:before {
- content: '';
- position: absolute;
- left: -15px;
- top: 9px;
- width: 7px;
- height: 7px;
- background-size: 7px auto;
-}
-
-.collapse {
- padding: 12px 18px 12px 18px;
- border-left: 3px solid #c76e06;
-}
-
-.collapse .heading,
-.collapse pnc.heading,
-.collapse .body,
-.collapse .h1,
-.collapse .li,
-.collapse .inline {
- display: block;
-}
-
-.collapse .heading:hover,
-.collapse pnc.heading:hover {
- cursor: pointer;
-}
-
-.collapse .heading:before,
-.collapse pnc.heading:before {
- width: 14px;
- height: 14px;
- background-size: 100% auto;
- background-position: center bottom;
- content: '+';
- display: inline-block;
- position: relative;
- top: 1px;
-}
-
-.collapse .body,
-.collapse .heading + .def {
- display: none;
-}
-
-.collapse .h1 {
- color: #c76e06;
- font-size: 1.5em;
- margin: 12px 0 6px 0;
- font-weight: bold;
- display: block;
-}
-
-.collapse .h3,
-.collapse .h2 {
- font-size: 1.26em;
- margin: 6px 0 3px 0;
- font-weight: bold;
- display: block;
- border-bottom: 1px solid rgba(199, 110, 6, 0.5);
- color: #333;
-}
-
-.collapse .li .x-gs {
- display: inline;
-}
-
-.collapse .x-gs {
- margin-bottom: 6px;
-}
-
-.collapse .p {
- margin: 0;
- display: block;
-}
-
-.collapse .p .xr-gs {
- display: inline;
- margin: 0;
-}
-
-.collapse .p .xr-gs[type~='pdf'] {
- display: none;
-}
-
-.collapse .inline,
-.collapse ul.inline {
- display: block;
- font-size: 1.26em;
- margin-bottom: 12px;
-}
-
-.collapse .inline .li,
-.collapse ul.inline .li {
- display: inline-block;
- font-weight: bold;
-}
-
-.collapse .inline .li:not(:last-of-type):after,
-.collapse ul.inline .li:not(:last-of-type):after {
- content: '';
- margin-left: 5px;
- position: relative;
- top: -2px;
- width: 6px;
- height: 6px;
- background-size: 6px auto;
- display: inline-block;
-}
-
-.collapse .deflist .li,
-.collapse ul.deflist .li {
- margin-top: 6px;
-}
-
-.collapse .deflist .li > .eb,
-.collapse ul.deflist .li > .eb {
- color: #c76e06;
- font-size: 1.23em;
-}
-
-.collapse .bullet,
-.collapse ul.bullet {
- display: block;
- margin: 6px 0 12px 0;
-}
-
-.collapse .bullet .li,
-.collapse ul.bullet .li {
- margin-top: 3px;
- margin-left: 16px;
- position: relative;
- display: block;
-}
-
-.collapse .bullet .li:before,
-.collapse ul.bullet .li:before {
- content: '\2022';
- position: absolute;
- left: -15px;
-}
-
-.collapse .table {
- margin: 12px;
- display: table;
-}
-
-.collapse .th,
-.collapse .td {
- padding: 2px 12px 2px 12px;
- border-bottom: 1px solid rgba(199, 110, 6, 0.5);
- display: table-cell;
-}
-
-.collapse .th {
- background-color: rgba(199, 110, 6, 0.2);
-}
-
-.collapse .tr {
- display: table-row;
-}
-
-.collapse[title^='Wordfinder'] .xr-gs:before {
- display: none;
-}
-
-.collapse[title^='Extra examples'] .x-gs .x-g {
- margin-left: 0;
-}
-
-.collapse[title^='More Like This'] .inline .li {
- font-weight: normal;
- font-size: 1.15em;
-}
-
-.collapse[title^='More Like This'] .sep {
- display: none;
-}
-
-.collapse[title^='AWL Collocations'] .er {
- font-weight: normal;
-}
-
-.collapse[title^='AWL Collocations'] .h3 {
- border-bottom: 0;
-}
-
-.collapse[title^='AWL Collocations'] .h3 .inline {
- margin-bottom: 0;
- font-size: 1.15em;
-}
-
-.unbox.is-active .heading,
-.unbox.is-active pnc.heading {
- margin-bottom: 12px;
-}
-
-.unbox.is-active .heading:hover,
-.unbox.is-active pnc.heading:hover {
- cursor: pointer;
-}
-
-.unbox.is-active .body,
-.unbox.is-active .heading + .def {
- display: block;
-}
-
-.snippet .collapse {
- border-left-color: #a9222d;
- background-color: transparent;
-}
-
-.snippet .collapse .shcut {
- border-bottom: none;
-}
-
-.snippet .collapse .heading {
- background-color: rgba(169, 34, 45, 0.1);
-}
-
-.snippet .collapse .heading:hover {
- background-color: rgba(169, 34, 45, 0.2);
-}
-
-.snippet .collapse .shcut {
- margin-top: 12px;
- font-size: 1.1em;
-}
-
-.snippet .collapse .sn-g {
- margin-top: 0;
-}
-
-.snippet .collapse .coll-g:before {
- content: '\2022';
- font-size: 1.54em;
- line-height: 1;
- padding-top: 2px;
- margin-right: 6px;
- display: inline-block;
- position: relative;
- top: 2px;
- color: silver;
-}
-
-.snippet .collapse .coll-gs .sep {
- display: none;
-}
-
-.peu-grammar-home .box {
- background: white;
-}
-
-.block {
- display: block;
-}
-
-.bold,
-.eb,
-.eb,
-.title_bold {
- font-weight: bold;
-}
-
-.boldItalic,
-.ebi {
- font-style: italic;
- font-weight: bold;
-}
-
-.caption {
- font-size: 0.92em;
- padding-left: 20px;
-}
-
-.commentary {
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
-}
-
-.construct {
- font-weight: bold;
-}
-
-.constructGroup .construct {
- font-weight: normal;
- display: inline-block;
- padding: 3px 8px;
- background-color: #c6d9f9;
- margin-bottom: 0.4em;
-}
-
-.context {
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
-}
-
-.dialogue {
- font-style: italic;
-}
-
-.dialogue .speaker {
- font-style: normal;
-}
-
-.equivalent {
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
-}
-
-.example {
- display: block;
- font-style: italic;
- padding-left: 12px;
- text-indent: -12px;
-}
-
-.example * {
- text-indent: 0;
-}
-
-.exampleGroup {
- padding-left: 20px;
- display: block;
- position: relative;
-}
-
-.exampleGroupSet {
- display: block;
-}
-
-.example_runon {
- margin-left: 6px;
-}
-
-.grammarEntry .h {
- font-weight: bold;
-}
-
-.hang {
- min-width: 30px;
- display: table-cell;
-}
-
-.indent {
- display: table-cell;
-}
-
-.italic,
-.ei,
-.ei {
- font-style: italic;
-}
-
-.list_keyword {
- font-weight: bold;
- display: inline-block;
- margin-top: 8px;
-}
-
-.locution {
- display: inline;
-}
-
-.locution:not(:last-child) {
- margin-right: 6px;
-}
-
-.note {
- font-size: 0.8em;
-}
-
-.note .a {
- font-size: 111.35%;
-}
-
-.notes {
- display: block;
- margin-top: 11px;
- border-left: 4px solid silver;
- padding-left: 8px;
-}
-
-.notPertinent {
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
-}
-
-.pertinent {
- font-style: italic;
-}
-
-.phons {
- font-style: normal;
-}
-
-.roman {
- font-style: normal;
-}
-
-.smallCaps,
-.esc {
- font-variant: small-caps;
- font-variant: all-small-caps;
- font-size: 1.2em;
- text-transform: lowercase;
-}
-
-.strikethrough,
-.estrike {
- text-decoration: line-through;
-}
-
-.strikethrough .eph,
-.estrike .eph {
- text-decoration: line-through;
-}
-
-.strikethrough .noStrike,
-.estrike .noStrike {
- display: inline-block;
-}
-
-.subtitle {
- font-weight: normal;
-}
-
-.subtitle .ebi {
- font-weight: normal;
-}
-
-.superSectionIntro {
- display: block;
- margin: 1em 0;
-}
-
-.tabular {
- display: block;
-}
-
-.title {
- color: #0d3880;
- display: block;
- font-weight: bold;
- font-size: 1.2em;
-}
-
-.title .subtitle .ei {
- font-weight: normal;
-}
-
-.underline {
- text-decoration: underline;
-}
-
-.vocabBox {
- background-color: #c6d9f9;
- padding: 3px 20px;
- margin-bottom: 0.4em;
- margin-top: 0.4em;
- display: inline-block;
-}
-
-.grammarEntry .wx-gs {
- display: block;
- border: 1px solid #0d3880;
- padding: 8px;
- margin-top: 14px;
-}
-
-.grammarEntry .wx-gs .title {
- padding-bottom: 8px;
- font-weight: bold;
- font-size: 1.38em;
-}
-
-.grammarEntry .wx-gs .wx {
- font-style: normal;
- text-decoration: none;
- display: block;
- padding: 2px 0 2px 26px;
- position: relative;
-}
-
-.grammarEntry .wx-gs .wx:before {
- content: '';
- display: inline-block;
- width: 12px;
- height: 16px;
- position: absolute;
- top: 6px;
- left: 0;
- background-size: 12px 16px;
-}
-
-.xh {
- font-variant: small-caps;
-}
-
-.xref {
- color: #0d3880;
- white-space: nowrap;
-}
-
-.xref:before {
- content: '';
- display: inline-block;
- position: relative;
- border-top: 0.35em solid transparent;
- border-bottom: 0.35em solid transparent;
- border-left: 0.7em solid #0d3880;
- margin-right: 4px;
- margin-left: 1px;
-}
-
-.grammarEntry .xr-gs .xr-g {
- display: block;
-}
-
-.grammarEntry .Ref .xr-gs {
- display: inline-block;
-}
-
-.peu-btns {
- padding-top: 10px;
- display: block;
-}
-
-.peu-btns:after {
- content: '';
- display: table;
- clear: both;
-}
-
-.peu-btns a {
- display: block;
- position: relative;
- min-width: 90px;
- padding: 0 12px;
- background-color: #004aac;
- color: white;
- font-variant: normal;
- text-transform: lowercase;
- font-size: 0.92em;
- font-weight: normal;
- border-radius: 15px;
-}
-
-.peu-btns a:before,
-.peu-btns a:after {
- display: inline-block;
- vertical-align: middle;
- width: 11px;
- height: 30px;
-}
-
-.peu-btns a:hover {
- background-color: #00123c;
-}
-
-.peu-btns .xr-g {
- display: block;
-}
-
-.peu-btns .xr-g:first-child a {
- float: left;
-}
-
-.peu-btns .xr-g:first-child a:before {
- content: '';
- margin-right: 6px;
-}
-
-.peu-btns .xr-g:last-child a {
- float: right;
- text-align: right;
-}
-
-.peu-btns .xr-g:last-child a:after {
- content: '';
- background-position: right top;
- margin-left: 6px;
-}
-
-.peu-btns .xr-g:last-child a:before {
- content: none;
-}
-
-.page-head,
-.grammarEntry > .title,
-.introduction > .title {
- font-size: 1.6em;
- font-weight: bold;
- margin-bottom: 1em;
-}
-
-.grammarEntry {
- display: block;
- clear: both;
-}
-
-.grammarEntry > .title[section='yes'] {
- font-size: 1.8em;
- font-weight: bold;
- margin-bottom: 1em;
-}
-
-.grammarEntry > .title .hang {
- padding-right: 20px;
-}
-
-.grammarEntry > .title .indent .notPertinent {
- font-weight: inherit;
-}
-
-.grammarEntry .breadcrumb {
- display: none;
-}
-
-.grammarEntry > .breadcrumb {
- font-size: 0.8em;
- display: block;
- margin-top: -10px;
- margin-bottom: 4px;
-}
-
-.grammarEntry > .breadcrumb:before {
- content: 'PEU';
- font-weight: bold;
-}
-
-.grammarEntry > .breadcrumb .l1 {
- padding-left: 23px;
- background-size: 14px 15px;
-}
-
-.grammarEntry .xr-gs:before,
-.grammarEntry .institle,
-.grammarEntry .arl {
- display: none;
-}
-
-.grammarEntry .example_runon {
- display: block;
- margin-left: 0;
-}
-
-.grammarEntry .exampleGroup {
- padding-left: 12px;
-}
-
-.grammarEntry .exampleGroup .hang {
- left: 12px;
-}
-
-.grammarEntry .exampleGroup .hang + .indent {
- padding-left: 10px;
- display: block;
-}
-
-.grammarEntry .constructGroup {
- padding-left: 12px;
-}
-
-.author-name {
- color: #4d4c4c;
- font-size: 1.38em;
-}
-
-.peu-home-logo {
- display: inline-block;
- margin: -10px 0 -10px;
-}
-
-.peu-home-un-authorized {
- padding-bottom: 20px;
-}
-
-.peu-home-un-authorized h1 {
- font-size: 2.15em;
- margin-top: 0;
- margin-bottom: 8px;
-}
-
-.peu-home-un-authorized h1:after {
- content: '';
- display: inline-block;
- width: 26px;
- height: 28px;
- background-size: 26px 28px;
- margin-left: 8px;
- margin-top: -4px;
- vertical-align: middle;
-}
-
-.peu-home-un-authorized #generaltext h2 {
- font-size: 1.23em;
- margin-top: 24px;
-}
-
-.peu-home-un-authorized #generaltext .open-close h2 {
- color: #0d3880;
-}
-
-.peu-home-un-authorized #generaltext .open-close h2:first-child {
- margin-top: 0;
-}
-
-.peu-home-un-authorized h3 {
- font-size: 1.23em;
- font-weight: bold;
-}
-
-.peu-home-un-authorized h3 + h3 {
- margin-top: -7px;
-}
-
-.peu-home-un-authorized .peu-quote {
- text-align: right;
- font-size: 1.08em;
- margin: 4px 0;
-}
-
-.peu-home-authorized h3 {
- padding-bottom: 0;
-}
-
-.peu-sales-box {
- border: 1px solid #8f0610;
- padding: 12px 16px 10px;
- margin-bottom: 20px;
- margin-top: 20px;
-}
-
-.peu-sales-box .bgtn-premium {
- margin-top: 6px;
-}
-
-.grammarEntry[type='interstitial'] .title {
- color: #333;
- font-weight: bold;
-}
-
-.grammarEntry[type='interstitial'] > .title + .section {
- margin-bottom: 8px;
-}
-
-.grammarEntry[type='interstitial'] .section .title {
- display: inline;
-}
-
-.grammarEntry[type='interstitial'] .section {
- margin-bottom: 6px;
-}
-
-.grammarEntry[type='interstitial'] > .section {
- margin-top: 24px;
-}
-
-.grammarEntry[type='interstitial'] .subtitle {
- font-weight: bold;
-}
-
-.grammarEntry[type='interstitial'] .title .indent {
- font-size: 1.15em;
- font-weight: normal;
- display: inline;
-}
-
-.grammarEntry[type='interstitial'] .title + .block {
- display: inline-block;
- padding-left: 18px;
- margin-top: 0;
-}
-
-.grammarEntry[type='interstitial'] .title + .block .xr-gs {
- display: inline-block;
- margin-top: 0;
-}
-
-.section {
- display: block;
-}
-
-.section > .title {
- margin-top: 1em;
-}
-
-.section > .section > .title {
- font-size: 1em;
- font-weight: normal;
-}
-
-.grammarEntry > .section[section_num] > span:not(.title):not(.pnc),
-.grammarEntry > .section > .section[section_num] > span:not(.title):not(.pnc) {
- margin-left: 30px;
-}
-
-.grammarEntry > .section[section_num] + .notes,
-.grammarEntry > .section > .section[section_num] + .notes {
- margin-top: 24px;
- margin-left: 30px;
- border-left: 12px solid silver;
-}
-
-.section > .block,
-.section > .constructGroup,
-.section > .notes,
-.section > .lettered,
-.section > .bulleted,
-.section > .numbered {
- display: block;
- margin-top: 0.4em;
-}
-
-.section .title {
- display: table;
-}
-
-.section .title .indent,
-.section .title .indent .ebi {
- font-weight: normal;
-}
-
-.exampleGroup .hang {
- position: absolute;
- left: 0;
-}
-
-.example .pertinent {
- font-weight: bold;
-}
-
-.example .commentary .pertinent {
- font-weight: normal;
-}
-
-.example .commentary .example .pertinent {
- font-weight: bold;
-}
-
-.block .example,
-.commentary .example {
- display: inline;
- padding-left: 0;
- text-indent: 0;
-}
-
-.vocabBox .example {
- display: inline;
-}
-
-table span {
- margin-left: 0 !important;
-}
-
-table .exampleGroup,
-table .example {
- padding-left: 0;
-}
-
-table td {
- padding: 0 1em 0 0;
- vertical-align: top;
-}
-
-table .block {
- margin: 0;
-}
-
-.frame_all_,
-.frame_none_,
-.frame_no_row_,
-.frame_never_,
-.frame__,
-.frame_none_0 {
- margin-top: 0.8em;
- margin-bottom: 0.4em;
-}
-
-.frame_all_ th,
-.frame_none_ th,
-.frame_no_row_ th,
-.frame_never_ th,
-.frame__ th,
-.frame_none_0 th {
- text-align: left;
- font-weight: bold;
-}
-
-.frame_all_ tr,
-.frame_no_row_ tr {
- border: 1px black solid;
-}
-
-.frame_all_ th,
-.frame_no_row_ th {
- padding: 2px 6px;
-}
-
-.frame_all_ td,
-.frame_no_row_ td {
- padding: 2px 6px 2px 16px;
- text-indent: -10px;
-}
-
-.frame_no_row_ tr {
- border-width: 0 1px;
-}
-
-.frame_no_row_ tr:last-child {
- border-bottom-width: 1px;
-}
-
-.frame_no_row_ tr:first-child {
- border-top-width: 1px;
- border-bottom-width: 1px;
-}
-
-.frame_none_ th,
-.frame_none_0 th,
-.frame__ th {
- text-align: left;
- padding-right: 15px;
-}
-
-.plain {
- display: block;
-}
-
-.plain .indent {
- display: block;
-}
-
-.plain .exampleGroup {
- padding-left: 20px;
-}
-
-.plain .example {
- padding-left: 0;
-}
-
-.plain .block {
- margin: 0;
-}
-
-.bulleted,
-.lettered,
-.numbered {
- padding-left: 20px;
- position: relative;
-}
-
-.bulleted .li:before,
-.lettered .li:before,
-.numbered .li:before {
- position: absolute;
- left: 0;
- font-weight: bold;
-}
-
-.bulleted .li:before {
- content: '\2022';
-}
-
-.lettered {
- counter-reset: letter-counter;
-}
-
-.lettered .li:before {
- content: counter(letter-counter, lower-alpha);
- counter-increment: letter-counter;
-}
-
-.numbered {
- counter-reset: number-counter;
-}
-
-.numbered .li:before {
- content: counter(number-counter);
- counter-increment: number-counter;
-}
-
-.numbered .bulleted {
- display: block;
-}
-
-.numbered .bulleted .li:before {
- content: '\2022' !important;
- counter-increment: none;
-}
-
-.peu-contents-full {
- margin-bottom: 10px;
-}
-
-.peu-contents-full li a {
- padding: 7px 0 7px 25px;
-}
-
-.peu-contents-full ul > li > div > a {
- color: #333;
-}
-
-.peu-contents-full ul ul > li > div > a {
- color: #004aac;
- padding: 4px 0 4px 25px;
-}
-
-.peu-contents-full ul ul ul > li > div > a {
- color: #333;
- padding: 4px 0 4px 25px;
-}
-
-.peu-contents-full
- .section
- .section[subsection='1']:not(:first-child)
- .title:before {
- content: '- ';
-}
-
-#rightcolumn .toc_header {
- border-bottom: 1px solid #cccccc;
-}
-
-#rightcolumn .toc_header h4 {
- padding-left: 26px;
- font-size: 1.15em;
-}
-
-#rightcolumn .toc_content {
- padding-right: 8px;
-}
-
-#rightcolumn .toc_content > a {
- margin-top: 8px;
- display: inline-block;
-}
-
-#rightcolumn .relatedBlock ul ul div a {
- padding: 4px;
- margin-left: 16px;
- color: #004aac;
-}
-
-#rightcolumn .relatedBlock ul ul .icon-plus,
-#rightcolumn .relatedBlock ul ul .icon-minus {
- display: none;
-}
-
-#rightcolumn .relatedBlock ul ul ul[style] {
- display: none !important;
-}
-
-.grammarEntry .pron-gs {
- border: none;
- padding: 0 4px;
- vertical-align: top;
- margin-top: 0;
- display: inline-block;
-}
-
-.grammarEntry .pron-gs .sound {
- display: block;
-}
-
-.lang-study-page h3,
-.peu-introduction-page h3 {
- margin: 14px 0 0;
-}
-
-.peu-link-nav,
-#browse-letters {
- margin-top: 16px;
-}
-
-.peu-link-nav:after,
-#browse-letters:after {
- content: '';
- display: table;
- clear: both;
-}
-
-.peu-link-nav a,
-#browse-letters a {
- display: block;
- float: left;
- padding: 0 8px;
- min-width: 34px;
- text-align: center;
- margin-right: 8px;
- margin-bottom: 8px;
- border: 2px solid #cccccc;
- border-radius: 8px;
-}
-
-.peu-link-nav a:hover,
-#browse-letters a:hover {
- background-color: #ebebeb;
- text-decoration: none;
- color: black;
-}
-
-.definition-wrap {
- margin-left: 22px;
- text-indent: -22px;
- margin-bottom: 8px;
-}
-
-.phon-table td {
- height: 30px;
-}
-
-.phon-table td:first-child {
- width: 35px;
-}
-
-.story-behind-peu .float-right {
- float: right;
- margin: 5px 0 10px 10px;
-}
-
-.story-behind-peu .float-left {
- float: left;
- margin: 5px 10px 10px 0;
-}
-
-.story-behind-peu .float-right,
-.story-behind-peu .float-left {
- max-width: 50%;
- height: auto;
-}
-
-.entry-unauthorised .restrictedLock {
- color: #333;
- margin-bottom: 18px;
-}
-
-.entry-unauthorised .restrictedImg img {
- width: 14px;
-}
-
-.entry-unauthorised .restrictedLinks table {
- margin-bottom: 20px;
- position: relative;
-}
-
-.entry-unauthorised .restrictedLinks td {
- display: block;
- float: left;
-}
-
-.entry-unauthorised .restrictedLinks td:first-child {
- font-size: 1.38em;
- font-weight: bold;
-}
-
-.introduction > .title {
- margin-bottom: 0;
-}
-
-.introduction > .title .hang {
- display: inline-block;
- padding-right: 20px;
- font-weight: normal;
-}
-
-.introduction > .title .indent {
- display: inline-block;
- font-weight: bold;
-}
-
-.introduction > .title .indent .ei,
-.introduction > .title .indent .notPertinent {
- font-weight: bold;
-}
-
-.superSectionIntro,
-.title_contents {
- text-transform: uppercase;
- color: #333;
- font-size: 1.85em;
- margin-top: 1em;
- margin-bottom: 10px;
- display: block;
- font-weight: normal;
-}
-
-#simple-present-forms__16 tr,
-#passive-structures-and-verb-forms__23 tr {
- border-width: 0 1px 0 1px;
-}
-
-#simple-present-forms__16 tr:first-child,
-#passive-structures-and-verb-forms__23 tr:first-child {
- border-width: 1px;
-}
-
-#simple-present-forms__16 tr:last-child,
-#passive-structures-and-verb-forms__23 tr:last-child {
- border-width: 0 1px 1px 1px;
-}
-
-#abbreviations__164 td,
-#prefixes-and-suffixes__997 td,
-#prefixes-and-suffixes__1024 td,
-#prefixes-and-suffixes__798 td,
-#special-rules-and-exceptions__724 td {
- padding-left: 10px;
- text-indent: -10px;
-}
-
-#numbers_1__853 {
- margin-left: 15px;
-}
-
-#numbers_1__803 td > span {
- display: block;
- padding-left: 10px;
- text-indent: -10px;
-}
-
-#numbers_1__803 td:first-child {
- white-space: nowrap;
-}
-
-#headlines__203 .esc {
- display: block;
- padding-left: 15px;
-}
-
-#special-rules-and-exceptions__724 td .ei:nth-child(2),
-#special-rules-and-exceptions__724 td .ei:nth-child(3) {
- display: block;
- padding-left: 10px;
-}
-
-#special-rules-and-exceptions__724 .example_runon {
- padding-left: 10px;
-}
-
-#numbers_1__846 td:first-child {
- white-space: nowrap;
-}
-
-#spelling-of-plurals__30 tr:nth-child(2) td .ebi,
-#spelling-of-plurals__128 tr:nth-child(2) td .ebi,
-#if-introduction__45 tr:nth-child(2) td .ebi,
-#if-introduction__63 tr:nth-child(2) td .ebi,
-#if-introduction__81 tr:nth-child(2) td .ebi {
- padding: 3px 8px;
- background-color: #c6d9f9;
-}
-
-#if-introduction__45 tr:nth-child(2) td,
-#if-introduction__63 tr:nth-child(2) td,
-#if-introduction__81 tr:nth-child(2) td {
- text-align: left;
-}
-
-#if-introduction__45 tr:nth-child(2) td .ebi,
-#if-introduction__45 tr:nth-child(2) td .eb,
-#if-introduction__63 tr:nth-child(2) td .ebi,
-#if-introduction__63 tr:nth-child(2) td .eb,
-#if-introduction__81 tr:nth-child(2) td .ebi,
-#if-introduction__81 tr:nth-child(2) td .eb {
- font-weight: normal;
-}
-
-#if-introduction__45 td:first-child,
-#if-introduction__63 td:first-child,
-#if-introduction__81 td:first-child {
- min-width: 170px;
-}
-
-#formal-and-informal-vocabulary__9 .exampleGroup .context {
- width: 150px;
- display: inline-block;
-}
-
-#capital-letters_1__9 {
- counter-reset: letter-counter;
- position: relative;
-}
-
-#capital-letters_1__9 .section:before {
- content: counter(letter-counter, lower-alpha);
- counter-increment: letter-counter;
- position: absolute;
- left: 0;
- font-weight: bold;
-}
-
-#spelling-and-pronunciation__134 .example {
- display: inline-block;
-}
-
-#comparative-and-superlative-adjectives__311,
-#comparative-and-superlative-adjectives__340,
-#american-and-british-english__212,
-#american-and-british-english__24 {
- border: none;
-}
-
-#comparative-and-superlative-adjectives__311 tr,
-#comparative-and-superlative-adjectives__340 tr,
-#american-and-british-english__212 tr,
-#american-and-british-english__24 tr {
- border: none;
-}
-
-#comparative-and-superlative-adjectives__311 td,
-#comparative-and-superlative-adjectives__340 td,
-#american-and-british-english__212 td,
-#american-and-british-english__24 td {
- padding-left: 12px;
- text-indent: -12px;
-}
-
-#prepositions-before-particular-words-and-expressions__9 .plain {
- margin-top: 16px;
-}
-
-#prepositions-before-particular-words-and-expressions__9 .plain .indent {
- margin-top: 8px;
-}
-
-#prepositions-after-particular-words-and-expressions__9 .plain .indent {
- margin-top: 8px;
-}
-
-#spelling-and-pronunciation__1176 .sound {
- display: inline-block;
-}
-
-.swb-home-logo {
- display: inline-block;
- margin: -10px 0 -10px;
-}
-
-h2 .oxford3000 {
- top: 0;
-}
-
-.unbox .p {
- display: block;
-}
-
-.unbox .p + .p {
- margin-top: 18px;
-}
-
-.trans-page .v_alt {
- font-weight: bold;
-}
-
-.trans-page .prefix_adv,
-.trans-page .ds,
-.trans-page .dtxt {
- font-style: italic;
-}
-
-.trans-page .tx {
- display: block;
- color: #008900;
- font-size: 1.08em;
-}
-
-.trans-page .unbox,
-.trans-page .bf-gs {
- border: 1px solid rgba(199, 110, 6, 0.4);
- border-radius: 10px 10px 0 0;
- display: block;
- margin: 18px 0 18px 0;
- overflow: hidden;
- padding: 9px 18px;
-}
-
-.trans-page .unbox {
- border-color: #333;
-}
-
-.trans-page .unbox .h1 {
- font-size: 1.54em;
- padding: 10px 0 6px;
- display: block;
-}
-
-.trans-page .top-g .unbox {
- border: none;
- display: inline;
- padding: 0;
- margin: 0;
-}
-
-.trans-page .idm-gs {
- border-color: #c76e06;
-}
-
-.trans-page .idm-gs > .unbox {
- margin-left: 18px;
- margin-right: 18px;
-}
-
-.trans-page .idm-gs > .prefix {
- display: block;
- font-size: 1.38em;
- padding: 12px 18px 0 18px;
- color: #c76e06;
-}
-
-.trans-page .bf-gs .top-container {
- margin-left: 0;
- margin-right: 0;
- margin-bottom: 0;
- background-color: transparent;
- padding: 0;
-}
-
-.trans-page .bf-gs .top-container .top-g .clear {
- display: none;
-}
-
-.trans-page .bf-gs .prefix {
- color: #c76e06;
-}
-
-.schulwoerterbuch_German-English .clear {
- display: none;
-}
-
-.audio .icon-audio {
- background-repeat: no-repeat;
- background-position: left top !important;
- background-size: 100%;
- width: 24px;
- height: 24px;
- margin-right: 4px;
- display: inline-block;
-}
-
-.audio .icon-audio:hover {
- background-position: left bottom !important;
-}
-
-.shcut-red,
-.snippet .collapse .shcut,
-.ocoll .shcut,
-.collapse[title='Collocations'] .shcut,
-.collapse[title='All Collocations'] .shcut {
- text-transform: uppercase;
- font-weight: bold;
- border-bottom: none;
- margin-top: 1em;
- color: #a9222d;
-}
-
-.ocoll .top-container {
- background-color: transparent;
- margin-right: 0;
- margin-left: 0;
- margin-bottom: 0;
- padding: 0;
- clear: none;
-}
-
-.ocoll .num {
- display: inline-block;
- width: 20px;
-}
-
-.ocoll .colldef {
- font-size: 1.23em;
-}
-
-.ocoll .pos-g + .colldef {
- display: block;
-}
-
-.ocoll .subentry-g .top-container,
-.ocoll .subentry-g .top-g {
- display: inline;
-}
-
-.ocoll .subentry-g .top-g .clear {
- display: none;
-}
-
-.ocoll .subentry-g {
- display: block;
-}
-
-.ocoll .subentry-g + .subentry-g {
- margin-top: 30px;
-}
-
-.ocoll .top-container + .sn-gs > .shcut-g:first-child .shcut {
- margin-top: 9px;
-}
-
-.ocoll .top-container .v-gs {
- display: inline-block;
-}
-
-.ocoll .shcut-g {
- padding-left: 20px;
- display: block;
-}
-
-.ocoll .coll_un:before {
- content: '(';
-}
-
-.ocoll .coll_un:after {
- content: ')';
-}
-
-.ocoll .coll_un[un='note'] {
- font-weight: normal;
-}
-
-.ocoll .sn-g {
- padding-left: 18px;
- margin-top: 8px;
- margin-bottom: 8px;
-}
-
-.ocoll .sn-g.sn-g:before {
- content: '\2022';
- color: silver;
- font-size: 1.69em;
- padding-right: 6px;
- position: absolute;
- text-align: right;
- left: -8px;
- width: 24px;
-}
-
-.ocoll .coll-gs:not(.x-gs) {
- font-weight: bold;
-}
-
-.ocoll .x-gs {
- margin-top: 2px;
- font-weight: normal;
-}
-
-.ocoll .x-gs .x-g {
- margin-left: 0;
- margin-top: 0;
-}
-
-.ocoll .xr-gs {
- padding-left: 21px;
-}
-
-.ocoll .collapse .coll-gs {
- padding-left: 20px;
- display: block;
- position: relative;
-}
-
-.ocoll .collapse .coll-g:before {
- content: '\2022';
- color: silver;
- font-size: 1.23em;
- padding-right: 6px;
- position: absolute;
- text-align: right;
- left: -8px;
- width: 24px;
-}
-
-.col-home-logo {
- display: inline-block;
- margin: -10px 0 -10px;
- width: 44px;
- height: 44px;
-}
-
-.eul {
- text-decoration: underline;
-}
-
-.collapse[title='Collocations'] .shcut,
-.collapse[title='All Collocations'] .shcut {
- color: #333;
- margin-top: 12px;
-}
-
-.collapse[title='Collocations'] .sn-g,
-.collapse[title='All Collocations'] .sn-g {
- margin-top: 0;
-}
-
-.collapse[title='Collocations'] .colsep,
-.collapse[title='All Collocations'] .colsep {
- color: silver;
-}
-
-.prefix + .Ref {
- display: inline;
- margin: 0;
-}
-
-.audio_play_button,
-.responsive_display_inline_on_smartphone,
-.oxford3000 {
- display: none;
-}
-
-.dictOALD-Header {
- .z {
- display: none;
- }
-}
-
-.dictOALD-Related {
- a {
- margin-left: 2em;
- color: #16a085;
- }
-}
diff --git a/src/components/dictionaries/oald/config.ts b/src/components/dictionaries/oald/config.ts
deleted file mode 100644
index 6af024bb1..000000000
--- a/src/components/dictionaries/oald/config.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { DictItem } from '@/app-config/dicts'
-
-export type OaldConfig = DictItem<{
- related: boolean
-}>
-
-export default (): OaldConfig => ({
- lang: '10000000',
- selectionLang: {
- english: true,
- chinese: false,
- japanese: false,
- korean: false,
- french: false,
- spanish: false,
- deutsch: false,
- others: false,
- matchAll: false
- },
- defaultUnfold: {
- english: true,
- chinese: true,
- japanese: true,
- korean: true,
- french: true,
- spanish: true,
- deutsch: true,
- others: true,
- matchAll: false
- },
- preferredHeight: 265,
- selectionWC: {
- min: 1,
- max: 5
- },
- options: {
- related: true
- }
-})
diff --git a/src/components/dictionaries/oald/engine.ts b/src/components/dictionaries/oald/engine.ts
deleted file mode 100644
index 0ecb0b869..000000000
--- a/src/components/dictionaries/oald/engine.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { fetchDirtyDOM } from '@/_helpers/fetch-dom'
-import { reflect } from '@/_helpers/promise-more'
-import {
- HTMLString,
- getInnerHTML,
- handleNoResult,
- handleNetWorkError,
- SearchFunction,
- GetSrcPageFunction,
- DictSearchResult
-} from '../helpers'
-import { DictConfigs } from '@/app-config'
-
-export const getSrcPage: GetSrcPageFunction = text => {
- return `https://www.oxfordlearnersdictionaries.com/definition/english/${text
- .trim()
- .split(/\s+/)
- .join('-')}`
-}
-
-const HOST = 'https://www.oxfordlearnersdictionaries.com'
-
-interface OALDResultItem {
- title: HTMLString
- prons: Array<{
- phsym: HTMLString
- pron: string
- }>
- defs: HTMLString
-}
-
-export interface OALDResultLex {
- type: 'lex'
- items: OALDResultItem[]
-}
-
-export interface OALDResultRelated {
- type: 'related'
- list: HTMLString
-}
-
-export type OALDResult = OALDResultLex | OALDResultRelated
-
-type OALDSearchResult = DictSearchResult<OALDResult>
-type OALDSearchResultLex = DictSearchResult<OALDResultLex>
-
-export const search: SearchFunction<OALDResult> = (
- text,
- config,
- profile,
- payload
-) => {
- text = text.toLocaleLowerCase().replace(/[^A-Za-z0-9]+/g, '-')
- const options = profile.dicts.all.oald.options
-
- return fetchDirtyDOM(
- 'https://www.oxfordlearnersdictionaries.com/definition/english/' + text
- )
- .catch(handleNetWorkError)
- .then(doc => checkResult(doc, text, options))
-}
-
-function checkResult(
- doc: Document,
- text: string,
- options: DictConfigs['oald']['options']
-): OALDSearchResult | Promise<OALDSearchResult> {
- if (doc.querySelector('#entryContent')) {
- return getAllEntries(doc, text).then(handleAllDOMs)
- } else if (options.related) {
- const $alternative = doc.querySelector('.result-list')
- if ($alternative) {
- return {
- result: {
- type: 'related',
- list: getInnerHTML(HOST, $alternative)
- }
- }
- }
- }
- return handleNoResult()
-}
-
-function getAllEntries(doc: Document, text: string): Promise<Document[]> {
- const wordTester = new RegExp(`/${text}_\\d+$`)
- const hrefs = [
- ...doc.querySelectorAll<HTMLAnchorElement>('#relatedentries .list-col a')
- ]
- .map($a => $a.getAttribute('href') || '')
- .filter(href => wordTester.test(href))
-
- if (hrefs.length > 0) {
- return reflect(hrefs.map(href => fetchDirtyDOM(href))).then(docs => [
- doc,
- ...docs.filter((d): d is Document => !!d)
- ])
- }
-
- return Promise.resolve([doc])
-}
-
-function handleAllDOMs(
- docs: Document[]
-): OALDSearchResultLex | Promise<OALDSearchResultLex> {
- const results = docs
- .map(handleDOM)
- .filter((result): result is DictSearchResult<OALDResultItem> => !!result)
- if (results.length > 0) {
- let resultWithAudio = results.find(
- ({ audio }) => audio && audio.uk && audio.us
- )
- if (!resultWithAudio) {
- resultWithAudio = results.find(
- ({ audio }) => audio && (audio.uk || audio.us)
- )
- }
- const audio = resultWithAudio ? resultWithAudio.audio : undefined
- return {
- result: {
- type: 'lex',
- items: results.map(({ result }) => result)
- },
- audio
- }
- }
- return handleNoResult()
-}
-
-function handleDOM(doc: Document): null | DictSearchResult<OALDResultItem> {
- const result: OALDResultItem = {
- title: getInnerHTML(HOST, doc, '.webtop-g'),
- prons: [],
- defs: ''
- }
-
- const audio: { us?: string; uk?: string } = {}
-
- const $entry = doc.querySelector('#entryContent .h-g')
- if (!$entry) {
- return null
- }
- const $topCon = $entry.querySelector('.top-container')
- if (!$topCon) {
- return null
- }
-
- const $prons = $topCon.querySelector('.pron-gs')
- if ($prons) {
- $prons.querySelectorAll('.pron-g').forEach($p => {
- const $audio = $p.querySelector<HTMLDivElement>('.audio_play_button')
- if (!$audio) {
- return
- }
- const mp3 = $audio.dataset.srcMp3
- if (!mp3) {
- return
- }
-
- if ($audio.className.includes('pron-uk')) {
- audio.uk = mp3
- } else {
- audio.us = mp3
- }
-
- result.prons.push({ phsym: getInnerHTML(HOST, $p), pron: mp3 })
- })
- }
-
- $topCon.remove()
- result.defs = getInnerHTML(HOST, $entry)
-
- if (result.title && result.defs) {
- return { result, audio }
- }
- return null
-}
diff --git a/src/components/dictionaries/oald/favicon.png b/src/components/dictionaries/oald/favicon.png
deleted file mode 100644
index 7b53c2ecd..000000000
Binary files a/src/components/dictionaries/oald/favicon.png and /dev/null differ
diff --git a/test/specs/components/dictionaries/oald/engine.spec.ts b/test/specs/components/dictionaries/oald/engine.spec.ts
deleted file mode 100644
index c463bd0c5..000000000
--- a/test/specs/components/dictionaries/oald/engine.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { retry } from '../helpers'
-import {
- search,
- OALDResultLex,
- OALDResultRelated
-} from '@/components/dictionaries/oald/engine'
-import { getDefaultConfig } from '@/app-config'
-import { getDefaultProfile } from '@/app-config/profiles'
-
-describe('Dict/OALD/engine', () => {
- it('should parse lex result correctly', () => {
- return retry(() =>
- search('love', getDefaultConfig(), getDefaultProfile(), {
- isPDF: false
- }).then(searchResult => {
- expect(searchResult.audio && typeof searchResult.audio.uk).toBe(
- 'string'
- )
- expect(searchResult.audio && typeof searchResult.audio.us).toBe(
- 'string'
- )
-
- const result = searchResult.result as OALDResultLex
- expect(result.type).toBe('lex')
- expect(result.items).toHaveLength(2)
-
- result.items.forEach(item => {
- expect(typeof item.title).toBe('string')
- expect(item.title).toBeTruthy()
- expect(typeof item.defs).toBe('string')
- expect(item.defs).toBeTruthy()
- expect(item.prons).toHaveLength(2)
- })
- })
- )
- })
-
- it('should parse related result correctly', () => {
- return retry(() =>
- search('jumblish', getDefaultConfig(), getDefaultProfile(), {
- isPDF: false
- }).then(searchResult => {
- expect(searchResult.audio).toBeUndefined()
-
- const result = searchResult.result as OALDResultRelated
- expect(result.type).toBe('related')
- expect(typeof result.list).toBe('string')
- })
- )
- })
-})
diff --git a/test/specs/components/dictionaries/oald/fixtures.js b/test/specs/components/dictionaries/oald/fixtures.js
deleted file mode 100644
index 33dd013d2..000000000
--- a/test/specs/components/dictionaries/oald/fixtures.js
+++ /dev/null
@@ -1,16 +0,0 @@
-module.exports = {
- files: [
- [
- 'jumblish.html',
- 'https://www.oxfordlearnersdictionaries.com/definition/english/jumblish'
- ],
- [
- 'love.html',
- 'https://www.oxfordlearnersdictionaries.com/definition/english/love'
- ],
- [
- 'love_2.html',
- 'https://www.oxfordlearnersdictionaries.com/definition/english/love_2'
- ]
- ]
-}
diff --git a/test/specs/components/dictionaries/oald/requests.mock.ts b/test/specs/components/dictionaries/oald/requests.mock.ts
deleted file mode 100644
index 4305553a0..000000000
--- a/test/specs/components/dictionaries/oald/requests.mock.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { MockRequest } from '@/components/dictionaries/helpers'
-
-export const mockSearchTexts = ['love', 'jumblish']
-
-export const mockRequest: MockRequest = mock => {
- mock.onGet(/oxfordlearnersdictionaries/).reply(info => {
- const wordMatch = /[^/]+$/.exec(info.url || '')
- return wordMatch
- ? [
- 200,
- new DOMParser().parseFromString(
- require(`raw-loader!./response/${decodeURIComponent(
- wordMatch[0]
- )}.html`).default,
- 'text/html'
- )
- ]
- : [404]
- })
-}
|
refactor
|
remove oald
|
fc6c6781aa6e90e97641a910737b569e2e81f306
|
2019-11-04 09:31:24
|
crimx
|
chore(release): 7.5.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 323ef49ed..c3537f334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [7.5.1](https://github.com/crimx/ext-saladict/compare/v7.5.0...v7.5.1) (2019-11-04)
+
+
+### Bug Fixes
+
+* translate context before editing ([5c92445](https://github.com/crimx/ext-saladict/commit/5c92445)), closes [#550](https://github.com/crimx/ext-saladict/issues/550)
+
+
+
## [7.5.0](https://github.com/crimx/ext-saladict/compare/v7.4.0...v7.5.0) (2019-11-03)
diff --git a/package.json b/package.json
index 6e4a88952..c14e0ad13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.5.0",
+ "version": "7.5.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.5.1
|
860d394e4ed85dec58462d2b02d6a408b8d18b03
|
2018-11-03 17:40:59
|
CRIMX
|
test: update snapshots
| false
|
diff --git a/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap b/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
index b2f6c3895..af0ad0191 100644
--- a/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
+++ b/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
@@ -47,11 +47,20 @@ exports[`Component/content/MenuBar should render correctly 1`] = `
<input
className="panel-MenuBar_SearchBox"
key="search-box"
+ onBlur={[Function]}
onChange={[Function]}
onKeyUp={[Function]}
type="text"
value=""
/>
+ <div>
+ <CSSTransition
+ classNames="panel-MenuBar_SuggestPanel"
+ in={false}
+ timeout={100}
+ unmountOnExit={true}
+ />
+ </div>
<button
className="panel-MenuBar_Btn"
onClick={[Function]}
@@ -243,11 +252,20 @@ exports[`Component/content/MenuBar should render correctly with fav and pin 1`]
<input
className="panel-MenuBar_SearchBox"
key="search-box"
+ onBlur={[Function]}
onChange={[Function]}
onKeyUp={[Function]}
type="text"
value=""
/>
+ <div>
+ <CSSTransition
+ classNames="panel-MenuBar_SuggestPanel"
+ in={false}
+ timeout={100}
+ unmountOnExit={true}
+ />
+ </div>
<button
className="panel-MenuBar_Btn"
onClick={[Function]}
|
test
|
update snapshots
|
710a5de033861d080585313e608f4b5511030c8b
|
2020-02-02 19:15:48
|
crimx
|
refactor(wordpage): reduce title length
| false
|
diff --git a/src/_locales/zh-CN/wordpage.ts b/src/_locales/zh-CN/wordpage.ts
index b9e29dcf7..d1602794d 100644
--- a/src/_locales/zh-CN/wordpage.ts
+++ b/src/_locales/zh-CN/wordpage.ts
@@ -54,9 +54,9 @@ export const locale = {
},
wordCount: {
- selected: '已选中 {{count}} 个单词',
- selected_plural: '已选中 {{count}} 个单词',
- total: '共有 {{count}} 个单词',
- total_plural: '共有 {{count}} 个单词'
+ selected: '已选 {{count}} 项',
+ selected_plural: '已选 {{count}} 项',
+ total: '共 {{count}} 项',
+ total_plural: '共 {{count}} 项'
}
}
diff --git a/src/_locales/zh-TW/wordpage.ts b/src/_locales/zh-TW/wordpage.ts
index 74636792f..e3f9b9b2a 100644
--- a/src/_locales/zh-TW/wordpage.ts
+++ b/src/_locales/zh-TW/wordpage.ts
@@ -56,9 +56,9 @@ export const locale: typeof _locale = {
},
wordCount: {
- selected: '已選中 {{count}} 個單字',
- selected_plural: '已選中 {{count}} 個單字',
- total: '共有 {{count}} 個單字',
- total_plural: '共有 {{count}} 個單字'
+ selected: '選中 {{count}} 個',
+ selected_plural: '選中 {{count}} 個',
+ total: '共 {{count}} 個',
+ total_plural: '共 {{count}} 個'
}
}
diff --git a/src/components/WordPage/App.tsx b/src/components/WordPage/App.tsx
index d8ca40d4b..3d1f5996a 100644
--- a/src/components/WordPage/App.tsx
+++ b/src/components/WordPage/App.tsx
@@ -424,10 +424,13 @@ export class WordPageMain extends React.Component<
<Layout className="wordpage-Container">
<Header className="wordpage-Header">
<div className="wordpage-Title">
- <h1>
- {t(`title.${area}`)} <small>({t('localonly')})</small>
+ <h1 className="wordpage-Title_head">
+ {t(`title.${area}`)}{' '}
+ <small className="wordpage-Title_small">
+ ({t('localonly')})
+ </small>
</h1>
- <div>
+ <div style={{ whiteSpace: 'nowrap' }}>
{(pagination.total as number) > 0 && (
<span className="wordpage-Wordcount">
{t(`wordCount.total`, { count: pagination.total })}
@@ -440,7 +443,7 @@ export class WordPageMain extends React.Component<
)}
</div>
</div>
- <div style={{ marginLeft: 'auto' }}>
+ <div style={{ marginLeft: 'auto', whiteSpace: 'nowrap' }}>
<Input
style={{ width: '15em' }}
placeholder="Search"
diff --git a/src/components/WordPage/_style.scss b/src/components/WordPage/_style.scss
index 9541562c6..49f2874eb 100644
--- a/src/components/WordPage/_style.scss
+++ b/src/components/WordPage/_style.scss
@@ -32,15 +32,19 @@ textarea {
align-items: center;
line-height: 1;
color: #fff;
+}
+
+.wordpage-Title_head {
+ margin-bottom: 5px;
+ color: #fff;
+}
- h1 {
- margin-bottom: 5px;
- color: #fff;
+.wordpage-Title_small {
+ font-size: 0.6em;
+ vertical-align: middle;
- small {
- font-size: 0.6em;
- vertical-align: middle;
- }
+ @media screen and (max-width: 720px) {
+ display: none !important;
}
}
|
refactor
|
reduce title length
|
c2f26bec4ae533b3f22610fe5ce7ad722e15d446
|
2020-03-27 20:32:03
|
crimx
|
fix(panel): disable external style reset on standalone panel
| false
|
diff --git a/src/content/content.scss b/src/content/content.scss
index 237248436..46fa50f02 100644
--- a/src/content/content.scss
+++ b/src/content/content.scss
@@ -1,5 +1,6 @@
-.saladict-external,
-.saladict-panel {
+.saladict-div,
+.saladict-div > .saladict-external,
+.saladict-div > .saladict-panel {
display: block !important;
width: 0 !important;
height: 0 !important;
|
fix
|
disable external style reset on standalone panel
|
bf169ddbc34d92dcb7fbccc6dfe76e6a1e2f8530
|
2020-05-26 04:37:11
|
crimx
|
refactor(sync-services): reset services on config updates
| false
|
diff --git a/src/background/sync-manager/index.ts b/src/background/sync-manager/index.ts
index b9c23bbda..198bff0b8 100644
--- a/src/background/sync-manager/index.ts
+++ b/src/background/sync-manager/index.ts
@@ -32,28 +32,24 @@ export function startSyncServiceInterval() {
return syncConfig
})
)
- .subscribe(syncConfig => {
+ .subscribe(async syncConfig => {
+ try {
+ await Promise.all(
+ [...activeServices.values()].map(service => service.destroy())
+ )
+ } catch (e) {
+ console.error(e)
+ }
+ activeServices.clear()
+
if (syncConfig) {
Services.forEach(Service => {
- const service = activeServices.get(Service.id)
if (syncConfig[Service.id]?.enable) {
- if (service) {
- service.config = syncConfig[Service.id]
- } else {
- const newService = new Service(syncConfig[Service.id])
- activeServices.set(Service.id, newService)
- newService.startInterval()
- }
- } else {
- if (service) {
- service.destroy()
- activeServices.delete(Service.id)
- }
+ const newService = new Service(syncConfig[Service.id])
+ activeServices.set(Service.id, newService)
+ newService.onStart()
}
})
- } else {
- activeServices.forEach(service => service.destroy())
- activeServices.clear()
}
if (process.env.DEBUG) {
|
refactor
|
reset services on config updates
|
04825f43d5f1b864ee351f55d5cef447938d98db
|
2020-01-22 20:47:44
|
crimx
|
refactor: remove youdao page translate for Firefox
| false
|
diff --git a/package.json b/package.json
index 7a2784615..e5463548b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"scripts": {
"start": "webpack-dev-server --mode development --open",
"storybook": "start-storybook",
- "build": "webpack --mode production",
+ "build": "webpack --mode production && node scripts/after-build.js",
"devbuild": "webpack --mode development",
"type-check": "tsc --noEmit",
"test": "jest --testTimeout 20000",
diff --git a/scripts/after-build.js b/scripts/after-build.js
new file mode 100644
index 000000000..5c9976fdc
--- /dev/null
+++ b/scripts/after-build.js
@@ -0,0 +1,5 @@
+const fs = require('fs-extra')
+const path = require('path')
+
+// FF policy
+fs.remove(path.join(__dirname, '../build/firefox/assets/fanyi.youdao.2.0'))
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 6ef5a4199..96782f59e 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -12,6 +12,8 @@ import { concatMap, filter, distinctUntilChanged } from 'rxjs/operators'
import { openPDF, extractPDFUrl } from './pdf-sniffer'
import { copyTextToClipboard } from './clipboard-manager'
+const isFirefox = navigator.userAgent.includes('Firefox')
+
interface CreateMenuOptions {
type?: browser.contextMenus.ItemType
id?: string
@@ -43,6 +45,8 @@ export class ContextMenus {
}
static openYoudao() {
+ // FF policy
+ if (isFirefox) return
// inject youdao script, defaults to the active tab of the current window.
browser.tabs
.executeScript({ file: '/assets/fanyi.youdao.2.0/main.js' })
@@ -236,6 +240,11 @@ export class ContextMenus {
const browserActionItems: string[] = []
for (const id of contextMenus.selected) {
+ if (isFirefox && id === 'youdao_page_translate') {
+ // FF policy
+ continue
+ }
+
let contexts: browser.contextMenus.ContextType[]
switch (id) {
case 'google_page_translate':
diff --git a/src/options/components/options/ContextMenus/AddModal.tsx b/src/options/components/options/ContextMenus/AddModal.tsx
index 779b7c876..cf98aa9f3 100644
--- a/src/options/components/options/ContextMenus/AddModal.tsx
+++ b/src/options/components/options/ContextMenus/AddModal.tsx
@@ -6,6 +6,8 @@ import AddNewItem from './AddNewItem'
import { Modal, List, Card, Button } from 'antd'
+const isFirefox = navigator.userAgent.includes('Firefox')
+
export type AddModalProps = {
t: TFunction
config: AppConfig
@@ -63,9 +65,13 @@ export class AddModal extends React.Component<AddModalProps> {
render() {
const { onClose, show, t, config } = this.props
const selectedSet = new Set(config.contextMenus.selected as string[])
- const unselected = Object.keys(config.contextMenus.all).filter(
- id => !selectedSet.has(id)
- )
+ const unselected = Object.keys(config.contextMenus.all).filter(id => {
+ // FF policy
+ if (isFirefox && id === 'youdao_page_translate') {
+ return false
+ }
+ return !selectedSet.has(id)
+ })
return (
<Modal
diff --git a/src/options/components/options/ContextMenus/index.tsx b/src/options/components/options/ContextMenus/index.tsx
index 68d46b290..39e7dc6af 100644
--- a/src/options/components/options/ContextMenus/index.tsx
+++ b/src/options/components/options/ContextMenus/index.tsx
@@ -9,6 +9,8 @@ import AddModal from './AddModal'
import { Row, Col, message } from 'antd'
+const isFirefox = navigator.userAgent.includes('Firefox')
+
export type ContextMenusProps = Props
interface ContextMenusState {
@@ -106,13 +108,21 @@ export class ContextMenus extends React.Component<
t={t}
title={t('nav.ContextMenus')}
description={<p>{t('opt.context_description')}</p>}
- list={config.contextMenus.selected.map(id => {
- const item = allMenus[id]
- return {
- value: id,
- title: typeof item === 'string' ? t(`menus:${id}`) : item.name
- }
- })}
+ list={config.contextMenus.selected
+ .filter(id => {
+ // FF policy
+ if (isFirefox && id === 'youdao_page_translate') {
+ return false
+ }
+ return true
+ })
+ .map(id => {
+ const item = allMenus[id]
+ return {
+ value: id,
+ title: typeof item === 'string' ? t(`menus:${id}`) : item.name
+ }
+ })}
disableEdit={this.disableEdit}
onAdd={this.openAddModal}
onEdit={this.openEditModal}
|
refactor
|
remove youdao page translate for Firefox
|
1bc63cb6e50fcb585994ecd36946871fcf9fdb34
|
2018-05-10 12:20:31
|
CRIMX
|
refactor(background): stop playing audio when src is empty string
| false
|
diff --git a/src/background/audio-manager.ts b/src/background/audio-manager.ts
index 11c5fba04..e4baf8973 100644
--- a/src/background/audio-manager.ts
+++ b/src/background/audio-manager.ts
@@ -12,62 +12,33 @@ declare global {
function noop () {/* empty */}
-export function load (src: string): HTMLAudioElement {
+export function reset () {
if (window.__audio_manager__) {
window.__audio_manager__.pause()
window.__audio_manager__.currentTime = 0
window.__audio_manager__.src = ''
+ window.__audio_manager__.onended = null
}
+}
+
+export function load (src: string): HTMLAudioElement {
+ reset()
window.__audio_manager__ = new Audio(src)
return window.__audio_manager__
}
export function play (src?: string): Promise<void> {
- // ignore interruption error
- let p: Promise<void>
- if (src) {
- p = load(src).play()
- } else if (window.__audio_manager__) {
- p = window.__audio_manager__.play()
- } else {
+ if (!src) {
+ reset()
return Promise.resolve()
}
+ const audio = load(src)
+
const onEnd = new Promise(resolve => {
- const audio = window.__audio_manager__ as HTMLAudioElement
- function handler () {
- audio.removeEventListener('ended', handler)
- resolve()
- }
- audio.addEventListener('ended', handler)
+ audio.onended = resolve
})
- return p.then(() => timeout(onEnd, 4000))
+ return audio.play().then(() => timeout(onEnd, 4000))
.catch(noop)
}
-
-export function addListener<K extends keyof HTMLMediaElementEventMap> (
- type: K,
- listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any,
- options?: boolean | AddEventListenerOptions
-): void
-export function addListener (
- type: string,
- listener: EventListenerOrEventListenerObject,
- options?: boolean | AddEventListenerOptions
-): void
-export function addListener (type, listener, options): void {
- if (window.__audio_manager__) {
- if (options) {
- window.__audio_manager__.addEventListener(type, listener, options)
- } else {
- window.__audio_manager__.addEventListener(type, listener)
- }
- }
-}
-
-export default {
- load,
- play,
- addListener,
-}
diff --git a/test/specs/background/audio-manager.spec.ts b/test/specs/background/audio-manager.spec.ts
index b1266d73e..e0b92190e 100644
--- a/test/specs/background/audio-manager.spec.ts
+++ b/test/specs/background/audio-manager.spec.ts
@@ -1,4 +1,4 @@
-import audio from '@/background/audio-manager'
+import * as audio from '@/background/audio-manager'
describe('Audio Manager', () => {
const bakAudio = (window as any).Audio
@@ -51,13 +51,4 @@ describe('Audio Manager', () => {
expect(mockAudioInstances[1].play).toHaveBeenCalledTimes(1)
expect(mockAudioInstances[1].pause).toHaveBeenCalledTimes(0)
})
-
- it('listen', () => {
- const url = 'https://e.b/play.mp3'
- expect(audio.load(url)).toBe(mockAudioInstances[0])
- expect(mockAudio).toBeCalledWith(url)
- const listener = () => {}
- audio.addListener('play', listener)
- expect(mockAudioInstances[0].addEventListener).toBeCalledWith('play', listener)
- })
})
|
refactor
|
stop playing audio when src is empty string
|
f83a485dc709452125af9828b4424a8e38118b93
|
2019-08-08 20:25:52
|
crimx
|
fix(manifest): remvoe update url
| false
|
diff --git a/src/manifest/chrome.manifest.json b/src/manifest/chrome.manifest.json
index 2d8fc0d79..a358f2367 100644
--- a/src/manifest/chrome.manifest.json
+++ b/src/manifest/chrome.manifest.json
@@ -9,6 +9,5 @@
"incognito": "split",
"homepage_url": "https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg?hl=en",
"options_page": "options.html",
- "update_url": "https://clients2.google.com/service/update2/crx",
"minimum_chrome_version": "55"
}
diff --git a/src/manifest/common.manifest.json b/src/manifest/common.manifest.json
index d10920e86..915234ed7 100644
--- a/src/manifest/common.manifest.json
+++ b/src/manifest/common.manifest.json
@@ -3,8 +3,6 @@
"homepage_url": "https://saladict.crimx.com/",
- "minimum_chrome_version": "55",
-
"name": "__MSG_extension_name__",
"short_name": "__MSG_extension_short_name__",
"description": "__MSG_extension_description__",
|
fix
|
remvoe update url
|
452bf537a4aee7d1e3d79b7960cd5183cdff88af
|
2021-09-05 22:02:33
|
yipanhuasheng
|
feat(sync-services): add eudic (#1467)
| false
|
diff --git a/src/_locales/en/options.ts b/src/_locales/en/options.ts
index 2b7eb0821..09cc308b9 100644
--- a/src/_locales/en/options.ts
+++ b/src/_locales/en/options.ts
@@ -276,6 +276,24 @@ export const locale: typeof _locale = {
sync_last: 'Upload the last new word'
},
+ eudic: {
+ description:
+ 'Before using Eudic to synchronize words, you must first create a default new word book on Eudic official website (my.eudic.net/home/index) (generally, it will be automatically generated and cannot be deleted after the first manual import). Pay attention not to synchronize frequently in a short time, which may cause temporary lock.',
+ token: 'Authorization information',
+ getToken: 'Get authorization',
+ verify: 'Check authorization information',
+ verified: 'Eudic authorization information checked successfully',
+ enable_help:
+ 'After opening, each new word added will be automatically synchronized to the Eudic default word book (salad to Eudic word book) in one direction, and only the new word itself will be synchronized (deleted out of synchronization)',
+ token_help:
+ 'Please confirm to set valid personal authorization information, otherwise the synchronization will fail. You can click the button at the bottom to check.',
+ sync_all: 'Synchronize all new words',
+ sync_help:
+ 'Synchronize all existing new words in salad word book to the Eudic default word book (turn on the synchronization switch above at the same time and click save)',
+ sync_all_confirm:
+ 'Note that frequent synchronization in a short time may lead to lock temporarily. Are you sure to continue?'
+ },
+
webdav: {
description:
'Extension settings (including this) are synced via browser. New words notebook can be synced via WebDAV through settings here.',
diff --git a/src/_locales/zh-CN/options.ts b/src/_locales/zh-CN/options.ts
index f8d29c529..e89776a86 100644
--- a/src/_locales/zh-CN/options.ts
+++ b/src/_locales/zh-CN/options.ts
@@ -263,6 +263,24 @@ export const locale = {
sync_last: '上传最近的一个生词'
},
+ eudic: {
+ description:
+ '使用欧路词典同步单词前，必须先在欧路官网（my.eudic.net/home/index）创建默认生词本（一般初次手动导入会自动生成且无法删除）。注意短时间内不要频繁同步，可能会造成暂时封停。',
+ token: '授权信息',
+ getToken: '获取授权',
+ verify: '检查 授权信息',
+ verified: '成功检查 欧路授权信息',
+ enable_help:
+ '开启后每次添加生词将自动单向同步到欧路默认生词本（salad到欧路生词本），只同步新增单词本身（删除不同步）',
+ token_help:
+ '请确认设置有效的个人授权信息，否则将同步失败。可点击底部按钮检查。',
+ sync_all: '同步全部生词',
+ sync_help:
+ '将salad单词本中现有的所有生词，同步到欧路词典默认生词本中（需同时开启上方同步开关，点击保存）',
+ sync_all_confirm:
+ '注意短时间内频繁同步有可能会导致接下来一小段时间的封停，确定继续？'
+ },
+
webdav: {
description:
'应用设置（包括本设置）已通过浏览器自动同步。生词本可通过本设置实现 WebDAV 同步。',
diff --git a/src/_locales/zh-TW/options.ts b/src/_locales/zh-TW/options.ts
index a2d313174..4a5aa5edf 100644
--- a/src/_locales/zh-TW/options.ts
+++ b/src/_locales/zh-TW/options.ts
@@ -267,6 +267,24 @@ export const locale: typeof _locale = {
sync_last: '上傳最近的一個生字'
},
+ eudic: {
+ description:
+ '使用歐路詞典同步單詞前，必須先在歐路官網（my.eudic.net/home/index）創建默認生詞本（一般初次手動導入會自動生成且無法删除）。注意短時間內不要頻繁同步，可能會造成暫時封停。',
+ token: '授權資訊',
+ getToken: '獲取授權',
+ verify: '檢查 授權資訊',
+ verified: '成功檢查 歐路授權資訊',
+ enable_help:
+ '開啟後每次添加生詞將自動單向同步到歐路默認生詞本（salad到歐路生詞本），只同步新增單詞本身（删除不同步）',
+ token_help:
+ '請確認設定有效的個人授權資訊，否則將同步失敗。可點擊底部按鈕檢查。',
+ sync_all: '同步全部生詞',
+ sync_help:
+ '將salad單詞本中現有的所有生詞，同步到歐路詞典默認生詞本中（需同時開啟上方同步開關，點擊保存）',
+ sync_all_confirm:
+ '注意短時間內頻繁同步有可能會導致接下來一小段時間的封停，確定繼續？'
+ },
+
webdav: {
description:
'應用設定（包括本設定）已通過瀏覽器自動同步。生詞本可通過本設定實現 WebDAV 同步。',
diff --git a/src/background/sync-manager/services/eudic/_locales/en.ts b/src/background/sync-manager/services/eudic/_locales/en.ts
new file mode 100644
index 000000000..d5462a4a7
--- /dev/null
+++ b/src/background/sync-manager/services/eudic/_locales/en.ts
@@ -0,0 +1,13 @@
+import { locale as _locale } from './zh-CN'
+
+export const locale: typeof _locale = {
+ title: 'Eudic Word Syncing',
+ open: 'Open',
+ error: {
+ network:
+ 'Unable to access the new word book of Eudic, please check the network.',
+ illegal_token: 'Please set legal Eudic authorization information.',
+ no_wordbook:
+ 'Unable to add to the new word book of European dictionary. Please go to the European official website to generate the default new word book first.'
+ }
+}
diff --git a/src/background/sync-manager/services/eudic/_locales/zh-CN.ts b/src/background/sync-manager/services/eudic/_locales/zh-CN.ts
new file mode 100644
index 000000000..388b89bb2
--- /dev/null
+++ b/src/background/sync-manager/services/eudic/_locales/zh-CN.ts
@@ -0,0 +1,9 @@
+export const locale = {
+ title: '欧路单词同步',
+ open: '打开',
+ error: {
+ network: '无法访问欧路词典生词本，请检查网络。',
+ illegal_token: '请设置合法的欧路词典授权信息',
+ no_wordbook: '无法添加到欧路词典生词本，请先上欧路官网生成默认生词本'
+ }
+}
diff --git a/src/background/sync-manager/services/eudic/_locales/zh-TW.ts b/src/background/sync-manager/services/eudic/_locales/zh-TW.ts
new file mode 100644
index 000000000..27b17563e
--- /dev/null
+++ b/src/background/sync-manager/services/eudic/_locales/zh-TW.ts
@@ -0,0 +1,11 @@
+import { locale as _locale } from './zh-CN'
+
+export const locale: typeof _locale = {
+ title: '歐路單字同步',
+ open: '開啟',
+ error: {
+ network: '無法訪問歐路詞典生詞本，請檢查網絡。',
+ illegal_token: '請設定合法的歐路詞典授權資訊',
+ no_wordbook: '無法添加到歐路詞典生詞本，請先上歐路官網生成默認生詞本'
+ }
+}
diff --git a/src/background/sync-manager/services/eudic/index.ts b/src/background/sync-manager/services/eudic/index.ts
new file mode 100644
index 000000000..1d1900c36
--- /dev/null
+++ b/src/background/sync-manager/services/eudic/index.ts
@@ -0,0 +1,120 @@
+import { AddConfig, SyncService } from '../../interface'
+import { getNotebook } from '../../helpers'
+import axios from 'axios'
+
+export interface SyncConfig {
+ enable: boolean
+ token: string
+ syncAll: boolean
+}
+
+interface Books {
+ id: string
+ language: string
+ name: string
+}
+
+export class Service extends SyncService<SyncConfig> {
+ static readonly id = 'eudic'
+
+ static getDefaultConfig(): SyncConfig {
+ return {
+ enable: false,
+ token: '',
+ syncAll: false
+ }
+ }
+
+ async init() {
+ const wordbooks = await this.getWordbooks<Books[]>()
+
+ if (wordbooks.length === 0 || !wordbooks) {
+ throw new Error('no_wordbook')
+ }
+ }
+
+ async add(config: AddConfig) {
+ await this.addWordOrPatch(config)
+ }
+
+ /**
+ * sync a word or patch words
+ */
+ async addWordOrPatch({ words, force }: AddConfig) {
+ if (!this.config.enable) {
+ return 0
+ }
+
+ if (force) {
+ words = await getNotebook()
+ }
+
+ if (!words || words.length <= 0) {
+ return 0
+ }
+
+ const payload = force ? words.map(word => word.text) : words[0].text
+
+ await this.requestAddWords(payload)
+ }
+
+ /**
+ * get the user's wordbooks and judge the correctness of the authorization information
+ */
+ async getWordbooks<R = void>(): Promise<R> {
+ const result = await axios({
+ method: 'get',
+ url: `https://api.frdic.com/api/open/v1/studylist/category`,
+ params: {
+ language: 'en'
+ },
+ headers: {
+ Authorization: this.config.token
+ }
+ }).catch(e => {
+ if (e.response && e.response.status === 401) {
+ throw new Error('illegal_token')
+ } else {
+ throw new Error('network')
+ }
+ })
+ if (!result?.data) {
+ throw new Error('network')
+ }
+ const { data } = result
+
+ if (process.env.DEBUG) {
+ console.log(`Eudic Connect response(wordbook list)`, data)
+ }
+
+ if (!data || !Object.prototype.hasOwnProperty.call(data, 'data')) {
+ throw new Error('network')
+ }
+
+ return data.data
+ }
+
+ async requestAddWords(words: string | string[]) {
+ return await axios({
+ method: 'post',
+ url: `https://api.frdic.com/api/open/v1/studylist/words`,
+ data: {
+ id: '0', // id of default wordbook
+ language: 'en',
+ words: typeof words === 'string' ? [words] : words
+ },
+ headers: {
+ Authorization: this.config.token
+ }
+ }).catch(e => {
+ if (process.env.DEBUG) {
+ console.error(e)
+ }
+ if (e.response && e.response.status === 401) {
+ throw new Error('illegal_token')
+ } else {
+ throw new Error('network')
+ }
+ })
+ }
+}
diff --git a/src/options/components/Entries/Notebook/sync-services/eudic.tsx b/src/options/components/Entries/Notebook/sync-services/eudic.tsx
new file mode 100644
index 000000000..cdb172941
--- /dev/null
+++ b/src/options/components/Entries/Notebook/sync-services/eudic.tsx
@@ -0,0 +1,230 @@
+import React, { FC, useState, useRef } from 'react'
+import {
+ Modal,
+ Button,
+ Form,
+ Input,
+ Switch,
+ message as AntdMsg,
+ notification
+} from 'antd'
+import { FormInstance } from 'antd/lib/form'
+import { ExclamationCircleOutlined } from '@ant-design/icons'
+import { Service, SyncConfig } from '@/background/sync-manager/services/eudic'
+import { setSyncConfig } from '@/background/sync-manager/helpers'
+import { getWords } from '@/_helpers/record-manager'
+import { useTranslate } from '@/_helpers/i18n'
+
+export interface EudicModalProps {
+ syncConfig?: SyncConfig
+ show: boolean
+ onClose: () => void
+}
+
+export const EuDicModal: FC<EudicModalProps> = props => {
+ const { t, i18n } = useTranslate(['options', 'common', 'sync'])
+ const [serviceChecking, setServiceChecking] = useState(false)
+ const formRef = useRef<FormInstance>(null)
+
+ return (
+ <Modal
+ visible={props.show}
+ title={t('sync:eudic.title')}
+ destroyOnClose
+ onOk={submitForm}
+ onCancel={closeModal}
+ footer={[
+ <Button
+ key="verify"
+ disabled={serviceChecking}
+ loading={serviceChecking}
+ onClick={verifyService}
+ >
+ {t('syncService.eudic.verify')}
+ </Button>,
+ <Button
+ key="save"
+ type="primary"
+ disabled={serviceChecking}
+ onClick={submitForm}
+ >
+ {t('common:save')}
+ </Button>,
+ <Button key="cancel" onClick={closeModal}>
+ {t('common:cancel')}
+ </Button>
+ ]}
+ >
+ <p>
+ {t('syncService.eudic.description')}
+ {t('syncService.eudic.token_help')}
+ <a
+ href="https://my.eudic.net/OpenAPI/Authorization"
+ target="_blank"
+ rel="nofollow noopener noreferrer"
+ >
+ {t('syncService.eudic.getToken')}
+ </a>
+ </p>
+ <Form
+ ref={formRef}
+ initialValues={props.syncConfig || Service.getDefaultConfig()}
+ labelCol={{ span: 5 }}
+ wrapperCol={{ span: 18 }}
+ onFinish={saveService}
+ >
+ <Form.Item
+ name="enable"
+ label={t('common:enable')}
+ help={t('syncService.eudic.enable_help')}
+ valuePropName="checked"
+ >
+ <Switch />
+ </Form.Item>
+ <Form.Item
+ name="token"
+ label={t('syncService.eudic.token')}
+ hasFeedback
+ rules={[{ required: true }]}
+ >
+ <Input />
+ </Form.Item>
+ <Form.Item
+ name="syncAll"
+ label={t('syncService.eudic.sync_all')}
+ help={t('syncService.eudic.sync_help')}
+ valuePropName="checked"
+ >
+ <Switch />
+ </Form.Item>
+ </Form>
+ </Modal>
+ )
+
+ function submitForm() {
+ if (formRef.current) {
+ formRef.current.submit()
+ }
+ }
+
+ function closeModal() {
+ if (formRef.current && formRef.current.isFieldsTouched()) {
+ Modal.confirm({
+ title: t('syncService.close_confirm'),
+ icon: <ExclamationCircleOutlined />,
+ okType: 'danger',
+ onOk: props.onClose
+ })
+ } else {
+ props.onClose()
+ }
+ }
+
+ async function verify(service: Service): Promise<Boolean> {
+ let isError = false
+ try {
+ await service.init()
+ notification.success({ message: t('syncService.eudic.verified') })
+ isError = false
+ } catch (error) {
+ isError = true
+ notifyError(error)
+ }
+ return isError
+ }
+
+ async function verifyService() {
+ const config = extractConfigFromForm()
+ if (!config) return
+
+ setServiceChecking(true)
+
+ const service = new Service(config)
+
+ await verify(service)
+
+ setServiceChecking(false)
+ }
+
+ async function saveService() {
+ const config = extractConfigFromForm()
+ if (!config) return
+
+ if (config.enable) {
+ setServiceChecking(true)
+
+ const service = new Service(config)
+
+ const isError = await verify(service)
+
+ setServiceChecking(false)
+
+ if (isError) {
+ return
+ }
+
+ if (config.syncAll) {
+ await onSyncAll(service)
+ }
+ }
+
+ try {
+ await setSyncConfig(Service.id, config)
+ props.onClose()
+ } catch (error) {
+ notifyError(error)
+ }
+ }
+
+ function extractConfigFromForm(): SyncConfig | undefined {
+ if (!formRef.current) {
+ if (process.env.DEBUG) {
+ console.error(new Error('Missing form ref when saving service'))
+ }
+ notification.error({
+ message: 'Error',
+ description: t('sync:eudic.error.internal')
+ })
+ return
+ }
+
+ return formRef.current.getFieldsValue() as SyncConfig
+ }
+
+ async function onSyncAll(service: Service) {
+ const { total } = await getWords('notebook', {
+ itemsPerPage: 1,
+ filters: {}
+ })
+ if (total > 50 && !confirm(t('syncService.eudic.sync_all_confirm'))) {
+ return
+ }
+
+ await syncWords(service)
+ }
+
+ async function syncWords(service: Service) {
+ AntdMsg.destroy()
+ AntdMsg.success(t('syncService.start'), 0)
+
+ try {
+ await service.addWordOrPatch({
+ words: [],
+ force: true
+ })
+ AntdMsg.destroy()
+ AntdMsg.success(t('syncService.success'))
+ } catch (error) {
+ notifyError(error, t('syncService.failed'))
+ }
+ }
+
+ function notifyError(error: Error | string, message: string = 'Error') {
+ const errorText = typeof error === 'string' ? error : error.message
+ const msgPath = 'sync:eudic.error.' + errorText
+ const description = i18n.exists(msgPath) ? t(msgPath) : errorText
+ notification.error({ message, description })
+ }
+}
+
+export default EuDicModal
|
feat
|
add eudic (#1467)
|
eff9d7716a51c9f845d3103ee9c9cf1aadae5a8b
|
2020-02-03 14:25:24
|
crimx
|
chore(release): 7.7.5
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d9ae99ec..5b41bc40f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [7.7.5](https://github.com/crimx/ext-saladict/compare/v7.7.4...v7.7.5) (2020-02-03)
+
+
+
### [7.7.4](https://github.com/crimx/ext-saladict/compare/v7.7.3...v7.7.4) (2020-02-03)
diff --git a/package.json b/package.json
index ac83868a0..0d68bf451 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.7.4",
+ "version": "7.7.5",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.7.5
|
3e70b084c95aa240904f18c94252f000e498856a
|
2019-07-26 17:02:29
|
crimx
|
refactor: split key event
| false
|
diff --git a/src/content/components/MenuBar/FloatBox.tsx b/src/content/components/MenuBar/FloatBox.tsx
index 2347d9fc1..88cedb945 100644
--- a/src/content/components/MenuBar/FloatBox.tsx
+++ b/src/content/components/MenuBar/FloatBox.tsx
@@ -8,7 +8,12 @@ interface FloatBoxPropsBase {
onBlur: (e: React.FocusEvent<HTMLButtonElement>) => any
/** When a item is selected */
onSelect: (key: string) => any
- onClose: () => any
+ /** When ArrowUp key if pressed on the first item */
+ onArrowUpFirst?: (container: HTMLDivElement) => any
+ /** When ArrowDown key if pressed on the last item */
+ onArrowDownLast?: (container: HTMLDivElement) => any
+ /** When the panel is about to close */
+ onClose?: (container: HTMLDivElement) => any
}
interface FloatBoxPropsWithList extends FloatBoxPropsBase {
@@ -26,57 +31,66 @@ export type FloatBoxProps = FloatBoxPropsWithList | FloatBoxPropsLoading
* A white box
*/
export const FloatBox = React.forwardRef(
- (props: FloatBoxProps, ref: React.Ref<HTMLDivElement>) => (
- <div className="menuBar-FloatBoxContainer">
- <AnimateHeight height={props.isLoading ? 32 : 'auto'}>
- {props.isLoading ? (
- <div className="lds-ellipsis">
- <div></div>
- <div></div>
- <div></div>
- <div></div>
- </div>
- ) : (
- <div ref={ref} className="menuBar-FloatBox">
- {props.list.map(item => (
- <button
- key={item.key}
- className="menuBar-FloatBoxBtn"
- onFocus={props.onFocus}
- onBlur={props.onBlur}
- onClick={e => props.onSelect(e.currentTarget.dataset.key!)}
- onKeyDown={e => {
- if (e.key === 'ArrowDown') {
- e.preventDefault()
- e.stopPropagation()
- const $nextLi = e.currentTarget.nextSibling
- if ($nextLi) {
- ;($nextLi as HTMLButtonElement).focus()
- }
- } else if (e.key === 'ArrowUp') {
- e.preventDefault()
- e.stopPropagation()
- const $prevLi = e.currentTarget.previousSibling
- if ($prevLi) {
- ;($prevLi as HTMLButtonElement).focus()
- } else {
- props.onClose()
- }
- } else if (e.key === 'Escape') {
- // prevent the dict panel being closed
- e.preventDefault()
- e.stopPropagation()
- props.onClose()
- }
- }}
- data-key={item.key}
- >
- {item.content}
- </button>
- ))}
- </div>
- )}
- </AnimateHeight>
- </div>
- )
+ (props: FloatBoxProps, containerRef: React.Ref<HTMLDivElement>) => {
+ return (
+ <div className="menuBar-FloatBoxContainer">
+ <AnimateHeight height={props.isLoading ? 32 : 'auto'}>
+ {props.isLoading ? (
+ <div className="lds-ellipsis">
+ <div></div>
+ <div></div>
+ <div></div>
+ <div></div>
+ </div>
+ ) : (
+ <div ref={containerRef} className="menuBar-FloatBox">
+ {props.list.map(item => (
+ <button
+ key={item.key}
+ className="menuBar-FloatBoxBtn"
+ onFocus={props.onFocus}
+ onBlur={props.onBlur}
+ onClick={e => props.onSelect(e.currentTarget.dataset.key!)}
+ onKeyDown={e => {
+ if (e.key === 'ArrowDown') {
+ e.preventDefault()
+ e.stopPropagation()
+ const $nextLi = e.currentTarget.nextSibling
+ if ($nextLi) {
+ ; ($nextLi as HTMLButtonElement).focus()
+ } else if (props.onArrowDownLast) {
+ props.onArrowDownLast(e.currentTarget
+ .parentElement as HTMLDivElement)
+ }
+ } else if (e.key === 'ArrowUp') {
+ e.preventDefault()
+ e.stopPropagation()
+ const $prevLi = e.currentTarget.previousSibling
+ if ($prevLi) {
+ ; ($prevLi as HTMLButtonElement).focus()
+ } else if (props.onArrowUpFirst) {
+ props.onArrowUpFirst(e.currentTarget
+ .parentElement as HTMLDivElement)
+ }
+ } else if (e.key === 'Escape') {
+ // prevent the dict panel being closed
+ e.preventDefault()
+ e.stopPropagation()
+ if (props.onClose) {
+ props.onClose(e.currentTarget
+ .parentElement as HTMLDivElement)
+ }
+ }
+ }}
+ data-key={item.key}
+ >
+ {item.content}
+ </button>
+ ))}
+ </div>
+ )}
+ </AnimateHeight>
+ </div>
+ )
+ }
)
diff --git a/src/content/components/MenuBar/SearchBox.tsx b/src/content/components/MenuBar/SearchBox.tsx
index e95314a43..1f20b3818 100644
--- a/src/content/components/MenuBar/SearchBox.tsx
+++ b/src/content/components/MenuBar/SearchBox.tsx
@@ -7,7 +7,7 @@ import {
useObservable
} from 'observable-hooks'
import { identity, merge } from 'rxjs'
-import { map, debounceTime } from 'rxjs/operators'
+import { focusBlur } from '@/_helpers/observables'
import { Suggest } from './Suggest'
export interface SearchBoxProps {
@@ -30,15 +30,7 @@ export const SearchBox: FC<SearchBoxProps> = props => {
// Textarea also shares the text so only replace here
const text = props.text.replace(/\s+/g, ' ')
- const [onFocusBlur, focusBlur$] = useObservableCallback<
- boolean,
- { type: string }
- >(event$ =>
- event$.pipe(
- map(e => e.type !== 'blur'),
- debounceTime(100)
- )
- )
+ const [onFocusBlur, focusBlur$] = useObservableCallback(focusBlur)
const [onShowSugget, onShowSugget$] = useObservableCallback<boolean>(identity)
@@ -57,6 +49,12 @@ export const SearchBox: FC<SearchBoxProps> = props => {
}
}, [])
+ const focusInput = () => {
+ if (inputRef.current) {
+ inputRef.current.focus()
+ }
+ }
+
return (
<div className="menuBar-SearchBox_Wrap">
<input
@@ -108,11 +106,8 @@ export const SearchBox: FC<SearchBoxProps> = props => {
}}
onFocus={onFocusBlur}
onBlur={onFocusBlur}
- onClose={() => {
- if (inputRef.current) {
- inputRef.current.focus()
- }
- }}
+ onArrowUpFirst={focusInput}
+ onClose={focusInput}
/>
</div>
</CSSTransition>
diff --git a/src/content/components/MenuBar/Suggest.tsx b/src/content/components/MenuBar/Suggest.tsx
index e76a8cdea..4e1b49601 100644
--- a/src/content/components/MenuBar/Suggest.tsx
+++ b/src/content/components/MenuBar/Suggest.tsx
@@ -20,7 +20,10 @@ export interface SuggestItem {
export type SuggestProps = {
/** Search box text */
text: string
-} & Pick<FloatBoxProps, 'onFocus' | 'onBlur' | 'onSelect' | 'onClose'>
+} & Pick<
+ FloatBoxProps,
+ 'onFocus' | 'onBlur' | 'onSelect' | 'onArrowUpFirst' | 'onClose'
+>
/**
* Suggest panel offering similar words.
|
refactor
|
split key event
|
f44ce5a6bd54b2f3346d63934151db6aa76789d0
|
2020-07-11 11:49:45
|
crimx
|
build: add sass globals to storybook
| false
|
diff --git a/.neutrinorc.js b/.neutrinorc.js
index 5dbb66df0..6f7c931f2 100644
--- a/.neutrinorc.js
+++ b/.neutrinorc.js
@@ -1,4 +1,5 @@
const path = require('path')
+const fs = require('fs')
const webpack = require('webpack')
const react = require('@neutrinojs/react')
const copy = require('@neutrinojs/copy')
@@ -126,12 +127,11 @@ module.exports = {
useId: 'sass-resources',
options: {
sourceMap: process.env.NODE_ENV !== 'production',
- resources: [
- path.resolve(__dirname, 'src/_sass_shared/_global/_interfaces.scss'),
- path.resolve(__dirname, 'src/_sass_shared/_global/_z-indices.scss'),
- path.resolve(__dirname, 'src/_sass_shared/_global/_variables.scss'),
- path.resolve(__dirname, 'src/_sass_shared/_global/_mixins.scss'),
- ]
+ resources: fs
+ .readdirSync(path.join(__dirname, 'src/_sass_shared/_global/'))
+ .map(filename =>
+ path.join(__dirname, 'src/_sass_shared/_global/', filename)
+ )
}
}
]
@@ -194,46 +194,45 @@ module.exports = {
/* eslint-disable indent */
// images
- neutrino.config.module
- .rules.delete('image')
+ neutrino.config.module.rules
+ .delete('image')
.end()
.rule('svg')
- .test(/\.(svg)(\?v=\d+\.\d+\.\d+)?$/)
- .use('svg-url')
- .loader(require.resolve('url-loader'))
- .options({
- limit: 8192,
- // remove `default` when `require` image
- // due to legacy code
- esModule: false,
- generator: content => svgToMiniDataURI(content.toString())
- })
- .end()
- .end()
+ .test(/\.(svg)(\?v=\d+\.\d+\.\d+)?$/)
+ .use('svg-url')
+ .loader(require.resolve('url-loader'))
+ .options({
+ limit: 8192,
+ // remove `default` when `require` image
+ // due to legacy code
+ esModule: false,
+ generator: content => svgToMiniDataURI(content.toString())
+ })
+ .end()
+ .end()
.rule('pixel')
- .test(/\.(ico|png|jpg|jpeg|gif|webp)(\?v=\d+\.\d+\.\d+)?$/)
- .use('img-url')
- .loader(require.resolve('file-loader'))
- .options({
- // dev-server image name collision
- name: resourcePath => {
- if (process.env.NODE_ENV === 'development') {
- return '[path]/[name].[ext]'
- }
-
- const dictMatch = /\/dictionaries\/([^/]+)\/favicon.png/.exec(
- resourcePath
- )
- if (dictMatch) {
- return `assets/favicon-${dictMatch[1]}.[contenthash:8].[ext]`
- }
+ .test(/\.(ico|png|jpg|jpeg|gif|webp)(\?v=\d+\.\d+\.\d+)?$/)
+ .use('img-url')
+ .loader(require.resolve('file-loader'))
+ .options({
+ // dev-server image name collision
+ name: resourcePath => {
+ if (process.env.NODE_ENV === 'development') {
+ return '[path]/[name].[ext]'
+ }
- return 'assets/[name].[contenthash:8].[ext]'
- },
- limit: 0,
- esModule: false
- })
+ const dictMatch = /\/dictionaries\/([^/]+)\/favicon.png/.exec(
+ resourcePath
+ )
+ if (dictMatch) {
+ return `assets/favicon-${dictMatch[1]}.[contenthash:8].[ext]`
+ }
+ return 'assets/[name].[contenthash:8].[ext]'
+ },
+ limit: 0,
+ esModule: false
+ })
// avoid collision
neutrino.config.output.jsonpFunction('saladictEntry')
diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js
index 82b7938bc..887c2c745 100644
--- a/.storybook/webpack.config.js
+++ b/.storybook/webpack.config.js
@@ -1,4 +1,5 @@
const path = require('path')
+const fs = require('fs')
const Neutrino = require('neutrino/Neutrino')
const neutrinorc = require('../.neutrinorc.js')
const neutrino = new Neutrino(neutrinorc.options)
@@ -18,6 +19,10 @@ const babelOptions = neutrino.config.module
// }
// ])
+const sassGlobals = fs
+ .readdirSync(path.join(__dirname, '../src/_sass_shared/_global/'))
+ .map(filename => path.join(__dirname, '../src/_sass_shared/_global/', filename))
+
module.exports = ({ config }) => {
config.module.rules.push({
test: /\.mjs$/,
@@ -83,7 +88,14 @@ module.exports = ({ config }) => {
plugins: [require('autoprefixer')]
}
},
- 'sass-loader'
+ 'sass-loader',
+ {
+ loader: 'sass-resources-loader',
+ options: {
+ sourceMap: true,
+ resources: sassGlobals
+ }
+ }
],
include: path.resolve(__dirname, '../src')
},
@@ -103,7 +115,14 @@ module.exports = ({ config }) => {
plugins: [require('autoprefixer')]
}
},
- 'sass-loader'
+ 'sass-loader',
+ {
+ loader: 'sass-resources-loader',
+ options: {
+ sourceMap: true,
+ resources: sassGlobals
+ }
+ }
],
include: path.resolve(__dirname, '../src')
}
|
build
|
add sass globals to storybook
|
fcf5eae384bad05731c56b6e620b452598dc553c
|
2020-04-06 00:38:36
|
crimx
|
chore: upgrade deps
| false
|
diff --git a/yarn.lock b/yarn.lock
index e30ce62bb..b5ee4f4dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2469,9 +2469,9 @@
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
"@types/node@*":
- version "13.9.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
- integrity sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==
+ version "13.11.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
+ integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
"@types/node@^12.11.7":
version "12.12.29"
@@ -3952,10 +3952,12 @@ bindings@^1.5.0:
file-uri-to-path "1.0.0"
bl@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.1.tgz#8c9b4fb754e80cc86463077722be7b88b4af3f42"
- integrity sha512-FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA==
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
+ integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==
dependencies:
+ buffer "^5.5.0"
+ inherits "^2.0.4"
readable-stream "^3.4.0"
block-stream@*:
@@ -4188,7 +4190,7 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
-buffer@^5.1.0:
+buffer@^5.1.0, buffer@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.5.0.tgz#9c3caa3d623c33dd1c7ef584b89b88bf9c9bc1ce"
integrity sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==
@@ -6710,9 +6712,9 @@ fastparse@^1.1.1:
integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
fastq@^1.6.0:
- version "1.6.1"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.1.tgz#4570c74f2ded173e71cf0beb08ac70bb85826791"
- integrity sha512-mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.7.0.tgz#fcd79a08c5bd7ec5b55cd3f5c4720db551929801"
+ integrity sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==
dependencies:
reusify "^1.0.4"
@@ -7328,13 +7330,20 @@ glob-parent@^3.1.0:
is-glob "^3.1.0"
path-dirname "^1.0.0"
-glob-parent@^5.0.0, glob-parent@^5.1.0:
+glob-parent@^5.0.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
dependencies:
is-glob "^4.0.1"
+glob-parent@^5.1.0:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+ integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+ dependencies:
+ is-glob "^4.0.1"
+
glob-to-regexp@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -8030,7 +8039,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"
-inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -10192,15 +10201,15 @@ nested-object-assign@^1.0.3:
integrity sha512-kgq1CuvLyUcbcIuTiCA93cQ2IJFSlRwXcN+hLcb2qLJwC2qrePHGZZa7IipyWqaWF6tQjdax2pQnVxdq19Zzwg==
neutrino-webextension@^1.1.3:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/neutrino-webextension/-/neutrino-webextension-1.1.3.tgz#4193f000d6dee79aa7a7d444eb64384f46469665"
- integrity sha512-ciLI+wVZcWgFqHn+5yuNtMEqKadhAeiz4367Qb3MOaq49tOUo45fMeFrE3zNM4YUY3/nR9VqtvQGhz7629B7aA==
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/neutrino-webextension/-/neutrino-webextension-1.1.5.tgz#00ea18300fd6fa43ede4d69a2dbc84201cc531e2"
+ integrity sha512-/pYhxe8lE34bpAfpbcGGgCewVZnHL3sE6gyC8T3e9OIdNIAYCjjvvVJB3im/GA4R+SXygUPezvttJoGuhhapog==
dependencies:
archiver "^3.0.0"
deepmerge "^3.3.0"
fs-extra "^9.0.0"
globby "^10.0.1"
- webextensions-emulator "^1.2.5"
+ webextensions-emulator "^1.2.6"
webpack-target-webextension "^0.1.1"
yargs-parser "^18.1.0"
@@ -11034,11 +11043,16 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4:
version "2.2.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+picomatch@^2.0.5, picomatch@^2.2.1:
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+ integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
pify@^2.0.0, pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -14020,9 +14034,9 @@ tapable@^1.0.0, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar-stream@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.1.tgz#e188b1dd74b940b9efc4a832a9a2dc957845937c"
- integrity sha512-GZjLk64XcE/58qwIc1ZfXGqTSE4OutPMEkfBE/oh9eJ4x1eMRjYkgrLrav7PzddpvIpSJSGi8FgNNYXdB9Vumg==
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325"
+ integrity sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==
dependencies:
bl "^4.0.1"
end-of-stream "^1.4.1"
@@ -14740,10 +14754,10 @@ webextension-polyfill@^0.6.0:
resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.6.0.tgz#1afd925f3274a0d4848083579b9c0b649a5c6763"
integrity sha512-PlYwiX8e4bNZrEeBFxbFFsLtm0SMPxJliLTGdNCA0Bq2XkWrAn2ejUd+89vZm+8BnfFB1BclJyCz3iKsm2atNg==
-webextensions-emulator@^1.2.5:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/webextensions-emulator/-/webextensions-emulator-1.2.5.tgz#59cc7170d21613122298c7e9ece3698fa32e9d6b"
- integrity sha512-3yH2ayJTMVXbyUXMiD22+uzYlr/lmZqQass/vZMwhxc6ME9iSQWKb7IPeljMX9jQCOOwLrKbcP1k6fJVefcizA==
+webextensions-emulator@^1.2.6:
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/webextensions-emulator/-/webextensions-emulator-1.2.6.tgz#8527acdea6e3d58bfeeb5eaff0f3c2199676c819"
+ integrity sha512-L3FivxpYSEbQnj53A+MzTXYM77lWjG5ycvgiuNiXbFFl109XCsJuDpTDlHgAL/lmaYKc2vGlJEJq7Nwrtm1NgA==
dependencies:
lodash "^4.17.15"
sinon-chrome "^3.0.1"
@@ -15172,9 +15186,9 @@ yargs-parser@^16.1.0:
decamelize "^1.2.0"
yargs-parser@^18.1.0:
- version "18.1.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.0.tgz#1b0ab1118ebd41f68bb30e729f4c83df36ae84c3"
- integrity sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==
+ version "18.1.2"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
+ integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
dependencies:
camelcase "^5.0.0"
decamelize "^1.2.0"
|
chore
|
upgrade deps
|
7e825d6d9c345034d4358453fe9764ff59210180
|
2018-11-09 13:06:01
|
CRIMX
|
refactor(sync): instruct user to create dir on server
| false
|
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index 5c7411471..c05d483a8 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -655,9 +655,9 @@
"zh_TW": "伺服器上 Saladict 目錄下的檔案將被替換。先下載合併到本地？"
},
"sync_webdav_err_mkcol": {
- "en": "Cannot create \"Saladict\" directory on server.",
- "zh_CN": "无法在服务器创建“Saladict”目录。",
- "zh_TW": "無法在伺服器建立“Saladict”目錄。"
+ "en": "Cannot create \"Saladict\" directory on server. Please create the directory manualy on server.",
+ "zh_CN": "无法在服务器创建“Saladict”目录。请手动在服务器上创建。",
+ "zh_TW": "無法在伺服器建立“Saladict”目錄。請手動在伺服器上建立。"
},
"sync_webdav_err_network": {
"en": "Network error. Cannot connect to server.",
|
refactor
|
instruct user to create dir on server
|
b0fb09a7a06adadbc71a53484da1bb7e5fbe58c4
|
2019-09-28 16:06:54
|
crimx
|
refactor(panel): nowrap entry box title
| false
|
diff --git a/src/components/EntryBox/EntryBox.scss b/src/components/EntryBox/EntryBox.scss
index eb1f338b1..98ebbc42f 100644
--- a/src/components/EntryBox/EntryBox.scss
+++ b/src/components/EntryBox/EntryBox.scss
@@ -15,7 +15,11 @@
top: 0;
left: 1em;
transform: translateY(-50%);
+ max-width: 90%;
+ overflow: hidden;
padding: 0 5px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
font-size: 1.2em;
background: var(--color-background);
}
|
refactor
|
nowrap entry box title
|
4da6fdcb274da7f3e5dabea32a4064f37f2ce4fe
|
2019-08-04 14:57:35
|
crimx
|
refactor(dicts): guoyu
| false
|
diff --git a/src/components/dictionaries/guoyu/View.tsx b/src/components/dictionaries/guoyu/View.tsx
index 8e03818ab..326be689e 100644
--- a/src/components/dictionaries/guoyu/View.tsx
+++ b/src/components/dictionaries/guoyu/View.tsx
@@ -1,65 +1,82 @@
-import React from 'react'
+import React, { FC } from 'react'
import { GuoYuResult } from './engine'
import Speaker from '@/components/Speaker'
import { ViewPorps } from '@/components/dictionaries/helpers'
-export default class DictGuoyu extends React.PureComponent<ViewPorps<GuoYuResult>> {
- render () {
- const result = this.props.result
- return (
- <>
- {result.h && result.h.map(h => (
- <div className='dictMoe-H' key={h.p}>
- <h1 className='dictMoe-Title'>{replaceLink(result.t)}</h1>
- <span className='dictMoe-Pinyin'>{h.p || ''}</span>
- <Speaker src={h['=']}></Speaker>
- {h.d &&
- <ol className='dictMoe-Defs'>
+export const DictGuoyu: FC<ViewPorps<GuoYuResult>> = ({ result }) => (
+ <>
+ {result.h &&
+ result.h.map(h => (
+ <div className="dictMoe-H" key={h.p}>
+ <h1 className="dictMoe-Title">{replaceLink(result.t)}</h1>
+ <span className="dictMoe-Pinyin">{h.p || ''}</span>
+ <Speaker src={h['=']}></Speaker>
+ {h.d && (
+ <ol className="dictMoe-Defs">
{h.d.map(defs => (
<li key={defs.f}>
- <p className='dictMoe-Defs_F'>{replaceLink(defs.f)}</p>
- {defs.e && defs.e.map(e => (
- <p key={e} className='dictMoe-Defs_E'>{replaceLink(e)}</p>
- ))}
+ <p className="dictMoe-Defs_F">{replaceLink(defs.f)}</p>
+ {defs.e &&
+ defs.e.map(e => (
+ <p key={e} className="dictMoe-Defs_E">
+ {replaceLink(e)}
+ </p>
+ ))}
</li>
))}
- </ol>
- }
- </div>
- ))}
+ </ol>
+ )}
+ </div>
+ ))}
- {result.translation &&
- <>
- {result.translation.English &&
- <div className='dictMoe-Trans'>
- <span className='dictMoe-Trans_Pos'>英.</span>
- <span className='dictMoe-Trans_Def'>{result.translation.English.join(', ')}</span>
- </div>
- }
- {result.translation.francais &&
- <div className='dictMoe-Trans'>
- <span className='dictMoe-Trans_Pos'>法.</span>
- <span className='dictMoe-Trans_Def'>{result.translation.francais.join(', ')}</span>
- </div>
- }
- {result.translation.Deutsch &&
- <div className='dictMoe-Trans'>
- <span className='dictMoe-Trans_Pos'>德.</span>
- <span className='dictMoe-Trans_Def'>{result.translation.Deutsch.join(', ')}</span>
- </div>
- }
- </>
- }
+ {result.translation && (
+ <>
+ {result.translation.English && (
+ <div className="dictMoe-Trans">
+ <span className="dictMoe-Trans_Pos">英.</span>
+ <span className="dictMoe-Trans_Def">
+ {result.translation.English.join(', ')}
+ </span>
+ </div>
+ )}
+ {result.translation.francais && (
+ <div className="dictMoe-Trans">
+ <span className="dictMoe-Trans_Pos">法.</span>
+ <span className="dictMoe-Trans_Def">
+ {result.translation.francais.join(', ')}
+ </span>
+ </div>
+ )}
+ {result.translation.Deutsch && (
+ <div className="dictMoe-Trans">
+ <span className="dictMoe-Trans_Pos">德.</span>
+ <span className="dictMoe-Trans_Def">
+ {result.translation.Deutsch.join(', ')}
+ </span>
+ </div>
+ )}
</>
- )
- }
-}
+ )}
+ </>
+)
-function replaceLink (text: string) {
- if (!text) { return '' }
- return text.split(/`(.*?)~/g)
- .map((word, i) => i % 2 === 0
- ? word.replace('例⃝', '')
- : <a key={i} className='dictMoe-Link' href={`https://www.moedict.tw/${word}`}>{word}</a>
+export default DictGuoyu
+
+function replaceLink(text: string) {
+ if (!text) {
+ return ''
+ }
+ return text.split(/`(.*?)~/g).map((word, i) =>
+ i % 2 === 0 ? (
+ word.replace('例⃝', '')
+ ) : (
+ <a
+ key={i}
+ className="dictMoe-Link"
+ href={`https://www.moedict.tw/${word}`}
+ >
+ {word}
+ </a>
)
+ )
}
diff --git a/src/components/dictionaries/guoyu/_style.scss b/src/components/dictionaries/guoyu/_style.shadow.scss
similarity index 89%
rename from src/components/dictionaries/guoyu/_style.scss
rename to src/components/dictionaries/guoyu/_style.shadow.scss
index 72c66c2da..67ea80514 100644
--- a/src/components/dictionaries/guoyu/_style.scss
+++ b/src/components/dictionaries/guoyu/_style.shadow.scss
@@ -1,3 +1,6 @@
+@import '@/_sass_global/_reset.scss';
+@import '@/components/Speaker/Speaker.scss';
+
.dictMoe-H {
margin-bottom: 10px;
}
diff --git a/src/components/dictionaries/guoyu/engine.ts b/src/components/dictionaries/guoyu/engine.ts
index 8234f1ce1..4bc1321d2 100644
--- a/src/components/dictionaries/guoyu/engine.ts
+++ b/src/components/dictionaries/guoyu/engine.ts
@@ -1,9 +1,15 @@
-import { handleNoResult, handleNetWorkError, SearchFunction, GetSrcPageFunction } from '../helpers'
+import {
+ handleNoResult,
+ handleNetWorkError,
+ SearchFunction,
+ GetSrcPageFunction,
+ DictSearchResult
+} from '../helpers'
import chsToChz from '@/_helpers/chs-to-chz'
import { AppConfig } from '@/app-config'
-import { DictSearchResult } from '@/typings/server'
+import axios from 'axios'
-export const getSrcPage: GetSrcPageFunction = (text) => {
+export const getSrcPage: GetSrcPageFunction = text => {
return `https://www.moedict.tw/${chsToChz(text)}`
}
@@ -18,15 +24,15 @@ export interface GuoYuResult {
/** Definitions */
d: Array<{
/** Title */
- type: string,
+ type: string
/** Meaning */
f: string
/** Homophones */
- l?: string[],
+ l?: string[]
/** Examples */
- e?: string[],
+ e?: string[]
/** Quotes */
- q?: string[],
+ q?: string[]
}>
/** Pinyin */
p: string
@@ -40,28 +46,39 @@ export interface GuoYuResult {
}
}
-export const search: SearchFunction<DictSearchResult<GuoYuResult>> = (
- text, config, profile, payload
+export const search: SearchFunction<GuoYuResult> = (
+ text,
+ config,
+ profile,
+ payload
) => {
- return moedictSearch<GuoYuResult>('a', encodeURIComponent(text.replace(/\s+/g, '')), config)
+ return moedictSearch<GuoYuResult>(
+ 'a',
+ encodeURIComponent(text.replace(/\s+/g, '')),
+ config
+ )
}
-export function moedictSearch<R extends GuoYuResult> (
+export function moedictSearch<R extends GuoYuResult>(
moedictID: string,
text: string,
config: AppConfig
): Promise<DictSearchResult<R>> {
- return fetch(`https://www.moedict.tw/${moedictID}/${chsToChz(text)}.json`)
- .then<R>(res => res.json())
+ return axios
+ .get<R>(`https://www.moedict.tw/${moedictID}/${chsToChz(text)}.json`)
.catch(handleNetWorkError)
- .then<DictSearchResult<R>>(data => {
- if (!data || !data.h) { return handleNoResult() }
+ .then<DictSearchResult<R>>(({ data }) => {
+ if (!data || !data.h) {
+ return handleNoResult()
+ }
const result: DictSearchResult<R> = { result: data }
data.h.forEach(h => {
if (h['=']) {
- h['='] = `https://203146b5091e8f0aafda-15d41c68795720c6e932125f5ace0c70.ssl.cf1.rackcdn.com/${h['=']}.ogg`
+ h[
+ '='
+ ] = `https://203146b5091e8f0aafda-15d41c68795720c6e932125f5ace0c70.ssl.cf1.rackcdn.com/${h['=']}.ogg`
}
if (!result.audio) {
result.audio = {
diff --git a/test/specs/components/dictionaries/guoyu/requests.mock.ts b/test/specs/components/dictionaries/guoyu/requests.mock.ts
new file mode 100644
index 000000000..056e2e4ed
--- /dev/null
+++ b/test/specs/components/dictionaries/guoyu/requests.mock.ts
@@ -0,0 +1,7 @@
+import { MockRequest } from '@/components/dictionaries/helpers'
+
+export const mockSearchTexts = ['愛']
+
+export const mockRequest: MockRequest = mock => {
+ mock.onGet(/moedict/).reply(200, require('./response/愛.json'))
+}
|
refactor
|
guoyu
|
524cb83003764c9796809e7f92e343c5bcb6096f
|
2018-02-07 02:39:45
|
CRIMX
|
refactor(background): refactor menus creation with rx
| false
|
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 703636258..eaa6384e9 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -1,11 +1,16 @@
-import { storage, openURL } from '@/_helpers/browser-api'
+import { storage, openURL, StorageListenerCb } from '@/_helpers/browser-api'
import { AppConfig } from '@/app-config'
import { Observable } from 'rxjs/Observable'
import { fromPromise } from 'rxjs/observable/fromPromise'
-import { NextObserver } from 'rxjs/Observer'
-import { TeardownLogic } from 'rxjs/Subscription'
-import { audit, mapTo, mergeMap, share, startWith } from 'rxjs/operators'
+import { fromEventPattern } from 'rxjs/observable/fromEventPattern'
+import { filter } from 'rxjs/operators/filter'
+import { map } from 'rxjs/operators/map'
+import { audit } from 'rxjs/operators/audit'
+import { mapTo } from 'rxjs/operators/mapTo'
+import { mergeMap } from 'rxjs/operators/mergeMap'
+import { share } from 'rxjs/operators/share'
+import { startWith } from 'rxjs/operators/startWith'
type ContextMenusConfig = AppConfig['contextMenus']
@@ -89,33 +94,26 @@ browser.contextMenus.onClicked.addListener(info => {
export function init (initConfig: ContextMenusConfig): void {
if (contextMenusChanged$) { return }
// when context menus config changes
- contextMenusChanged$ = Observable.create(
- (observer: NextObserver<ContextMenusConfig>): TeardownLogic => {
- storage.sync.addListener('config', handler)
-
- return () => {
- storage.sync.removeListener('config', handler)
+ contextMenusChanged$ = storage.createStream<{ config: { newValue: AppConfig, oldValue: AppConfig } }>('config')
+ .pipe(
+ filter(({ config: { newValue, oldValue } }) => {
+ if (!oldValue) {
+ return true
}
- function handler ({ config }: any) {
- const oldValue = config.oldValue as AppConfig
- const newValue = config.newValue as AppConfig
- if (!oldValue) {
- return observer.next(newValue.contextMenus)
- }
-
- const oldSelected = oldValue.contextMenus.selected
- const newSelected = newValue.contextMenus.selected
- if (oldSelected.length !== newSelected.length) {
- return observer.next(newValue.contextMenus)
- }
- for (let i = 0; i < oldSelected.length; i += 1) {
- if (oldSelected[i] !== newSelected[i]) {
- return observer.next(newValue.contextMenus)
- }
+ const oldSelected = oldValue.contextMenus.selected
+ const newSelected = newValue.contextMenus.selected
+ if (oldSelected.length !== newSelected.length) {
+ return true
+ }
+ for (let i = 0; i < oldSelected.length; i += 1) {
+ if (oldSelected[i] !== newSelected[i]) {
+ return true
}
}
- }
+ return false
+ }),
+ map(({ config }) => config.newValue.contextMenus),
)
let signal$: Observable<boolean>
|
refactor
|
refactor menus creation with rx
|
f590d23368ba946a72a8d2ebdedfdfcafc889e2d
|
2019-09-28 14:03:23
|
crimx
|
chore: upgrade react to prevent bugs on Firefox
| false
|
diff --git a/package.json b/package.json
index c370fdf51..657ac5c30 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
"observable-hooks": "^2.1.2",
"pako": "^1.0.10",
"qrcode.react": "^0.9.3",
- "react": "^16",
- "react-dom": "^16",
+ "react": "^16.10.0",
+ "react-dom": "^16.10.0",
"react-hot-loader": "^4",
"react-i18next": "^10.11.4",
"react-number-editor": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index b3ba63174..6d524580c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11387,7 +11387,17 @@ react-docgen@^4.1.0:
node-dir "^0.1.10"
recast "^0.17.3"
-react-dom@^16, react-dom@^16.8.3:
+react-dom@^16.10.0:
+ version "16.10.0"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.0.tgz#319356767b5c044f3c016eef28518ef7726dce84"
+ integrity sha512-0QJQUFrKG04hB/1lWyUs/FOd1qNseKGRQI+JBRsADIqVAFxYObhZ2zsVQKjt+nVSCmi8KA0sL52RLwwWuXQtOw==
+ dependencies:
+ loose-envify "^1.1.0"
+ object-assign "^4.1.1"
+ prop-types "^15.6.2"
+ scheduler "^0.16.0"
+
+react-dom@^16.8.3:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
integrity sha512-YFT2rxO9hM70ewk9jq0y6sQk8cL02xm4+IzYBz75CQGlClQQ1Bxq0nhHF6OtSbit+AIahujJgb/CPRibFkMNJQ==
@@ -11665,7 +11675,16 @@ react-wait@^0.3.0:
resolved "https://registry.yarnpkg.com/react-wait/-/react-wait-0.3.0.tgz#0cdd4d919012451a5bc3ab0a16d00c6fd9a8c10b"
integrity sha512-kB5x/kMKWcn0uVr9gBdNz21/oGbQwEQnF3P9p6E9yLfJ9DRcKS0fagbgYMFI0YFOoyKDj+2q6Rwax0kTYJF37g==
-react@^16, react@^16.8.3:
+react@^16.10.0:
+ version "16.10.0"
+ resolved "https://registry.yarnpkg.com/react/-/react-16.10.0.tgz#95c41e8fc1c706e174deef54b663b5ab94c8ee32"
+ integrity sha512-lc37bD3j6ZWJRso/a1rrFu6CO1qOf30ZadUDBi1c5RHA1lBSWA8x2MGABB6Oikk+RfmgC+kAT+XegL0eD1ecKg==
+ dependencies:
+ loose-envify "^1.1.0"
+ object-assign "^4.1.1"
+ prop-types "^15.6.2"
+
+react@^16.8.3:
version "16.9.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz#40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"
integrity sha512-+7LQnFBwkiw+BobzOF6N//BdoNw0ouwmSJTEm9cglOOmsg/TMiFHZLe2sEoN5M7LgJTj9oHH0gxklfnQe66S1w==
@@ -12316,6 +12335,14 @@ scheduler@^0.15.0:
loose-envify "^1.1.0"
object-assign "^4.1.1"
+scheduler@^0.16.0:
+ version "0.16.0"
+ resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.0.tgz#cc8914b79c5c1cfa16714cb1ddc4cbd2c7513efa"
+ integrity sha512-Jq59uCXQzi71B562VEjuDgvsgfTfkLDvdjNhA7hamN/fKBxecXIEFF24Zu4OVrnAz9NJJ8twa9X16Zp4b0P/xQ==
+ dependencies:
+ loose-envify "^1.1.0"
+ object-assign "^4.1.1"
+
schema-utils@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
|
chore
|
upgrade react to prevent bugs on Firefox
|
18193f42d9faa439b533dfdc70fd73693fa23f5d
|
2019-09-16 14:17:52
|
crimx
|
fix(dicts): fix tencent referer
| false
|
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index b2ef0e43b..a14d7b855 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -20,7 +20,7 @@ export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
: 'en'
: profile.dicts.all.tencent.options.tl
- return `https://fanyi.tencent.com/#auto/${lang}/${text}`
+ return `https://fanyi.qq.com/#auto/${lang}/${text}`
}
interface TencentToken {
@@ -45,7 +45,7 @@ const langcodes: ReadonlyArray<string> = [
'de', 'tr', 'ru', 'pt', 'vi', 'id', 'th', 'ms'
]
-let isSetupOriginModifier = false
+let isSetupHeaderModifier = false
export const search: SearchFunction<TencentResult, MachineTranslatePayload> = (
text,
@@ -53,9 +53,9 @@ export const search: SearchFunction<TencentResult, MachineTranslatePayload> = (
profile,
payload
) => {
- if (!isSetupOriginModifier) {
- setupOriginModifier()
- isSetupOriginModifier = true
+ if (!isSetupHeaderModifier) {
+ setupHeaderModifier()
+ isSetupHeaderModifier = true
}
const options = profile.dicts.all.tencent.options
@@ -195,19 +195,36 @@ async function getToken(): Promise<TencentToken> {
return dict_tencent.token
}
-function setupOriginModifier() {
+function setupHeaderModifier() {
+ const extraInfoSpec = ['blocking', 'requestHeaders']
+ // https://developer.chrome.com/extensions/webRequest#life_cycle_footnote
+ if (
+ browser.webRequest['OnBeforeSendHeadersOptions'] &&
+ browser.webRequest['OnBeforeSendHeadersOptions'].hasOwnProperty(
+ 'EXTRA_HEADERS'
+ )
+ ) {
+ extraInfoSpec.push('extraHeaders')
+ }
+
browser.webRequest.onBeforeSendHeaders.addListener(
details => {
if (details && details.requestHeaders) {
- for (var i = 0; i < details.requestHeaders.length; ++i) {
- if (details.requestHeaders[i].name === 'Origin') {
- details.requestHeaders[i].value = 'https://fanyi.qq.com'
- }
- }
+ const headers = details.requestHeaders.filter(
+ header => !/^(Origin|Referer|Host)$/.test(header.name)
+ )
+
+ headers.push(
+ { name: 'Origin', value: 'https://fanyi.qq.com' },
+ { name: 'Referer', value: 'https://fanyi.qq.com/' },
+ { name: 'Host', value: 'fanyi.qq.com' }
+ )
+
+ return { requestHeaders: headers }
}
return { requestHeaders: details.requestHeaders }
},
{ urls: ['https://fanyi.qq.com/api/translate'] },
- ['blocking', 'requestHeaders']
+ extraInfoSpec as any
)
}
|
fix
|
fix tencent referer
|
cb018407e33aeed03bf9ec8a2c0f4591d0dc2327
|
2020-08-07 08:57:29
|
crimx
|
chore(release): 7.15.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5457beea6..89fb6b073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [7.15.1](https://github.com/crimx/ext-saladict/compare/v7.15.0...v7.15.1) (2020-08-07)
+
## [7.15.0](https://github.com/crimx/ext-saladict/compare/v7.14.5...v7.15.0) (2020-08-07)
diff --git a/package.json b/package.json
index 601f54717..8b7ca0234 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.15.0",
+ "version": "7.15.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.15.1
|
feb16d3e9b4397cd75526b51baec8bf4cea4acf6
|
2019-02-23 19:51:40
|
CRIMX
|
refactor: granular minor language control
| false
|
diff --git a/src/_locales/common/messages.json b/src/_locales/common/messages.json
index cda886a90..91cff759d 100644
--- a/src/_locales/common/messages.json
+++ b/src/_locales/common/messages.json
@@ -49,6 +49,11 @@
"zh_CN": "中文",
"zh_TW": "漢字"
},
+ "lang_deutsch": {
+ "en": "Deutsch",
+ "zh_CN": "德文",
+ "zh_TW": "德文"
+ },
"lang_eng": {
"en": "English",
"zh_CN": "英文",
@@ -59,11 +64,36 @@
"zh_CN": "英文",
"zh_TW": "英文"
},
+ "lang_french": {
+ "en": "French",
+ "zh_CN": "法文",
+ "zh_TW": "法文"
+ },
+ "lang_japanese": {
+ "en": "Japanese",
+ "zh_CN": "日文",
+ "zh_TW": "日文"
+ },
+ "lang_korean": {
+ "en": "Korean",
+ "zh_CN": "韩文",
+ "zh_TW": "韓文"
+ },
"lang_minor": {
"en": "Minor",
"zh_CN": "其它语言",
"zh_TW": "其它語言"
},
+ "lang_others": {
+ "en": "Others",
+ "zh_CN": "其它字符",
+ "zh_TW": "其它字元"
+ },
+ "lang_spanish": {
+ "en": "Spanish",
+ "zh_CN": "西班牙文",
+ "zh_TW": "西班牙文"
+ },
"max": {
"en": "Max",
"zh_CN": "最大",
diff --git a/src/app-config/dicts.ts b/src/app-config/dicts.ts
index cf21344ed..3d562862d 100644
--- a/src/app-config/dicts.ts
+++ b/src/app-config/dicts.ts
@@ -9,7 +9,12 @@ export interface DictItem {
selectionLang: {
eng: boolean
chs: boolean
- minor: boolean
+ japanese: boolean
+ korean: boolean
+ french: boolean
+ spanish: boolean
+ deutsch: boolean
+ others: boolean
}
options?: {
[option: string]: number | boolean | string
@@ -49,7 +54,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -92,7 +102,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -134,7 +149,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
},
cobuild: {
@@ -165,7 +185,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -203,7 +228,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -242,7 +272,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -280,7 +315,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -324,7 +364,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -362,7 +407,12 @@ export function getALlDicts () {
selectionLang: {
eng: false,
chs: true,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
}
},
hjdict: {
@@ -393,7 +443,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -443,7 +498,12 @@ export function getALlDicts () {
selectionLang: {
eng: false,
chs: true,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
}
},
longman: {
@@ -474,7 +534,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -518,7 +583,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -556,7 +626,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -594,7 +669,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -637,7 +717,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -675,7 +760,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
}
},
weblio: {
@@ -706,7 +796,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
},
websterlearner: {
@@ -737,7 +832,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: false,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -779,7 +879,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -820,7 +925,12 @@ export function getALlDicts () {
selectionLang: {
eng: true,
chs: true,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
},
/**
* Optional dict custom options. Can only be boolean, number or string.
@@ -863,7 +973,12 @@ export function getALlDicts () {
selectionLang: {
eng: false,
chs: true,
- minor: false,
+ japanese: false,
+ korean: false,
+ french: false,
+ spanish: false,
+ deutsch: false,
+ others: false,
}
},
}
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
index 43e2a13b0..2e8580940 100644
--- a/src/app-config/index.ts
+++ b/src/app-config/index.ts
@@ -226,7 +226,12 @@ function _getDefaultConfig () {
language: {
chinese: true,
english: true,
- minor: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: false,
},
/** auto pronunciation */
diff --git a/src/app-config/merge-config.ts b/src/app-config/merge-config.ts
index ef7223066..876d8d75e 100644
--- a/src/app-config/merge-config.ts
+++ b/src/app-config/merge-config.ts
@@ -108,7 +108,12 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
mergeBoolean('language.chinese')
mergeBoolean('language.english')
- mergeBoolean('language.minor')
+ mergeBoolean('language.japanese')
+ mergeBoolean('language.korean')
+ mergeBoolean('language.french')
+ mergeBoolean('language.spanish')
+ mergeBoolean('language.deutsch')
+ mergeBoolean('language.others')
merge('autopron.cn.dict', id => defaultAllDicts[id])
merge('autopron.en.dict', id => defaultAllDicts[id])
@@ -147,6 +152,14 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
)
}
+ if (oldConfig.language['minor'] === false) {
+ base.language.japanese = false
+ base.language.korean = false
+ base.language.french = false
+ base.language.spanish = false
+ base.language.deutsch = false
+ }
+
if (base.panelMaxHeightRatio < 1) {
base.panelMaxHeightRatio = Math.round(base.panelMaxHeightRatio * 100)
}
diff --git a/src/app-config/merge-profile.ts b/src/app-config/merge-profile.ts
index ee9689923..7817e6d26 100644
--- a/src/app-config/merge-profile.ts
+++ b/src/app-config/merge-profile.ts
@@ -24,7 +24,12 @@ export function mergeProfile (oldProfile: Profile, baseProfile?: Profile): Profi
mergeNumber(`dicts.all.${id}.selectionWC.max`)
mergeBoolean(`dicts.all.${id}.selectionLang.eng`)
mergeBoolean(`dicts.all.${id}.selectionLang.chs`)
- mergeBoolean(`dicts.all.${id}.selectionLang.minor`)
+ mergeBoolean(`dicts.all.${id}.selectionLang.japanese`)
+ mergeBoolean(`dicts.all.${id}.selectionLang.korean`)
+ mergeBoolean(`dicts.all.${id}.selectionLang.french`)
+ mergeBoolean(`dicts.all.${id}.selectionLang.spanish`)
+ mergeBoolean(`dicts.all.${id}.selectionLang.deutsch`)
+ mergeBoolean(`dicts.all.${id}.selectionLang.others`)
if (dict['options']) {
forEach(dict['options'], (value, opt) => {
if (isNumber(value)) {
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
index 34685de46..3c50565fb 100644
--- a/src/content/redux/modules/dictionaries.ts
+++ b/src/content/redux/modules/dictionaries.ts
@@ -3,12 +3,24 @@ import { DictID, PreloadSource } from '@/app-config'
import isEqual from 'lodash/isEqual'
import { saveWord } from '@/_helpers/record-manager'
import { getDefaultSelectionInfo, SelectionInfo, isSameSelection } from '@/_helpers/selection'
-import { isContainChinese, isContainEnglish, testerPunct, isContainMinor, testerChinese, testJapanese, testKorean } from '@/_helpers/lang-check'
import { MsgType, MsgFetchDictResult, MsgQSPanelSearchText } from '@/typings/message'
import getDefaultProfile from '@/app-config/profiles'
import { DeepReadonly } from '@/typings/helpers'
import { StoreState, DispatcherThunk } from './index'
import { isInNotebook, searchBoxUpdate } from './widget'
+import {
+ testerPunct,
+ testerChinese,
+ testJapanese,
+ testKorean,
+ isContainChinese,
+ isContainEnglish,
+ isContainJapanese,
+ isContainKorean,
+ isContainFrench,
+ isContainSpanish,
+ isContainDeutsch,
+} from '@/_helpers/lang-check'
const isSaladictOptionsPage = !!window.__SALADICT_OPTIONS_PAGE__
const isSaladictInternalPage = !!window.__SALADICT_INTERNAL_PAGE__
@@ -318,14 +330,18 @@ export function searchText (
const isTextContainChs = isContainChinese(info.text)
const isTextContainEng = isContainEnglish(info.text)
- const isTextContainOther = isContainMinor(info.text)
selectedDicts.forEach(id => {
- const { chs, eng, minor } = allDicts[id].selectionLang
+ const { selectionLang } = allDicts[id]
let isValidSelection = (
- chs && isTextContainChs ||
- eng && isTextContainEng ||
- minor && isTextContainOther
+ selectionLang.eng && isTextContainEng ||
+ selectionLang.chs && isTextContainChs ||
+ selectionLang.japanese && (isContainJapanese(info.text) || isTextContainChs) ||
+ selectionLang.korean && (isContainKorean(info.text) || isTextContainChs) ||
+ selectionLang.french && (isContainFrench(info.text) || isTextContainEng) ||
+ selectionLang.spanish && (isContainSpanish(info.text) || isTextContainEng) ||
+ selectionLang.deutsch && (isContainDeutsch(info.text) || isTextContainEng) ||
+ selectionLang.others
)
if (isValidSelection) {
diff --git a/src/options/components/options/Dictionaries/EditDictModal.tsx b/src/options/components/options/Dictionaries/EditDictModal.tsx
index dc950c872..655c3a4e2 100644
--- a/src/options/components/options/Dictionaries/EditDictModal.tsx
+++ b/src/options/components/options/Dictionaries/EditDictModal.tsx
@@ -120,8 +120,16 @@ export class EditDictModal extends React.Component<EditDictModalProps> {
{...formItemModalLayout}
label={t('dict_sel_lang')}
help={t('dict_sel_lang_help')}
- >{
- ['eng', 'chs', 'minor'].map(lang => (
+ >{[
+ 'eng',
+ 'chs',
+ 'japanese',
+ 'korean',
+ 'french',
+ 'spanish',
+ 'deutsch',
+ 'others',
+ ].map(lang => (
<Form.Item key={lang} className='form-item-inline'>{
getFieldDecorator(`${dictPath}#selectionLang#${lang}`, {
initialValue: allDict[dictID].selectionLang[lang],
diff --git a/src/options/components/options/SearchModes/index.tsx b/src/options/components/options/SearchModes/index.tsx
index 493daec10..6d0cef8b1 100644
--- a/src/options/components/options/SearchModes/index.tsx
+++ b/src/options/components/options/SearchModes/index.tsx
@@ -32,8 +32,16 @@ export class SearchModes extends React.Component<SearchModesProps> {
{...formItemLayout}
label={t('opt_sel_lang')}
help={t('opt_sel_lang_help')}
- >{
- ['chinese', 'english', 'minor'].map(lang => (
+ >{[
+ 'chinese',
+ 'english',
+ 'japanese',
+ 'korean',
+ 'french',
+ 'spanish',
+ 'deutsch',
+ 'others',
+ ].map(lang => (
<Form.Item key={lang} className='form-item-inline'>{
getFieldDecorator(`config#language#${lang}`, {
initialValue: config.language[lang],
diff --git a/src/selection/helper.ts b/src/selection/helper.ts
index 4c95c64f4..f2980e27d 100644
--- a/src/selection/helper.ts
+++ b/src/selection/helper.ts
@@ -2,8 +2,16 @@ import { AppConfig } from '@/app-config'
import { createConfigStream } from '@/_helpers/config-manager'
import { message } from '@/_helpers/browser-api'
import { getDefaultSelectionInfo, SelectionInfo } from '@/_helpers/selection'
-import { isContainChinese, isContainEnglish, isContainMinor } from '@/_helpers/lang-check'
import { MsgType, PostMsgType, PostMsgSelection, MsgSelection } from '@/typings/message'
+import {
+ isContainChinese,
+ isContainEnglish,
+ isContainJapanese,
+ isContainKorean,
+ isContainFrench,
+ isContainSpanish,
+ isContainDeutsch,
+} from '@/_helpers/lang-check'
import { Observable } from 'rxjs/Observable'
import { fromEvent } from 'rxjs/observable/fromEvent'
@@ -131,12 +139,25 @@ export function isSelectionLangValid (
text: string,
language: AppConfig['language'],
): boolean {
- return Boolean(
- text && (
- (language.english && isContainEnglish(text) && !isContainChinese(text)) ||
- (language.chinese && isContainChinese(text)) ||
- (language.minor && isContainMinor(text))
- )
+ if (!text) { return false }
+
+ const isContainEng = isContainEnglish(text)
+ if (language.english && isContainEng) {
+ return true
+ }
+
+ const isContainChs = isContainChinese(text)
+ if (language.chinese && isContainChs) {
+ return true
+ }
+
+ return (
+ language.japanese && (isContainJapanese(text) || isContainChs) ||
+ language.korean && (isContainKorean(text) || isContainChs) ||
+ language.french && (isContainFrench(text) || isContainEng) ||
+ language.spanish && (isContainSpanish(text) || isContainEng) ||
+ language.deutsch && (isContainDeutsch(text) || isContainEng) ||
+ language.others
)
}
|
refactor
|
granular minor language control
|
64aee9b67c59c587e80b8bd23aab82cf51c95224
|
2018-05-26 10:53:02
|
CRIMX
|
fix(dicts): fix macmillan style
| false
|
diff --git a/src/components/dictionaries/macmillan/_style.scss b/src/components/dictionaries/macmillan/_style.scss
index 0f30c2822..35993605d 100644
--- a/src/components/dictionaries/macmillan/_style.scss
+++ b/src/components/dictionaries/macmillan/_style.scss
@@ -1,9 +1,12 @@
-.dictMacmillan-Head {
+.dictMacmillan-Header {
display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ line-height: 1;
margin-bottom: 5px;
}
-.dictMacmillan-Head_Info {
+.dictMacmillan-Header_Info {
margin-left: 10px;
color: #aaa;
}
|
fix
|
fix macmillan style
|
844f0e7d8703c02ff331030066d5dfebf8ba3ae1
|
2020-03-20 21:21:07
|
crimx
|
refactor: simplify component types
| false
|
diff --git a/src/content/components/MenuBar/FloatBox.tsx b/src/content/components/MenuBar/FloatBox.tsx
index 5c678f521..a90726b71 100644
--- a/src/content/components/MenuBar/FloatBox.tsx
+++ b/src/content/components/MenuBar/FloatBox.tsx
@@ -1,7 +1,8 @@
import React, { FC, Ref, useState, useCallback } from 'react'
import { ResizeReporter } from 'react-resize-reporter/scroll'
-interface FloatBoxPropsBase {
+interface FloatBoxProps {
+ list?: Array<{ key: string; content: React.ReactNode }>
/** Box container */
ref?: Ref<HTMLDivElement>
/** When a item is selected */
@@ -24,17 +25,6 @@ interface FloatBoxPropsBase {
onHeightChanged?: (height: number) => any
}
-interface FloatBoxPropsWithList extends FloatBoxPropsBase {
- list: Array<{ key: string; content: React.ReactNode }>
- isLoading?: false
-}
-
-interface FloatBoxPropsLoading extends FloatBoxPropsBase {
- isLoading: true
-}
-
-export type FloatBoxProps = FloatBoxPropsWithList | FloatBoxPropsLoading
-
/**
* A white box
*/
@@ -63,7 +53,7 @@ export const FloatBox: FC<FloatBoxProps> = React.forwardRef(
<div className="menuBar-FloatBoxMeasure">
<ResizeReporter reportInit onSizeChanged={updateHeight} />
- {props.isLoading ? (
+ {!props.list ? (
<div className="lds-ellipsis">
<div></div>
<div></div>
@@ -87,8 +77,9 @@ export const FloatBox: FC<FloatBoxProps> = React.forwardRef(
if ($nextLi) {
;($nextLi as HTMLButtonElement).focus()
} else if (props.onArrowDownLast) {
- props.onArrowDownLast(e.currentTarget
- .parentElement as HTMLDivElement)
+ props.onArrowDownLast(
+ e.currentTarget.parentElement as HTMLDivElement
+ )
}
} else if (e.key === 'ArrowUp') {
e.preventDefault()
@@ -97,16 +88,18 @@ export const FloatBox: FC<FloatBoxProps> = React.forwardRef(
if ($prevLi) {
;($prevLi as HTMLButtonElement).focus()
} else if (props.onArrowUpFirst) {
- props.onArrowUpFirst(e.currentTarget
- .parentElement as HTMLDivElement)
+ props.onArrowUpFirst(
+ e.currentTarget.parentElement as HTMLDivElement
+ )
}
} else if (e.key === 'Escape') {
// prevent the dict panel being closed
e.preventDefault()
e.stopPropagation()
if (props.onClose) {
- props.onClose(e.currentTarget
- .parentElement as HTMLDivElement)
+ props.onClose(
+ e.currentTarget.parentElement as HTMLDivElement
+ )
}
}
}}
diff --git a/src/content/components/MenuBar/Suggest.tsx b/src/content/components/MenuBar/Suggest.tsx
index 8790f7ab0..afe404e5c 100644
--- a/src/content/components/MenuBar/Suggest.tsx
+++ b/src/content/components/MenuBar/Suggest.tsx
@@ -72,10 +72,10 @@ export const Suggest: FC<SuggestProps> = React.forwardRef(
{...props}
/>
)),
- startWith(<FloatBox isLoading {...props} />)
+ startWith(<FloatBox {...props} />)
)
),
- startWith(<FloatBox isLoading {...props} />)
+ startWith(<FloatBox {...props} />)
),
[props.text]
)
|
refactor
|
simplify component types
|
0967209a615a777e9980fd8d9e6b241c3bff81b4
|
2018-01-21 12:16:05
|
CRIMX
|
refactor(background): rename js to ts
| false
|
diff --git a/src/background/audio-manager.js b/src/background/audio-manager.ts
similarity index 100%
rename from src/background/audio-manager.js
rename to src/background/audio-manager.ts
diff --git a/src/background/context-menus.js b/src/background/context-menus.ts
similarity index 100%
rename from src/background/context-menus.js
rename to src/background/context-menus.ts
diff --git a/src/background/initialization.js b/src/background/initialization.ts
similarity index 100%
rename from src/background/initialization.js
rename to src/background/initialization.ts
diff --git a/src/background/main.js b/src/background/main.ts
similarity index 100%
rename from src/background/main.js
rename to src/background/main.ts
diff --git a/src/background/merge-config.js b/src/background/merge-config.ts
similarity index 100%
rename from src/background/merge-config.js
rename to src/background/merge-config.ts
diff --git a/src/background/pdf-sniffer.js b/src/background/pdf-sniffer.ts
similarity index 100%
rename from src/background/pdf-sniffer.js
rename to src/background/pdf-sniffer.ts
diff --git a/src/background/server.js b/src/background/server.ts
similarity index 100%
rename from src/background/server.js
rename to src/background/server.ts
|
refactor
|
rename js to ts
|
8f7f65b3c82e83f4d6984119642bab5f38f879d0
|
2019-09-07 23:16:59
|
crimx
|
chore: upgrade deps
| false
|
diff --git a/package.json b/package.json
index 88c641679..9810c5528 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"start": "webpack-dev-server --mode development --open",
"storybook": "start-storybook",
"build": "webpack --mode production",
- "devbuild": "node scripts/build.js --devbuild",
+ "devbuild": "webpack --mode development",
"type-check": "tsc --noEmit",
"zip": "node scripts/pack.js",
"test": "node scripts/test.js --env=jsdom",
@@ -61,7 +61,7 @@
"md5": "^2.2.1",
"memoize-one": "^5.1.0",
"normalize-scss": "^7.0.1",
- "observable-hooks": "^2.1.0",
+ "observable-hooks": "^2.1.2",
"pako": "^1.0.10",
"qrcode.react": "^0.9.3",
"react": "^16",
diff --git a/yarn.lock b/yarn.lock
index 93e4d4e27..087f0dde5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9797,10 +9797,10 @@ object.values@^1.1.0:
function-bind "^1.1.1"
has "^1.0.3"
-observable-hooks@^2.1.0:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/observable-hooks/-/observable-hooks-2.1.1.tgz#971aa1983936ff8071a223e60991c8aeedb06ccc"
- integrity sha512-7gy4rPWP/1ezwAzhyGsrI55XFPnSYBkHwSOSe+fZvuDDBbBZzN8rpIf5AHgLflT95+vqapR05FsofPDlPcxX/g==
+observable-hooks@^2.1.2:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/observable-hooks/-/observable-hooks-2.1.2.tgz#6b2414487aab9bc16250fbaebc6a48dfcf1c089e"
+ integrity sha512-8PQB/3ggq6rQl1pw/j0hLPiEhtMDLDuf74//9umE6fTBr1APSy/ww8mo7qyYEljb4/eakm92cJZvDD9ypish2w==
obuf@^1.0.0, obuf@^1.1.2:
version "1.1.2"
|
chore
|
upgrade deps
|
664b389662220f7d25285c24bec5cb4aa526efd5
|
2019-01-23 19:45:00
|
CRIMX
|
refactor(options): add page import export
| false
|
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index 5b55c2d61..f44bb097f 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -234,6 +234,36 @@
"zh_CN": "英文自动发音",
"zh_TW": "英文自動發音"
},
+ "opt_config_export": {
+ "en": "Export Configs",
+ "zh_CN": "导出设定",
+ "zh_TW": "匯出設定"
+ },
+ "opt_config_help": {
+ "en": "Configs are synced automatically via browser.",
+ "zh_CN": "设定已通过浏览器自动同步，也可以手动导入导出。",
+ "zh_TW": "設定已通過瀏覽器自動同步，也可以手動匯入匯出。"
+ },
+ "opt_config_import": {
+ "en": "Import Configs",
+ "zh_CN": "导入设定",
+ "zh_TW": "匯入設定"
+ },
+ "opt_config_import_error": {
+ "en": "Import Configs failed",
+ "zh_CN": "导入设定失败",
+ "zh_TW": "匯入設定失敗"
+ },
+ "opt_config_reset": {
+ "en": "Reset Configs",
+ "zh_CN": "重置设定",
+ "zh_TW": "重置設定"
+ },
+ "opt_config_reset_confirm": {
+ "en": "Reset to default settings. Confirm？",
+ "zh_CN": "所有设定将还原到默认值，确定？",
+ "zh_TW": "所有設定將還原到還原點，確定？"
+ },
"opt_context_menus_add_rules": {
"en": "URL with %s in place of query.",
"zh_CN": "链接中的 %s 会被替换为选词。",
diff --git a/src/options/components/options/ImportExport/index.tsx b/src/options/components/options/ImportExport/index.tsx
new file mode 100644
index 000000000..fa09096a5
--- /dev/null
+++ b/src/options/components/options/ImportExport/index.tsx
@@ -0,0 +1,157 @@
+import React from 'react'
+import { Props } from '../typings'
+import { AppConfig } from '@/app-config'
+import { ProfileIDList, Profile } from '@/app-config/profiles'
+import { updateConfig } from '@/_helpers/config-manager'
+import { storage } from '@/_helpers/browser-api'
+
+import { Upload, Icon, Row, Col, message } from 'antd'
+import { RcFile } from 'antd/lib/upload/interface'
+
+export type ConfigStorage = {
+ baseconfig: AppConfig
+ activeProfileID: string
+ hasInstructionsShown: boolean
+ profileIDList: ProfileIDList
+} & {
+ [id: string]: Profile
+}
+
+export class ImportExport extends React.Component<Props> {
+ importConfig = async (file: RcFile) => {
+ const result = await new Promise<Partial<ConfigStorage> | null>(resolve => {
+ const fr = new FileReader()
+ fr.onload = () => {
+ try {
+ const json = JSON.parse(fr.result as string)
+ resolve(json)
+ } catch (err) {/* */}
+ resolve()
+ }
+ fr.onerror = () => resolve()
+ fr.readAsText(file)
+ })
+
+ if (!result) {
+ message.error('opt_config_import_error')
+ return
+ }
+
+ let {
+ baseconfig,
+ activeProfileID,
+ hasInstructionsShown,
+ profileIDList,
+ } = result
+
+ if (!baseconfig &&
+ !activeProfileID &&
+ !profileIDList &&
+ hasInstructionsShown == null
+ ) {
+ message.error('opt_config_import_error')
+ return
+ }
+
+ await storage.sync.clear()
+
+ if (baseconfig) {
+ updateConfig(baseconfig)
+ }
+
+ if (hasInstructionsShown != null) {
+ storage.sync.set({ hasInstructionsShown })
+ }
+
+ if (profileIDList) {
+ profileIDList = profileIDList.filter(({ id }) => result[id])
+ if (profileIDList.length > 0) {
+ for (const { id } of profileIDList) {
+ await storage.sync.set({ [id]: result[id] })
+ }
+ if (!activeProfileID ||
+ profileIDList.every(({ id }) => id !== activeProfileID)
+ ) {
+ // use first item instead
+ activeProfileID = profileIDList[0].id
+ }
+ storage.sync.set({ activeProfileID, profileIDList })
+ }
+ }
+ }
+
+ exportConfig = async () => {
+ const result = await storage.sync.get([
+ 'baseconfig',
+ 'activeProfileID',
+ 'hasInstructionsShown',
+ 'profileIDList',
+ ])
+
+ console.log(result)
+
+ if (!result.baseconfig ||
+ !result.activeProfileID ||
+ !result.profileIDList
+ ) {
+ message.error('opt_config_import_error')
+ return
+ }
+
+ for (const { id } of result.profileIDList) {
+ result[id] = (await storage.sync.get(id))[id]
+ }
+ try {
+ let text = JSON.stringify(result)
+ const { os } = await browser.runtime.getPlatformInfo()
+ if (os === 'win') {
+ text = text.replace(/\r\n|\n/g, '\r\n')
+ }
+ const file = new Blob([text], { type: 'text/plain;charset=utf-8' })
+ const a = document.createElement('a')
+ a.href = URL.createObjectURL(file)
+ a.download = `config-${Date.now()}.saladict`
+
+ // firefox
+ a.target = '_blank'
+ document.body.appendChild(a)
+
+ a.click()
+ } catch (err) {
+ message.error('opt_config_import_error')
+ return
+ }
+ }
+
+ render () {
+ const { t } = this.props
+ return (
+ <Row>
+ <Col span={12}>
+ <Row gutter={10}>
+ <Col span={12}>
+ <Upload.Dragger beforeUpload={file => (this.importConfig(file), false)}>
+ <p className='ant-upload-drag-icon'>
+ <Icon type='download' />
+ </p>
+ <p className='ant-upload-text'>{t('opt_config_import')}</p>
+ </Upload.Dragger>
+ </Col>
+ <Col span={12}>
+ <button className='ant-upload ant-upload-drag' onClick={this.exportConfig}>
+ <div className='ant-upload ant-upload-btn'>
+ <p className='ant-upload-drag-icon'>
+ <Icon type='upload' />
+ </p>
+ <p className='ant-upload-text'>{t('opt_config_export')}</p>
+ </div>
+ </button>
+ </Col>
+ </Row>
+ </Col>
+ </Row>
+ )
+ }
+}
+
+export default ImportExport
|
refactor
|
add page import export
|
afdac41d4099aef1efa6021c60b741e3ad6fda22
|
2020-06-29 22:13:21
|
crimx
|
fix(dicts): update tts for tencent and caiyun
| false
|
diff --git a/src/components/dictionaries/caiyun/engine.ts b/src/components/dictionaries/caiyun/engine.ts
index 0ce9a01ca..2c45e2de1 100644
--- a/src/components/dictionaries/caiyun/engine.ts
+++ b/src/components/dictionaries/caiyun/engine.ts
@@ -44,21 +44,13 @@ export const search: SearchFunction<
payload
)
- const baiduAppid = config.dictAuth.baidu.appid
- const baiduKey = config.dictAuth.baidu.key
- const baiduConfig =
- baiduAppid && baiduKey ? { appid: baiduAppid, key: baiduKey } : undefined
+ const baiduTranslator = getBaiduTranslator()
let baiduResult: TranslateResult | undefined
try {
- baiduResult = await getBaiduTranslator().translate(
- text,
- sl,
- tl,
- baiduConfig
- )
-
+ // Caiyun's lang detection is broken
+ baiduResult = await baiduTranslator.translate(text, sl, tl)
if (langcodes.includes(baiduResult.from)) {
sl = baiduResult.from
}
@@ -69,10 +61,14 @@ export const search: SearchFunction<
try {
const result = await translator.translate(text, sl, tl, caiYunConfig)
- if (baiduResult) {
- result.origin.tts = baiduResult.origin.tts
- result.trans.tts = baiduResult.trans.tts
- }
+ result.origin.tts = await baiduTranslator.textToSpeech(
+ result.origin.paragraphs.join('\n'),
+ result.from
+ )
+ result.trans.tts = await baiduTranslator.textToSpeech(
+ result.trans.paragraphs.join('\n'),
+ result.to
+ )
return {
result: {
id: 'caiyun',
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index 7ad414c4e..dcbb746f1 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -60,21 +60,18 @@ export const search: SearchFunction<
try {
const result = await translator.translate(text, sl, tl, translatorConfig)
- if (!result.origin.tts || !result.trans.tts) {
- const baidu = getBaiduTranslator()
- if (!result.origin.tts) {
- result.origin.tts = await baidu.textToSpeech(
- result.origin.paragraphs.join('\n'),
- result.from
- )
- }
- if (!result.trans.tts) {
- result.trans.tts = await baidu.textToSpeech(
- result.trans.paragraphs.join('\n'),
- result.to
- )
- }
- }
+ // Tencent needs extra api credits for TTS which does
+ // not fit in the current Saladict architecture.
+ // Use Baidu instead.
+ const baidu = getBaiduTranslator()
+ result.origin.tts = await baidu.textToSpeech(
+ result.origin.paragraphs.join('\n'),
+ result.from
+ )
+ result.trans.tts = await baidu.textToSpeech(
+ result.trans.paragraphs.join('\n'),
+ result.to
+ )
return {
result: {
|
fix
|
update tts for tencent and caiyun
|
59aa74be6a6d2354f764a3daccacf875ad76cfcf
|
2020-04-03 17:37:40
|
crimx
|
refactor(analytics): ignore development mode
| false
|
diff --git a/src/_helpers/analytics.ts b/src/_helpers/analytics.ts
index 5473094ad..0385f16ed 100644
--- a/src/_helpers/analytics.ts
+++ b/src/_helpers/analytics.ts
@@ -8,6 +8,7 @@ export async function reportGA(page: string): Promise<void> {
if (
process.env.DEV_BUILD ||
process.env.NODE_ENV === 'test' ||
+ process.env.NODE_ENV === 'development' ||
!process.env.SDAPP_ANALYTICS
) {
return
|
refactor
|
ignore development mode
|
15fdead010b73528cb7d3b67ed2e4776feeb9fd8
|
2020-04-26 12:00:33
|
crimx
|
chore(release): 7.10.2
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26d5dd6bf..bb11a2120 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [7.10.2](https://github.com/crimx/ext-saladict/compare/v7.10.1...v7.10.2) (2020-04-26)
+
+
+### Bug Fixes
+
+* **dicts:** cnki should respect options ([c78d2d7](https://github.com/crimx/ext-saladict/commit/c78d2d7ae41dc08d1c7a8a3900613392825c3527)), closes [#752](https://github.com/crimx/ext-saladict/issues/752)
+* **options:** smooth dark/bright transition ([5433cac](https://github.com/crimx/ext-saladict/commit/5433cac8f074e00a597e91c6804cf3fc8acf3bef))
+* **options:** typo ([c66ed05](https://github.com/crimx/ext-saladict/commit/c66ed0586a1662d2a9c4611f8ef8e2c4c7099b60))
+* **selection:** cancel instant capture on keyup ([c6dbaa7](https://github.com/crimx/ext-saladict/commit/c6dbaa7ef92c29827b6a35db7bc6824c8696843f)), closes [#756](https://github.com/crimx/ext-saladict/issues/756)
+
### [7.10.1](https://github.com/crimx/ext-saladict/compare/v7.10.0...v7.10.1) (2020-04-24)
diff --git a/package.json b/package.json
index d3abaa3c6..8eca37977 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.10.1",
+ "version": "7.10.2",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.10.2
|
914c28d09b674689f1b091f5842a17101493ff61
|
2018-05-12 16:55:54
|
CRIMX
|
refactor(options): remove config listener
| false
|
diff --git a/src/options/index.ts b/src/options/index.ts
index e29f5c670..4b787ec83 100644
--- a/src/options/index.ts
+++ b/src/options/index.ts
@@ -58,32 +58,12 @@ storage.sync.get('config')
dbClick: false,
ctrlKey: false,
})
- if (process.env.NODE_ENV === 'development') {
- console.log({
- type: MsgType.Selection,
- selectionInfo: getDefaultSelectionInfo({
- text: window['__SALADICT_LAST_SEARCH__']
- }),
- mouseX: window.innerWidth - this.$store.config.panelWidth - 110,
- mouseY: window.innerHeight * (1 - this.$store.config.panelMaxHeightRatio) / 2 + 50,
- dbClick: false,
- ctrlKey: false,
- })
- }
}, 2000)
}
}
}
},
created () {
- storage.sync.addListener('config', changes => {
- let config = changes.config.newValue
- if (config) {
- // only listen to active setting in popup panel
- this.store.config.active = config.active
- }
- })
-
storage.sync.get('unlock')
.then(({ unlock }) => {
this.store.unlock = Boolean(unlock)
|
refactor
|
remove config listener
|
6e523d6ba56475ca9bddee005f01c6e1f3b2e774
|
2019-08-22 18:48:45
|
crimx
|
fix(panel): typo
| false
|
diff --git a/src/content/components/SaladBowl/SaladBowl.container.tsx b/src/content/components/SaladBowl/SaladBowl.container.tsx
index f33b67f44..aa01e765b 100644
--- a/src/content/components/SaladBowl/SaladBowl.container.tsx
+++ b/src/content/components/SaladBowl/SaladBowl.container.tsx
@@ -8,7 +8,7 @@ type Dispatchers = 'onChange'
const mapStateToProps = (
state: StoreState
): Omit<SaladBowlPortalProps, Dispatchers> => ({
- show: state.isShowDictPanel,
+ show: state.isShowBowl,
mouseX: state.selection.mouseX,
mouseY: state.selection.mouseY,
withAnimation: state.config.animation,
|
fix
|
typo
|
13516db21adc7674025f914bd89adbf2da89e596
|
2018-05-02 19:26:15
|
CRIMX
|
refactor(content): rename SaladBowlPortal
| false
|
diff --git a/src/content/components/SaladBowlPortal.tsx b/src/content/components/SaladBowlPortal/index.tsx
similarity index 100%
rename from src/content/components/SaladBowlPortal.tsx
rename to src/content/components/SaladBowlPortal/index.tsx
|
refactor
|
rename SaladBowlPortal
|
5a91f1c0eccfbabd88a1c7246d9c9fb06b7643c5
|
2018-02-03 18:15:23
|
CRIMX
|
refactor(background): rename menus init and move into initialization
| false
|
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index 507190849..994b59ec4 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -86,7 +86,7 @@ browser.contextMenus.onClicked.addListener(info => {
}
})
-export function setupListener (initConfig: ContextMenusConfig): void {
+export function init (initConfig: ContextMenusConfig): void {
if (contextMenusChanged$) { return }
// when context menus config changes
contextMenusChanged$ = Observable.create(
diff --git a/src/background/index.ts b/src/background/index.ts
index 1e2c55d71..b568bcf29 100644
--- a/src/background/index.ts
+++ b/src/background/index.ts
@@ -1,4 +1,2 @@
-import './context-menus'
-import './initialization'
import './server'
-import './pdf-sniffer'
+import './initialization'
diff --git a/src/background/initialization.ts b/src/background/initialization.ts
index 32a582bf0..d2055f5fd 100644
--- a/src/background/initialization.ts
+++ b/src/background/initialization.ts
@@ -2,7 +2,8 @@ import { storage, openURL } from '../_helpers/browser-api'
import checkUpdate from '../_helpers/check-update'
import { AppConfig } from '../app-config'
import { mergeConfig } from './merge-config'
-import { setupListener } from './context-menus'
+import { init as initMenus } from './context-menus'
+import { init as initPdf } from './pdf-sniffer'
browser.runtime.onInstalled.addListener(onInstalled)
browser.runtime.onStartup.addListener(onStartup)
@@ -33,7 +34,8 @@ function onInstalled ({ reason, previousVersion }: { reason: string, previousVer
showNews()
}
}
- setupListener(config.contextMenus)
+ initMenus(config.contextMenus)
+ initPdf(config.pdfSniff)
storage.local.set({ lastCheckUpdate: Date.now() })
})
}
@@ -42,7 +44,8 @@ function onStartup (): void {
// check update every month
Promise.all([storage.local.get('lastCheckUpdate'), storage.sync.get('config')])
.then(([{ lastCheckUpdate }, { config }]: [{ lastCheckUpdate: number }, { config: AppConfig }]) => {
- setupListener(config.contextMenus)
+ initMenus(config.contextMenus)
+ initPdf(config.pdfSniff)
const today = Date.now()
if (!lastCheckUpdate || !(today - lastCheckUpdate < 7 * 24 * 60 * 60 * 1000)) {
checkUpdate().then(({ info, isAvailable }) => {
diff --git a/test/unit/background/context-menus.spec.ts b/test/unit/background/context-menus.spec.ts
index 66d7d40ee..39e249ccc 100644
--- a/test/unit/background/context-menus.spec.ts
+++ b/test/unit/background/context-menus.spec.ts
@@ -93,8 +93,8 @@ describe('Context Menus', () => {
browser.contextMenus.create.callsFake((_, cb) => cb())
config = specialConfig()
jest.resetModules()
- const { setupListener } = require('../../../src/background/context-menus')
- setupListener(config.contextMenus)
+ const { init } = require('../../../src/background/context-menus')
+ init(config.contextMenus)
})
it('should set menus on init', done => {
@@ -110,9 +110,9 @@ describe('Context Menus', () => {
it('should not init setup when called multiple times', () => {
expect(browser.contextMenus.removeAll.calledOnce).toBeTruthy()
- const { setupListener } = require('../../../src/background/context-menus')
- setupListener(config.contextMenus)
- setupListener(config.contextMenus)
+ const { init } = require('../../../src/background/context-menus')
+ init(config.contextMenus)
+ init(config.contextMenus)
expect(browser.contextMenus.removeAll.calledOnce).toBeTruthy()
})
diff --git a/test/unit/background/initialization.spec.ts b/test/unit/background/initialization.spec.ts
index aa7292d3e..7bc09728d 100644
--- a/test/unit/background/initialization.spec.ts
+++ b/test/unit/background/initialization.spec.ts
@@ -5,7 +5,8 @@ import sinon from 'sinon'
describe('Initialization', () => {
const bakFetch = window.fetch
const openURL = jest.fn(() => Promise.resolve())
- const setupListener = jest.fn(() => Promise.resolve())
+ const initMenus = jest.fn(() => Promise.resolve())
+ const initPdf = jest.fn()
const mergeConfig = jest.fn()
const checkUpdate = jest.fn().mockReturnValue(Promise.resolve())
@@ -24,7 +25,10 @@ describe('Initialization', () => {
}
})
jest.doMock('../../../src/background/context-menus', () => {
- return { setupListener }
+ return { init: initMenus }
+ })
+ jest.doMock('../../../src/background/pdf-sniffer', () => {
+ return { init: initPdf }
})
jest.doMock('../../../src/_helpers/check-update', () => {
return checkUpdate
@@ -49,7 +53,8 @@ describe('Initialization', () => {
beforeEach(() => {
openURL.mockReset()
- setupListener.mockReset()
+ initMenus.mockReset()
+ initPdf.mockReset()
mergeConfig.mockReset()
fetchMock.resetMocks()
@@ -87,7 +92,8 @@ describe('Initialization', () => {
expect(openURL).toHaveBeenCalledTimes(1)
expect(mergeConfig).toHaveBeenCalledTimes(1)
expect(mergeConfig).toHaveBeenCalledWith(undefined)
- expect(setupListener).toHaveBeenCalledTimes(1)
+ expect(initMenus).toHaveBeenCalledTimes(1)
+ expect(initPdf).toHaveBeenCalledTimes(1)
expect(browser.storage.local.set.calledWithMatch({
lastCheckUpdate: sinon.match.number
})).toBeTruthy()
@@ -119,7 +125,8 @@ describe('Initialization', () => {
message: '1. one.\n2. two',
}
)).toBeTruthy()
- expect(setupListener).toHaveBeenCalledTimes(1)
+ expect(initMenus).toHaveBeenCalledTimes(1)
+ expect(initPdf).toHaveBeenCalledTimes(1)
expect(browser.storage.local.set.calledWithMatch({
lastCheckUpdate: sinon.match.number
})).toBeTruthy()
@@ -139,7 +146,8 @@ describe('Initialization', () => {
}))
browser.runtime.onStartup.dispatch()
setTimeout(() => {
- expect(setupListener).toHaveBeenCalledTimes(1)
+ expect(initMenus).toHaveBeenCalledTimes(1)
+ expect(initPdf).toHaveBeenCalledTimes(1)
expect(checkUpdate).toHaveBeenCalledTimes(0)
done()
}, 0)
@@ -155,7 +163,8 @@ describe('Initialization', () => {
checkUpdate.mockReturnValueOnce(Promise.resolve({ isAvailable: true, info: {} }))
browser.runtime.onStartup.dispatch()
setTimeout(() => {
- expect(setupListener).toHaveBeenCalledTimes(1)
+ expect(initMenus).toHaveBeenCalledTimes(1)
+ expect(initPdf).toHaveBeenCalledTimes(1)
expect(checkUpdate).toHaveBeenCalledTimes(1)
expect(browser.storage.sync.set.notCalled).toBeTruthy()
expect(browser.storage.local.set.calledWith({
|
refactor
|
rename menus init and move into initialization
|
4b1e15a23960f290916a27df7ce778ec71732101
|
2019-08-13 21:59:20
|
crimx
|
refactor(message): selection
| false
|
diff --git a/src/typings/message.ts b/src/typings/message.ts
index d60d22737..bc5eeeb8d 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -131,6 +131,30 @@ export type MessageConfig = {
response: void
}
+ /* ------------------------------------------------ *\
+ Text Selection
+ \* ------------------------------------------------ */
+
+ SELECTION: {
+ /** To dict panel */
+ payload: {
+ word: Word
+ mouseX: number
+ mouseY: number
+ dbClick: boolean
+ shiftKey: boolean
+ ctrlKey: boolean
+ metaKey: boolean
+ /** inside panel? */
+ self: boolean
+ /** skip salad bowl and show panel directly */
+ instant: boolean
+ /** force panel to skip reconciling position */
+ force: boolean
+ }
+ response: void
+ }
+
/* ------------------------------------------------ *\
Dict Panel
\* ------------------------------------------------ */
@@ -209,9 +233,6 @@ export type MessageResponse<T extends MsgType> = Readonly<
// /** Default */
// Default,
-// /** is dict panel pinned? */
-// IsPinned,
-
// /** is a standalone panel running? */
// QSPanelIDChanged,
@@ -223,9 +244,6 @@ export type MessageResponse<T extends MsgType> = Readonly<
// QSPanelSearchText,
-// /** Mouse down, selection maybe empty */
-// Selection,
-
// /** Ctrl/Command has been hit 3 times */
// TripleCtrl,
@@ -235,18 +253,8 @@ export type MessageResponse<T extends MsgType> = Readonly<
// /** Response the pageInfo of a page */
// PageInfo,
-// /** Create a tab with the url or highlight an existing one */
-// OpenURL,
-// /** open a dictionary source page */
-// OpenSrcPage,
-// /** Request background to play a audio src */
-// PlayAudio,
// /** Background to a dict panel on one page */
// PlayWaveform,
-// /** Search text with a dictionary and response the result */
-// FetchDictResult,
-// /** Call a custom method of a dict engine */
-// DictEngineMethod,
// /** Request background proxy for current selection */
// PreloadSelection,
// /** Get clipboard content */
@@ -254,14 +262,6 @@ export type MessageResponse<T extends MsgType> = Readonly<
// RequestCSS,
-// IsInNotebook,
-// SaveWord,
-// WordSaved,
-// DeleteWords,
-// GetWordsByText,
-// GetWords,
-// GetSuggests,
-
// /** Popup page */
// TempDisabledState,
@@ -274,10 +274,6 @@ export type MessageResponse<T extends MsgType> = Readonly<
// /** Manually emit selection event */
// EmitSelection,
-// SyncServiceInit,
-// SyncServiceDownload,
-// SyncServiceUpload,
-
// /** Manually trigger context menus click */
// ContextMenusClick,
|
refactor
|
selection
|
efa8b20d6bf9356c5818533d31ef7041585c2255
|
2019-07-23 17:33:57
|
CRIMX
|
refactor: import arrow down on search box
| false
|
diff --git a/src/content/components/MenuBar/SearchBox.tsx b/src/content/components/MenuBar/SearchBox.tsx
index bc5378e07..e95314a43 100644
--- a/src/content/components/MenuBar/SearchBox.tsx
+++ b/src/content/components/MenuBar/SearchBox.tsx
@@ -76,13 +76,12 @@ export const SearchBox: FC<SearchBoxProps> = props => {
}}
onKeyDown={e => {
if (e.key === 'ArrowDown') {
- const doc = e.currentTarget.ownerDocument
- if (doc) {
- const firstSuggestBtn =
- suggestRef.current && suggestRef.current.querySelector('button')
- if (firstSuggestBtn) {
- firstSuggestBtn.focus()
- }
+ const firstSuggestBtn =
+ suggestRef.current && suggestRef.current.querySelector('button')
+ if (firstSuggestBtn) {
+ firstSuggestBtn.focus()
+ } else {
+ onShowSugget(true)
}
e.preventDefault()
e.stopPropagation()
|
refactor
|
import arrow down on search box
|
c39151e2ca16208f81b3b995f5c910ec1993522d
|
2018-05-28 10:38:53
|
CRIMX
|
fix(dicts): fix locales
| false
|
diff --git a/src/components/dictionaries/eudic/_locales.json b/src/components/dictionaries/eudic/_locales.json
index 1416f3f69..6e1476997 100644
--- a/src/components/dictionaries/eudic/_locales.json
+++ b/src/components/dictionaries/eudic/_locales.json
@@ -3,5 +3,17 @@
"en": "Eudic",
"zh_CN": "双语例句",
"zh_TW": "雙語例句"
+ },
+ "options": {
+ "resultnum": {
+ "en": "Show",
+ "zh_CN": "结果数量",
+ "zh_TW": "結果數量"
+ },
+ "resultnum_unit": {
+ "en": "results",
+ "zh_CN": "个",
+ "zh_TW": "個"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/components/dictionaries/longman/_locales.json b/src/components/dictionaries/longman/_locales.json
index c82ff39e3..ff9180fb3 100644
--- a/src/components/dictionaries/longman/_locales.json
+++ b/src/components/dictionaries/longman/_locales.json
@@ -1,8 +1,8 @@
{
"name": {
- "en": "Longman Business",
- "zh_CN": "Longman Business",
- "zh_TW": "Longman Business"
+ "en": "Longman Dictionary",
+ "zh_CN": "朗文词典",
+ "zh_TW": "朗文詞典"
},
"options": {
"wordfams": {
|
fix
|
fix locales
|
f5129f8045c1d28dc640c22ee0c65ff48e0ec645
|
2018-08-27 10:09:53
|
CRIMX
|
chore(release): 6.10.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4efd70eda..562799b40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.10.1"></a>
+## [6.10.1](https://github.com/crimx/ext-saladict/compare/v6.10.0...v6.10.1) (2018-08-27)
+
+
+### Bug Fixes
+
+* **dicts:** fix longman styles ([4dc74c4](https://github.com/crimx/ext-saladict/commit/4dc74c4))
+* **locales:** typo ([f86f77e](https://github.com/crimx/ext-saladict/commit/f86f77e))
+
+
+
<a name="6.10.0"></a>
# [6.10.0](https://github.com/crimx/ext-saladict/compare/v6.9.0...v6.10.0) (2018-08-27)
diff --git a/package.json b/package.json
index 677f37d94..0067f69d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.10.0",
+ "version": "6.10.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.10.1
|
28ce1da407e155f33d5117a38603ae17a5a1bd42
|
2022-02-28 17:16:50
|
dependabot[bot]
|
build(deps): bump trim-off-newlines from 1.0.1 to 1.0.3 (#1662)
| false
|
diff --git a/yarn.lock b/yarn.lock
index 92159a69..76770b14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14708,9 +14708,9 @@ trim-newlines@^3.0.0:
integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
trim-off-newlines@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
- integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz#8df24847fcb821b0ab27d58ab6efec9f2fe961a1"
+ integrity sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==
[email protected]:
version "0.0.1"
|
build
|
bump trim-off-newlines from 1.0.1 to 1.0.3 (#1662)
|
028663e4f354b9cebec2ff01c8a3f6531b7f0488
|
2018-12-23 16:01:05
|
CRIMX
|
chore: update pdf js
| false
|
diff --git a/public/static/pdf/build/pdf.js b/public/static/pdf/build/pdf.js
index e92b4dc47..9bd1236aa 100644
--- a/public/static/pdf/build/pdf.js
+++ b/public/static/pdf/build/pdf.js
@@ -123,30 +123,43 @@ return /******/ (function(modules) { // webpackBootstrap
"use strict";
-var pdfjsVersion = '2.1.28';
-var pdfjsBuild = 'ec76aa53';
+var pdfjsVersion = '2.1.124';
+var pdfjsBuild = '74461b0a';
+
var pdfjsSharedUtil = __w_pdfjs_require__(1);
+
var pdfjsDisplayAPI = __w_pdfjs_require__(133);
+
var pdfjsDisplayTextLayer = __w_pdfjs_require__(149);
+
var pdfjsDisplayAnnotationLayer = __w_pdfjs_require__(150);
-var pdfjsDisplayDOMUtils = __w_pdfjs_require__(134);
+
+var pdfjsDisplayDOMUtils = __w_pdfjs_require__(138);
+
var pdfjsDisplaySVG = __w_pdfjs_require__(151);
-var pdfjsDisplayWorkerOptions = __w_pdfjs_require__(139);
-var pdfjsDisplayAPICompatibility = __w_pdfjs_require__(136);
+
+var pdfjsDisplayWorkerOptions = __w_pdfjs_require__(143);
+
+var pdfjsDisplayAPICompatibility = __w_pdfjs_require__(140);
+
{
var isNodeJS = __w_pdfjs_require__(4);
+
if (isNodeJS()) {
var PDFNodeStream = __w_pdfjs_require__(152).PDFNodeStream;
+
pdfjsDisplayAPI.setPDFNetworkStreamFactory(function (params) {
return new PDFNodeStream(params);
});
} else if (typeof Response !== 'undefined' && 'body' in Response.prototype && typeof ReadableStream !== 'undefined') {
var PDFFetchStream = __w_pdfjs_require__(155).PDFFetchStream;
+
pdfjsDisplayAPI.setPDFNetworkStreamFactory(function (params) {
return new PDFFetchStream(params);
});
} else {
var PDFNetworkStream = __w_pdfjs_require__(156).PDFNetworkStream;
+
pdfjsDisplayAPI.setPDFNetworkStreamFactory(function (params) {
return new PDFNetworkStream(params);
});
@@ -197,9 +210,54 @@ exports.apiCompatibilityParams = pdfjsDisplayAPICompatibility.apiCompatibilityPa
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.URL = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.getInheritableProperty = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.toRomanNumerals = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VerbosityLevel = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+exports.toRomanNumerals = toRomanNumerals;
+exports.arrayByteLength = arrayByteLength;
+exports.arraysToBytes = arraysToBytes;
+exports.assert = assert;
+exports.bytesToString = bytesToString;
+exports.createPromiseCapability = createPromiseCapability;
+exports.deprecated = deprecated;
+exports.getInheritableProperty = getInheritableProperty;
+exports.getLookupTableFactory = getLookupTableFactory;
+exports.getVerbosityLevel = getVerbosityLevel;
+exports.info = info;
+exports.isArrayBuffer = isArrayBuffer;
+exports.isBool = isBool;
+exports.isEmptyObj = isEmptyObj;
+exports.isNum = isNum;
+exports.isString = isString;
+exports.isSpace = isSpace;
+exports.isSameOrigin = isSameOrigin;
+exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
+exports.isLittleEndian = isLittleEndian;
+exports.isEvalSupported = isEvalSupported;
+exports.log2 = log2;
+exports.readInt8 = readInt8;
+exports.readUint16 = readUint16;
+exports.readUint32 = readUint32;
+exports.removeNullCharacters = removeNullCharacters;
+exports.setVerbosityLevel = setVerbosityLevel;
+exports.shadow = shadow;
+exports.string32 = string32;
+exports.stringToBytes = stringToBytes;
+exports.stringToPDFString = stringToPDFString;
+exports.stringToUTF8String = stringToUTF8String;
+exports.utf8StringToString = utf8StringToString;
+exports.warn = warn;
+exports.unreachable = unreachable;
+Object.defineProperty(exports, "ReadableStream", {
+ enumerable: true,
+ get: function get() {
+ return _streams_polyfill.ReadableStream;
+ }
+});
+Object.defineProperty(exports, "URL", {
+ enumerable: true,
+ get: function get() {
+ return _url_polyfill.URL;
+ }
+});
+exports.createObjectURL = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VerbosityLevel = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = void 0;
__w_pdfjs_require__(2);
@@ -207,13 +265,18 @@ var _streams_polyfill = __w_pdfjs_require__(129);
var _url_polyfill = __w_pdfjs_require__(131);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
+exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
var FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
+exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
var NativeImageDecoding = {
NONE: 'none',
DECODE: 'decode',
DISPLAY: 'display'
};
+exports.NativeImageDecoding = NativeImageDecoding;
var PermissionFlag = {
PRINT: 0x04,
MODIFY_CONTENTS: 0x08,
@@ -224,6 +287,7 @@ var PermissionFlag = {
ASSEMBLE: 0x400,
PRINT_HIGH_QUALITY: 0x800
};
+exports.PermissionFlag = PermissionFlag;
var TextRenderingMode = {
FILL: 0,
STROKE: 1,
@@ -236,11 +300,13 @@ var TextRenderingMode = {
FILL_STROKE_MASK: 3,
ADD_TO_PATH_FLAG: 4
};
+exports.TextRenderingMode = TextRenderingMode;
var ImageKind = {
GRAYSCALE_1BPP: 1,
RGB_24BPP: 2,
RGBA_32BPP: 3
};
+exports.ImageKind = ImageKind;
var AnnotationType = {
TEXT: 1,
LINK: 2,
@@ -269,6 +335,7 @@ var AnnotationType = {
THREED: 25,
REDACT: 26
};
+exports.AnnotationType = AnnotationType;
var AnnotationFlag = {
INVISIBLE: 0x01,
HIDDEN: 0x02,
@@ -281,6 +348,7 @@ var AnnotationFlag = {
TOGGLENOVIEW: 0x100,
LOCKEDCONTENTS: 0x200
};
+exports.AnnotationFlag = AnnotationFlag;
var AnnotationFieldFlag = {
READONLY: 0x0000001,
REQUIRED: 0x0000002,
@@ -302,6 +370,7 @@ var AnnotationFieldFlag = {
RADIOSINUNISON: 0x2000000,
COMMITONSELCHANGE: 0x4000000
};
+exports.AnnotationFieldFlag = AnnotationFieldFlag;
var AnnotationBorderStyleType = {
SOLID: 1,
DASHED: 2,
@@ -309,6 +378,7 @@ var AnnotationBorderStyleType = {
INSET: 4,
UNDERLINE: 5
};
+exports.AnnotationBorderStyleType = AnnotationBorderStyleType;
var StreamType = {
UNKNOWN: 0,
FLATE: 1,
@@ -321,6 +391,7 @@ var StreamType = {
CCF: 8,
RL: 9
};
+exports.StreamType = StreamType;
var FontType = {
UNKNOWN: 0,
TYPE1: 1,
@@ -334,16 +405,19 @@ var FontType = {
TYPE0: 9,
MMTYPE1: 10
};
+exports.FontType = FontType;
var VerbosityLevel = {
ERRORS: 0,
WARNINGS: 1,
INFOS: 5
};
+exports.VerbosityLevel = VerbosityLevel;
var CMapCompressionType = {
NONE: 0,
BINARY: 1,
STREAM: 2
};
+exports.CMapCompressionType = CMapCompressionType;
var OPS = {
dependency: 1,
setLineWidth: 2,
@@ -437,6 +511,7 @@ var OPS = {
paintSolidColorImageMask: 90,
constructPath: 91
};
+exports.OPS = OPS;
var UNSUPPORTED_FEATURES = {
unknown: 'unknown',
forms: 'forms',
@@ -445,56 +520,70 @@ var UNSUPPORTED_FEATURES = {
shadingPattern: 'shadingPattern',
font: 'font'
};
+exports.UNSUPPORTED_FEATURES = UNSUPPORTED_FEATURES;
var PasswordResponses = {
NEED_PASSWORD: 1,
INCORRECT_PASSWORD: 2
};
+exports.PasswordResponses = PasswordResponses;
var verbosity = VerbosityLevel.WARNINGS;
+
function setVerbosityLevel(level) {
if (Number.isInteger(level)) {
verbosity = level;
}
}
+
function getVerbosityLevel() {
return verbosity;
}
+
function info(msg) {
if (verbosity >= VerbosityLevel.INFOS) {
console.log('Info: ' + msg);
}
}
+
function warn(msg) {
if (verbosity >= VerbosityLevel.WARNINGS) {
console.log('Warning: ' + msg);
}
}
+
function deprecated(details) {
console.log('Deprecated API usage: ' + details);
}
+
function unreachable(msg) {
throw new Error(msg);
}
+
function assert(cond, msg) {
if (!cond) {
unreachable(msg);
}
}
+
function isSameOrigin(baseUrl, otherUrl) {
try {
var base = new _url_polyfill.URL(baseUrl);
+
if (!base.origin || base.origin === 'null') {
return false;
}
} catch (e) {
return false;
}
+
var other = new _url_polyfill.URL(otherUrl, base);
return base.origin === other.origin;
}
+
function _isValidProtocol(url) {
if (!url) {
return false;
}
+
switch (url.protocol) {
case 'http:':
case 'https:':
@@ -502,22 +591,28 @@ function _isValidProtocol(url) {
case 'mailto:':
case 'tel:':
return true;
+
default:
return false;
}
}
+
function createValidAbsoluteUrl(url, baseUrl) {
if (!url) {
return null;
}
+
try {
var absoluteUrl = baseUrl ? new _url_polyfill.URL(url, baseUrl) : new _url_polyfill.URL(url);
+
if (_isValidProtocol(absoluteUrl)) {
return absoluteUrl;
}
} catch (ex) {}
+
return null;
}
+
function shadow(obj, prop, value) {
Object.defineProperty(obj, prop, {
value: value,
@@ -527,6 +622,7 @@ function shadow(obj, prop, value) {
});
return value;
}
+
function getLookupTableFactory(initializer) {
var lookup;
return function () {
@@ -535,151 +631,206 @@ function getLookupTableFactory(initializer) {
initializer(lookup);
initializer = null;
}
+
return lookup;
};
}
+
var PasswordException = function PasswordExceptionClosure() {
function PasswordException(msg, code) {
this.name = 'PasswordException';
this.message = msg;
this.code = code;
}
+
PasswordException.prototype = new Error();
PasswordException.constructor = PasswordException;
return PasswordException;
}();
+
+exports.PasswordException = PasswordException;
+
var UnknownErrorException = function UnknownErrorExceptionClosure() {
function UnknownErrorException(msg, details) {
this.name = 'UnknownErrorException';
this.message = msg;
this.details = details;
}
+
UnknownErrorException.prototype = new Error();
UnknownErrorException.constructor = UnknownErrorException;
return UnknownErrorException;
}();
+
+exports.UnknownErrorException = UnknownErrorException;
+
var InvalidPDFException = function InvalidPDFExceptionClosure() {
function InvalidPDFException(msg) {
this.name = 'InvalidPDFException';
this.message = msg;
}
+
InvalidPDFException.prototype = new Error();
InvalidPDFException.constructor = InvalidPDFException;
return InvalidPDFException;
}();
+
+exports.InvalidPDFException = InvalidPDFException;
+
var MissingPDFException = function MissingPDFExceptionClosure() {
function MissingPDFException(msg) {
this.name = 'MissingPDFException';
this.message = msg;
}
+
MissingPDFException.prototype = new Error();
MissingPDFException.constructor = MissingPDFException;
return MissingPDFException;
}();
+
+exports.MissingPDFException = MissingPDFException;
+
var UnexpectedResponseException = function UnexpectedResponseExceptionClosure() {
function UnexpectedResponseException(msg, status) {
this.name = 'UnexpectedResponseException';
this.message = msg;
this.status = status;
}
+
UnexpectedResponseException.prototype = new Error();
UnexpectedResponseException.constructor = UnexpectedResponseException;
return UnexpectedResponseException;
}();
+
+exports.UnexpectedResponseException = UnexpectedResponseException;
+
var MissingDataException = function MissingDataExceptionClosure() {
function MissingDataException(begin, end) {
this.begin = begin;
this.end = end;
this.message = 'Missing data [' + begin + ', ' + end + ')';
}
+
MissingDataException.prototype = new Error();
MissingDataException.prototype.name = 'MissingDataException';
MissingDataException.constructor = MissingDataException;
return MissingDataException;
}();
+
+exports.MissingDataException = MissingDataException;
+
var XRefParseException = function XRefParseExceptionClosure() {
function XRefParseException(msg) {
this.message = msg;
}
+
XRefParseException.prototype = new Error();
XRefParseException.prototype.name = 'XRefParseException';
XRefParseException.constructor = XRefParseException;
return XRefParseException;
}();
+
+exports.XRefParseException = XRefParseException;
+
var FormatError = function FormatErrorClosure() {
function FormatError(msg) {
this.message = msg;
}
+
FormatError.prototype = new Error();
FormatError.prototype.name = 'FormatError';
FormatError.constructor = FormatError;
return FormatError;
}();
+
+exports.FormatError = FormatError;
+
var AbortException = function AbortExceptionClosure() {
function AbortException(msg) {
this.name = 'AbortException';
this.message = msg;
}
+
AbortException.prototype = new Error();
AbortException.constructor = AbortException;
return AbortException;
}();
+
+exports.AbortException = AbortException;
var NullCharactersRegExp = /\x00/g;
+
function removeNullCharacters(str) {
if (typeof str !== 'string') {
warn('The argument for removeNullCharacters must be a string.');
return str;
}
+
return str.replace(NullCharactersRegExp, '');
}
+
function bytesToString(bytes) {
- assert(bytes !== null && (typeof bytes === 'undefined' ? 'undefined' : _typeof(bytes)) === 'object' && bytes.length !== undefined, 'Invalid argument for bytesToString');
+ assert(bytes !== null && _typeof(bytes) === 'object' && bytes.length !== undefined, 'Invalid argument for bytesToString');
var length = bytes.length;
var MAX_ARGUMENT_COUNT = 8192;
+
if (length < MAX_ARGUMENT_COUNT) {
return String.fromCharCode.apply(null, bytes);
}
+
var strBuf = [];
+
for (var i = 0; i < length; i += MAX_ARGUMENT_COUNT) {
var chunkEnd = Math.min(i + MAX_ARGUMENT_COUNT, length);
var chunk = bytes.subarray(i, chunkEnd);
strBuf.push(String.fromCharCode.apply(null, chunk));
}
+
return strBuf.join('');
}
+
function stringToBytes(str) {
assert(typeof str === 'string', 'Invalid argument for stringToBytes');
var length = str.length;
var bytes = new Uint8Array(length);
+
for (var i = 0; i < length; ++i) {
bytes[i] = str.charCodeAt(i) & 0xFF;
}
+
return bytes;
}
+
function arrayByteLength(arr) {
if (arr.length !== undefined) {
return arr.length;
}
+
assert(arr.byteLength !== undefined);
return arr.byteLength;
}
+
function arraysToBytes(arr) {
if (arr.length === 1 && arr[0] instanceof Uint8Array) {
return arr[0];
}
+
var resultLength = 0;
var i,
ii = arr.length;
var item, itemLength;
+
for (i = 0; i < ii; i++) {
item = arr[i];
itemLength = arrayByteLength(item);
resultLength += itemLength;
}
+
var pos = 0;
var data = new Uint8Array(resultLength);
+
for (i = 0; i < ii; i++) {
item = arr[i];
+
if (!(item instanceof Uint8Array)) {
if (typeof item === 'string') {
item = stringToBytes(item);
@@ -687,36 +838,46 @@ function arraysToBytes(arr) {
item = new Uint8Array(item);
}
}
+
itemLength = item.byteLength;
data.set(item, pos);
pos += itemLength;
}
+
return data;
}
+
function string32(value) {
return String.fromCharCode(value >> 24 & 0xff, value >> 16 & 0xff, value >> 8 & 0xff, value & 0xff);
}
+
function log2(x) {
if (x <= 0) {
return 0;
}
+
return Math.ceil(Math.log2(x));
}
+
function readInt8(data, start) {
return data[start] << 24 >> 24;
}
+
function readUint16(data, offset) {
return data[offset] << 8 | data[offset + 1];
}
+
function readUint32(data, offset) {
return (data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3]) >>> 0;
}
+
function isLittleEndian() {
var buffer8 = new Uint8Array(4);
buffer8[0] = 1;
var view32 = new Uint32Array(buffer8.buffer, 0, 1);
return view32[0] === 1;
}
+
function isEvalSupported() {
try {
new Function('');
@@ -725,59 +886,73 @@ function isEvalSupported() {
return false;
}
}
+
function getInheritableProperty(_ref) {
var dict = _ref.dict,
key = _ref.key,
_ref$getArray = _ref.getArray,
- getArray = _ref$getArray === undefined ? false : _ref$getArray,
+ getArray = _ref$getArray === void 0 ? false : _ref$getArray,
_ref$stopWhenFound = _ref.stopWhenFound,
- stopWhenFound = _ref$stopWhenFound === undefined ? true : _ref$stopWhenFound;
-
+ stopWhenFound = _ref$stopWhenFound === void 0 ? true : _ref$stopWhenFound;
var LOOP_LIMIT = 100;
var loopCount = 0;
- var values = void 0;
+ var values;
+
while (dict) {
var value = getArray ? dict.getArray(key) : dict.get(key);
+
if (value !== undefined) {
if (stopWhenFound) {
return value;
}
+
if (!values) {
values = [];
}
+
values.push(value);
}
+
if (++loopCount > LOOP_LIMIT) {
- warn('getInheritableProperty: maximum loop count exceeded for "' + key + '"');
+ warn("getInheritableProperty: maximum loop count exceeded for \"".concat(key, "\""));
break;
}
+
dict = dict.get('Parent');
}
+
return values;
}
+
var Util = function UtilClosure() {
function Util() {}
+
var rgbBuf = ['rgb(', 0, ',', 0, ',', 0, ')'];
+
Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
rgbBuf[1] = r;
rgbBuf[3] = g;
rgbBuf[5] = b;
return rgbBuf.join('');
};
+
Util.transform = function Util_transform(m1, m2) {
return [m1[0] * m2[0] + m1[2] * m2[1], m1[1] * m2[0] + m1[3] * m2[1], m1[0] * m2[2] + m1[2] * m2[3], m1[1] * m2[2] + m1[3] * m2[3], m1[0] * m2[4] + m1[2] * m2[5] + m1[4], m1[1] * m2[4] + m1[3] * m2[5] + m1[5]];
};
+
Util.applyTransform = function Util_applyTransform(p, m) {
var xt = p[0] * m[0] + p[1] * m[2] + m[4];
var yt = p[0] * m[1] + p[1] * m[3] + m[5];
return [xt, yt];
};
+
Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
var d = m[0] * m[3] - m[1] * m[2];
var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
return [xt, yt];
};
+
Util.getAxialAlignedBoundingBox = function Util_getAxialAlignedBoundingBox(r, m) {
var p1 = Util.applyTransform(r, m);
var p2 = Util.applyTransform(r.slice(2, 4), m);
@@ -785,13 +960,16 @@ var Util = function UtilClosure() {
var p4 = Util.applyTransform([r[2], r[1]], m);
return [Math.min(p1[0], p2[0], p3[0], p4[0]), Math.min(p1[1], p2[1], p3[1], p4[1]), Math.max(p1[0], p2[0], p3[0], p4[0]), Math.max(p1[1], p2[1], p3[1], p4[1])];
};
+
Util.inverseTransform = function Util_inverseTransform(m) {
var d = m[0] * m[3] - m[1] * m[2];
return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d, (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
};
+
Util.apply3dTransform = function Util_apply3dTransform(m, v) {
return [m[0] * v[0] + m[1] * v[1] + m[2] * v[2], m[3] * v[0] + m[4] * v[1] + m[5] * v[2], m[6] * v[0] + m[7] * v[1] + m[8] * v[2]];
};
+
Util.singularValueDecompose2dScale = function Util_singularValueDecompose2dScale(m) {
var transpose = [m[0], m[2], m[1], m[3]];
var a = m[0] * transpose[0] + m[1] * transpose[2];
@@ -804,54 +982,68 @@ var Util = function UtilClosure() {
var sy = first - second || 1;
return [Math.sqrt(sx), Math.sqrt(sy)];
};
+
Util.normalizeRect = function Util_normalizeRect(rect) {
var r = rect.slice(0);
+
if (rect[0] > rect[2]) {
r[0] = rect[2];
r[2] = rect[0];
}
+
if (rect[1] > rect[3]) {
r[1] = rect[3];
r[3] = rect[1];
}
+
return r;
};
+
Util.intersect = function Util_intersect(rect1, rect2) {
function compare(a, b) {
return a - b;
}
+
var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
result = [];
rect1 = Util.normalizeRect(rect1);
rect2 = Util.normalizeRect(rect2);
+
if (orderedX[0] === rect1[0] && orderedX[1] === rect2[0] || orderedX[0] === rect2[0] && orderedX[1] === rect1[0]) {
result[0] = orderedX[1];
result[2] = orderedX[2];
} else {
return false;
}
+
if (orderedY[0] === rect1[1] && orderedY[1] === rect2[1] || orderedY[0] === rect2[1] && orderedY[1] === rect1[1]) {
result[1] = orderedY[1];
result[3] = orderedY[2];
} else {
return false;
}
+
return result;
};
+
return Util;
}();
+
+exports.Util = Util;
var ROMAN_NUMBER_MAP = ['', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM', '', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC', '', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'];
+
function toRomanNumerals(number) {
var lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
assert(Number.isInteger(number) && number > 0, 'The number should be a positive integer.');
- var pos = void 0,
+ var pos,
romanBuf = [];
+
while (number >= 1000) {
number -= 1000;
romanBuf.push('M');
}
+
pos = number / 100 | 0;
number %= 100;
romanBuf.push(ROMAN_NUMBER_MAP[pos]);
@@ -862,11 +1054,14 @@ function toRomanNumerals(number) {
var romanStr = romanBuf.join('');
return lowerCase ? romanStr.toLowerCase() : romanStr;
}
+
var PDFStringTranslateTable = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014, 0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C, 0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160, 0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC];
+
function stringToPDFString(str) {
var i,
n = str.length,
strBuf = [];
+
if (str[0] === '\xFE' && str[1] === '\xFF') {
for (i = 2; i < n; i += 2) {
strBuf.push(String.fromCharCode(str.charCodeAt(i) << 8 | str.charCodeAt(i + 1)));
@@ -877,35 +1072,46 @@ function stringToPDFString(str) {
strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
}
}
+
return strBuf.join('');
}
+
function stringToUTF8String(str) {
return decodeURIComponent(escape(str));
}
+
function utf8StringToString(str) {
return unescape(encodeURIComponent(str));
}
+
function isEmptyObj(obj) {
for (var key in obj) {
return false;
}
+
return true;
}
+
function isBool(v) {
return typeof v === 'boolean';
}
+
function isNum(v) {
return typeof v === 'number';
}
+
function isString(v) {
return typeof v === 'string';
}
+
function isArrayBuffer(v) {
- return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' && v !== null && v.byteLength !== undefined;
+ return _typeof(v) === 'object' && v !== null && v.byteLength !== undefined;
}
+
function isSpace(ch) {
return ch === 0x20 || ch === 0x09 || ch === 0x0D || ch === 0x0A;
}
+
function createPromiseCapability() {
var capability = {};
capability.promise = new Promise(function (resolve, reject) {
@@ -914,16 +1120,21 @@ function createPromiseCapability() {
});
return capability;
}
+
var createObjectURL = function createObjectURLClosure() {
var digits = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
return function createObjectURL(data, contentType) {
var forceDataSchema = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
if (!forceDataSchema && _url_polyfill.URL.createObjectURL) {
- var blob = new Blob([data], { type: contentType });
+ var blob = new Blob([data], {
+ type: contentType
+ });
return _url_polyfill.URL.createObjectURL(blob);
}
+
var buffer = 'data:' + contentType + ';base64,';
+
for (var i = 0, ii = data.length; i < ii; i += 3) {
var b1 = data[i] & 0xFF;
var b2 = data[i + 1] & 0xFF;
@@ -934,74 +1145,12 @@ var createObjectURL = function createObjectURLClosure() {
var d4 = i + 2 < ii ? b3 & 0x3F : 64;
buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
}
+
return buffer;
};
}();
-exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
-exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
-exports.OPS = OPS;
-exports.VerbosityLevel = VerbosityLevel;
-exports.UNSUPPORTED_FEATURES = UNSUPPORTED_FEATURES;
-exports.AnnotationBorderStyleType = AnnotationBorderStyleType;
-exports.AnnotationFieldFlag = AnnotationFieldFlag;
-exports.AnnotationFlag = AnnotationFlag;
-exports.AnnotationType = AnnotationType;
-exports.FontType = FontType;
-exports.ImageKind = ImageKind;
-exports.CMapCompressionType = CMapCompressionType;
-exports.AbortException = AbortException;
-exports.InvalidPDFException = InvalidPDFException;
-exports.MissingDataException = MissingDataException;
-exports.MissingPDFException = MissingPDFException;
-exports.NativeImageDecoding = NativeImageDecoding;
-exports.PasswordException = PasswordException;
-exports.PasswordResponses = PasswordResponses;
-exports.PermissionFlag = PermissionFlag;
-exports.StreamType = StreamType;
-exports.TextRenderingMode = TextRenderingMode;
-exports.UnexpectedResponseException = UnexpectedResponseException;
-exports.UnknownErrorException = UnknownErrorException;
-exports.Util = Util;
-exports.toRomanNumerals = toRomanNumerals;
-exports.XRefParseException = XRefParseException;
-exports.FormatError = FormatError;
-exports.arrayByteLength = arrayByteLength;
-exports.arraysToBytes = arraysToBytes;
-exports.assert = assert;
-exports.bytesToString = bytesToString;
-exports.createPromiseCapability = createPromiseCapability;
+
exports.createObjectURL = createObjectURL;
-exports.deprecated = deprecated;
-exports.getInheritableProperty = getInheritableProperty;
-exports.getLookupTableFactory = getLookupTableFactory;
-exports.getVerbosityLevel = getVerbosityLevel;
-exports.info = info;
-exports.isArrayBuffer = isArrayBuffer;
-exports.isBool = isBool;
-exports.isEmptyObj = isEmptyObj;
-exports.isNum = isNum;
-exports.isString = isString;
-exports.isSpace = isSpace;
-exports.isSameOrigin = isSameOrigin;
-exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
-exports.isLittleEndian = isLittleEndian;
-exports.isEvalSupported = isEvalSupported;
-exports.log2 = log2;
-exports.readInt8 = readInt8;
-exports.readUint16 = readUint16;
-exports.readUint32 = readUint32;
-exports.removeNullCharacters = removeNullCharacters;
-exports.ReadableStream = _streams_polyfill.ReadableStream;
-exports.URL = _url_polyfill.URL;
-exports.setVerbosityLevel = setVerbosityLevel;
-exports.shadow = shadow;
-exports.string32 = string32;
-exports.stringToBytes = stringToBytes;
-exports.stringToPDFString = stringToPDFString;
-exports.stringToUTF8String = stringToUTF8String;
-exports.utf8StringToString = utf8StringToString;
-exports.warn = warn;
-exports.unreachable = unreachable;
/***/ }),
/* 2 */
@@ -1010,152 +1159,196 @@ exports.unreachable = unreachable;
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var globalScope = __w_pdfjs_require__(3);
+
if (!globalScope._pdfjsCompatibilityChecked) {
globalScope._pdfjsCompatibilityChecked = true;
+
var isNodeJS = __w_pdfjs_require__(4);
- var hasDOM = (typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && (typeof document === 'undefined' ? 'undefined' : _typeof(document)) === 'object';
+
+ var hasDOM = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object' && (typeof document === "undefined" ? "undefined" : _typeof(document)) === 'object';
+
(function checkNodeBtoa() {
if (globalScope.btoa || !isNodeJS()) {
return;
}
+
globalScope.btoa = function (chars) {
return Buffer.from(chars, 'binary').toString('base64');
};
})();
+
(function checkNodeAtob() {
if (globalScope.atob || !isNodeJS()) {
return;
}
+
globalScope.atob = function (input) {
return Buffer.from(input, 'base64').toString('binary');
};
})();
+
(function checkCurrentScript() {
if (!hasDOM) {
return;
}
+
if ('currentScript' in document) {
return;
}
+
Object.defineProperty(document, 'currentScript', {
get: function get() {
var scripts = document.getElementsByTagName('script');
return scripts[scripts.length - 1];
},
-
enumerable: true,
configurable: true
});
})();
+
(function checkChildNodeRemove() {
if (!hasDOM) {
return;
}
+
if (typeof Element.prototype.remove !== 'undefined') {
return;
}
+
Element.prototype.remove = function () {
if (this.parentNode) {
this.parentNode.removeChild(this);
}
};
})();
+
(function checkDOMTokenListToggle() {
if (!hasDOM || isNodeJS()) {
return;
}
+
var div = document.createElement('div');
+
if (div.classList.toggle('test', 0) === false) {
return;
}
+
var originalDOMTokenListToggle = DOMTokenList.prototype.toggle;
+
DOMTokenList.prototype.toggle = function (token) {
if (arguments.length > 1) {
var force = !!arguments[1];
return this[force ? 'add' : 'remove'](token), force;
}
+
return originalDOMTokenListToggle(token);
};
})();
+
(function checkStringIncludes() {
if (String.prototype.includes) {
return;
}
+
__w_pdfjs_require__(5);
})();
+
(function checkArrayIncludes() {
if (Array.prototype.includes) {
return;
}
+
__w_pdfjs_require__(33);
})();
+
(function checkObjectAssign() {
if (Object.assign) {
return;
}
+
__w_pdfjs_require__(42);
})();
+
(function checkMathLog2() {
if (Math.log2) {
return;
}
+
Math.log2 = __w_pdfjs_require__(52);
})();
+
(function checkNumberIsNaN() {
if (Number.isNaN) {
return;
}
+
Number.isNaN = __w_pdfjs_require__(54);
})();
+
(function checkNumberIsInteger() {
if (Number.isInteger) {
return;
}
+
Number.isInteger = __w_pdfjs_require__(56);
})();
+
(function checkPromise() {
if (globalScope.Promise) {
return;
}
+
globalScope.Promise = __w_pdfjs_require__(59);
})();
+
(function checkWeakMap() {
if (globalScope.WeakMap) {
return;
}
+
globalScope.WeakMap = __w_pdfjs_require__(94);
})();
+
(function checkWeakSet() {
if (globalScope.WeakSet) {
return;
}
+
globalScope.WeakSet = __w_pdfjs_require__(111);
})();
+
(function checkStringCodePointAt() {
if (String.codePointAt) {
return;
}
+
String.codePointAt = __w_pdfjs_require__(115);
})();
+
(function checkStringFromCodePoint() {
if (String.fromCodePoint) {
return;
}
+
String.fromCodePoint = __w_pdfjs_require__(117);
})();
+
(function checkSymbol() {
if (globalScope.Symbol) {
return;
}
+
__w_pdfjs_require__(119);
})();
+
(function checkObjectValues() {
if (Object.values) {
return;
}
+
Object.values = __w_pdfjs_require__(126);
})();
}
@@ -1176,10 +1369,10 @@ module.exports = typeof window !== 'undefined' && window.Math === Math ? window
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
module.exports = function isNodeJS() {
- return (typeof process === 'undefined' ? 'undefined' : _typeof(process)) === 'object' && process + '' === '[object process]';
+ return (typeof process === "undefined" ? "undefined" : _typeof(process)) === 'object' && process + '' === '[object process]' && !process.versions['nw'];
};
/***/ }),
@@ -1190,6 +1383,7 @@ module.exports = function isNodeJS() {
__w_pdfjs_require__(6);
+
module.exports = __w_pdfjs_require__(9).String.includes;
/***/ }),
@@ -1200,7 +1394,9 @@ module.exports = __w_pdfjs_require__(9).String.includes;
var $export = __w_pdfjs_require__(7);
+
var context = __w_pdfjs_require__(25);
+
var INCLUDES = 'includes';
$export($export.P + $export.F * __w_pdfjs_require__(32)(INCLUDES), 'String', {
includes: function includes(searchString) {
@@ -1216,11 +1412,17 @@ $export($export.P + $export.F * __w_pdfjs_require__(32)(INCLUDES), 'String', {
var global = __w_pdfjs_require__(8);
+
var core = __w_pdfjs_require__(9);
+
var hide = __w_pdfjs_require__(10);
+
var redefine = __w_pdfjs_require__(20);
+
var ctx = __w_pdfjs_require__(23);
+
var PROTOTYPE = 'prototype';
+
var $export = function $export(type, name, source) {
var IS_FORCED = type & $export.F;
var IS_GLOBAL = type & $export.G;
@@ -1232,6 +1434,7 @@ var $export = function $export(type, name, source) {
var expProto = exports[PROTOTYPE] || (exports[PROTOTYPE] = {});
var key, own, out, exp;
if (IS_GLOBAL) source = name;
+
for (key in source) {
own = !IS_FORCED && target && target[key] !== undefined;
out = (own ? target : source)[key];
@@ -1241,6 +1444,7 @@ var $export = function $export(type, name, source) {
if (IS_PROTO && expProto[key] != out) expProto[key] = out;
}
};
+
global.core = core;
$export.F = 1;
$export.G = 2;
@@ -1269,7 +1473,9 @@ if (typeof __g == 'number') __g = global;
"use strict";
-var core = module.exports = { version: '2.5.7' };
+var core = module.exports = {
+ version: '2.6.1'
+};
if (typeof __e == 'number') __e = core;
/***/ }),
@@ -1280,7 +1486,9 @@ if (typeof __e == 'number') __e = core;
var dP = __w_pdfjs_require__(11);
+
var createDesc = __w_pdfjs_require__(19);
+
module.exports = __w_pdfjs_require__(15) ? function (object, key, value) {
return dP.f(object, key, createDesc(1, value));
} : function (object, key, value) {
@@ -1296,8 +1504,11 @@ module.exports = __w_pdfjs_require__(15) ? function (object, key, value) {
var anObject = __w_pdfjs_require__(12);
+
var IE8_DOM_DEFINE = __w_pdfjs_require__(14);
+
var toPrimitive = __w_pdfjs_require__(18);
+
var dP = Object.defineProperty;
exports.f = __w_pdfjs_require__(15) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
@@ -1319,6 +1530,7 @@ exports.f = __w_pdfjs_require__(15) ? Object.defineProperty : function definePro
var isObject = __w_pdfjs_require__(13);
+
module.exports = function (it) {
if (!isObject(it)) throw TypeError(it + ' is not an object!');
return it;
@@ -1331,10 +1543,10 @@ module.exports = function (it) {
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
module.exports = function (it) {
- return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) === 'object' ? it !== null : typeof it === 'function';
+ return _typeof(it) === 'object' ? it !== null : typeof it === 'function';
};
/***/ }),
@@ -1390,8 +1602,11 @@ module.exports = function (exec) {
var isObject = __w_pdfjs_require__(13);
+
var document = __w_pdfjs_require__(8).document;
+
var is = isObject(document) && isObject(document.createElement);
+
module.exports = function (it) {
return is ? document.createElement(it) : {};
};
@@ -1404,6 +1619,7 @@ module.exports = function (it) {
var isObject = __w_pdfjs_require__(13);
+
module.exports = function (it, S) {
if (!isObject(it)) return it;
var fn, val;
@@ -1437,20 +1653,27 @@ module.exports = function (bitmap, value) {
var global = __w_pdfjs_require__(8);
+
var hide = __w_pdfjs_require__(10);
+
var has = __w_pdfjs_require__(21);
+
var SRC = __w_pdfjs_require__(22)('src');
+
var TO_STRING = 'toString';
var $toString = Function[TO_STRING];
var TPL = ('' + $toString).split(TO_STRING);
+
__w_pdfjs_require__(9).inspectSource = function (it) {
return $toString.call(it);
};
+
(module.exports = function (O, key, val, safe) {
var isFunction = typeof val == 'function';
if (isFunction) has(val, 'name') || hide(val, 'name', key);
if (O[key] === val) return;
if (isFunction) has(val, SRC) || hide(val, SRC, O[key] ? '' + O[key] : TPL.join(String(key)));
+
if (O === global) {
O[key] = val;
} else if (!safe) {
@@ -1473,6 +1696,7 @@ __w_pdfjs_require__(9).inspectSource = function (it) {
var hasOwnProperty = {}.hasOwnProperty;
+
module.exports = function (it, key) {
return hasOwnProperty.call(it, key);
};
@@ -1486,6 +1710,7 @@ module.exports = function (it, key) {
var id = 0;
var px = Math.random();
+
module.exports = function (key) {
return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
};
@@ -1498,23 +1723,28 @@ module.exports = function (key) {
var aFunction = __w_pdfjs_require__(24);
+
module.exports = function (fn, that, length) {
aFunction(fn);
if (that === undefined) return fn;
+
switch (length) {
case 1:
return function (a) {
return fn.call(that, a);
};
+
case 2:
return function (a, b) {
return fn.call(that, a, b);
};
+
case 3:
return function (a, b, c) {
return fn.call(that, a, b, c);
};
}
+
return function () {
return fn.apply(that, arguments);
};
@@ -1540,7 +1770,9 @@ module.exports = function (it) {
var isRegExp = __w_pdfjs_require__(26);
+
var defined = __w_pdfjs_require__(31);
+
module.exports = function (that, searchString, NAME) {
if (isRegExp(searchString)) throw TypeError('String#' + NAME + " doesn't accept regex!");
return String(defined(that));
@@ -1554,8 +1786,11 @@ module.exports = function (that, searchString, NAME) {
var isObject = __w_pdfjs_require__(13);
+
var cof = __w_pdfjs_require__(27);
+
var MATCH = __w_pdfjs_require__(28)('match');
+
module.exports = function (it) {
var isRegExp;
return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : cof(it) == 'RegExp');
@@ -1569,6 +1804,7 @@ module.exports = function (it) {
var toString = {}.toString;
+
module.exports = function (it) {
return toString.call(it).slice(8, -1);
};
@@ -1581,12 +1817,17 @@ module.exports = function (it) {
var store = __w_pdfjs_require__(29)('wks');
+
var uid = __w_pdfjs_require__(22);
+
var _Symbol = __w_pdfjs_require__(8).Symbol;
+
var USE_SYMBOL = typeof _Symbol == 'function';
+
var $exports = module.exports = function (name) {
return store[name] || (store[name] = USE_SYMBOL && _Symbol[name] || (USE_SYMBOL ? _Symbol : uid)('Symbol.' + name));
};
+
$exports.store = store;
/***/ }),
@@ -1597,7 +1838,9 @@ $exports.store = store;
var core = __w_pdfjs_require__(9);
+
var global = __w_pdfjs_require__(8);
+
var SHARED = '__core-js_shared__';
var store = global[SHARED] || (global[SHARED] = {});
(module.exports = function (key, value) {
@@ -1637,8 +1880,10 @@ module.exports = function (it) {
var MATCH = __w_pdfjs_require__(28)('match');
+
module.exports = function (KEY) {
var re = /./;
+
try {
'/./'[KEY](re);
} catch (e) {
@@ -1647,6 +1892,7 @@ module.exports = function (KEY) {
return !'/./'[KEY](re);
} catch (f) {}
}
+
return true;
};
@@ -1658,6 +1904,7 @@ module.exports = function (KEY) {
__w_pdfjs_require__(34);
+
module.exports = __w_pdfjs_require__(9).Array.includes;
/***/ }),
@@ -1668,12 +1915,15 @@ module.exports = __w_pdfjs_require__(9).Array.includes;
var $export = __w_pdfjs_require__(7);
+
var $includes = __w_pdfjs_require__(35)(true);
+
$export($export.P, 'Array', {
includes: function includes(el) {
return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
}
});
+
__w_pdfjs_require__(41)('includes');
/***/ }),
@@ -1684,8 +1934,11 @@ __w_pdfjs_require__(41)('includes');
var toIObject = __w_pdfjs_require__(36);
+
var toLength = __w_pdfjs_require__(38);
+
var toAbsoluteIndex = __w_pdfjs_require__(40);
+
module.exports = function (IS_INCLUDES) {
return function ($this, el, fromIndex) {
var O = toIObject($this);
@@ -1699,7 +1952,8 @@ module.exports = function (IS_INCLUDES) {
if (IS_INCLUDES || index in O) {
if (O[index] === el) return IS_INCLUDES || index || 0;
}
- }return !IS_INCLUDES && -1;
+ }
+ return !IS_INCLUDES && -1;
};
};
@@ -1711,7 +1965,9 @@ module.exports = function (IS_INCLUDES) {
var IObject = __w_pdfjs_require__(37);
+
var defined = __w_pdfjs_require__(31);
+
module.exports = function (it) {
return IObject(defined(it));
};
@@ -1724,6 +1980,7 @@ module.exports = function (it) {
var cof = __w_pdfjs_require__(27);
+
module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
return cof(it) == 'String' ? it.split('') : Object(it);
};
@@ -1736,7 +1993,9 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
var toInteger = __w_pdfjs_require__(39);
+
var min = Math.min;
+
module.exports = function (it) {
return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0;
};
@@ -1750,6 +2009,7 @@ module.exports = function (it) {
var ceil = Math.ceil;
var floor = Math.floor;
+
module.exports = function (it) {
return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
};
@@ -1762,8 +2022,10 @@ module.exports = function (it) {
var toInteger = __w_pdfjs_require__(39);
+
var max = Math.max;
var min = Math.min;
+
module.exports = function (index, length) {
index = toInteger(index);
return index < 0 ? max(index + length, 0) : min(index, length);
@@ -1777,8 +2039,10 @@ module.exports = function (index, length) {
var UNSCOPABLES = __w_pdfjs_require__(28)('unscopables');
+
var ArrayProto = Array.prototype;
if (ArrayProto[UNSCOPABLES] == undefined) __w_pdfjs_require__(10)(ArrayProto, UNSCOPABLES, {});
+
module.exports = function (key) {
ArrayProto[UNSCOPABLES][key] = true;
};
@@ -1791,6 +2055,7 @@ module.exports = function (key) {
__w_pdfjs_require__(43);
+
module.exports = __w_pdfjs_require__(9).Object.assign;
/***/ }),
@@ -1801,7 +2066,10 @@ module.exports = __w_pdfjs_require__(9).Object.assign;
var $export = __w_pdfjs_require__(7);
-$export($export.S + $export.F, 'Object', { assign: __w_pdfjs_require__(44) });
+
+$export($export.S + $export.F, 'Object', {
+ assign: __w_pdfjs_require__(44)
+});
/***/ }),
/* 44 */
@@ -1811,10 +2079,15 @@ $export($export.S + $export.F, 'Object', { assign: __w_pdfjs_require__(44) });
var getKeys = __w_pdfjs_require__(45);
+
var gOPS = __w_pdfjs_require__(49);
+
var pIE = __w_pdfjs_require__(50);
+
var toObject = __w_pdfjs_require__(51);
+
var IObject = __w_pdfjs_require__(37);
+
var $assign = Object.assign;
module.exports = !$assign || __w_pdfjs_require__(16)(function () {
var A = {};
@@ -1832,16 +2105,19 @@ module.exports = !$assign || __w_pdfjs_require__(16)(function () {
var index = 1;
var getSymbols = gOPS.f;
var isEnum = pIE.f;
+
while (aLen > index) {
var S = IObject(arguments[index++]);
var keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S);
var length = keys.length;
var j = 0;
var key;
+
while (length > j) {
if (isEnum.call(S, key = keys[j++])) T[key] = S[key];
}
}
+
return T;
} : $assign;
@@ -1853,7 +2129,9 @@ module.exports = !$assign || __w_pdfjs_require__(16)(function () {
var $keys = __w_pdfjs_require__(46);
+
var enumBugKeys = __w_pdfjs_require__(48);
+
module.exports = Object.keys || function keys(O) {
return $keys(O, enumBugKeys);
};
@@ -1866,21 +2144,30 @@ module.exports = Object.keys || function keys(O) {
var has = __w_pdfjs_require__(21);
+
var toIObject = __w_pdfjs_require__(36);
+
var arrayIndexOf = __w_pdfjs_require__(35)(false);
+
var IE_PROTO = __w_pdfjs_require__(47)('IE_PROTO');
+
module.exports = function (object, names) {
var O = toIObject(object);
var i = 0;
var result = [];
var key;
+
for (key in O) {
if (key != IE_PROTO) has(O, key) && result.push(key);
- }while (names.length > i) {
+ }
+
+ while (names.length > i) {
if (has(O, key = names[i++])) {
~arrayIndexOf(result, key) || result.push(key);
}
- }return result;
+ }
+
+ return result;
};
/***/ }),
@@ -1891,7 +2178,9 @@ module.exports = function (object, names) {
var shared = __w_pdfjs_require__(29)('keys');
+
var uid = __w_pdfjs_require__(22);
+
module.exports = function (key) {
return shared[key] || (shared[key] = uid(key));
};
@@ -1931,6 +2220,7 @@ exports.f = {}.propertyIsEnumerable;
var defined = __w_pdfjs_require__(31);
+
module.exports = function (it) {
return Object(defined(it));
};
@@ -1943,6 +2233,7 @@ module.exports = function (it) {
__w_pdfjs_require__(53);
+
module.exports = __w_pdfjs_require__(9).Math.log2;
/***/ }),
@@ -1953,6 +2244,7 @@ module.exports = __w_pdfjs_require__(9).Math.log2;
var $export = __w_pdfjs_require__(7);
+
$export($export.S, 'Math', {
log2: function log2(x) {
return Math.log(x) / Math.LN2;
@@ -1967,6 +2259,7 @@ $export($export.S, 'Math', {
__w_pdfjs_require__(55);
+
module.exports = __w_pdfjs_require__(9).Number.isNaN;
/***/ }),
@@ -1977,6 +2270,7 @@ module.exports = __w_pdfjs_require__(9).Number.isNaN;
var $export = __w_pdfjs_require__(7);
+
$export($export.S, 'Number', {
isNaN: function isNaN(number) {
return number != number;
@@ -1991,6 +2285,7 @@ $export($export.S, 'Number', {
__w_pdfjs_require__(57);
+
module.exports = __w_pdfjs_require__(9).Number.isInteger;
/***/ }),
@@ -2001,7 +2296,10 @@ module.exports = __w_pdfjs_require__(9).Number.isInteger;
var $export = __w_pdfjs_require__(7);
-$export($export.S, 'Number', { isInteger: __w_pdfjs_require__(58) });
+
+$export($export.S, 'Number', {
+ isInteger: __w_pdfjs_require__(58)
+});
/***/ }),
/* 58 */
@@ -2011,7 +2309,9 @@ $export($export.S, 'Number', { isInteger: __w_pdfjs_require__(58) });
var isObject = __w_pdfjs_require__(13);
+
var floor = Math.floor;
+
module.exports = function isInteger(it) {
return !isObject(it) && isFinite(it) && floor(it) === it;
};
@@ -2024,11 +2324,17 @@ module.exports = function isInteger(it) {
__w_pdfjs_require__(60);
+
__w_pdfjs_require__(62);
+
__w_pdfjs_require__(72);
+
__w_pdfjs_require__(75);
+
__w_pdfjs_require__(92);
+
__w_pdfjs_require__(93);
+
module.exports = __w_pdfjs_require__(9).Promise;
/***/ }),
@@ -2039,8 +2345,10 @@ module.exports = __w_pdfjs_require__(9).Promise;
var classof = __w_pdfjs_require__(61);
+
var test = {};
test[__w_pdfjs_require__(28)('toStringTag')] = 'z';
+
if (test + '' != '[object z]') {
__w_pdfjs_require__(20)(Object.prototype, 'toString', function toString() {
return '[object ' + classof(this) + ']';
@@ -2055,15 +2363,19 @@ if (test + '' != '[object z]') {
var cof = __w_pdfjs_require__(27);
+
var TAG = __w_pdfjs_require__(28)('toStringTag');
+
var ARG = cof(function () {
return arguments;
}()) == 'Arguments';
+
var tryGet = function tryGet(it, key) {
try {
return it[key];
} catch (e) {}
};
+
module.exports = function (it) {
var O, T, B;
return it === undefined ? 'Undefined' : it === null ? 'Null' : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T : ARG ? cof(O) : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
@@ -2077,6 +2389,7 @@ module.exports = function (it) {
var $at = __w_pdfjs_require__(63)(true);
+
__w_pdfjs_require__(64)(String, 'String', function (iterated) {
this._t = String(iterated);
this._i = 0;
@@ -2104,7 +2417,9 @@ __w_pdfjs_require__(64)(String, 'String', function (iterated) {
var toInteger = __w_pdfjs_require__(39);
+
var defined = __w_pdfjs_require__(31);
+
module.exports = function (TO_STRING) {
return function (that, pos) {
var s = String(defined(that));
@@ -2125,39 +2440,55 @@ module.exports = function (TO_STRING) {
var LIBRARY = __w_pdfjs_require__(30);
+
var $export = __w_pdfjs_require__(7);
+
var redefine = __w_pdfjs_require__(20);
+
var hide = __w_pdfjs_require__(10);
+
var Iterators = __w_pdfjs_require__(65);
+
var $iterCreate = __w_pdfjs_require__(66);
+
var setToStringTag = __w_pdfjs_require__(70);
+
var getPrototypeOf = __w_pdfjs_require__(71);
+
var ITERATOR = __w_pdfjs_require__(28)('iterator');
+
var BUGGY = !([].keys && 'next' in [].keys());
var FF_ITERATOR = '@@iterator';
var KEYS = 'keys';
var VALUES = 'values';
+
var returnThis = function returnThis() {
return this;
};
+
module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
$iterCreate(Constructor, NAME, next);
+
var getMethod = function getMethod(kind) {
if (!BUGGY && kind in proto) return proto[kind];
+
switch (kind) {
case KEYS:
return function keys() {
return new Constructor(this, kind);
};
+
case VALUES:
return function values() {
return new Constructor(this, kind);
};
}
+
return function entries() {
return new Constructor(this, kind);
};
};
+
var TAG = NAME + ' Iterator';
var DEF_VALUES = DEFAULT == VALUES;
var VALUES_BUG = false;
@@ -2167,24 +2498,31 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
var methods, key, IteratorPrototype;
+
if ($anyNative) {
IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
+
if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
setToStringTag(IteratorPrototype, TAG, true);
if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
}
}
+
if (DEF_VALUES && $native && $native.name !== VALUES) {
VALUES_BUG = true;
+
$default = function values() {
return $native.call(this);
};
}
+
if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
hide(proto, ITERATOR, $default);
}
+
Iterators[NAME] = $default;
Iterators[TAG] = returnThis;
+
if (DEFAULT) {
methods = {
values: DEF_VALUES ? $default : getMethod(VALUES),
@@ -2195,6 +2533,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
if (!(key in proto)) redefine(proto, key, methods[key]);
} else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
}
+
return methods;
};
@@ -2215,14 +2554,21 @@ module.exports = {};
var create = __w_pdfjs_require__(67);
+
var descriptor = __w_pdfjs_require__(19);
+
var setToStringTag = __w_pdfjs_require__(70);
+
var IteratorPrototype = {};
+
__w_pdfjs_require__(10)(IteratorPrototype, __w_pdfjs_require__(28)('iterator'), function () {
return this;
});
+
module.exports = function (Constructor, NAME, next) {
- Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+ Constructor.prototype = create(IteratorPrototype, {
+ next: descriptor(1, next)
+ });
setToStringTag(Constructor, NAME + ' Iterator');
};
@@ -2234,37 +2580,52 @@ module.exports = function (Constructor, NAME, next) {
var anObject = __w_pdfjs_require__(12);
+
var dPs = __w_pdfjs_require__(68);
+
var enumBugKeys = __w_pdfjs_require__(48);
+
var IE_PROTO = __w_pdfjs_require__(47)('IE_PROTO');
+
var Empty = function Empty() {};
+
var PROTOTYPE = 'prototype';
+
var _createDict = function createDict() {
var iframe = __w_pdfjs_require__(17)('iframe');
+
var i = enumBugKeys.length;
var lt = '<';
var gt = '>';
var iframeDocument;
iframe.style.display = 'none';
+
__w_pdfjs_require__(69).appendChild(iframe);
+
iframe.src = 'javascript:';
iframeDocument = iframe.contentWindow.document;
iframeDocument.open();
iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
iframeDocument.close();
_createDict = iframeDocument.F;
+
while (i--) {
delete _createDict[PROTOTYPE][enumBugKeys[i]];
- }return _createDict();
+ }
+
+ return _createDict();
};
+
module.exports = Object.create || function create(O, Properties) {
var result;
+
if (O !== null) {
Empty[PROTOTYPE] = anObject(O);
result = new Empty();
Empty[PROTOTYPE] = null;
result[IE_PROTO] = O;
} else result = _createDict();
+
return Properties === undefined ? result : dPs(result, Properties);
};
@@ -2276,17 +2637,23 @@ module.exports = Object.create || function create(O, Properties) {
var dP = __w_pdfjs_require__(11);
+
var anObject = __w_pdfjs_require__(12);
+
var getKeys = __w_pdfjs_require__(45);
+
module.exports = __w_pdfjs_require__(15) ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = getKeys(Properties);
var length = keys.length;
var i = 0;
var P;
+
while (length > i) {
dP.f(O, P = keys[i++], Properties[P]);
- }return O;
+ }
+
+ return O;
};
/***/ }),
@@ -2297,6 +2664,7 @@ module.exports = __w_pdfjs_require__(15) ? Object.defineProperties : function de
var document = __w_pdfjs_require__(8).document;
+
module.exports = document && document.documentElement;
/***/ }),
@@ -2307,8 +2675,11 @@ module.exports = document && document.documentElement;
var def = __w_pdfjs_require__(11).f;
+
var has = __w_pdfjs_require__(21);
+
var TAG = __w_pdfjs_require__(28)('toStringTag');
+
module.exports = function (it, tag, stat) {
if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, {
configurable: true,
@@ -2324,15 +2695,21 @@ module.exports = function (it, tag, stat) {
var has = __w_pdfjs_require__(21);
+
var toObject = __w_pdfjs_require__(51);
+
var IE_PROTO = __w_pdfjs_require__(47)('IE_PROTO');
+
var ObjectProto = Object.prototype;
+
module.exports = Object.getPrototypeOf || function (O) {
O = toObject(O);
if (has(O, IE_PROTO)) return O[IE_PROTO];
+
if (typeof O.constructor == 'function' && O instanceof O.constructor) {
return O.constructor.prototype;
}
+
return O instanceof Object ? ObjectProto : null;
};
@@ -2344,12 +2721,19 @@ module.exports = Object.getPrototypeOf || function (O) {
var $iterators = __w_pdfjs_require__(73);
+
var getKeys = __w_pdfjs_require__(45);
+
var redefine = __w_pdfjs_require__(20);
+
var global = __w_pdfjs_require__(8);
+
var hide = __w_pdfjs_require__(10);
+
var Iterators = __w_pdfjs_require__(65);
+
var wks = __w_pdfjs_require__(28);
+
var ITERATOR = wks('iterator');
var TO_STRING_TAG = wks('toStringTag');
var ArrayValues = Iterators.Array;
@@ -2386,12 +2770,14 @@ var DOMIterables = {
TextTrackList: false,
TouchList: false
};
+
for (var collections = getKeys(DOMIterables), i = 0; i < collections.length; i++) {
var NAME = collections[i];
var explicit = DOMIterables[NAME];
var Collection = global[NAME];
var proto = Collection && Collection.prototype;
var key;
+
if (proto) {
if (!proto[ITERATOR]) hide(proto, ITERATOR, ArrayValues);
if (!proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
@@ -2410,9 +2796,13 @@ for (var collections = getKeys(DOMIterables), i = 0; i < collections.length; i++
var addToUnscopables = __w_pdfjs_require__(41);
+
var step = __w_pdfjs_require__(74);
+
var Iterators = __w_pdfjs_require__(65);
+
var toIObject = __w_pdfjs_require__(36);
+
module.exports = __w_pdfjs_require__(64)(Array, 'Array', function (iterated, kind) {
this._t = toIObject(iterated);
this._i = 0;
@@ -2421,10 +2811,12 @@ module.exports = __w_pdfjs_require__(64)(Array, 'Array', function (iterated, kin
var O = this._t;
var kind = this._k;
var index = this._i++;
+
if (!O || index >= O.length) {
this._t = undefined;
return step(1);
}
+
if (kind == 'keys') return step(0, index);
if (kind == 'values') return step(0, O[index]);
return step(0, [index, O[index]]);
@@ -2456,21 +2848,37 @@ module.exports = function (done, value) {
var LIBRARY = __w_pdfjs_require__(30);
+
var global = __w_pdfjs_require__(8);
+
var ctx = __w_pdfjs_require__(23);
+
var classof = __w_pdfjs_require__(61);
+
var $export = __w_pdfjs_require__(7);
+
var isObject = __w_pdfjs_require__(13);
+
var aFunction = __w_pdfjs_require__(24);
+
var anInstance = __w_pdfjs_require__(76);
+
var forOf = __w_pdfjs_require__(77);
+
var speciesConstructor = __w_pdfjs_require__(81);
+
var task = __w_pdfjs_require__(82).set;
+
var microtask = __w_pdfjs_require__(84)();
+
var newPromiseCapabilityModule = __w_pdfjs_require__(85);
+
var perform = __w_pdfjs_require__(86);
+
var userAgent = __w_pdfjs_require__(87);
+
var promiseResolve = __w_pdfjs_require__(88);
+
var PROMISE = 'Promise';
var TypeError = global.TypeError;
var process = global.process;
@@ -2478,22 +2886,28 @@ var versions = process && process.versions;
var v8 = versions && versions.v8 || '';
var $Promise = global[PROMISE];
var isNode = classof(process) == 'process';
+
var empty = function empty() {};
+
var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
var USE_NATIVE = !!function () {
try {
var promise = $Promise.resolve(1);
+
var FakePromise = (promise.constructor = {})[__w_pdfjs_require__(28)('species')] = function (exec) {
exec(empty, empty);
};
+
return (isNode || typeof PromiseRejectionEvent == 'function') && promise.then(empty) instanceof FakePromise && v8.indexOf('6.6') !== 0 && userAgent.indexOf('Chrome/66') === -1;
} catch (e) {}
}();
+
var isThenable = function isThenable(it) {
var then;
return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
};
+
var notify = function notify(promise, isReject) {
if (promise._n) return;
promise._n = true;
@@ -2502,26 +2916,31 @@ var notify = function notify(promise, isReject) {
var value = promise._v;
var ok = promise._s == 1;
var i = 0;
+
var run = function run(reaction) {
var handler = ok ? reaction.ok : reaction.fail;
var resolve = reaction.resolve;
var reject = reaction.reject;
var domain = reaction.domain;
var result, then, exited;
+
try {
if (handler) {
if (!ok) {
if (promise._h == 2) onHandleUnhandled(promise);
promise._h = 1;
}
+
if (handler === true) result = value;else {
if (domain) domain.enter();
result = handler(value);
+
if (domain) {
domain.exit();
exited = true;
}
}
+
if (result === reaction.promise) {
reject(TypeError('Promise-chain cycle'));
} else if (then = isThenable(result)) {
@@ -2533,18 +2952,23 @@ var notify = function notify(promise, isReject) {
reject(e);
}
};
+
while (chain.length > i) {
run(chain[i++]);
- }promise._c = [];
+ }
+
+ promise._c = [];
promise._n = false;
if (isReject && !promise._h) onUnhandled(promise);
});
};
+
var onUnhandled = function onUnhandled(promise) {
task.call(global, function () {
var value = promise._v;
var unhandled = isUnhandled(promise);
var result, handler, console;
+
if (unhandled) {
result = perform(function () {
if (isNode) {
@@ -2560,16 +2984,20 @@ var onUnhandled = function onUnhandled(promise) {
});
promise._h = isNode || isUnhandled(promise) ? 2 : 1;
}
+
promise._a = undefined;
if (unhandled && result.e) throw result.v;
});
};
+
var isUnhandled = function isUnhandled(promise) {
return promise._h !== 1 && (promise._a || promise._c).length === 0;
};
+
var onHandleUnhandled = function onHandleUnhandled(promise) {
task.call(global, function () {
var handler;
+
if (isNode) {
process.emit('rejectionHandled', promise);
} else if (handler = global.onrejectionhandled) {
@@ -2580,6 +3008,7 @@ var onHandleUnhandled = function onHandleUnhandled(promise) {
}
});
};
+
var $reject = function $reject(value) {
var promise = this;
if (promise._d) return;
@@ -2590,20 +3019,24 @@ var $reject = function $reject(value) {
if (!promise._a) promise._a = promise._c.slice();
notify(promise, true);
};
+
var $resolve = function $resolve(value) {
var promise = this;
var then;
if (promise._d) return;
promise._d = true;
promise = promise._w || promise;
+
try {
if (promise === value) throw TypeError("Promise can't be resolved itself");
+
if (then = isThenable(value)) {
microtask(function () {
var wrapper = {
_w: promise,
_d: false
};
+
try {
then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
} catch (e) {
@@ -2622,17 +3055,20 @@ var $resolve = function $resolve(value) {
}, e);
}
};
+
if (!USE_NATIVE) {
$Promise = function Promise(executor) {
anInstance(this, $Promise, PROMISE, '_h');
aFunction(executor);
Internal.call(this);
+
try {
executor(ctx($resolve, this, 1), ctx($reject, this, 1));
} catch (err) {
$reject.call(this, err);
}
};
+
Internal = function Promise(executor) {
this._c = [];
this._a = undefined;
@@ -2642,13 +3078,16 @@ if (!USE_NATIVE) {
this._h = 0;
this._n = false;
};
+
Internal.prototype = __w_pdfjs_require__(89)($Promise.prototype, {
then: function then(onFulfilled, onRejected) {
var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
reaction.fail = typeof onRejected == 'function' && onRejected;
reaction.domain = isNode ? process.domain : undefined;
+
this._c.push(reaction);
+
if (this._a) this._a.push(reaction);
if (this._s) notify(this, false);
return reaction.promise;
@@ -2657,19 +3096,27 @@ if (!USE_NATIVE) {
return this.then(undefined, onRejected);
}
});
+
OwnPromiseCapability = function OwnPromiseCapability() {
var promise = new Internal();
this.promise = promise;
this.resolve = ctx($resolve, promise, 1);
this.reject = ctx($reject, promise, 1);
};
+
newPromiseCapabilityModule.f = newPromiseCapability = function newPromiseCapability(C) {
return C === $Promise || C === Wrapper ? new OwnPromiseCapability(C) : newGenericPromiseCapability(C);
};
}
-$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
+
+$export($export.G + $export.W + $export.F * !USE_NATIVE, {
+ Promise: $Promise
+});
+
__w_pdfjs_require__(70)($Promise, PROMISE);
+
__w_pdfjs_require__(90)(PROMISE);
+
Wrapper = __w_pdfjs_require__(9)[PROMISE];
$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
reject: function reject(r) {
@@ -2738,6 +3185,7 @@ module.exports = function (it, Constructor, name, forbiddenField) {
if (!(it instanceof Constructor) || forbiddenField !== undefined && forbiddenField in it) {
throw TypeError(name + ': incorrect invocation!');
}
+
return it;
};
@@ -2749,13 +3197,20 @@ module.exports = function (it, Constructor, name, forbiddenField) {
var ctx = __w_pdfjs_require__(23);
+
var call = __w_pdfjs_require__(78);
+
var isArrayIter = __w_pdfjs_require__(79);
+
var anObject = __w_pdfjs_require__(12);
+
var toLength = __w_pdfjs_require__(38);
+
var getIterFn = __w_pdfjs_require__(80);
+
var BREAK = {};
var RETURN = {};
+
var _exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
var iterFn = ITERATOR ? function () {
return iterable;
@@ -2772,6 +3227,7 @@ var _exports = module.exports = function (iterable, entries, fn, that, ITERATOR)
if (result === BREAK || result === RETURN) return result;
}
};
+
_exports.BREAK = BREAK;
_exports.RETURN = RETURN;
@@ -2783,6 +3239,7 @@ _exports.RETURN = RETURN;
var anObject = __w_pdfjs_require__(12);
+
module.exports = function (iterator, fn, value, entries) {
try {
return entries ? fn(anObject(value)[0], value[1]) : fn(value);
@@ -2801,8 +3258,11 @@ module.exports = function (iterator, fn, value, entries) {
var Iterators = __w_pdfjs_require__(65);
+
var ITERATOR = __w_pdfjs_require__(28)('iterator');
+
var ArrayProto = Array.prototype;
+
module.exports = function (it) {
return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
};
@@ -2815,8 +3275,11 @@ module.exports = function (it) {
var classof = __w_pdfjs_require__(61);
+
var ITERATOR = __w_pdfjs_require__(28)('iterator');
+
var Iterators = __w_pdfjs_require__(65);
+
module.exports = __w_pdfjs_require__(9).getIteratorMethod = function (it) {
if (it != undefined) return it[ITERATOR] || it['@@iterator'] || Iterators[classof(it)];
};
@@ -2829,8 +3292,11 @@ module.exports = __w_pdfjs_require__(9).getIteratorMethod = function (it) {
var anObject = __w_pdfjs_require__(12);
+
var aFunction = __w_pdfjs_require__(24);
+
var SPECIES = __w_pdfjs_require__(28)('species');
+
module.exports = function (O, D) {
var C = anObject(O).constructor;
var S;
@@ -2845,10 +3311,15 @@ module.exports = function (O, D) {
var ctx = __w_pdfjs_require__(23);
+
var invoke = __w_pdfjs_require__(83);
+
var html = __w_pdfjs_require__(69);
+
var cel = __w_pdfjs_require__(17);
+
var global = __w_pdfjs_require__(8);
+
var process = global.process;
var setTask = global.setImmediate;
var clearTask = global.clearImmediate;
@@ -2858,32 +3329,42 @@ var counter = 0;
var queue = {};
var ONREADYSTATECHANGE = 'onreadystatechange';
var defer, channel, port;
+
var run = function run() {
var id = +this;
+
if (queue.hasOwnProperty(id)) {
var fn = queue[id];
delete queue[id];
fn();
}
};
+
var listener = function listener(event) {
run.call(event.data);
};
+
if (!setTask || !clearTask) {
setTask = function setImmediate(fn) {
var args = [];
var i = 1;
+
while (arguments.length > i) {
args.push(arguments[i++]);
- }queue[++counter] = function () {
+ }
+
+ queue[++counter] = function () {
invoke(typeof fn == 'function' ? fn : Function(fn), args);
};
+
defer(counter);
return counter;
};
+
clearTask = function clearImmediate(id) {
delete queue[id];
};
+
if (__w_pdfjs_require__(27)(process) == 'process') {
defer = function defer(id) {
process.nextTick(ctx(run, id, 1));
@@ -2901,6 +3382,7 @@ if (!setTask || !clearTask) {
defer = function defer(id) {
global.postMessage(id + '', '*');
};
+
global.addEventListener('message', listener, false);
} else if (ONREADYSTATECHANGE in cel('script')) {
defer = function defer(id) {
@@ -2915,6 +3397,7 @@ if (!setTask || !clearTask) {
};
}
}
+
module.exports = {
set: setTask,
clear: clearTask
@@ -2929,18 +3412,24 @@ module.exports = {
module.exports = function (fn, args, that) {
var un = that === undefined;
+
switch (args.length) {
case 0:
return un ? fn() : fn.call(that);
+
case 1:
return un ? fn(args[0]) : fn.call(that, args[0]);
+
case 2:
return un ? fn(args[0], args[1]) : fn.call(that, args[0], args[1]);
+
case 3:
return un ? fn(args[0], args[1], args[2]) : fn.call(that, args[0], args[1], args[2]);
+
case 4:
return un ? fn(args[0], args[1], args[2], args[3]) : fn.call(that, args[0], args[1], args[2], args[3]);
}
+
return fn.apply(that, args);
};
@@ -2952,19 +3441,25 @@ module.exports = function (fn, args, that) {
var global = __w_pdfjs_require__(8);
+
var macrotask = __w_pdfjs_require__(82).set;
+
var Observer = global.MutationObserver || global.WebKitMutationObserver;
var process = global.process;
var Promise = global.Promise;
var isNode = __w_pdfjs_require__(27)(process) == 'process';
+
module.exports = function () {
var head, last, notify;
+
var flush = function flush() {
var parent, fn;
if (isNode && (parent = process.domain)) parent.exit();
+
while (head) {
fn = head.fn;
head = head.next;
+
try {
fn();
} catch (e) {
@@ -2972,9 +3467,11 @@ module.exports = function () {
throw e;
}
}
+
last = undefined;
if (parent) parent.enter();
};
+
if (isNode) {
notify = function notify() {
process.nextTick(flush);
@@ -2982,12 +3479,16 @@ module.exports = function () {
} else if (Observer && !(global.navigator && global.navigator.standalone)) {
var toggle = true;
var node = document.createTextNode('');
- new Observer(flush).observe(node, { characterData: true });
+ new Observer(flush).observe(node, {
+ characterData: true
+ });
+
notify = function notify() {
node.data = toggle = !toggle;
};
} else if (Promise && Promise.resolve) {
var promise = Promise.resolve(undefined);
+
notify = function notify() {
promise.then(flush);
};
@@ -2996,16 +3497,19 @@ module.exports = function () {
macrotask.call(global, flush);
};
}
+
return function (fn) {
var task = {
fn: fn,
next: undefined
};
if (last) last.next = task;
+
if (!head) {
head = task;
notify();
}
+
last = task;
};
};
@@ -3018,6 +3522,7 @@ module.exports = function () {
var aFunction = __w_pdfjs_require__(24);
+
function PromiseCapability(C) {
var resolve, reject;
this.promise = new C(function ($$resolve, $$reject) {
@@ -3028,6 +3533,7 @@ function PromiseCapability(C) {
this.resolve = aFunction(resolve);
this.reject = aFunction(reject);
}
+
module.exports.f = function (C) {
return new PromiseCapability(C);
};
@@ -3061,6 +3567,7 @@ module.exports = function (exec) {
var global = __w_pdfjs_require__(8);
+
var navigator = global.navigator;
module.exports = navigator && navigator.userAgent || '';
@@ -3072,8 +3579,11 @@ module.exports = navigator && navigator.userAgent || '';
var anObject = __w_pdfjs_require__(12);
+
var isObject = __w_pdfjs_require__(13);
+
var newPromiseCapability = __w_pdfjs_require__(85);
+
module.exports = function (C, x) {
anObject(C);
if (isObject(x) && x.constructor === C) return x;
@@ -3091,10 +3601,13 @@ module.exports = function (C, x) {
var redefine = __w_pdfjs_require__(20);
+
module.exports = function (target, src, safe) {
for (var key in src) {
redefine(target, key, src[key], safe);
- }return target;
+ }
+
+ return target;
};
/***/ }),
@@ -3105,9 +3618,13 @@ module.exports = function (target, src, safe) {
var global = __w_pdfjs_require__(8);
+
var dP = __w_pdfjs_require__(11);
+
var DESCRIPTORS = __w_pdfjs_require__(15);
+
var SPECIES = __w_pdfjs_require__(28)('species');
+
module.exports = function (KEY) {
var C = global[KEY];
if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
@@ -3126,30 +3643,42 @@ module.exports = function (KEY) {
var ITERATOR = __w_pdfjs_require__(28)('iterator');
+
var SAFE_CLOSING = false;
+
try {
var riter = [7][ITERATOR]();
+
riter['return'] = function () {
SAFE_CLOSING = true;
};
+
Array.from(riter, function () {
throw 2;
});
} catch (e) {}
+
module.exports = function (exec, skipClosing) {
if (!skipClosing && !SAFE_CLOSING) return false;
var safe = false;
+
try {
var arr = [7];
var iter = arr[ITERATOR]();
+
iter.next = function () {
- return { done: safe = true };
+ return {
+ done: safe = true
+ };
};
+
arr[ITERATOR] = function () {
return iter;
};
+
exec(arr);
} catch (e) {}
+
return safe;
};
@@ -3161,10 +3690,15 @@ module.exports = function (exec, skipClosing) {
var $export = __w_pdfjs_require__(7);
+
var core = __w_pdfjs_require__(9);
+
var global = __w_pdfjs_require__(8);
+
var speciesConstructor = __w_pdfjs_require__(81);
+
var promiseResolve = __w_pdfjs_require__(88);
+
$export($export.P + $export.R, 'Promise', {
'finally': function _finally(onFinally) {
var C = speciesConstructor(this, core.Promise || global.Promise);
@@ -3189,8 +3723,11 @@ $export($export.P + $export.R, 'Promise', {
var $export = __w_pdfjs_require__(7);
+
var newPromiseCapability = __w_pdfjs_require__(85);
+
var perform = __w_pdfjs_require__(86);
+
$export($export.S, 'Promise', {
'try': function _try(callbackfn) {
var promiseCapability = newPromiseCapability.f(this);
@@ -3208,10 +3745,15 @@ $export($export.S, 'Promise', {
__w_pdfjs_require__(60);
+
__w_pdfjs_require__(72);
+
__w_pdfjs_require__(95);
+
__w_pdfjs_require__(107);
+
__w_pdfjs_require__(109);
+
module.exports = __w_pdfjs_require__(9).WeakMap;
/***/ }),
@@ -3222,24 +3764,34 @@ module.exports = __w_pdfjs_require__(9).WeakMap;
var each = __w_pdfjs_require__(96)(0);
+
var redefine = __w_pdfjs_require__(20);
+
var meta = __w_pdfjs_require__(100);
+
var assign = __w_pdfjs_require__(44);
+
var weak = __w_pdfjs_require__(101);
+
var isObject = __w_pdfjs_require__(13);
+
var fails = __w_pdfjs_require__(16);
+
var validate = __w_pdfjs_require__(102);
+
var WEAK_MAP = 'WeakMap';
var getWeak = meta.getWeak;
var isExtensible = Object.isExtensible;
var uncaughtFrozenStore = weak.ufstore;
var tmp = {};
var InternalMap;
+
var wrapper = function wrapper(get) {
return function WeakMap() {
return get(this, arguments.length > 0 ? arguments[0] : undefined);
};
};
+
var methods = {
get: function get(key) {
if (isObject(key)) {
@@ -3252,7 +3804,9 @@ var methods = {
return weak.def(validate(this, WEAK_MAP), key, value);
}
};
+
var $WeakMap = module.exports = __w_pdfjs_require__(103)(WEAK_MAP, wrapper, methods, weak, true, true);
+
if (fails(function () {
return new $WeakMap().set((Object.freeze || Object)(tmp), 7).get(tmp) != 7;
})) {
@@ -3265,9 +3819,12 @@ if (fails(function () {
redefine(proto, key, function (a, b) {
if (isObject(a) && !isExtensible(a)) {
if (!this._f) this._f = new InternalMap();
+
var result = this._f[key](a, b);
+
return key == 'set' ? this : result;
}
+
return method.call(this, a, b);
});
});
@@ -3281,10 +3838,15 @@ if (fails(function () {
var ctx = __w_pdfjs_require__(23);
+
var IObject = __w_pdfjs_require__(37);
+
var toObject = __w_pdfjs_require__(51);
+
var toLength = __w_pdfjs_require__(38);
+
var asc = __w_pdfjs_require__(97);
+
module.exports = function (TYPE, $create) {
var IS_MAP = TYPE == 1;
var IS_FILTER = TYPE == 2;
@@ -3301,24 +3863,31 @@ module.exports = function (TYPE, $create) {
var index = 0;
var result = IS_MAP ? create($this, length) : IS_FILTER ? create($this, 0) : undefined;
var val, res;
+
for (; length > index; index++) {
if (NO_HOLES || index in self) {
val = self[index];
res = f(val, index, O);
+
if (TYPE) {
if (IS_MAP) result[index] = res;else if (res) switch (TYPE) {
case 3:
return true;
+
case 5:
return val;
+
case 6:
return index;
+
case 2:
result.push(val);
} else if (IS_EVERY) return false;
}
}
- }return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : result;
+ }
+
+ return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : result;
};
};
@@ -3330,6 +3899,7 @@ module.exports = function (TYPE, $create) {
var speciesConstructor = __w_pdfjs_require__(98);
+
module.exports = function (original, length) {
return new (speciesConstructor(original))(length);
};
@@ -3342,18 +3912,24 @@ module.exports = function (original, length) {
var isObject = __w_pdfjs_require__(13);
+
var isArray = __w_pdfjs_require__(99);
+
var SPECIES = __w_pdfjs_require__(28)('species');
+
module.exports = function (original) {
var C;
+
if (isArray(original)) {
C = original.constructor;
if (typeof C == 'function' && (C === Array || isArray(C.prototype))) C = undefined;
+
if (isObject(C)) {
C = C[SPECIES];
if (C === null) C = undefined;
}
}
+
return C === undefined ? Array : C;
};
@@ -3365,6 +3941,7 @@ module.exports = function (original) {
var cof = __w_pdfjs_require__(27);
+
module.exports = Array.isArray || function isArray(arg) {
return cof(arg) == 'Array';
};
@@ -3376,19 +3953,26 @@ module.exports = Array.isArray || function isArray(arg) {
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var META = __w_pdfjs_require__(22)('meta');
+
var isObject = __w_pdfjs_require__(13);
+
var has = __w_pdfjs_require__(21);
+
var setDesc = __w_pdfjs_require__(11).f;
+
var id = 0;
+
var isExtensible = Object.isExtensible || function () {
return true;
};
+
var FREEZE = !__w_pdfjs_require__(16)(function () {
return isExtensible(Object.preventExtensions({}));
});
+
var setMeta = function setMeta(it) {
setDesc(it, META, {
value: {
@@ -3397,27 +3981,34 @@ var setMeta = function setMeta(it) {
}
});
};
+
var fastKey = function fastKey(it, create) {
- if (!isObject(it)) return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) == 'symbol' ? it : (typeof it == 'string' ? 'S' : 'P') + it;
+ if (!isObject(it)) return _typeof(it) == 'symbol' ? it : (typeof it == 'string' ? 'S' : 'P') + it;
+
if (!has(it, META)) {
if (!isExtensible(it)) return 'F';
if (!create) return 'E';
setMeta(it);
}
+
return it[META].i;
};
+
var getWeak = function getWeak(it, create) {
if (!has(it, META)) {
if (!isExtensible(it)) return true;
if (!create) return false;
setMeta(it);
}
+
return it[META].w;
};
+
var onFreeze = function onFreeze(it) {
if (FREEZE && meta.NEED && isExtensible(it) && !has(it, META)) setMeta(it);
return it;
};
+
var meta = module.exports = {
KEY: META,
NEED: false,
@@ -3434,28 +4025,41 @@ var meta = module.exports = {
var redefineAll = __w_pdfjs_require__(89);
+
var getWeak = __w_pdfjs_require__(100).getWeak;
+
var anObject = __w_pdfjs_require__(12);
+
var isObject = __w_pdfjs_require__(13);
+
var anInstance = __w_pdfjs_require__(76);
+
var forOf = __w_pdfjs_require__(77);
+
var createArrayMethod = __w_pdfjs_require__(96);
+
var $has = __w_pdfjs_require__(21);
+
var validate = __w_pdfjs_require__(102);
+
var arrayFind = createArrayMethod(5);
var arrayFindIndex = createArrayMethod(6);
var id = 0;
+
var uncaughtFrozenStore = function uncaughtFrozenStore(that) {
return that._l || (that._l = new UncaughtFrozenStore());
};
+
var UncaughtFrozenStore = function UncaughtFrozenStore() {
this.a = [];
};
+
var findUncaughtFrozen = function findUncaughtFrozen(store, key) {
return arrayFind(store.a, function (it) {
return it[0] === key;
});
};
+
UncaughtFrozenStore.prototype = {
get: function get(key) {
var entry = findUncaughtFrozen(this, key);
@@ -3517,6 +4121,7 @@ module.exports = {
var isObject = __w_pdfjs_require__(13);
+
module.exports = function (it, TYPE) {
if (!isObject(it) || it._t !== TYPE) throw TypeError('Incompatible receiver, ' + TYPE + ' required!');
return it;
@@ -3530,23 +4135,36 @@ module.exports = function (it, TYPE) {
var global = __w_pdfjs_require__(8);
+
var $export = __w_pdfjs_require__(7);
+
var redefine = __w_pdfjs_require__(20);
+
var redefineAll = __w_pdfjs_require__(89);
+
var meta = __w_pdfjs_require__(100);
+
var forOf = __w_pdfjs_require__(77);
+
var anInstance = __w_pdfjs_require__(76);
+
var isObject = __w_pdfjs_require__(13);
+
var fails = __w_pdfjs_require__(16);
+
var $iterDetect = __w_pdfjs_require__(91);
+
var setToStringTag = __w_pdfjs_require__(70);
+
var inheritIfRequired = __w_pdfjs_require__(104);
+
module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var Base = global[NAME];
var C = Base;
var ADDER = IS_MAP ? 'set' : 'add';
var proto = C && C.prototype;
var O = {};
+
var fixMethod = function fixMethod(KEY) {
var fn = proto[KEY];
redefine(proto, KEY, KEY == 'delete' ? function (a) {
@@ -3563,6 +4181,7 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
return this;
});
};
+
if (typeof C != 'function' || !(IS_WEAK || proto.forEach && !fails(function () {
new C().entries().next();
}))) {
@@ -3581,10 +4200,14 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var BUGGY_ZERO = !IS_WEAK && fails(function () {
var $instance = new C();
var index = 5;
+
while (index--) {
$instance[ADDER](index, index);
- }return !$instance.has(-0);
+ }
+
+ return !$instance.has(-0);
});
+
if (!ACCEPT_ITERABLES) {
C = wrapper(function (target, iterable) {
anInstance(target, C, NAME);
@@ -3595,14 +4218,17 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
C.prototype = proto;
proto.constructor = C;
}
+
if (THROWS_ON_PRIMITIVES || BUGGY_ZERO) {
fixMethod('delete');
fixMethod('has');
IS_MAP && fixMethod('get');
}
+
if (BUGGY_ZERO || HASNT_CHAINING) fixMethod(ADDER);
if (IS_WEAK && proto.clear) delete proto.clear;
}
+
setToStringTag(C, NAME);
O[NAME] = C;
$export($export.G + $export.W + $export.F * (C != Base), O);
@@ -3618,13 +4244,17 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var isObject = __w_pdfjs_require__(13);
+
var setPrototypeOf = __w_pdfjs_require__(105).set;
+
module.exports = function (that, target, C) {
var S = target.constructor;
var P;
+
if (S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf) {
setPrototypeOf(that, P);
}
+
return that;
};
@@ -3636,11 +4266,14 @@ module.exports = function (that, target, C) {
var isObject = __w_pdfjs_require__(13);
+
var anObject = __w_pdfjs_require__(12);
+
var check = function check(O, proto) {
anObject(O);
if (!isObject(proto) && proto !== null) throw TypeError(proto + ": can't set as prototype!");
};
+
module.exports = {
set: Object.setPrototypeOf || ('__proto__' in {} ? function (test, buggy, set) {
try {
@@ -3650,6 +4283,7 @@ module.exports = {
} catch (e) {
buggy = true;
}
+
return function setPrototypeOf(O, proto) {
check(O, proto);
if (buggy) O.__proto__ = proto;else set(O, proto);
@@ -3667,11 +4301,17 @@ module.exports = {
var pIE = __w_pdfjs_require__(50);
+
var createDesc = __w_pdfjs_require__(19);
+
var toIObject = __w_pdfjs_require__(36);
+
var toPrimitive = __w_pdfjs_require__(18);
+
var has = __w_pdfjs_require__(21);
+
var IE8_DOM_DEFINE = __w_pdfjs_require__(14);
+
var gOPD = Object.getOwnPropertyDescriptor;
exports.f = __w_pdfjs_require__(15) ? gOPD : function getOwnPropertyDescriptor(O, P) {
O = toIObject(O);
@@ -3699,14 +4339,18 @@ __w_pdfjs_require__(108)('WeakMap');
var $export = __w_pdfjs_require__(7);
+
module.exports = function (COLLECTION) {
$export($export.S, COLLECTION, {
of: function of() {
var length = arguments.length;
var A = new Array(length);
+
while (length--) {
A[length] = arguments[length];
- }return new this(A);
+ }
+
+ return new this(A);
}
});
};
@@ -3728,9 +4372,13 @@ __w_pdfjs_require__(110)('WeakMap');
var $export = __w_pdfjs_require__(7);
+
var aFunction = __w_pdfjs_require__(24);
+
var ctx = __w_pdfjs_require__(23);
+
var forOf = __w_pdfjs_require__(77);
+
module.exports = function (COLLECTION) {
$export($export.S, COLLECTION, {
from: function from(source) {
@@ -3741,6 +4389,7 @@ module.exports = function (COLLECTION) {
if (mapping) aFunction(mapFn);
if (source == undefined) return new this();
A = [];
+
if (mapping) {
n = 0;
cb = ctx(mapFn, arguments[2], 2);
@@ -3750,6 +4399,7 @@ module.exports = function (COLLECTION) {
} else {
forOf(source, false, A.push, A);
}
+
return new this(A);
}
});
@@ -3763,10 +4413,15 @@ module.exports = function (COLLECTION) {
__w_pdfjs_require__(60);
+
__w_pdfjs_require__(72);
+
__w_pdfjs_require__(112);
+
__w_pdfjs_require__(113);
+
__w_pdfjs_require__(114);
+
module.exports = __w_pdfjs_require__(9).WeakSet;
/***/ }),
@@ -3777,8 +4432,11 @@ module.exports = __w_pdfjs_require__(9).WeakSet;
var weak = __w_pdfjs_require__(101);
+
var validate = __w_pdfjs_require__(102);
+
var WEAK_SET = 'WeakSet';
+
__w_pdfjs_require__(103)(WEAK_SET, function (get) {
return function WeakSet() {
return get(this, arguments.length > 0 ? arguments[0] : undefined);
@@ -3815,6 +4473,7 @@ __w_pdfjs_require__(110)('WeakSet');
__w_pdfjs_require__(116);
+
module.exports = __w_pdfjs_require__(9).String.codePointAt;
/***/ }),
@@ -3825,7 +4484,9 @@ module.exports = __w_pdfjs_require__(9).String.codePointAt;
var $export = __w_pdfjs_require__(7);
+
var $at = __w_pdfjs_require__(63)(false);
+
$export($export.P, 'String', {
codePointAt: function codePointAt(pos) {
return $at(this, pos);
@@ -3840,6 +4501,7 @@ $export($export.P, 'String', {
__w_pdfjs_require__(118);
+
module.exports = __w_pdfjs_require__(9).String.fromCodePoint;
/***/ }),
@@ -3850,7 +4512,9 @@ module.exports = __w_pdfjs_require__(9).String.fromCodePoint;
var $export = __w_pdfjs_require__(7);
+
var toAbsoluteIndex = __w_pdfjs_require__(40);
+
var fromCharCode = String.fromCharCode;
var $fromCodePoint = String.fromCodePoint;
$export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1), 'String', {
@@ -3859,11 +4523,13 @@ $export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1)
var aLen = arguments.length;
var i = 0;
var code;
+
while (aLen > i) {
code = +arguments[i++];
if (toAbsoluteIndex(code, 0x10ffff) !== code) throw RangeError(code + ' is not a valid code point');
res.push(code < 0x10000 ? fromCharCode(code) : fromCharCode(((code -= 0x10000) >> 10) + 0xd800, code % 0x400 + 0xdc00));
}
+
return res.join('');
}
});
@@ -3876,7 +4542,9 @@ $export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1)
__w_pdfjs_require__(120);
+
__w_pdfjs_require__(60);
+
module.exports = __w_pdfjs_require__(9).Symbol;
/***/ }),
@@ -3886,39 +4554,66 @@ module.exports = __w_pdfjs_require__(9).Symbol;
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var global = __w_pdfjs_require__(8);
+
var has = __w_pdfjs_require__(21);
+
var DESCRIPTORS = __w_pdfjs_require__(15);
+
var $export = __w_pdfjs_require__(7);
+
var redefine = __w_pdfjs_require__(20);
+
var META = __w_pdfjs_require__(100).KEY;
+
var $fails = __w_pdfjs_require__(16);
+
var shared = __w_pdfjs_require__(29);
+
var setToStringTag = __w_pdfjs_require__(70);
+
var uid = __w_pdfjs_require__(22);
+
var wks = __w_pdfjs_require__(28);
+
var wksExt = __w_pdfjs_require__(121);
+
var wksDefine = __w_pdfjs_require__(122);
+
var enumKeys = __w_pdfjs_require__(123);
+
var isArray = __w_pdfjs_require__(99);
+
var anObject = __w_pdfjs_require__(12);
+
var isObject = __w_pdfjs_require__(13);
+
var toIObject = __w_pdfjs_require__(36);
+
var toPrimitive = __w_pdfjs_require__(18);
+
var createDesc = __w_pdfjs_require__(19);
+
var _create = __w_pdfjs_require__(67);
+
var gOPNExt = __w_pdfjs_require__(124);
+
var $GOPD = __w_pdfjs_require__(106);
+
var $DP = __w_pdfjs_require__(11);
+
var $keys = __w_pdfjs_require__(45);
+
var gOPD = $GOPD.f;
var dP = $DP.f;
var gOPN = gOPNExt.f;
var $Symbol = global.Symbol;
var $JSON = global.JSON;
+
var _stringify = $JSON && $JSON.stringify;
+
var PROTOTYPE = 'prototype';
var HIDDEN = wks('_hidden');
var TO_PRIMITIVE = wks('toPrimitive');
@@ -3933,7 +4628,9 @@ var setter = !QObject || !QObject[PROTOTYPE] || !QObject[PROTOTYPE].findChild;
var setSymbolDesc = DESCRIPTORS && $fails(function () {
return _create(dP({}, 'a', {
get: function get() {
- return dP(this, 'a', { value: 7 }).a;
+ return dP(this, 'a', {
+ value: 7
+ }).a;
}
})).a != 7;
}) ? function (it, key, D) {
@@ -3942,51 +4639,67 @@ var setSymbolDesc = DESCRIPTORS && $fails(function () {
dP(it, key, D);
if (protoDesc && it !== ObjectProto) dP(ObjectProto, key, protoDesc);
} : dP;
+
var wrap = function wrap(tag) {
var sym = AllSymbols[tag] = _create($Symbol[PROTOTYPE]);
+
sym._k = tag;
return sym;
};
+
var isSymbol = USE_NATIVE && _typeof($Symbol.iterator) == 'symbol' ? function (it) {
- return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) == 'symbol';
+ return _typeof(it) == 'symbol';
} : function (it) {
return it instanceof $Symbol;
};
+
var $defineProperty = function defineProperty(it, key, D) {
if (it === ObjectProto) $defineProperty(OPSymbols, key, D);
anObject(it);
key = toPrimitive(key, true);
anObject(D);
+
if (has(AllSymbols, key)) {
if (!D.enumerable) {
if (!has(it, HIDDEN)) dP(it, HIDDEN, createDesc(1, {}));
it[HIDDEN][key] = true;
} else {
if (has(it, HIDDEN) && it[HIDDEN][key]) it[HIDDEN][key] = false;
- D = _create(D, { enumerable: createDesc(0, false) });
+ D = _create(D, {
+ enumerable: createDesc(0, false)
+ });
}
+
return setSymbolDesc(it, key, D);
}
+
return dP(it, key, D);
};
+
var $defineProperties = function defineProperties(it, P) {
anObject(it);
var keys = enumKeys(P = toIObject(P));
var i = 0;
var l = keys.length;
var key;
+
while (l > i) {
$defineProperty(it, key = keys[i++], P[key]);
- }return it;
+ }
+
+ return it;
};
+
var $create = function create(it, P) {
return P === undefined ? _create(it) : $defineProperties(_create(it), P);
};
+
var $propertyIsEnumerable = function propertyIsEnumerable(key) {
var E = isEnum.call(this, key = toPrimitive(key, true));
if (this === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key)) return false;
return E || !has(this, key) || !has(AllSymbols, key) || has(this, HIDDEN) && this[HIDDEN][key] ? E : true;
};
+
var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(it, key) {
it = toIObject(it);
key = toPrimitive(key, true);
@@ -3995,42 +4708,52 @@ var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(it, key) {
if (D && has(AllSymbols, key) && !(has(it, HIDDEN) && it[HIDDEN][key])) D.enumerable = true;
return D;
};
+
var $getOwnPropertyNames = function getOwnPropertyNames(it) {
var names = gOPN(toIObject(it));
var result = [];
var i = 0;
var key;
+
while (names.length > i) {
if (!has(AllSymbols, key = names[i++]) && key != HIDDEN && key != META) result.push(key);
}
+
return result;
};
+
var $getOwnPropertySymbols = function getOwnPropertySymbols(it) {
var IS_OP = it === ObjectProto;
var names = gOPN(IS_OP ? OPSymbols : toIObject(it));
var result = [];
var i = 0;
var key;
+
while (names.length > i) {
if (has(AllSymbols, key = names[i++]) && (IS_OP ? has(ObjectProto, key) : true)) result.push(AllSymbols[key]);
}
+
return result;
};
+
if (!USE_NATIVE) {
$Symbol = function _Symbol() {
if (this instanceof $Symbol) throw TypeError('Symbol is not a constructor!');
var tag = uid(arguments.length > 0 ? arguments[0] : undefined);
+
var $set = function $set(value) {
if (this === ObjectProto) $set.call(OPSymbols, value);
if (has(this, HIDDEN) && has(this[HIDDEN], tag)) this[HIDDEN][tag] = false;
setSymbolDesc(this, tag, createDesc(1, value));
};
+
if (DESCRIPTORS && setter) setSymbolDesc(ObjectProto, tag, {
configurable: true,
set: $set
});
return wrap(tag);
};
+
redefine($Symbol[PROTOTYPE], 'toString', function toString() {
return this._k;
});
@@ -4039,24 +4762,35 @@ if (!USE_NATIVE) {
__w_pdfjs_require__(125).f = gOPNExt.f = $getOwnPropertyNames;
__w_pdfjs_require__(50).f = $propertyIsEnumerable;
__w_pdfjs_require__(49).f = $getOwnPropertySymbols;
+
if (DESCRIPTORS && !__w_pdfjs_require__(30)) {
redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true);
}
+
wksExt.f = function (name) {
return wrap(wks(name));
};
}
-$export($export.G + $export.W + $export.F * !USE_NATIVE, { Symbol: $Symbol });
+
+$export($export.G + $export.W + $export.F * !USE_NATIVE, {
+ Symbol: $Symbol
+});
+
for (var es6Symbols = 'hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables'.split(','), j = 0; es6Symbols.length > j;) {
wks(es6Symbols[j++]);
-}for (var wellKnownSymbols = $keys(wks.store), k = 0; wellKnownSymbols.length > k;) {
+}
+
+for (var wellKnownSymbols = $keys(wks.store), k = 0; wellKnownSymbols.length > k;) {
wksDefine(wellKnownSymbols[k++]);
-}$export($export.S + $export.F * !USE_NATIVE, 'Symbol', {
+}
+
+$export($export.S + $export.F * !USE_NATIVE, 'Symbol', {
'for': function _for(key) {
return has(SymbolRegistry, key += '') ? SymbolRegistry[key] : SymbolRegistry[key] = $Symbol(key);
},
keyFor: function keyFor(sym) {
if (!isSymbol(sym)) throw TypeError(sym + ' is not a symbol!');
+
for (var key in SymbolRegistry) {
if (SymbolRegistry[key] === sym) return key;
}
@@ -4078,15 +4812,20 @@ $export($export.S + $export.F * !USE_NATIVE, 'Object', {
});
$JSON && $export($export.S + $export.F * (!USE_NATIVE || $fails(function () {
var S = $Symbol();
- return _stringify([S]) != '[null]' || _stringify({ a: S }) != '{}' || _stringify(Object(S)) != '{}';
+ return _stringify([S]) != '[null]' || _stringify({
+ a: S
+ }) != '{}' || _stringify(Object(S)) != '{}';
})), 'JSON', {
stringify: function stringify(it) {
var args = [it];
var i = 1;
var replacer, $replacer;
+
while (arguments.length > i) {
args.push(arguments[i++]);
- }$replacer = replacer = args[1];
+ }
+
+ $replacer = replacer = args[1];
if (!isObject(replacer) && it === undefined || isSymbol(it)) return;
if (!isArray(replacer)) replacer = function replacer(key, value) {
if (typeof $replacer == 'function') value = $replacer.call(this, key, value);
@@ -4118,13 +4857,20 @@ exports.f = __w_pdfjs_require__(28);
var global = __w_pdfjs_require__(8);
+
var core = __w_pdfjs_require__(9);
+
var LIBRARY = __w_pdfjs_require__(30);
+
var wksExt = __w_pdfjs_require__(121);
+
var defineProperty = __w_pdfjs_require__(11).f;
+
module.exports = function (name) {
var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {});
- if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, { value: wksExt.f(name) });
+ if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, {
+ value: wksExt.f(name)
+ });
};
/***/ }),
@@ -4135,20 +4881,26 @@ module.exports = function (name) {
var getKeys = __w_pdfjs_require__(45);
+
var gOPS = __w_pdfjs_require__(49);
+
var pIE = __w_pdfjs_require__(50);
+
module.exports = function (it) {
var result = getKeys(it);
var getSymbols = gOPS.f;
+
if (getSymbols) {
var symbols = getSymbols(it);
var isEnum = pIE.f;
var i = 0;
var key;
+
while (symbols.length > i) {
if (isEnum.call(it, key = symbols[i++])) result.push(key);
}
}
+
return result;
};
@@ -4159,12 +4911,15 @@ module.exports = function (it) {
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var toIObject = __w_pdfjs_require__(36);
+
var gOPN = __w_pdfjs_require__(125).f;
+
var toString = {}.toString;
-var windowNames = (typeof window === 'undefined' ? 'undefined' : _typeof(window)) == 'object' && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [];
+var windowNames = (typeof window === "undefined" ? "undefined" : _typeof(window)) == 'object' && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [];
+
var getWindowNames = function getWindowNames(it) {
try {
return gOPN(it);
@@ -4172,6 +4927,7 @@ var getWindowNames = function getWindowNames(it) {
return windowNames.slice();
}
};
+
module.exports.f = function getOwnPropertyNames(it) {
return windowNames && toString.call(it) == '[object Window]' ? getWindowNames(it) : gOPN(toIObject(it));
};
@@ -4184,7 +4940,9 @@ module.exports.f = function getOwnPropertyNames(it) {
var $keys = __w_pdfjs_require__(46);
+
var hiddenKeys = __w_pdfjs_require__(48).concat('length', 'prototype');
+
exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return $keys(O, hiddenKeys);
};
@@ -4197,6 +4955,7 @@ exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
__w_pdfjs_require__(127);
+
module.exports = __w_pdfjs_require__(9).Object.values;
/***/ }),
@@ -4207,7 +4966,9 @@ module.exports = __w_pdfjs_require__(9).Object.values;
var $export = __w_pdfjs_require__(7);
+
var $values = __w_pdfjs_require__(128)(false);
+
$export($export.S, 'Object', {
values: function values(it) {
return $values(it);
@@ -4222,8 +4983,11 @@ $export($export.S, 'Object', {
var getKeys = __w_pdfjs_require__(45);
+
var toIObject = __w_pdfjs_require__(36);
+
var isEnum = __w_pdfjs_require__(50).f;
+
module.exports = function (isEntries) {
return function (it) {
var O = toIObject(it);
@@ -4232,11 +4996,14 @@ module.exports = function (isEntries) {
var i = 0;
var result = [];
var key;
+
while (length > i) {
if (isEnum.call(O, key = keys[i++])) {
result.push(isEntries ? [key, O[key]] : O[key]);
}
- }return result;
+ }
+
+ return result;
};
};
@@ -4248,6 +5015,7 @@ module.exports = function (isEntries) {
var isReadableStreamSupported = false;
+
if (typeof ReadableStream !== 'undefined') {
try {
new ReadableStream({
@@ -4258,6 +5026,7 @@ if (typeof ReadableStream !== 'undefined') {
isReadableStreamSupported = true;
} catch (e) {}
}
+
if (isReadableStreamSupported) {
exports.ReadableStream = ReadableStream;
} else {
@@ -4271,7 +5040,7 @@ if (isReadableStreamSupported) {
"use strict";
-var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof2(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof2 = function _typeof2(obj) { return typeof obj; }; } else { _typeof2 = function _typeof2(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof2(obj); }
(function (e, a) {
for (var i in a) {
@@ -4279,6 +5048,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
})(exports, function (modules) {
var installedModules = {};
+
function __w_pdfjs_require__(moduleId) {
if (installedModules[moduleId]) return installedModules[moduleId].exports;
var module = installedModules[moduleId] = {
@@ -4290,11 +5060,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
module.l = true;
return module.exports;
}
+
__w_pdfjs_require__.m = modules;
__w_pdfjs_require__.c = installedModules;
+
__w_pdfjs_require__.i = function (value) {
return value;
};
+
__w_pdfjs_require__.d = function (exports, name, getter) {
if (!__w_pdfjs_require__.o(exports, name)) {
Object.defineProperty(exports, name, {
@@ -4304,36 +5077,45 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
}
};
+
__w_pdfjs_require__.n = function (module) {
var getter = module && module.__esModule ? function getDefault() {
return module['default'];
} : function getModuleExports() {
return module;
};
+
__w_pdfjs_require__.d(getter, 'a', getter);
+
return getter;
};
+
__w_pdfjs_require__.o = function (object, property) {
return Object.prototype.hasOwnProperty.call(object, property);
};
+
__w_pdfjs_require__.p = "";
return __w_pdfjs_require__(__w_pdfjs_require__.s = 7);
}([function (module, exports, __w_pdfjs_require__) {
"use strict";
var _typeof = typeof Symbol === "function" && _typeof2(Symbol.iterator) === "symbol" ? function (obj) {
- return typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+ return _typeof2(obj);
} : function (obj) {
- return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+ return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : _typeof2(obj);
};
+
var _require = __w_pdfjs_require__(1),
assert = _require.assert;
+
function IsPropertyKey(argument) {
return typeof argument === 'string' || (typeof argument === 'undefined' ? 'undefined' : _typeof(argument)) === 'symbol';
}
+
exports.typeIsObject = function (x) {
return (typeof x === 'undefined' ? 'undefined' : _typeof(x)) === 'object' && x !== null || typeof x === 'function';
};
+
exports.createDataProperty = function (o, p, v) {
assert(exports.typeIsObject(o));
Object.defineProperty(o, p, {
@@ -4343,12 +5125,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
configurable: true
});
};
+
exports.createArrayFromList = function (elements) {
return elements.slice();
};
+
exports.ArrayBufferCopy = function (dest, destOffset, src, srcOffset, n) {
new Uint8Array(dest).set(new Uint8Array(src, srcOffset, n), destOffset);
};
+
exports.CreateIterResultObject = function (value, done) {
assert(typeof done === 'boolean');
var obj = {};
@@ -4366,78 +5151,99 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
return obj;
};
+
exports.IsFiniteNonNegativeNumber = function (v) {
if (Number.isNaN(v)) {
return false;
}
+
if (v === Infinity) {
return false;
}
+
if (v < 0) {
return false;
}
+
return true;
};
+
function Call(F, V, args) {
if (typeof F !== 'function') {
throw new TypeError('Argument is not a function');
}
+
return Function.prototype.apply.call(F, V, args);
}
+
exports.InvokeOrNoop = function (O, P, args) {
assert(O !== undefined);
assert(IsPropertyKey(P));
assert(Array.isArray(args));
var method = O[P];
+
if (method === undefined) {
return undefined;
}
+
return Call(method, O, args);
};
+
exports.PromiseInvokeOrNoop = function (O, P, args) {
assert(O !== undefined);
assert(IsPropertyKey(P));
assert(Array.isArray(args));
+
try {
return Promise.resolve(exports.InvokeOrNoop(O, P, args));
} catch (returnValueE) {
return Promise.reject(returnValueE);
}
};
+
exports.PromiseInvokeOrPerformFallback = function (O, P, args, F, argsF) {
assert(O !== undefined);
assert(IsPropertyKey(P));
assert(Array.isArray(args));
assert(Array.isArray(argsF));
var method = void 0;
+
try {
method = O[P];
} catch (methodE) {
return Promise.reject(methodE);
}
+
if (method === undefined) {
return F.apply(null, argsF);
}
+
try {
return Promise.resolve(Call(method, O, args));
} catch (e) {
return Promise.reject(e);
}
};
+
exports.TransferArrayBuffer = function (O) {
return O.slice();
};
+
exports.ValidateAndNormalizeHighWaterMark = function (highWaterMark) {
highWaterMark = Number(highWaterMark);
+
if (Number.isNaN(highWaterMark) || highWaterMark < 0) {
throw new RangeError('highWaterMark property of a queuing strategy must be non-negative and non-NaN');
}
+
return highWaterMark;
};
+
exports.ValidateAndNormalizeQueuingStrategy = function (size, highWaterMark) {
if (size !== undefined && typeof size !== 'function') {
throw new TypeError('size property of a queuing strategy must be a function');
}
+
highWaterMark = exports.ValidateAndNormalizeHighWaterMark(highWaterMark);
return {
size: size,
@@ -4454,18 +5260,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}, 0);
}
}
+
function AssertionError(message) {
this.name = 'AssertionError';
this.message = message || '';
this.stack = new Error().stack;
}
+
AssertionError.prototype = Object.create(Error.prototype);
AssertionError.prototype.constructor = AssertionError;
+
function assert(value, message) {
if (!value) {
throw new AssertionError(message);
}
}
+
module.exports = {
rethrowAssertionErrorRejection: rethrowAssertionErrorRejection,
AssertionError: AssertionError,
@@ -4484,38 +5294,47 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
Object.defineProperty(target, descriptor.key, descriptor);
}
}
+
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
+
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
+
var _require = __w_pdfjs_require__(0),
InvokeOrNoop = _require.InvokeOrNoop,
PromiseInvokeOrNoop = _require.PromiseInvokeOrNoop,
ValidateAndNormalizeQueuingStrategy = _require.ValidateAndNormalizeQueuingStrategy,
typeIsObject = _require.typeIsObject;
+
var _require2 = __w_pdfjs_require__(1),
assert = _require2.assert,
rethrowAssertionErrorRejection = _require2.rethrowAssertionErrorRejection;
+
var _require3 = __w_pdfjs_require__(3),
DequeueValue = _require3.DequeueValue,
EnqueueValueWithSize = _require3.EnqueueValueWithSize,
PeekQueueValue = _require3.PeekQueueValue,
ResetQueue = _require3.ResetQueue;
+
var WritableStream = function () {
function WritableStream() {
var underlyingSink = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
size = _ref.size,
_ref$highWaterMark = _ref.highWaterMark,
highWaterMark = _ref$highWaterMark === undefined ? 1 : _ref$highWaterMark;
+
_classCallCheck(this, WritableStream);
+
this._state = 'writable';
this._storedError = undefined;
this._writer = undefined;
@@ -4527,21 +5346,27 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
this._pendingAbortRequest = undefined;
this._backpressure = false;
var type = underlyingSink.type;
+
if (type !== undefined) {
throw new RangeError('Invalid type is specified');
}
+
this._writableStreamController = new WritableStreamDefaultController(this, underlyingSink, size, highWaterMark);
+
this._writableStreamController.__startSteps();
}
+
_createClass(WritableStream, [{
key: 'abort',
value: function abort(reason) {
if (IsWritableStream(this) === false) {
return Promise.reject(streamBrandCheckException('abort'));
}
+
if (IsWritableStreamLocked(this) === true) {
return Promise.reject(new TypeError('Cannot abort a stream that already has a writer'));
}
+
return WritableStreamAbort(this, reason);
}
}, {
@@ -4550,6 +5375,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStream(this) === false) {
throw streamBrandCheckException('getWriter');
}
+
return AcquireWritableStreamDefaultWriter(this);
}
}, {
@@ -4558,11 +5384,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStream(this) === false) {
throw streamBrandCheckException('locked');
}
+
return IsWritableStreamLocked(this);
}
}]);
+
return WritableStream;
}();
+
module.exports = {
AcquireWritableStreamDefaultWriter: AcquireWritableStreamDefaultWriter,
IsWritableStream: IsWritableStream,
@@ -4575,43 +5404,58 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
WritableStreamDefaultWriterWrite: WritableStreamDefaultWriterWrite,
WritableStreamCloseQueuedOrInFlight: WritableStreamCloseQueuedOrInFlight
};
+
function AcquireWritableStreamDefaultWriter(stream) {
return new WritableStreamDefaultWriter(stream);
}
+
function IsWritableStream(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_writableStreamController')) {
return false;
}
+
return true;
}
+
function IsWritableStreamLocked(stream) {
assert(IsWritableStream(stream) === true, 'IsWritableStreamLocked should only be used on known writable streams');
+
if (stream._writer === undefined) {
return false;
}
+
return true;
}
+
function WritableStreamAbort(stream, reason) {
var state = stream._state;
+
if (state === 'closed') {
return Promise.resolve(undefined);
}
+
if (state === 'errored') {
return Promise.reject(stream._storedError);
}
+
var error = new TypeError('Requested to abort');
+
if (stream._pendingAbortRequest !== undefined) {
return Promise.reject(error);
}
+
assert(state === 'writable' || state === 'erroring', 'state must be writable or erroring');
var wasAlreadyErroring = false;
+
if (state === 'erroring') {
wasAlreadyErroring = true;
reason = undefined;
}
+
var promise = new Promise(function (resolve, reject) {
stream._pendingAbortRequest = {
_resolve: resolve,
@@ -4620,11 +5464,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_wasAlreadyErroring: wasAlreadyErroring
};
});
+
if (wasAlreadyErroring === false) {
WritableStreamStartErroring(stream, error);
}
+
return promise;
}
+
function WritableStreamAddWriteRequest(stream) {
assert(IsWritableStreamLocked(stream) === true);
assert(stream._state === 'writable');
@@ -4633,19 +5480,24 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_resolve: resolve,
_reject: reject
};
+
stream._writeRequests.push(writeRequest);
});
return promise;
}
+
function WritableStreamDealWithRejection(stream, error) {
var state = stream._state;
+
if (state === 'writable') {
WritableStreamStartErroring(stream, error);
return;
}
+
assert(state === 'erroring');
WritableStreamFinishErroring(stream);
}
+
function WritableStreamStartErroring(stream, reason) {
assert(stream._storedError === undefined, 'stream._storedError === undefined');
assert(stream._state === 'writable', 'state must be writable');
@@ -4654,128 +5506,180 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
stream._state = 'erroring';
stream._storedError = reason;
var writer = stream._writer;
+
if (writer !== undefined) {
WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, reason);
}
+
if (WritableStreamHasOperationMarkedInFlight(stream) === false && controller._started === true) {
WritableStreamFinishErroring(stream);
}
}
+
function WritableStreamFinishErroring(stream) {
assert(stream._state === 'erroring', 'stream._state === erroring');
assert(WritableStreamHasOperationMarkedInFlight(stream) === false, 'WritableStreamHasOperationMarkedInFlight(stream) === false');
stream._state = 'errored';
+
stream._writableStreamController.__errorSteps();
+
var storedError = stream._storedError;
+
for (var i = 0; i < stream._writeRequests.length; i++) {
var writeRequest = stream._writeRequests[i];
+
writeRequest._reject(storedError);
}
+
stream._writeRequests = [];
+
if (stream._pendingAbortRequest === undefined) {
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
return;
}
+
var abortRequest = stream._pendingAbortRequest;
stream._pendingAbortRequest = undefined;
+
if (abortRequest._wasAlreadyErroring === true) {
abortRequest._reject(storedError);
+
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
return;
}
+
var promise = stream._writableStreamController.__abortSteps(abortRequest._reason);
+
promise.then(function () {
abortRequest._resolve();
+
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
}, function (reason) {
abortRequest._reject(reason);
+
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
});
}
+
function WritableStreamFinishInFlightWrite(stream) {
assert(stream._inFlightWriteRequest !== undefined);
+
stream._inFlightWriteRequest._resolve(undefined);
+
stream._inFlightWriteRequest = undefined;
}
+
function WritableStreamFinishInFlightWriteWithError(stream, error) {
assert(stream._inFlightWriteRequest !== undefined);
+
stream._inFlightWriteRequest._reject(error);
+
stream._inFlightWriteRequest = undefined;
assert(stream._state === 'writable' || stream._state === 'erroring');
WritableStreamDealWithRejection(stream, error);
}
+
function WritableStreamFinishInFlightClose(stream) {
assert(stream._inFlightCloseRequest !== undefined);
+
stream._inFlightCloseRequest._resolve(undefined);
+
stream._inFlightCloseRequest = undefined;
var state = stream._state;
assert(state === 'writable' || state === 'erroring');
+
if (state === 'erroring') {
stream._storedError = undefined;
+
if (stream._pendingAbortRequest !== undefined) {
stream._pendingAbortRequest._resolve();
+
stream._pendingAbortRequest = undefined;
}
}
+
stream._state = 'closed';
var writer = stream._writer;
+
if (writer !== undefined) {
defaultWriterClosedPromiseResolve(writer);
}
+
assert(stream._pendingAbortRequest === undefined, 'stream._pendingAbortRequest === undefined');
assert(stream._storedError === undefined, 'stream._storedError === undefined');
}
+
function WritableStreamFinishInFlightCloseWithError(stream, error) {
assert(stream._inFlightCloseRequest !== undefined);
+
stream._inFlightCloseRequest._reject(error);
+
stream._inFlightCloseRequest = undefined;
assert(stream._state === 'writable' || stream._state === 'erroring');
+
if (stream._pendingAbortRequest !== undefined) {
stream._pendingAbortRequest._reject(error);
+
stream._pendingAbortRequest = undefined;
}
+
WritableStreamDealWithRejection(stream, error);
}
+
function WritableStreamCloseQueuedOrInFlight(stream) {
if (stream._closeRequest === undefined && stream._inFlightCloseRequest === undefined) {
return false;
}
+
return true;
}
+
function WritableStreamHasOperationMarkedInFlight(stream) {
if (stream._inFlightWriteRequest === undefined && stream._inFlightCloseRequest === undefined) {
return false;
}
+
return true;
}
+
function WritableStreamMarkCloseRequestInFlight(stream) {
assert(stream._inFlightCloseRequest === undefined);
assert(stream._closeRequest !== undefined);
stream._inFlightCloseRequest = stream._closeRequest;
stream._closeRequest = undefined;
}
+
function WritableStreamMarkFirstWriteRequestInFlight(stream) {
assert(stream._inFlightWriteRequest === undefined, 'there must be no pending write request');
assert(stream._writeRequests.length !== 0, 'writeRequests must not be empty');
stream._inFlightWriteRequest = stream._writeRequests.shift();
}
+
function WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
assert(stream._state === 'errored', '_stream_.[[state]] is `"errored"`');
+
if (stream._closeRequest !== undefined) {
assert(stream._inFlightCloseRequest === undefined);
+
stream._closeRequest._reject(stream._storedError);
+
stream._closeRequest = undefined;
}
+
var writer = stream._writer;
+
if (writer !== undefined) {
defaultWriterClosedPromiseReject(writer, stream._storedError);
+
writer._closedPromise.catch(function () {});
}
}
+
function WritableStreamUpdateBackpressure(stream, backpressure) {
assert(stream._state === 'writable');
assert(WritableStreamCloseQueuedOrInFlight(stream) === false);
var writer = stream._writer;
+
if (writer !== undefined && backpressure !== stream._backpressure) {
if (backpressure === true) {
defaultWriterReadyPromiseReset(writer);
@@ -4784,30 +5688,39 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
defaultWriterReadyPromiseResolve(writer);
}
}
+
stream._backpressure = backpressure;
}
+
var WritableStreamDefaultWriter = function () {
function WritableStreamDefaultWriter(stream) {
_classCallCheck(this, WritableStreamDefaultWriter);
+
if (IsWritableStream(stream) === false) {
throw new TypeError('WritableStreamDefaultWriter can only be constructed with a WritableStream instance');
}
+
if (IsWritableStreamLocked(stream) === true) {
throw new TypeError('This stream has already been locked for exclusive writing by another writer');
}
+
this._ownerWritableStream = stream;
stream._writer = this;
var state = stream._state;
+
if (state === 'writable') {
if (WritableStreamCloseQueuedOrInFlight(stream) === false && stream._backpressure === true) {
defaultWriterReadyPromiseInitialize(this);
} else {
defaultWriterReadyPromiseInitializeAsResolved(this);
}
+
defaultWriterClosedPromiseInitialize(this);
} else if (state === 'erroring') {
defaultWriterReadyPromiseInitializeAsRejected(this, stream._storedError);
+
this._readyPromise.catch(function () {});
+
defaultWriterClosedPromiseInitialize(this);
} else if (state === 'closed') {
defaultWriterReadyPromiseInitializeAsResolved(this);
@@ -4816,20 +5729,26 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
assert(state === 'errored', 'state must be errored');
var storedError = stream._storedError;
defaultWriterReadyPromiseInitializeAsRejected(this, storedError);
+
this._readyPromise.catch(function () {});
+
defaultWriterClosedPromiseInitializeAsRejected(this, storedError);
+
this._closedPromise.catch(function () {});
}
}
+
_createClass(WritableStreamDefaultWriter, [{
key: 'abort',
value: function abort(reason) {
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('abort'));
}
+
if (this._ownerWritableStream === undefined) {
return Promise.reject(defaultWriterLockException('abort'));
}
+
return WritableStreamDefaultWriterAbort(this, reason);
}
}, {
@@ -4838,13 +5757,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('close'));
}
+
var stream = this._ownerWritableStream;
+
if (stream === undefined) {
return Promise.reject(defaultWriterLockException('close'));
}
+
if (WritableStreamCloseQueuedOrInFlight(stream) === true) {
return Promise.reject(new TypeError('cannot close an already-closing stream'));
}
+
return WritableStreamDefaultWriterClose(this);
}
}, {
@@ -4853,10 +5776,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
throw defaultWriterBrandCheckException('releaseLock');
}
+
var stream = this._ownerWritableStream;
+
if (stream === undefined) {
return;
}
+
assert(stream._writer !== undefined);
WritableStreamDefaultWriterRelease(this);
}
@@ -4866,9 +5792,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('write'));
}
+
if (this._ownerWritableStream === undefined) {
return Promise.reject(defaultWriterLockException('write to'));
}
+
return WritableStreamDefaultWriterWrite(this, chunk);
}
}, {
@@ -4877,6 +5805,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('closed'));
}
+
return this._closedPromise;
}
}, {
@@ -4885,9 +5814,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
throw defaultWriterBrandCheckException('desiredSize');
}
+
if (this._ownerWritableStream === undefined) {
throw defaultWriterLockException('desiredSize');
}
+
return WritableStreamDefaultWriterGetDesiredSize(this);
}
}, {
@@ -4896,32 +5827,41 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('ready'));
}
+
return this._readyPromise;
}
}]);
+
return WritableStreamDefaultWriter;
}();
+
function IsWritableStreamDefaultWriter(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_ownerWritableStream')) {
return false;
}
+
return true;
}
+
function WritableStreamDefaultWriterAbort(writer, reason) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
return WritableStreamAbort(stream, reason);
}
+
function WritableStreamDefaultWriterClose(writer) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
var state = stream._state;
+
if (state === 'closed' || state === 'errored') {
return Promise.reject(new TypeError('The stream (in ' + state + ' state) is not in the writable state and cannot be closed'));
}
+
assert(state === 'writable' || state === 'erroring');
assert(WritableStreamCloseQueuedOrInFlight(stream) === false);
var promise = new Promise(function (resolve, reject) {
@@ -4931,52 +5871,67 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
};
stream._closeRequest = closeRequest;
});
+
if (stream._backpressure === true && state === 'writable') {
defaultWriterReadyPromiseResolve(writer);
}
+
WritableStreamDefaultControllerClose(stream._writableStreamController);
return promise;
}
+
function WritableStreamDefaultWriterCloseWithErrorPropagation(writer) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
var state = stream._state;
+
if (WritableStreamCloseQueuedOrInFlight(stream) === true || state === 'closed') {
return Promise.resolve();
}
+
if (state === 'errored') {
return Promise.reject(stream._storedError);
}
+
assert(state === 'writable' || state === 'erroring');
return WritableStreamDefaultWriterClose(writer);
}
+
function WritableStreamDefaultWriterEnsureClosedPromiseRejected(writer, error) {
if (writer._closedPromiseState === 'pending') {
defaultWriterClosedPromiseReject(writer, error);
} else {
defaultWriterClosedPromiseResetToRejected(writer, error);
}
+
writer._closedPromise.catch(function () {});
}
+
function WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
if (writer._readyPromiseState === 'pending') {
defaultWriterReadyPromiseReject(writer, error);
} else {
defaultWriterReadyPromiseResetToRejected(writer, error);
}
+
writer._readyPromise.catch(function () {});
}
+
function WritableStreamDefaultWriterGetDesiredSize(writer) {
var stream = writer._ownerWritableStream;
var state = stream._state;
+
if (state === 'errored' || state === 'erroring') {
return null;
}
+
if (state === 'closed') {
return 0;
}
+
return WritableStreamDefaultControllerGetDesiredSize(stream._writableStreamController);
}
+
function WritableStreamDefaultWriterRelease(writer) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
@@ -4987,38 +5942,49 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
stream._writer = undefined;
writer._ownerWritableStream = undefined;
}
+
function WritableStreamDefaultWriterWrite(writer, chunk) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
var controller = stream._writableStreamController;
var chunkSize = WritableStreamDefaultControllerGetChunkSize(controller, chunk);
+
if (stream !== writer._ownerWritableStream) {
return Promise.reject(defaultWriterLockException('write to'));
}
+
var state = stream._state;
+
if (state === 'errored') {
return Promise.reject(stream._storedError);
}
+
if (WritableStreamCloseQueuedOrInFlight(stream) === true || state === 'closed') {
return Promise.reject(new TypeError('The stream is closing or closed and cannot be written to'));
}
+
if (state === 'erroring') {
return Promise.reject(stream._storedError);
}
+
assert(state === 'writable');
var promise = WritableStreamAddWriteRequest(stream);
WritableStreamDefaultControllerWrite(controller, chunk, chunkSize);
return promise;
}
+
var WritableStreamDefaultController = function () {
function WritableStreamDefaultController(stream, underlyingSink, size, highWaterMark) {
_classCallCheck(this, WritableStreamDefaultController);
+
if (IsWritableStream(stream) === false) {
throw new TypeError('WritableStreamDefaultController can only be constructed with a WritableStream instance');
}
+
if (stream._writableStreamController !== undefined) {
throw new TypeError('WritableStreamDefaultController instances can only be created by the WritableStream constructor');
}
+
this._controlledWritableStream = stream;
this._underlyingSink = underlyingSink;
this._queue = undefined;
@@ -5031,16 +5997,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var backpressure = WritableStreamDefaultControllerGetBackpressure(this);
WritableStreamUpdateBackpressure(stream, backpressure);
}
+
_createClass(WritableStreamDefaultController, [{
key: 'error',
value: function error(e) {
if (IsWritableStreamDefaultController(this) === false) {
throw new TypeError('WritableStreamDefaultController.prototype.error can only be used on a WritableStreamDefaultController');
}
+
var state = this._controlledWritableStream._state;
+
if (state !== 'writable') {
return;
}
+
WritableStreamDefaultControllerError(this, e);
}
}, {
@@ -5057,6 +6027,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
key: '__startSteps',
value: function __startSteps() {
var _this = this;
+
var startResult = InvokeOrNoop(this._underlyingSink, 'start', [this]);
var stream = this._controlledWritableStream;
Promise.resolve(startResult).then(function () {
@@ -5070,17 +6041,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}).catch(rethrowAssertionErrorRejection);
}
}]);
+
return WritableStreamDefaultController;
}();
+
function WritableStreamDefaultControllerClose(controller) {
EnqueueValueWithSize(controller, 'close', 0);
WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
}
+
function WritableStreamDefaultControllerGetChunkSize(controller, chunk) {
var strategySize = controller._strategySize;
+
if (strategySize === undefined) {
return 1;
}
+
try {
return strategySize(chunk);
} catch (chunkSizeE) {
@@ -5088,64 +6064,86 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return 1;
}
}
+
function WritableStreamDefaultControllerGetDesiredSize(controller) {
return controller._strategyHWM - controller._queueTotalSize;
}
+
function WritableStreamDefaultControllerWrite(controller, chunk, chunkSize) {
- var writeRecord = { chunk: chunk };
+ var writeRecord = {
+ chunk: chunk
+ };
+
try {
EnqueueValueWithSize(controller, writeRecord, chunkSize);
} catch (enqueueE) {
WritableStreamDefaultControllerErrorIfNeeded(controller, enqueueE);
return;
}
+
var stream = controller._controlledWritableStream;
+
if (WritableStreamCloseQueuedOrInFlight(stream) === false && stream._state === 'writable') {
var backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
WritableStreamUpdateBackpressure(stream, backpressure);
}
+
WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
}
+
function IsWritableStreamDefaultController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_underlyingSink')) {
return false;
}
+
return true;
}
+
function WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller) {
var stream = controller._controlledWritableStream;
+
if (controller._started === false) {
return;
}
+
if (stream._inFlightWriteRequest !== undefined) {
return;
}
+
var state = stream._state;
+
if (state === 'closed' || state === 'errored') {
return;
}
+
if (state === 'erroring') {
WritableStreamFinishErroring(stream);
return;
}
+
if (controller._queue.length === 0) {
return;
}
+
var writeRecord = PeekQueueValue(controller);
+
if (writeRecord === 'close') {
WritableStreamDefaultControllerProcessClose(controller);
} else {
WritableStreamDefaultControllerProcessWrite(controller, writeRecord.chunk);
}
}
+
function WritableStreamDefaultControllerErrorIfNeeded(controller, error) {
if (controller._controlledWritableStream._state === 'writable') {
WritableStreamDefaultControllerError(controller, error);
}
}
+
function WritableStreamDefaultControllerProcessClose(controller) {
var stream = controller._controlledWritableStream;
WritableStreamMarkCloseRequestInFlight(stream);
@@ -5158,6 +6156,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
WritableStreamFinishInFlightCloseWithError(stream, reason);
}).catch(rethrowAssertionErrorRejection);
}
+
function WritableStreamDefaultControllerProcessWrite(controller, chunk) {
var stream = controller._controlledWritableStream;
WritableStreamMarkFirstWriteRequestInFlight(stream);
@@ -5167,33 +6166,41 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var state = stream._state;
assert(state === 'writable' || state === 'erroring');
DequeueValue(controller);
+
if (WritableStreamCloseQueuedOrInFlight(stream) === false && state === 'writable') {
var backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
WritableStreamUpdateBackpressure(stream, backpressure);
}
+
WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
}, function (reason) {
WritableStreamFinishInFlightWriteWithError(stream, reason);
}).catch(rethrowAssertionErrorRejection);
}
+
function WritableStreamDefaultControllerGetBackpressure(controller) {
var desiredSize = WritableStreamDefaultControllerGetDesiredSize(controller);
return desiredSize <= 0;
}
+
function WritableStreamDefaultControllerError(controller, error) {
var stream = controller._controlledWritableStream;
assert(stream._state === 'writable');
WritableStreamStartErroring(stream, error);
}
+
function streamBrandCheckException(name) {
return new TypeError('WritableStream.prototype.' + name + ' can only be used on a WritableStream');
}
+
function defaultWriterBrandCheckException(name) {
return new TypeError('WritableStreamDefaultWriter.prototype.' + name + ' can only be used on a WritableStreamDefaultWriter');
}
+
function defaultWriterLockException(name) {
return new TypeError('Cannot ' + name + ' a stream using a released writer');
}
+
function defaultWriterClosedPromiseInitialize(writer) {
writer._closedPromise = new Promise(function (resolve, reject) {
writer._closedPromise_resolve = resolve;
@@ -5201,27 +6208,33 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
writer._closedPromiseState = 'pending';
});
}
+
function defaultWriterClosedPromiseInitializeAsRejected(writer, reason) {
writer._closedPromise = Promise.reject(reason);
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'rejected';
}
+
function defaultWriterClosedPromiseInitializeAsResolved(writer) {
writer._closedPromise = Promise.resolve(undefined);
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'resolved';
}
+
function defaultWriterClosedPromiseReject(writer, reason) {
assert(writer._closedPromise_resolve !== undefined, 'writer._closedPromise_resolve !== undefined');
assert(writer._closedPromise_reject !== undefined, 'writer._closedPromise_reject !== undefined');
assert(writer._closedPromiseState === 'pending', 'writer._closedPromiseState is pending');
+
writer._closedPromise_reject(reason);
+
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'rejected';
}
+
function defaultWriterClosedPromiseResetToRejected(writer, reason) {
assert(writer._closedPromise_resolve === undefined, 'writer._closedPromise_resolve === undefined');
assert(writer._closedPromise_reject === undefined, 'writer._closedPromise_reject === undefined');
@@ -5229,15 +6242,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
writer._closedPromise = Promise.reject(reason);
writer._closedPromiseState = 'rejected';
}
+
function defaultWriterClosedPromiseResolve(writer) {
assert(writer._closedPromise_resolve !== undefined, 'writer._closedPromise_resolve !== undefined');
assert(writer._closedPromise_reject !== undefined, 'writer._closedPromise_reject !== undefined');
assert(writer._closedPromiseState === 'pending', 'writer._closedPromiseState is pending');
+
writer._closedPromise_resolve(undefined);
+
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'resolved';
}
+
function defaultWriterReadyPromiseInitialize(writer) {
writer._readyPromise = new Promise(function (resolve, reject) {
writer._readyPromise_resolve = resolve;
@@ -5245,26 +6262,32 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
writer._readyPromiseState = 'pending';
}
+
function defaultWriterReadyPromiseInitializeAsRejected(writer, reason) {
writer._readyPromise = Promise.reject(reason);
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'rejected';
}
+
function defaultWriterReadyPromiseInitializeAsResolved(writer) {
writer._readyPromise = Promise.resolve(undefined);
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'fulfilled';
}
+
function defaultWriterReadyPromiseReject(writer, reason) {
assert(writer._readyPromise_resolve !== undefined, 'writer._readyPromise_resolve !== undefined');
assert(writer._readyPromise_reject !== undefined, 'writer._readyPromise_reject !== undefined');
+
writer._readyPromise_reject(reason);
+
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'rejected';
}
+
function defaultWriterReadyPromiseReset(writer) {
assert(writer._readyPromise_resolve === undefined, 'writer._readyPromise_resolve === undefined');
assert(writer._readyPromise_reject === undefined, 'writer._readyPromise_reject === undefined');
@@ -5274,16 +6297,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
writer._readyPromiseState = 'pending';
}
+
function defaultWriterReadyPromiseResetToRejected(writer, reason) {
assert(writer._readyPromise_resolve === undefined, 'writer._readyPromise_resolve === undefined');
assert(writer._readyPromise_reject === undefined, 'writer._readyPromise_reject === undefined');
writer._readyPromise = Promise.reject(reason);
writer._readyPromiseState = 'rejected';
}
+
function defaultWriterReadyPromiseResolve(writer) {
assert(writer._readyPromise_resolve !== undefined, 'writer._readyPromise_resolve !== undefined');
assert(writer._readyPromise_reject !== undefined, 'writer._readyPromise_reject !== undefined');
+
writer._readyPromise_resolve(undefined);
+
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'fulfilled';
@@ -5293,36 +6320,48 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var _require = __w_pdfjs_require__(0),
IsFiniteNonNegativeNumber = _require.IsFiniteNonNegativeNumber;
+
var _require2 = __w_pdfjs_require__(1),
assert = _require2.assert;
+
exports.DequeueValue = function (container) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: DequeueValue should only be used on containers with [[queue]] and [[queueTotalSize]].');
assert(container._queue.length > 0, 'Spec-level failure: should never dequeue from an empty queue.');
+
var pair = container._queue.shift();
+
container._queueTotalSize -= pair.size;
+
if (container._queueTotalSize < 0) {
container._queueTotalSize = 0;
}
+
return pair.value;
};
+
exports.EnqueueValueWithSize = function (container, value, size) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: EnqueueValueWithSize should only be used on containers with [[queue]] and ' + '[[queueTotalSize]].');
size = Number(size);
+
if (!IsFiniteNonNegativeNumber(size)) {
throw new RangeError('Size must be a finite, non-NaN, non-negative number.');
}
+
container._queue.push({
value: value,
size: size
});
+
container._queueTotalSize += size;
};
+
exports.PeekQueueValue = function (container) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: PeekQueueValue should only be used on containers with [[queue]] and [[queueTotalSize]].');
assert(container._queue.length > 0, 'Spec-level failure: should never peek at an empty queue.');
var pair = container._queue[0];
return pair.value;
};
+
exports.ResetQueue = function (container) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: ResetQueue should only be used on containers with [[queue]] and [[queueTotalSize]].');
container._queue = [];
@@ -5341,17 +6380,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
Object.defineProperty(target, descriptor.key, descriptor);
}
}
+
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
+
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
+
var _require = __w_pdfjs_require__(0),
ArrayBufferCopy = _require.ArrayBufferCopy,
CreateIterResultObject = _require.CreateIterResultObject,
@@ -5361,17 +6403,21 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
TransferArrayBuffer = _require.TransferArrayBuffer,
ValidateAndNormalizeQueuingStrategy = _require.ValidateAndNormalizeQueuingStrategy,
ValidateAndNormalizeHighWaterMark = _require.ValidateAndNormalizeHighWaterMark;
+
var _require2 = __w_pdfjs_require__(0),
createArrayFromList = _require2.createArrayFromList,
createDataProperty = _require2.createDataProperty,
typeIsObject = _require2.typeIsObject;
+
var _require3 = __w_pdfjs_require__(1),
assert = _require3.assert,
rethrowAssertionErrorRejection = _require3.rethrowAssertionErrorRejection;
+
var _require4 = __w_pdfjs_require__(3),
DequeueValue = _require4.DequeueValue,
EnqueueValueWithSize = _require4.EnqueueValueWithSize,
ResetQueue = _require4.ResetQueue;
+
var _require5 = __w_pdfjs_require__(2),
AcquireWritableStreamDefaultWriter = _require5.AcquireWritableStreamDefaultWriter,
IsWritableStream = _require5.IsWritableStream,
@@ -5381,13 +6427,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
WritableStreamDefaultWriterRelease = _require5.WritableStreamDefaultWriterRelease,
WritableStreamDefaultWriterWrite = _require5.WritableStreamDefaultWriterWrite,
WritableStreamCloseQueuedOrInFlight = _require5.WritableStreamCloseQueuedOrInFlight;
+
var ReadableStream = function () {
function ReadableStream() {
var underlyingSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
size = _ref.size,
highWaterMark = _ref.highWaterMark;
+
_classCallCheck(this, ReadableStream);
+
this._state = 'readable';
this._reader = undefined;
this._storedError = undefined;
@@ -5395,29 +6445,35 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
this._readableStreamController = undefined;
var type = underlyingSource.type;
var typeString = String(type);
+
if (typeString === 'bytes') {
if (highWaterMark === undefined) {
highWaterMark = 0;
}
+
this._readableStreamController = new ReadableByteStreamController(this, underlyingSource, highWaterMark);
} else if (type === undefined) {
if (highWaterMark === undefined) {
highWaterMark = 1;
}
+
this._readableStreamController = new ReadableStreamDefaultController(this, underlyingSource, size, highWaterMark);
} else {
throw new RangeError('Invalid type is specified');
}
}
+
_createClass(ReadableStream, [{
key: 'cancel',
value: function cancel(reason) {
if (IsReadableStream(this) === false) {
return Promise.reject(streamBrandCheckException('cancel'));
}
+
if (IsReadableStreamLocked(this) === true) {
return Promise.reject(new TypeError('Cannot cancel a stream that already has a reader'));
}
+
return ReadableStreamCancel(this, reason);
}
}, {
@@ -5425,16 +6481,21 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
value: function getReader() {
var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
mode = _ref2.mode;
+
if (IsReadableStream(this) === false) {
throw streamBrandCheckException('getReader');
}
+
if (mode === undefined) {
return AcquireReadableStreamDefaultReader(this);
}
+
mode = String(mode);
+
if (mode === 'byob') {
return AcquireReadableStreamBYOBReader(this);
}
+
throw new RangeError('Invalid mode is specified');
}
}, {
@@ -5450,25 +6511,32 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
key: 'pipeTo',
value: function pipeTo(dest) {
var _this = this;
+
var _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
preventClose = _ref4.preventClose,
preventAbort = _ref4.preventAbort,
preventCancel = _ref4.preventCancel;
+
if (IsReadableStream(this) === false) {
return Promise.reject(streamBrandCheckException('pipeTo'));
}
+
if (IsWritableStream(dest) === false) {
return Promise.reject(new TypeError('ReadableStream.prototype.pipeTo\'s first argument must be a WritableStream'));
}
+
preventClose = Boolean(preventClose);
preventAbort = Boolean(preventAbort);
preventCancel = Boolean(preventCancel);
+
if (IsReadableStreamLocked(this) === true) {
return Promise.reject(new TypeError('ReadableStream.prototype.pipeTo cannot be used on a locked ReadableStream'));
}
+
if (IsWritableStreamLocked(dest) === true) {
return Promise.reject(new TypeError('ReadableStream.prototype.pipeTo cannot be used on a locked WritableStream'));
}
+
var reader = AcquireReadableStreamDefaultReader(this);
var writer = AcquireWritableStreamDefaultWriter(dest);
var shuttingDown = false;
@@ -5476,20 +6544,25 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return new Promise(function (resolve, reject) {
function pipeLoop() {
currentWrite = Promise.resolve();
+
if (shuttingDown === true) {
return Promise.resolve();
}
+
return writer._readyPromise.then(function () {
return ReadableStreamDefaultReaderRead(reader).then(function (_ref5) {
var value = _ref5.value,
done = _ref5.done;
+
if (done === true) {
return;
}
+
currentWrite = WritableStreamDefaultWriterWrite(writer, value).catch(function () {});
});
}).then(pipeLoop);
}
+
isOrBecomesErrored(_this, reader._closedPromise, function (storedError) {
if (preventAbort === false) {
shutdownWithAction(function () {
@@ -5517,8 +6590,10 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
shutdown();
}
});
+
if (WritableStreamCloseQueuedOrInFlight(dest) === true || dest._state === 'closed') {
var destClosed = new TypeError('the destination writable stream closed before all data could be piped to it');
+
if (preventCancel === false) {
shutdownWithAction(function () {
return ReadableStreamCancel(_this, destClosed);
@@ -5527,16 +6602,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
shutdown(true, destClosed);
}
}
+
pipeLoop().catch(function (err) {
currentWrite = Promise.resolve();
rethrowAssertionErrorRejection(err);
});
+
function waitForWritesToFinish() {
var oldCurrentWrite = currentWrite;
return currentWrite.then(function () {
return oldCurrentWrite !== currentWrite ? waitForWritesToFinish() : undefined;
});
}
+
function isOrBecomesErrored(stream, promise, action) {
if (stream._state === 'errored') {
action(stream._storedError);
@@ -5544,6 +6622,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
promise.catch(action).catch(rethrowAssertionErrorRejection);
}
}
+
function isOrBecomesClosed(stream, promise, action) {
if (stream._state === 'closed') {
action();
@@ -5551,16 +6630,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
promise.then(action).catch(rethrowAssertionErrorRejection);
}
}
+
function shutdownWithAction(action, originalIsError, originalError) {
if (shuttingDown === true) {
return;
}
+
shuttingDown = true;
+
if (dest._state === 'writable' && WritableStreamCloseQueuedOrInFlight(dest) === false) {
waitForWritesToFinish().then(doTheRest);
} else {
doTheRest();
}
+
function doTheRest() {
action().then(function () {
return finalize(originalIsError, originalError);
@@ -5569,11 +6652,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}).catch(rethrowAssertionErrorRejection);
}
}
+
function shutdown(isError, error) {
if (shuttingDown === true) {
return;
}
+
shuttingDown = true;
+
if (dest._state === 'writable' && WritableStreamCloseQueuedOrInFlight(dest) === false) {
waitForWritesToFinish().then(function () {
return finalize(isError, error);
@@ -5582,9 +6668,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
finalize(isError, error);
}
}
+
function finalize(isError, error) {
WritableStreamDefaultWriterRelease(writer);
ReadableStreamReaderGenericRelease(reader);
+
if (isError) {
reject(error);
} else {
@@ -5599,6 +6687,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStream(this) === false) {
throw streamBrandCheckException('tee');
}
+
var branches = ReadableStreamTee(this, false);
return createArrayFromList(branches);
}
@@ -5608,11 +6697,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStream(this) === false) {
throw streamBrandCheckException('locked');
}
+
return IsReadableStreamLocked(this);
}
}]);
+
return ReadableStream;
}();
+
module.exports = {
ReadableStream: ReadableStream,
IsReadableStreamDisturbed: IsReadableStreamDisturbed,
@@ -5621,32 +6713,42 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableStreamDefaultControllerError: ReadableStreamDefaultControllerError,
ReadableStreamDefaultControllerGetDesiredSize: ReadableStreamDefaultControllerGetDesiredSize
};
+
function AcquireReadableStreamBYOBReader(stream) {
return new ReadableStreamBYOBReader(stream);
}
+
function AcquireReadableStreamDefaultReader(stream) {
return new ReadableStreamDefaultReader(stream);
}
+
function IsReadableStream(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_readableStreamController')) {
return false;
}
+
return true;
}
+
function IsReadableStreamDisturbed(stream) {
assert(IsReadableStream(stream) === true, 'IsReadableStreamDisturbed should only be used on known readable streams');
return stream._disturbed;
}
+
function IsReadableStreamLocked(stream) {
assert(IsReadableStream(stream) === true, 'IsReadableStreamLocked should only be used on known readable streams');
+
if (stream._reader === undefined) {
return false;
}
+
return true;
}
+
function ReadableStreamTee(stream, cloneForBranch2) {
assert(IsReadableStream(stream) === true);
assert(typeof cloneForBranch2 === 'boolean');
@@ -5681,16 +6783,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var branch2Stream = new ReadableStream(underlyingSource2);
pull._branch1 = branch1Stream._readableStreamController;
pull._branch2 = branch2Stream._readableStreamController;
+
reader._closedPromise.catch(function (r) {
if (teeState.closedOrErrored === true) {
return;
}
+
ReadableStreamDefaultControllerError(pull._branch1, r);
ReadableStreamDefaultControllerError(pull._branch2, r);
teeState.closedOrErrored = true;
});
+
return [branch1Stream, branch2Stream];
}
+
function create_ReadableStreamTeePullFunction() {
function f() {
var reader = f._reader,
@@ -5702,60 +6808,79 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var value = result.value;
var done = result.done;
assert(typeof done === 'boolean');
+
if (done === true && teeState.closedOrErrored === false) {
if (teeState.canceled1 === false) {
ReadableStreamDefaultControllerClose(branch1);
}
+
if (teeState.canceled2 === false) {
ReadableStreamDefaultControllerClose(branch2);
}
+
teeState.closedOrErrored = true;
}
+
if (teeState.closedOrErrored === true) {
return;
}
+
var value1 = value;
var value2 = value;
+
if (teeState.canceled1 === false) {
ReadableStreamDefaultControllerEnqueue(branch1, value1);
}
+
if (teeState.canceled2 === false) {
ReadableStreamDefaultControllerEnqueue(branch2, value2);
}
});
}
+
return f;
}
+
function create_ReadableStreamTeeBranch1CancelFunction() {
function f(reason) {
var stream = f._stream,
teeState = f._teeState;
teeState.canceled1 = true;
teeState.reason1 = reason;
+
if (teeState.canceled2 === true) {
var compositeReason = createArrayFromList([teeState.reason1, teeState.reason2]);
var cancelResult = ReadableStreamCancel(stream, compositeReason);
+
teeState._resolve(cancelResult);
}
+
return teeState.promise;
}
+
return f;
}
+
function create_ReadableStreamTeeBranch2CancelFunction() {
function f(reason) {
var stream = f._stream,
teeState = f._teeState;
teeState.canceled2 = true;
teeState.reason2 = reason;
+
if (teeState.canceled1 === true) {
var compositeReason = createArrayFromList([teeState.reason1, teeState.reason2]);
var cancelResult = ReadableStreamCancel(stream, compositeReason);
+
teeState._resolve(cancelResult);
}
+
return teeState.promise;
}
+
return f;
}
+
function ReadableStreamAddReadIntoRequest(stream) {
assert(IsReadableStreamBYOBReader(stream._reader) === true);
assert(stream._state === 'readable' || stream._state === 'closed');
@@ -5764,10 +6889,12 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_resolve: resolve,
_reject: reject
};
+
stream._reader._readIntoRequests.push(readIntoRequest);
});
return promise;
}
+
function ReadableStreamAddReadRequest(stream) {
assert(IsReadableStreamDefaultReader(stream._reader) === true);
assert(stream._state === 'readable');
@@ -5776,126 +6903,172 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_resolve: resolve,
_reject: reject
};
+
stream._reader._readRequests.push(readRequest);
});
return promise;
}
+
function ReadableStreamCancel(stream, reason) {
stream._disturbed = true;
+
if (stream._state === 'closed') {
return Promise.resolve(undefined);
}
+
if (stream._state === 'errored') {
return Promise.reject(stream._storedError);
}
+
ReadableStreamClose(stream);
+
var sourceCancelPromise = stream._readableStreamController.__cancelSteps(reason);
+
return sourceCancelPromise.then(function () {
return undefined;
});
}
+
function ReadableStreamClose(stream) {
assert(stream._state === 'readable');
stream._state = 'closed';
var reader = stream._reader;
+
if (reader === undefined) {
return undefined;
}
+
if (IsReadableStreamDefaultReader(reader) === true) {
for (var i = 0; i < reader._readRequests.length; i++) {
var _resolve = reader._readRequests[i]._resolve;
+
_resolve(CreateIterResultObject(undefined, true));
}
+
reader._readRequests = [];
}
+
defaultReaderClosedPromiseResolve(reader);
return undefined;
}
+
function ReadableStreamError(stream, e) {
assert(IsReadableStream(stream) === true, 'stream must be ReadableStream');
assert(stream._state === 'readable', 'state must be readable');
stream._state = 'errored';
stream._storedError = e;
var reader = stream._reader;
+
if (reader === undefined) {
return undefined;
}
+
if (IsReadableStreamDefaultReader(reader) === true) {
for (var i = 0; i < reader._readRequests.length; i++) {
var readRequest = reader._readRequests[i];
+
readRequest._reject(e);
}
+
reader._readRequests = [];
} else {
assert(IsReadableStreamBYOBReader(reader), 'reader must be ReadableStreamBYOBReader');
+
for (var _i = 0; _i < reader._readIntoRequests.length; _i++) {
var readIntoRequest = reader._readIntoRequests[_i];
+
readIntoRequest._reject(e);
}
+
reader._readIntoRequests = [];
}
+
defaultReaderClosedPromiseReject(reader, e);
+
reader._closedPromise.catch(function () {});
}
+
function ReadableStreamFulfillReadIntoRequest(stream, chunk, done) {
var reader = stream._reader;
assert(reader._readIntoRequests.length > 0);
+
var readIntoRequest = reader._readIntoRequests.shift();
+
readIntoRequest._resolve(CreateIterResultObject(chunk, done));
}
+
function ReadableStreamFulfillReadRequest(stream, chunk, done) {
var reader = stream._reader;
assert(reader._readRequests.length > 0);
+
var readRequest = reader._readRequests.shift();
+
readRequest._resolve(CreateIterResultObject(chunk, done));
}
+
function ReadableStreamGetNumReadIntoRequests(stream) {
return stream._reader._readIntoRequests.length;
}
+
function ReadableStreamGetNumReadRequests(stream) {
return stream._reader._readRequests.length;
}
+
function ReadableStreamHasBYOBReader(stream) {
var reader = stream._reader;
+
if (reader === undefined) {
return false;
}
+
if (IsReadableStreamBYOBReader(reader) === false) {
return false;
}
+
return true;
}
+
function ReadableStreamHasDefaultReader(stream) {
var reader = stream._reader;
+
if (reader === undefined) {
return false;
}
+
if (IsReadableStreamDefaultReader(reader) === false) {
return false;
}
+
return true;
}
+
var ReadableStreamDefaultReader = function () {
function ReadableStreamDefaultReader(stream) {
_classCallCheck(this, ReadableStreamDefaultReader);
+
if (IsReadableStream(stream) === false) {
throw new TypeError('ReadableStreamDefaultReader can only be constructed with a ReadableStream instance');
}
+
if (IsReadableStreamLocked(stream) === true) {
throw new TypeError('This stream has already been locked for exclusive reading by another reader');
}
+
ReadableStreamReaderGenericInitialize(this, stream);
this._readRequests = [];
}
+
_createClass(ReadableStreamDefaultReader, [{
key: 'cancel',
value: function cancel(reason) {
if (IsReadableStreamDefaultReader(this) === false) {
return Promise.reject(defaultReaderBrandCheckException('cancel'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('cancel'));
}
+
return ReadableStreamReaderGenericCancel(this, reason);
}
}, {
@@ -5904,9 +7077,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultReader(this) === false) {
return Promise.reject(defaultReaderBrandCheckException('read'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('read from'));
}
+
return ReadableStreamDefaultReaderRead(this);
}
}, {
@@ -5915,12 +7090,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultReader(this) === false) {
throw defaultReaderBrandCheckException('releaseLock');
}
+
if (this._ownerReadableStream === undefined) {
return;
}
+
if (this._readRequests.length > 0) {
throw new TypeError('Tried to release a reader lock when that reader has pending read() calls un-settled');
}
+
ReadableStreamReaderGenericRelease(this);
}
}, {
@@ -5929,35 +7107,45 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultReader(this) === false) {
return Promise.reject(defaultReaderBrandCheckException('closed'));
}
+
return this._closedPromise;
}
}]);
+
return ReadableStreamDefaultReader;
}();
+
var ReadableStreamBYOBReader = function () {
function ReadableStreamBYOBReader(stream) {
_classCallCheck(this, ReadableStreamBYOBReader);
+
if (!IsReadableStream(stream)) {
throw new TypeError('ReadableStreamBYOBReader can only be constructed with a ReadableStream instance given a ' + 'byte source');
}
+
if (IsReadableByteStreamController(stream._readableStreamController) === false) {
throw new TypeError('Cannot construct a ReadableStreamBYOBReader for a stream not constructed with a byte ' + 'source');
}
+
if (IsReadableStreamLocked(stream)) {
throw new TypeError('This stream has already been locked for exclusive reading by another reader');
}
+
ReadableStreamReaderGenericInitialize(this, stream);
this._readIntoRequests = [];
}
+
_createClass(ReadableStreamBYOBReader, [{
key: 'cancel',
value: function cancel(reason) {
if (!IsReadableStreamBYOBReader(this)) {
return Promise.reject(byobReaderBrandCheckException('cancel'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('cancel'));
}
+
return ReadableStreamReaderGenericCancel(this, reason);
}
}, {
@@ -5966,15 +7154,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (!IsReadableStreamBYOBReader(this)) {
return Promise.reject(byobReaderBrandCheckException('read'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('read from'));
}
+
if (!ArrayBuffer.isView(view)) {
return Promise.reject(new TypeError('view must be an array buffer view'));
}
+
if (view.byteLength === 0) {
return Promise.reject(new TypeError('view must have non-zero byteLength'));
}
+
return ReadableStreamBYOBReaderRead(this, view);
}
}, {
@@ -5983,12 +7175,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (!IsReadableStreamBYOBReader(this)) {
throw byobReaderBrandCheckException('releaseLock');
}
+
if (this._ownerReadableStream === undefined) {
return;
}
+
if (this._readIntoRequests.length > 0) {
throw new TypeError('Tried to release a reader lock when that reader has pending read() calls un-settled');
}
+
ReadableStreamReaderGenericRelease(this);
}
}, {
@@ -5997,32 +7192,42 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (!IsReadableStreamBYOBReader(this)) {
return Promise.reject(byobReaderBrandCheckException('closed'));
}
+
return this._closedPromise;
}
}]);
+
return ReadableStreamBYOBReader;
}();
+
function IsReadableStreamBYOBReader(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_readIntoRequests')) {
return false;
}
+
return true;
}
+
function IsReadableStreamDefaultReader(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_readRequests')) {
return false;
}
+
return true;
}
+
function ReadableStreamReaderGenericInitialize(reader, stream) {
reader._ownerReadableStream = stream;
stream._reader = reader;
+
if (stream._state === 'readable') {
defaultReaderClosedPromiseInitialize(reader);
} else if (stream._state === 'closed') {
@@ -6030,57 +7235,74 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
} else {
assert(stream._state === 'errored', 'state must be errored');
defaultReaderClosedPromiseInitializeAsRejected(reader, stream._storedError);
+
reader._closedPromise.catch(function () {});
}
}
+
function ReadableStreamReaderGenericCancel(reader, reason) {
var stream = reader._ownerReadableStream;
assert(stream !== undefined);
return ReadableStreamCancel(stream, reason);
}
+
function ReadableStreamReaderGenericRelease(reader) {
assert(reader._ownerReadableStream !== undefined);
assert(reader._ownerReadableStream._reader === reader);
+
if (reader._ownerReadableStream._state === 'readable') {
defaultReaderClosedPromiseReject(reader, new TypeError('Reader was released and can no longer be used to monitor the stream\'s closedness'));
} else {
defaultReaderClosedPromiseResetToRejected(reader, new TypeError('Reader was released and can no longer be used to monitor the stream\'s closedness'));
}
+
reader._closedPromise.catch(function () {});
+
reader._ownerReadableStream._reader = undefined;
reader._ownerReadableStream = undefined;
}
+
function ReadableStreamBYOBReaderRead(reader, view) {
var stream = reader._ownerReadableStream;
assert(stream !== undefined);
stream._disturbed = true;
+
if (stream._state === 'errored') {
return Promise.reject(stream._storedError);
}
+
return ReadableByteStreamControllerPullInto(stream._readableStreamController, view);
}
+
function ReadableStreamDefaultReaderRead(reader) {
var stream = reader._ownerReadableStream;
assert(stream !== undefined);
stream._disturbed = true;
+
if (stream._state === 'closed') {
return Promise.resolve(CreateIterResultObject(undefined, true));
}
+
if (stream._state === 'errored') {
return Promise.reject(stream._storedError);
}
+
assert(stream._state === 'readable');
return stream._readableStreamController.__pullSteps();
}
+
var ReadableStreamDefaultController = function () {
function ReadableStreamDefaultController(stream, underlyingSource, size, highWaterMark) {
_classCallCheck(this, ReadableStreamDefaultController);
+
if (IsReadableStream(stream) === false) {
throw new TypeError('ReadableStreamDefaultController can only be constructed with a ReadableStream instance');
}
+
if (stream._readableStreamController !== undefined) {
throw new TypeError('ReadableStreamDefaultController instances can only be created by the ReadableStream constructor');
}
+
this._controlledReadableStream = stream;
this._underlyingSource = underlyingSource;
this._queue = undefined;
@@ -6104,19 +7326,24 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableStreamDefaultControllerErrorIfNeeded(controller, r);
}).catch(rethrowAssertionErrorRejection);
}
+
_createClass(ReadableStreamDefaultController, [{
key: 'close',
value: function close() {
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('close');
}
+
if (this._closeRequested === true) {
throw new TypeError('The stream has already been closed; do not close it again!');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be closed');
}
+
ReadableStreamDefaultControllerClose(this);
}
}, {
@@ -6125,13 +7352,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('enqueue');
}
+
if (this._closeRequested === true) {
throw new TypeError('stream is closed or draining');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be enqueued to');
}
+
return ReadableStreamDefaultControllerEnqueue(this, chunk);
}
}, {
@@ -6140,10 +7371,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('error');
}
+
var stream = this._controlledReadableStream;
+
if (stream._state !== 'readable') {
throw new TypeError('The stream is ' + stream._state + ' and so cannot be errored');
}
+
ReadableStreamDefaultControllerError(this, e);
}
}, {
@@ -6156,15 +7390,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
key: '__pullSteps',
value: function __pullSteps() {
var stream = this._controlledReadableStream;
+
if (this._queue.length > 0) {
var chunk = DequeueValue(this);
+
if (this._closeRequested === true && this._queue.length === 0) {
ReadableStreamClose(stream);
} else {
ReadableStreamDefaultControllerCallPullIfNeeded(this);
}
+
return Promise.resolve(CreateIterResultObject(chunk, false));
}
+
var pendingPromise = ReadableStreamAddReadRequest(stream);
ReadableStreamDefaultControllerCallPullIfNeeded(this);
return pendingPromise;
@@ -6175,83 +7413,108 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('desiredSize');
}
+
return ReadableStreamDefaultControllerGetDesiredSize(this);
}
}]);
+
return ReadableStreamDefaultController;
}();
+
function IsReadableStreamDefaultController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_underlyingSource')) {
return false;
}
+
return true;
}
+
function ReadableStreamDefaultControllerCallPullIfNeeded(controller) {
var shouldPull = ReadableStreamDefaultControllerShouldCallPull(controller);
+
if (shouldPull === false) {
return undefined;
}
+
if (controller._pulling === true) {
controller._pullAgain = true;
return undefined;
}
+
assert(controller._pullAgain === false);
controller._pulling = true;
var pullPromise = PromiseInvokeOrNoop(controller._underlyingSource, 'pull', [controller]);
pullPromise.then(function () {
controller._pulling = false;
+
if (controller._pullAgain === true) {
controller._pullAgain = false;
return ReadableStreamDefaultControllerCallPullIfNeeded(controller);
}
+
return undefined;
}, function (e) {
ReadableStreamDefaultControllerErrorIfNeeded(controller, e);
}).catch(rethrowAssertionErrorRejection);
return undefined;
}
+
function ReadableStreamDefaultControllerShouldCallPull(controller) {
var stream = controller._controlledReadableStream;
+
if (stream._state === 'closed' || stream._state === 'errored') {
return false;
}
+
if (controller._closeRequested === true) {
return false;
}
+
if (controller._started === false) {
return false;
}
+
if (IsReadableStreamLocked(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) {
return true;
}
+
var desiredSize = ReadableStreamDefaultControllerGetDesiredSize(controller);
+
if (desiredSize > 0) {
return true;
}
+
return false;
}
+
function ReadableStreamDefaultControllerClose(controller) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
assert(stream._state === 'readable');
controller._closeRequested = true;
+
if (controller._queue.length === 0) {
ReadableStreamClose(stream);
}
}
+
function ReadableStreamDefaultControllerEnqueue(controller, chunk) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
assert(stream._state === 'readable');
+
if (IsReadableStreamLocked(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) {
ReadableStreamFulfillReadRequest(stream, chunk, false);
} else {
var chunkSize = 1;
+
if (controller._strategySize !== undefined) {
var strategySize = controller._strategySize;
+
try {
chunkSize = strategySize(chunk);
} catch (chunkSizeE) {
@@ -6259,6 +7522,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
throw chunkSizeE;
}
}
+
try {
EnqueueValueWithSize(controller, chunk, chunkSize);
} catch (enqueueE) {
@@ -6266,46 +7530,58 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
throw enqueueE;
}
}
+
ReadableStreamDefaultControllerCallPullIfNeeded(controller);
return undefined;
}
+
function ReadableStreamDefaultControllerError(controller, e) {
var stream = controller._controlledReadableStream;
assert(stream._state === 'readable');
ResetQueue(controller);
ReadableStreamError(stream, e);
}
+
function ReadableStreamDefaultControllerErrorIfNeeded(controller, e) {
if (controller._controlledReadableStream._state === 'readable') {
ReadableStreamDefaultControllerError(controller, e);
}
}
+
function ReadableStreamDefaultControllerGetDesiredSize(controller) {
var stream = controller._controlledReadableStream;
var state = stream._state;
+
if (state === 'errored') {
return null;
}
+
if (state === 'closed') {
return 0;
}
+
return controller._strategyHWM - controller._queueTotalSize;
}
+
var ReadableStreamBYOBRequest = function () {
function ReadableStreamBYOBRequest(controller, view) {
_classCallCheck(this, ReadableStreamBYOBRequest);
+
this._associatedReadableByteStreamController = controller;
this._view = view;
}
+
_createClass(ReadableStreamBYOBRequest, [{
key: 'respond',
value: function respond(bytesWritten) {
if (IsReadableStreamBYOBRequest(this) === false) {
throw byobRequestBrandCheckException('respond');
}
+
if (this._associatedReadableByteStreamController === undefined) {
throw new TypeError('This BYOB request has been invalidated');
}
+
ReadableByteStreamControllerRespond(this._associatedReadableByteStreamController, bytesWritten);
}
}, {
@@ -6314,12 +7590,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamBYOBRequest(this) === false) {
throw byobRequestBrandCheckException('respond');
}
+
if (this._associatedReadableByteStreamController === undefined) {
throw new TypeError('This BYOB request has been invalidated');
}
+
if (!ArrayBuffer.isView(view)) {
throw new TypeError('You can only respond with array buffer views');
}
+
ReadableByteStreamControllerRespondWithNewView(this._associatedReadableByteStreamController, view);
}
}, {
@@ -6328,17 +7607,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return this._view;
}
}]);
+
return ReadableStreamBYOBRequest;
}();
+
var ReadableByteStreamController = function () {
function ReadableByteStreamController(stream, underlyingByteSource, highWaterMark) {
_classCallCheck(this, ReadableByteStreamController);
+
if (IsReadableStream(stream) === false) {
throw new TypeError('ReadableByteStreamController can only be constructed with a ReadableStream instance given ' + 'a byte source');
}
+
if (stream._readableStreamController !== undefined) {
throw new TypeError('ReadableByteStreamController instances can only be created by the ReadableStream constructor given a byte ' + 'source');
}
+
this._controlledReadableStream = stream;
this._underlyingByteSource = underlyingByteSource;
this._pullAgain = false;
@@ -6350,11 +7634,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
this._started = false;
this._strategyHWM = ValidateAndNormalizeHighWaterMark(highWaterMark);
var autoAllocateChunkSize = underlyingByteSource.autoAllocateChunkSize;
+
if (autoAllocateChunkSize !== undefined) {
if (Number.isInteger(autoAllocateChunkSize) === false || autoAllocateChunkSize <= 0) {
throw new RangeError('autoAllocateChunkSize must be a positive integer');
}
}
+
this._autoAllocateChunkSize = autoAllocateChunkSize;
this._pendingPullIntos = [];
var controller = this;
@@ -6370,19 +7656,24 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
}).catch(rethrowAssertionErrorRejection);
}
+
_createClass(ReadableByteStreamController, [{
key: 'close',
value: function close() {
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('close');
}
+
if (this._closeRequested === true) {
throw new TypeError('The stream has already been closed; do not close it again!');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be closed');
}
+
ReadableByteStreamControllerClose(this);
}
}, {
@@ -6391,16 +7682,21 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('enqueue');
}
+
if (this._closeRequested === true) {
throw new TypeError('stream is closed or draining');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be enqueued to');
}
+
if (!ArrayBuffer.isView(chunk)) {
throw new TypeError('You can only enqueue array buffer views when using a ReadableByteStreamController');
}
+
ReadableByteStreamControllerEnqueue(this, chunk);
}
}, {
@@ -6409,10 +7705,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('error');
}
+
var stream = this._controlledReadableStream;
+
if (stream._state !== 'readable') {
throw new TypeError('The stream is ' + stream._state + ' and so cannot be errored');
}
+
ReadableByteStreamControllerError(this, e);
}
}, {
@@ -6422,6 +7721,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var firstDescriptor = this._pendingPullIntos[0];
firstDescriptor.bytesFilled = 0;
}
+
ResetQueue(this);
return PromiseInvokeOrNoop(this._underlyingByteSource, 'cancel', [reason]);
}
@@ -6430,27 +7730,36 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
value: function __pullSteps() {
var stream = this._controlledReadableStream;
assert(ReadableStreamHasDefaultReader(stream) === true);
+
if (this._queueTotalSize > 0) {
assert(ReadableStreamGetNumReadRequests(stream) === 0);
+
var entry = this._queue.shift();
+
this._queueTotalSize -= entry.byteLength;
ReadableByteStreamControllerHandleQueueDrain(this);
var view = void 0;
+
try {
view = new Uint8Array(entry.buffer, entry.byteOffset, entry.byteLength);
} catch (viewE) {
return Promise.reject(viewE);
}
+
return Promise.resolve(CreateIterResultObject(view, false));
}
+
var autoAllocateChunkSize = this._autoAllocateChunkSize;
+
if (autoAllocateChunkSize !== undefined) {
var buffer = void 0;
+
try {
buffer = new ArrayBuffer(autoAllocateChunkSize);
} catch (bufferE) {
return Promise.reject(bufferE);
}
+
var pullIntoDescriptor = {
buffer: buffer,
byteOffset: 0,
@@ -6460,8 +7769,10 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ctor: Uint8Array,
readerType: 'default'
};
+
this._pendingPullIntos.push(pullIntoDescriptor);
}
+
var promise = ReadableStreamAddReadRequest(stream);
ReadableByteStreamControllerCallPullIfNeeded(this);
return promise;
@@ -6472,11 +7783,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('byobRequest');
}
+
if (this._byobRequest === undefined && this._pendingPullIntos.length > 0) {
var firstDescriptor = this._pendingPullIntos[0];
var view = new Uint8Array(firstDescriptor.buffer, firstDescriptor.byteOffset + firstDescriptor.bytesFilled, firstDescriptor.byteLength - firstDescriptor.bytesFilled);
this._byobRequest = new ReadableStreamBYOBRequest(this, view);
}
+
return this._byobRequest;
}
}, {
@@ -6485,43 +7798,56 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('desiredSize');
}
+
return ReadableByteStreamControllerGetDesiredSize(this);
}
}]);
+
return ReadableByteStreamController;
}();
+
function IsReadableByteStreamController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_underlyingByteSource')) {
return false;
}
+
return true;
}
+
function IsReadableStreamBYOBRequest(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_associatedReadableByteStreamController')) {
return false;
}
+
return true;
}
+
function ReadableByteStreamControllerCallPullIfNeeded(controller) {
var shouldPull = ReadableByteStreamControllerShouldCallPull(controller);
+
if (shouldPull === false) {
return undefined;
}
+
if (controller._pulling === true) {
controller._pullAgain = true;
return undefined;
}
+
assert(controller._pullAgain === false);
controller._pulling = true;
var pullPromise = PromiseInvokeOrNoop(controller._underlyingByteSource, 'pull', [controller]);
pullPromise.then(function () {
controller._pulling = false;
+
if (controller._pullAgain === true) {
controller._pullAgain = false;
ReadableByteStreamControllerCallPullIfNeeded(controller);
@@ -6533,18 +7859,23 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}).catch(rethrowAssertionErrorRejection);
return undefined;
}
+
function ReadableByteStreamControllerClearPendingPullIntos(controller) {
ReadableByteStreamControllerInvalidateBYOBRequest(controller);
controller._pendingPullIntos = [];
}
+
function ReadableByteStreamControllerCommitPullIntoDescriptor(stream, pullIntoDescriptor) {
assert(stream._state !== 'errored', 'state must not be errored');
var done = false;
+
if (stream._state === 'closed') {
assert(pullIntoDescriptor.bytesFilled === 0);
done = true;
}
+
var filledView = ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
+
if (pullIntoDescriptor.readerType === 'default') {
ReadableStreamFulfillReadRequest(stream, filledView, done);
} else {
@@ -6552,6 +7883,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableStreamFulfillReadIntoRequest(stream, filledView, done);
}
}
+
function ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor) {
var bytesFilled = pullIntoDescriptor.bytesFilled;
var elementSize = pullIntoDescriptor.elementSize;
@@ -6559,14 +7891,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
assert(bytesFilled % elementSize === 0);
return new pullIntoDescriptor.ctor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, bytesFilled / elementSize);
}
+
function ReadableByteStreamControllerEnqueueChunkToQueue(controller, buffer, byteOffset, byteLength) {
controller._queue.push({
buffer: buffer,
byteOffset: byteOffset,
byteLength: byteLength
});
+
controller._queueTotalSize += byteLength;
}
+
function ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) {
var elementSize = pullIntoDescriptor.elementSize;
var currentAlignedBytes = pullIntoDescriptor.bytesFilled - pullIntoDescriptor.bytesFilled % elementSize;
@@ -6575,73 +7910,92 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var maxAlignedBytes = maxBytesFilled - maxBytesFilled % elementSize;
var totalBytesToCopyRemaining = maxBytesToCopy;
var ready = false;
+
if (maxAlignedBytes > currentAlignedBytes) {
totalBytesToCopyRemaining = maxAlignedBytes - pullIntoDescriptor.bytesFilled;
ready = true;
}
+
var queue = controller._queue;
+
while (totalBytesToCopyRemaining > 0) {
var headOfQueue = queue[0];
var bytesToCopy = Math.min(totalBytesToCopyRemaining, headOfQueue.byteLength);
var destStart = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
ArrayBufferCopy(pullIntoDescriptor.buffer, destStart, headOfQueue.buffer, headOfQueue.byteOffset, bytesToCopy);
+
if (headOfQueue.byteLength === bytesToCopy) {
queue.shift();
} else {
headOfQueue.byteOffset += bytesToCopy;
headOfQueue.byteLength -= bytesToCopy;
}
+
controller._queueTotalSize -= bytesToCopy;
ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, bytesToCopy, pullIntoDescriptor);
totalBytesToCopyRemaining -= bytesToCopy;
}
+
if (ready === false) {
assert(controller._queueTotalSize === 0, 'queue must be empty');
assert(pullIntoDescriptor.bytesFilled > 0);
assert(pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize);
}
+
return ready;
}
+
function ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, size, pullIntoDescriptor) {
assert(controller._pendingPullIntos.length === 0 || controller._pendingPullIntos[0] === pullIntoDescriptor);
ReadableByteStreamControllerInvalidateBYOBRequest(controller);
pullIntoDescriptor.bytesFilled += size;
}
+
function ReadableByteStreamControllerHandleQueueDrain(controller) {
assert(controller._controlledReadableStream._state === 'readable');
+
if (controller._queueTotalSize === 0 && controller._closeRequested === true) {
ReadableStreamClose(controller._controlledReadableStream);
} else {
ReadableByteStreamControllerCallPullIfNeeded(controller);
}
}
+
function ReadableByteStreamControllerInvalidateBYOBRequest(controller) {
if (controller._byobRequest === undefined) {
return;
}
+
controller._byobRequest._associatedReadableByteStreamController = undefined;
controller._byobRequest._view = undefined;
controller._byobRequest = undefined;
}
+
function ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller) {
assert(controller._closeRequested === false);
+
while (controller._pendingPullIntos.length > 0) {
if (controller._queueTotalSize === 0) {
return;
}
+
var pullIntoDescriptor = controller._pendingPullIntos[0];
+
if (ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) === true) {
ReadableByteStreamControllerShiftPendingPullInto(controller);
ReadableByteStreamControllerCommitPullIntoDescriptor(controller._controlledReadableStream, pullIntoDescriptor);
}
}
}
+
function ReadableByteStreamControllerPullInto(controller, view) {
var stream = controller._controlledReadableStream;
var elementSize = 1;
+
if (view.constructor !== DataView) {
elementSize = view.constructor.BYTES_PER_ELEMENT;
}
+
var ctor = view.constructor;
var pullIntoDescriptor = {
buffer: view.buffer,
@@ -6652,37 +8006,48 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ctor: ctor,
readerType: 'byob'
};
+
if (controller._pendingPullIntos.length > 0) {
pullIntoDescriptor.buffer = TransferArrayBuffer(pullIntoDescriptor.buffer);
+
controller._pendingPullIntos.push(pullIntoDescriptor);
+
return ReadableStreamAddReadIntoRequest(stream);
}
+
if (stream._state === 'closed') {
var emptyView = new view.constructor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, 0);
return Promise.resolve(CreateIterResultObject(emptyView, true));
}
+
if (controller._queueTotalSize > 0) {
if (ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) === true) {
var filledView = ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
ReadableByteStreamControllerHandleQueueDrain(controller);
return Promise.resolve(CreateIterResultObject(filledView, false));
}
+
if (controller._closeRequested === true) {
var e = new TypeError('Insufficient bytes to fill elements in the given buffer');
ReadableByteStreamControllerError(controller, e);
return Promise.reject(e);
}
}
+
pullIntoDescriptor.buffer = TransferArrayBuffer(pullIntoDescriptor.buffer);
+
controller._pendingPullIntos.push(pullIntoDescriptor);
+
var promise = ReadableStreamAddReadIntoRequest(stream);
ReadableByteStreamControllerCallPullIfNeeded(controller);
return promise;
}
+
function ReadableByteStreamControllerRespondInClosedState(controller, firstDescriptor) {
firstDescriptor.buffer = TransferArrayBuffer(firstDescriptor.buffer);
assert(firstDescriptor.bytesFilled === 0, 'bytesFilled must be 0');
var stream = controller._controlledReadableStream;
+
if (ReadableStreamHasBYOBReader(stream) === true) {
while (ReadableStreamGetNumReadIntoRequests(stream) > 0) {
var pullIntoDescriptor = ReadableByteStreamControllerShiftPendingPullInto(controller);
@@ -6690,84 +8055,109 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
}
}
+
function ReadableByteStreamControllerRespondInReadableState(controller, bytesWritten, pullIntoDescriptor) {
if (pullIntoDescriptor.bytesFilled + bytesWritten > pullIntoDescriptor.byteLength) {
throw new RangeError('bytesWritten out of range');
}
+
ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, bytesWritten, pullIntoDescriptor);
+
if (pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize) {
return;
}
+
ReadableByteStreamControllerShiftPendingPullInto(controller);
var remainderSize = pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize;
+
if (remainderSize > 0) {
var end = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
var remainder = pullIntoDescriptor.buffer.slice(end - remainderSize, end);
ReadableByteStreamControllerEnqueueChunkToQueue(controller, remainder, 0, remainder.byteLength);
}
+
pullIntoDescriptor.buffer = TransferArrayBuffer(pullIntoDescriptor.buffer);
pullIntoDescriptor.bytesFilled -= remainderSize;
ReadableByteStreamControllerCommitPullIntoDescriptor(controller._controlledReadableStream, pullIntoDescriptor);
ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller);
}
+
function ReadableByteStreamControllerRespondInternal(controller, bytesWritten) {
var firstDescriptor = controller._pendingPullIntos[0];
var stream = controller._controlledReadableStream;
+
if (stream._state === 'closed') {
if (bytesWritten !== 0) {
throw new TypeError('bytesWritten must be 0 when calling respond() on a closed stream');
}
+
ReadableByteStreamControllerRespondInClosedState(controller, firstDescriptor);
} else {
assert(stream._state === 'readable');
ReadableByteStreamControllerRespondInReadableState(controller, bytesWritten, firstDescriptor);
}
}
+
function ReadableByteStreamControllerShiftPendingPullInto(controller) {
var descriptor = controller._pendingPullIntos.shift();
+
ReadableByteStreamControllerInvalidateBYOBRequest(controller);
return descriptor;
}
+
function ReadableByteStreamControllerShouldCallPull(controller) {
var stream = controller._controlledReadableStream;
+
if (stream._state !== 'readable') {
return false;
}
+
if (controller._closeRequested === true) {
return false;
}
+
if (controller._started === false) {
return false;
}
+
if (ReadableStreamHasDefaultReader(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) {
return true;
}
+
if (ReadableStreamHasBYOBReader(stream) === true && ReadableStreamGetNumReadIntoRequests(stream) > 0) {
return true;
}
+
if (ReadableByteStreamControllerGetDesiredSize(controller) > 0) {
return true;
}
+
return false;
}
+
function ReadableByteStreamControllerClose(controller) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
assert(stream._state === 'readable');
+
if (controller._queueTotalSize > 0) {
controller._closeRequested = true;
return;
}
+
if (controller._pendingPullIntos.length > 0) {
var firstPendingPullInto = controller._pendingPullIntos[0];
+
if (firstPendingPullInto.bytesFilled > 0) {
var e = new TypeError('Insufficient bytes to fill elements in the given buffer');
ReadableByteStreamControllerError(controller, e);
throw e;
}
}
+
ReadableStreamClose(stream);
}
+
function ReadableByteStreamControllerEnqueue(controller, chunk) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
@@ -6776,6 +8166,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var byteOffset = chunk.byteOffset;
var byteLength = chunk.byteLength;
var transferredBuffer = TransferArrayBuffer(buffer);
+
if (ReadableStreamHasDefaultReader(stream) === true) {
if (ReadableStreamGetNumReadRequests(stream) === 0) {
ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
@@ -6792,6 +8183,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
}
}
+
function ReadableByteStreamControllerError(controller, e) {
var stream = controller._controlledReadableStream;
assert(stream._state === 'readable');
@@ -6799,93 +8191,122 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ResetQueue(controller);
ReadableStreamError(stream, e);
}
+
function ReadableByteStreamControllerGetDesiredSize(controller) {
var stream = controller._controlledReadableStream;
var state = stream._state;
+
if (state === 'errored') {
return null;
}
+
if (state === 'closed') {
return 0;
}
+
return controller._strategyHWM - controller._queueTotalSize;
}
+
function ReadableByteStreamControllerRespond(controller, bytesWritten) {
bytesWritten = Number(bytesWritten);
+
if (IsFiniteNonNegativeNumber(bytesWritten) === false) {
throw new RangeError('bytesWritten must be a finite');
}
+
assert(controller._pendingPullIntos.length > 0);
ReadableByteStreamControllerRespondInternal(controller, bytesWritten);
}
+
function ReadableByteStreamControllerRespondWithNewView(controller, view) {
assert(controller._pendingPullIntos.length > 0);
var firstDescriptor = controller._pendingPullIntos[0];
+
if (firstDescriptor.byteOffset + firstDescriptor.bytesFilled !== view.byteOffset) {
throw new RangeError('The region specified by view does not match byobRequest');
}
+
if (firstDescriptor.byteLength !== view.byteLength) {
throw new RangeError('The buffer of view has different capacity than byobRequest');
}
+
firstDescriptor.buffer = view.buffer;
ReadableByteStreamControllerRespondInternal(controller, view.byteLength);
}
+
function streamBrandCheckException(name) {
return new TypeError('ReadableStream.prototype.' + name + ' can only be used on a ReadableStream');
}
+
function readerLockException(name) {
return new TypeError('Cannot ' + name + ' a stream using a released reader');
}
+
function defaultReaderBrandCheckException(name) {
return new TypeError('ReadableStreamDefaultReader.prototype.' + name + ' can only be used on a ReadableStreamDefaultReader');
}
+
function defaultReaderClosedPromiseInitialize(reader) {
reader._closedPromise = new Promise(function (resolve, reject) {
reader._closedPromise_resolve = resolve;
reader._closedPromise_reject = reject;
});
}
+
function defaultReaderClosedPromiseInitializeAsRejected(reader, reason) {
reader._closedPromise = Promise.reject(reason);
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function defaultReaderClosedPromiseInitializeAsResolved(reader) {
reader._closedPromise = Promise.resolve(undefined);
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function defaultReaderClosedPromiseReject(reader, reason) {
assert(reader._closedPromise_resolve !== undefined);
assert(reader._closedPromise_reject !== undefined);
+
reader._closedPromise_reject(reason);
+
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function defaultReaderClosedPromiseResetToRejected(reader, reason) {
assert(reader._closedPromise_resolve === undefined);
assert(reader._closedPromise_reject === undefined);
reader._closedPromise = Promise.reject(reason);
}
+
function defaultReaderClosedPromiseResolve(reader) {
assert(reader._closedPromise_resolve !== undefined);
assert(reader._closedPromise_reject !== undefined);
+
reader._closedPromise_resolve(undefined);
+
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function byobReaderBrandCheckException(name) {
return new TypeError('ReadableStreamBYOBReader.prototype.' + name + ' can only be used on a ReadableStreamBYOBReader');
}
+
function defaultControllerBrandCheckException(name) {
return new TypeError('ReadableStreamDefaultController.prototype.' + name + ' can only be used on a ReadableStreamDefaultController');
}
+
function byobRequestBrandCheckException(name) {
return new TypeError('ReadableStreamBYOBRequest.prototype.' + name + ' can only be used on a ReadableStreamBYOBRequest');
}
+
function byteStreamControllerBrandCheckException(name) {
return new TypeError('ReadableByteStreamController.prototype.' + name + ' can only be used on a ReadableByteStreamController');
}
+
function ifIsObjectAndHasAPromiseIsHandledInternalSlotSetPromiseIsHandledToTrue(promise) {
try {
Promise.prototype.then.call(promise, undefined, function () {});
@@ -6895,8 +8316,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
"use strict";
var transformStream = __w_pdfjs_require__(6);
+
var readableStream = __w_pdfjs_require__(4);
+
var writableStream = __w_pdfjs_require__(2);
+
exports.TransformStream = transformStream.TransformStream;
exports.ReadableStream = readableStream.ReadableStream;
exports.IsReadableStreamDisturbed = readableStream.IsReadableStreamDisturbed;
@@ -6926,50 +8350,63 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
Object.defineProperty(target, descriptor.key, descriptor);
}
}
+
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
+
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
+
var _require = __w_pdfjs_require__(1),
assert = _require.assert;
+
var _require2 = __w_pdfjs_require__(0),
InvokeOrNoop = _require2.InvokeOrNoop,
PromiseInvokeOrPerformFallback = _require2.PromiseInvokeOrPerformFallback,
PromiseInvokeOrNoop = _require2.PromiseInvokeOrNoop,
typeIsObject = _require2.typeIsObject;
+
var _require3 = __w_pdfjs_require__(4),
ReadableStream = _require3.ReadableStream,
ReadableStreamDefaultControllerClose = _require3.ReadableStreamDefaultControllerClose,
ReadableStreamDefaultControllerEnqueue = _require3.ReadableStreamDefaultControllerEnqueue,
ReadableStreamDefaultControllerError = _require3.ReadableStreamDefaultControllerError,
ReadableStreamDefaultControllerGetDesiredSize = _require3.ReadableStreamDefaultControllerGetDesiredSize;
+
var _require4 = __w_pdfjs_require__(2),
WritableStream = _require4.WritableStream,
WritableStreamDefaultControllerError = _require4.WritableStreamDefaultControllerError;
+
function TransformStreamCloseReadable(transformStream) {
if (transformStream._errored === true) {
throw new TypeError('TransformStream is already errored');
}
+
if (transformStream._readableClosed === true) {
throw new TypeError('Readable side is already closed');
}
+
TransformStreamCloseReadableInternal(transformStream);
}
+
function TransformStreamEnqueueToReadable(transformStream, chunk) {
if (transformStream._errored === true) {
throw new TypeError('TransformStream is already errored');
}
+
if (transformStream._readableClosed === true) {
throw new TypeError('Readable side is already closed');
}
+
var controller = transformStream._readableController;
+
try {
ReadableStreamDefaultControllerEnqueue(controller, chunk);
} catch (e) {
@@ -6977,70 +8414,91 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
TransformStreamErrorIfNeeded(transformStream, e);
throw transformStream._storedError;
}
+
var desiredSize = ReadableStreamDefaultControllerGetDesiredSize(controller);
var maybeBackpressure = desiredSize <= 0;
+
if (maybeBackpressure === true && transformStream._backpressure === false) {
TransformStreamSetBackpressure(transformStream, true);
}
}
+
function TransformStreamError(transformStream, e) {
if (transformStream._errored === true) {
throw new TypeError('TransformStream is already errored');
}
+
TransformStreamErrorInternal(transformStream, e);
}
+
function TransformStreamCloseReadableInternal(transformStream) {
assert(transformStream._errored === false);
assert(transformStream._readableClosed === false);
+
try {
ReadableStreamDefaultControllerClose(transformStream._readableController);
} catch (e) {
assert(false);
}
+
transformStream._readableClosed = true;
}
+
function TransformStreamErrorIfNeeded(transformStream, e) {
if (transformStream._errored === false) {
TransformStreamErrorInternal(transformStream, e);
}
}
+
function TransformStreamErrorInternal(transformStream, e) {
assert(transformStream._errored === false);
transformStream._errored = true;
transformStream._storedError = e;
+
if (transformStream._writableDone === false) {
WritableStreamDefaultControllerError(transformStream._writableController, e);
}
+
if (transformStream._readableClosed === false) {
ReadableStreamDefaultControllerError(transformStream._readableController, e);
}
}
+
function TransformStreamReadableReadyPromise(transformStream) {
assert(transformStream._backpressureChangePromise !== undefined, '_backpressureChangePromise should have been initialized');
+
if (transformStream._backpressure === false) {
return Promise.resolve();
}
+
assert(transformStream._backpressure === true, '_backpressure should have been initialized');
return transformStream._backpressureChangePromise;
}
+
function TransformStreamSetBackpressure(transformStream, backpressure) {
assert(transformStream._backpressure !== backpressure, 'TransformStreamSetBackpressure() should be called only when backpressure is changed');
+
if (transformStream._backpressureChangePromise !== undefined) {
transformStream._backpressureChangePromise_resolve(backpressure);
}
+
transformStream._backpressureChangePromise = new Promise(function (resolve) {
transformStream._backpressureChangePromise_resolve = resolve;
});
+
transformStream._backpressureChangePromise.then(function (resolution) {
assert(resolution !== backpressure, '_backpressureChangePromise should be fulfilled only when backpressure is changed');
});
+
transformStream._backpressure = backpressure;
}
+
function TransformStreamDefaultTransform(chunk, transformStreamController) {
var transformStream = transformStreamController._controlledTransformStream;
TransformStreamEnqueueToReadable(transformStream, chunk);
return Promise.resolve();
}
+
function TransformStreamTransform(transformStream, chunk) {
assert(transformStream._errored === false);
assert(transformStream._transforming === false);
@@ -7057,30 +8515,39 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return Promise.reject(e);
});
}
+
function IsTransformStreamDefaultController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_controlledTransformStream')) {
return false;
}
+
return true;
}
+
function IsTransformStream(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_transformStreamController')) {
return false;
}
+
return true;
}
+
var TransformStreamSink = function () {
function TransformStreamSink(transformStream, startPromise) {
_classCallCheck(this, TransformStreamSink);
+
this._transformStream = transformStream;
this._startPromise = startPromise;
}
+
_createClass(TransformStreamSink, [{
key: 'start',
value: function start(c) {
@@ -7114,9 +8581,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (transformStream._errored === true) {
return Promise.reject(transformStream._storedError);
}
+
if (transformStream._readableClosed === false) {
TransformStreamCloseReadableInternal(transformStream);
}
+
return Promise.resolve();
}).catch(function (r) {
TransformStreamErrorIfNeeded(transformStream, r);
@@ -7124,14 +8593,18 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
}
}]);
+
return TransformStreamSink;
}();
+
var TransformStreamSource = function () {
function TransformStreamSource(transformStream, startPromise) {
_classCallCheck(this, TransformStreamSource);
+
this._transformStream = transformStream;
this._startPromise = startPromise;
}
+
_createClass(TransformStreamSource, [{
key: 'start',
value: function start(c) {
@@ -7139,9 +8612,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
transformStream._readableController = c;
return this._startPromise.then(function () {
assert(transformStream._backpressureChangePromise !== undefined, '_backpressureChangePromise should have been initialized');
+
if (transformStream._backpressure === true) {
return Promise.resolve();
}
+
assert(transformStream._backpressure === false, '_backpressure should have been initialized');
return transformStream._backpressureChangePromise;
});
@@ -7163,25 +8638,32 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
TransformStreamErrorInternal(transformStream, new TypeError('Readable side canceled'));
}
}]);
+
return TransformStreamSource;
}();
+
var TransformStreamDefaultController = function () {
function TransformStreamDefaultController(transformStream) {
_classCallCheck(this, TransformStreamDefaultController);
+
if (IsTransformStream(transformStream) === false) {
throw new TypeError('TransformStreamDefaultController can only be ' + 'constructed with a TransformStream instance');
}
+
if (transformStream._transformStreamController !== undefined) {
throw new TypeError('TransformStreamDefaultController instances can ' + 'only be created by the TransformStream constructor');
}
+
this._controlledTransformStream = transformStream;
}
+
_createClass(TransformStreamDefaultController, [{
key: 'enqueue',
value: function enqueue(chunk) {
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('enqueue');
}
+
TransformStreamEnqueueToReadable(this._controlledTransformStream, chunk);
}
}, {
@@ -7190,6 +8672,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('close');
}
+
TransformStreamCloseReadable(this._controlledTransformStream);
}
}, {
@@ -7198,6 +8681,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('error');
}
+
TransformStreamError(this._controlledTransformStream, reason);
}
}, {
@@ -7206,17 +8690,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('desiredSize');
}
+
var transformStream = this._controlledTransformStream;
var readableController = transformStream._readableController;
return ReadableStreamDefaultControllerGetDesiredSize(readableController);
}
}]);
+
return TransformStreamDefaultController;
}();
+
var TransformStream = function () {
function TransformStream() {
var transformer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
_classCallCheck(this, TransformStream);
+
this._transformer = transformer;
var readableStrategy = transformer.readableStrategy,
writableStrategy = transformer.writableStrategy;
@@ -7254,12 +8743,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
});
}
+
_createClass(TransformStream, [{
key: 'readable',
get: function get() {
if (IsTransformStream(this) === false) {
throw streamBrandCheckException('readable');
}
+
return this._readable;
}
}, {
@@ -7268,15 +8759,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStream(this) === false) {
throw streamBrandCheckException('writable');
}
+
return this._writable;
}
}]);
+
return TransformStream;
}();
- module.exports = { TransformStream: TransformStream };
+
+ module.exports = {
+ TransformStream: TransformStream
+ };
+
function defaultControllerBrandCheckException(name) {
return new TypeError('TransformStreamDefaultController.prototype.' + name + ' can only be used on a TransformStreamDefaultController');
}
+
function streamBrandCheckException(name) {
return new TypeError('TransformStream.prototype.' + name + ' can only be used on a TransformStream');
}
@@ -7291,10 +8789,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
{
var isURLSupported = false;
+
try {
if (typeof URL === 'function' && _typeof(URL.prototype) === 'object' && 'origin' in URL.prototype) {
var u = new URL('b', 'http://a');
@@ -7302,19 +8801,24 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
isURLSupported = u.href === 'http://a/c%20d';
}
} catch (ex) {}
+
if (isURLSupported) {
exports.URL = URL;
} else {
var PolyfillURL = __w_pdfjs_require__(132).URL;
+
var OriginalURL = __w_pdfjs_require__(3).URL;
+
if (OriginalURL) {
PolyfillURL.createObjectURL = function (blob) {
return OriginalURL.createObjectURL.apply(OriginalURL, arguments);
};
+
PolyfillURL.revokeObjectURL = function (url) {
OriginalURL.revokeObjectURL(url);
};
}
+
exports.URL = PolyfillURL;
}
}
@@ -7342,48 +8846,63 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
relativePathDotMapping['.%2e'] = '..';
relativePathDotMapping['%2e.'] = '..';
relativePathDotMapping['%2e%2e'] = '..';
+
function isRelativeScheme(scheme) {
return relative[scheme] !== undefined;
}
+
function invalid() {
clear.call(this);
this._isInvalid = true;
}
+
function IDNAToASCII(h) {
if (h === '') {
invalid.call(this);
}
+
return h.toLowerCase();
}
+
function percentEscape(c) {
var unicode = c.charCodeAt(0);
+
if (unicode > 0x20 && unicode < 0x7F && [0x22, 0x23, 0x3C, 0x3E, 0x3F, 0x60].indexOf(unicode) === -1) {
return c;
}
+
return encodeURIComponent(c);
}
+
function percentEscapeQuery(c) {
var unicode = c.charCodeAt(0);
+
if (unicode > 0x20 && unicode < 0x7F && [0x22, 0x23, 0x3C, 0x3E, 0x60].indexOf(unicode) === -1) {
return c;
}
+
return encodeURIComponent(c);
}
+
var EOF,
ALPHA = /[a-zA-Z]/,
ALPHANUMERIC = /[a-zA-Z0-9\+\-\.]/;
+
function parse(input, stateOverride, base) {
function err(message) {
errors.push(message);
}
+
var state = stateOverride || 'scheme start',
cursor = 0,
buffer = '',
seenAt = false,
seenBracket = false,
errors = [];
+
loop: while ((input[cursor - 1] !== EOF || cursor === 0) && !this._isInvalid) {
var c = input[cursor];
+
switch (state) {
case 'scheme start':
if (c && ALPHA.test(c)) {
@@ -7397,19 +8916,24 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
err('Invalid scheme.');
break loop;
}
+
break;
+
case 'scheme':
if (c && ALPHANUMERIC.test(c)) {
buffer += c.toLowerCase();
} else if (c === ':') {
this._scheme = buffer;
buffer = '';
+
if (stateOverride) {
break loop;
}
+
if (isRelativeScheme(this._scheme)) {
this._isRelative = true;
}
+
if (this._scheme === 'file') {
state = 'relative';
} else if (this._isRelative && base && base._scheme === this._scheme) {
@@ -7430,7 +8954,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
err('Code point not allowed in scheme: ' + c);
break loop;
}
+
break;
+
case 'scheme data':
if (c === '?') {
this._query = '?';
@@ -7443,7 +8969,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._schemeData += percentEscape(c);
}
}
+
break;
+
case 'no scheme':
if (!base || !isRelativeScheme(base._scheme)) {
err('Missing scheme.');
@@ -7452,7 +8980,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = 'relative';
continue;
}
+
break;
+
case 'relative or authority':
if (c === '/' && input[cursor + 1] === '/') {
state = 'authority ignore slashes';
@@ -7461,12 +8991,16 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = 'relative';
continue;
}
+
break;
+
case 'relative':
this._isRelative = true;
+
if (this._scheme !== 'file') {
this._scheme = base._scheme;
}
+
if (c === EOF) {
this._host = base._host;
this._port = base._port;
@@ -7479,6 +9013,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (c === '\\') {
err('\\ is an invalid code point.');
}
+
state = 'relative slash';
} else if (c === '?') {
this._host = base._host;
@@ -7500,23 +9035,29 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
var nextC = input[cursor + 1];
var nextNextC = input[cursor + 2];
+
if (this._scheme !== 'file' || !ALPHA.test(c) || nextC !== ':' && nextC !== '|' || nextNextC !== EOF && nextNextC !== '/' && nextNextC !== '\\' && nextNextC !== '?' && nextNextC !== '#') {
this._host = base._host;
this._port = base._port;
this._username = base._username;
this._password = base._password;
this._path = base._path.slice();
+
this._path.pop();
}
+
state = 'relative path';
continue;
}
+
break;
+
case 'relative slash':
if (c === '/' || c === '\\') {
if (c === '\\') {
err('\\ is an invalid code point.');
}
+
if (this._scheme === 'file') {
state = 'file host';
} else {
@@ -7529,10 +9070,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._username = base._username;
this._password = base._password;
}
+
state = 'relative path';
continue;
}
+
break;
+
case 'authority first slash':
if (c === '/') {
state = 'authority second slash';
@@ -7541,14 +9085,19 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = 'authority ignore slashes';
continue;
}
+
break;
+
case 'authority second slash':
state = 'authority ignore slashes';
+
if (c !== '/') {
err('Expected \'/\', got: ' + c);
continue;
}
+
break;
+
case 'authority ignore slashes':
if (c !== '/' && c !== '\\') {
state = 'authority';
@@ -7556,31 +9105,40 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
err('Expected authority, got: ' + c);
}
+
break;
+
case 'authority':
if (c === '@') {
if (seenAt) {
err('@ already seen.');
buffer += '%40';
}
+
seenAt = true;
+
for (var i = 0; i < buffer.length; i++) {
var cp = buffer[i];
+
if (cp === '\t' || cp === '\n' || cp === '\r') {
err('Invalid whitespace in authority.');
continue;
}
+
if (cp === ':' && this._password === null) {
this._password = '';
continue;
}
+
var tempC = percentEscape(cp);
+
if (this._password !== null) {
this._password += tempC;
} else {
this._username += tempC;
}
}
+
buffer = '';
} else if (c === EOF || c === '/' || c === '\\' || c === '?' || c === '#') {
cursor -= buffer.length;
@@ -7590,7 +9148,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
buffer += c;
}
+
break;
+
case 'file host':
if (c === EOF || c === '/' || c === '\\' || c === '?' || c === '#') {
if (buffer.length === 2 && ALPHA.test(buffer[0]) && (buffer[1] === ':' || buffer[1] === '|')) {
@@ -7602,19 +9162,23 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
buffer = '';
state = 'relative path start';
}
+
continue;
} else if (c === '\t' || c === '\n' || c === '\r') {
err('Invalid whitespace in file host.');
} else {
buffer += c;
}
+
break;
+
case 'host':
case 'hostname':
if (c === ':' && !seenBracket) {
this._host = IDNAToASCII.call(this, buffer);
buffer = '';
state = 'port';
+
if (stateOverride === 'hostname') {
break loop;
}
@@ -7622,9 +9186,11 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._host = IDNAToASCII.call(this, buffer);
buffer = '';
state = 'relative path start';
+
if (stateOverride) {
break loop;
}
+
continue;
} else if (c !== '\t' && c !== '\n' && c !== '\r') {
if (c === '[') {
@@ -7632,25 +9198,32 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (c === ']') {
seenBracket = false;
}
+
buffer += c;
} else {
err('Invalid code point in host/hostname: ' + c);
}
+
break;
+
case 'port':
if (/[0-9]/.test(c)) {
buffer += c;
} else if (c === EOF || c === '/' || c === '\\' || c === '?' || c === '#' || stateOverride) {
if (buffer !== '') {
var temp = parseInt(buffer, 10);
+
if (temp !== relative[this._scheme]) {
this._port = temp + '';
}
+
buffer = '';
}
+
if (stateOverride) {
break loop;
}
+
state = 'relative path start';
continue;
} else if (c === '\t' || c === '\n' || c === '\r') {
@@ -7658,27 +9231,37 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
invalid.call(this);
}
+
break;
+
case 'relative path start':
if (c === '\\') {
err('\'\\\' not allowed in path.');
}
+
state = 'relative path';
+
if (c !== '/' && c !== '\\') {
continue;
}
+
break;
+
case 'relative path':
if (c === EOF || c === '/' || c === '\\' || !stateOverride && (c === '?' || c === '#')) {
if (c === '\\') {
err('\\ not allowed in relative path.');
}
+
var tmp;
+
if (tmp = relativePathDotMapping[buffer.toLowerCase()]) {
buffer = tmp;
}
+
if (buffer === '..') {
this._path.pop();
+
if (c !== '/' && c !== '\\') {
this._path.push('');
}
@@ -7688,9 +9271,12 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (this._scheme === 'file' && this._path.length === 0 && buffer.length === 2 && ALPHA.test(buffer[0]) && buffer[1] === '|') {
buffer = buffer[0] + ':';
}
+
this._path.push(buffer);
}
+
buffer = '';
+
if (c === '?') {
this._query = '?';
state = 'query';
@@ -7701,7 +9287,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (c !== '\t' && c !== '\n' && c !== '\r') {
buffer += percentEscape(c);
}
+
break;
+
case 'query':
if (!stateOverride && c === '#') {
this._fragment = '#';
@@ -7709,16 +9297,21 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (c !== EOF && c !== '\t' && c !== '\n' && c !== '\r') {
this._query += percentEscapeQuery(c);
}
+
break;
+
case 'fragment':
if (c !== EOF && c !== '\t' && c !== '\n' && c !== '\r') {
this._fragment += c;
}
+
break;
}
+
cursor++;
}
}
+
function clear() {
this._scheme = '';
this._schemeData = '';
@@ -7732,15 +9325,18 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._isInvalid = false;
this._isRelative = false;
}
+
function JURL(url, base) {
if (base !== undefined && !(base instanceof JURL)) {
base = new JURL(String(base));
}
+
this._url = url;
clear.call(this);
var input = url.replace(/^[ \t\r\n\f]+|[ \t\r\n\f]+$/g, '');
parse.call(this, input, null, base);
}
+
JURL.prototype = {
toString: function toString() {
return this.href;
@@ -7750,111 +9346,149 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (this._isInvalid) {
return this._url;
}
+
var authority = '';
+
if (this._username !== '' || this._password !== null) {
authority = this._username + (this._password !== null ? ':' + this._password : '') + '@';
}
+
return this.protocol + (this._isRelative ? '//' + authority + this.host : '') + this.pathname + this._query + this._fragment;
},
+
set href(value) {
clear.call(this);
parse.call(this, value);
},
+
get protocol() {
return this._scheme + ':';
},
+
set protocol(value) {
if (this._isInvalid) {
return;
}
+
parse.call(this, value + ':', 'scheme start');
},
+
get host() {
return this._isInvalid ? '' : this._port ? this._host + ':' + this._port : this._host;
},
+
set host(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
parse.call(this, value, 'host');
},
+
get hostname() {
return this._host;
},
+
set hostname(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
parse.call(this, value, 'hostname');
},
+
get port() {
return this._port;
},
+
set port(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
parse.call(this, value, 'port');
},
+
get pathname() {
return this._isInvalid ? '' : this._isRelative ? '/' + this._path.join('/') : this._schemeData;
},
+
set pathname(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
this._path = [];
parse.call(this, value, 'relative path start');
},
+
get search() {
return this._isInvalid || !this._query || this._query === '?' ? '' : this._query;
},
+
set search(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
this._query = '?';
+
if (value[0] === '?') {
value = value.slice(1);
}
+
parse.call(this, value, 'query');
},
+
get hash() {
return this._isInvalid || !this._fragment || this._fragment === '#' ? '' : this._fragment;
},
+
set hash(value) {
if (this._isInvalid) {
return;
}
+
this._fragment = '#';
+
if (value[0] === '#') {
value = value.slice(1);
}
+
parse.call(this, value, 'fragment');
},
+
get origin() {
var host;
+
if (this._isInvalid || !this._scheme) {
return '';
}
+
switch (this._scheme) {
case 'data':
case 'file':
case 'javascript':
case 'mailto':
return 'null';
+
case 'blob':
try {
return new JURL(this._schemeData).origin || 'null';
} catch (_) {}
+
return 'null';
}
+
host = this.host;
+
if (!host) {
return '';
}
+
return this._scheme + '://' + host;
}
+
};
exports.URL = JURL;
})();
@@ -7869,31 +9503,27 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.build = exports.version = exports.setPDFNetworkStreamFactory = exports.PDFPageProxy = exports.PDFDocumentProxy = exports.PDFWorker = exports.PDFDataRangeTransport = exports.LoopbackPort = exports.getDocument = undefined;
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.getDocument = getDocument;
+exports.setPDFNetworkStreamFactory = setPDFNetworkStreamFactory;
+exports.build = exports.version = exports.PDFPageProxy = exports.PDFDocumentProxy = exports.PDFWorker = exports.PDFDataRangeTransport = exports.LoopbackPort = void 0;
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(134));
var _util = __w_pdfjs_require__(1);
-var _dom_utils = __w_pdfjs_require__(134);
+var _dom_utils = __w_pdfjs_require__(138);
-var _font_loader = __w_pdfjs_require__(135);
+var _font_loader = __w_pdfjs_require__(139);
-var _api_compatibility = __w_pdfjs_require__(136);
+var _api_compatibility = __w_pdfjs_require__(140);
-var _canvas = __w_pdfjs_require__(137);
+var _canvas = __w_pdfjs_require__(141);
-var _global_scope = __w_pdfjs_require__(3);
+var _global_scope = _interopRequireDefault(__w_pdfjs_require__(3));
-var _global_scope2 = _interopRequireDefault(_global_scope);
+var _worker_options = __w_pdfjs_require__(143);
-var _worker_options = __w_pdfjs_require__(139);
-
-var _message_handler = __w_pdfjs_require__(140);
+var _message_handler = __w_pdfjs_require__(144);
var _metadata = __w_pdfjs_require__(145);
@@ -7903,34 +9533,63 @@ var _webgl = __w_pdfjs_require__(148);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+
+function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
var DEFAULT_RANGE_CHUNK_SIZE = 65536;
var isWorkerDisabled = false;
-var fallbackWorkerSrc = void 0;
+var fallbackWorkerSrc;
var fakeWorkerFilesLoader = null;
{
var useRequireEnsure = false;
+
if (typeof window === 'undefined') {
isWorkerDisabled = true;
+
if (typeof require.ensure === 'undefined') {
require.ensure = require('node-ensure');
}
+
useRequireEnsure = true;
} else if (typeof require !== 'undefined' && typeof require.ensure === 'function') {
useRequireEnsure = true;
}
+
if (typeof requirejs !== 'undefined' && requirejs.toUrl) {
fallbackWorkerSrc = requirejs.toUrl('pdfjs-dist/build/pdf.worker.js');
}
+
var dynamicLoaderSupported = typeof requirejs !== 'undefined' && requirejs.load;
fakeWorkerFilesLoader = useRequireEnsure ? function () {
return new Promise(function (resolve, reject) {
require.ensure([], function () {
try {
- var worker = void 0;
+ var worker;
worker = require('./pdf.worker.js');
resolve(worker.WorkerMessageHandler);
} catch (ex) {
@@ -7949,38 +9608,53 @@ var fakeWorkerFilesLoader = null;
}, reject);
});
} : null;
+
if (!fallbackWorkerSrc && typeof document !== 'undefined') {
var pdfjsFilePath = document.currentScript && document.currentScript.src;
+
if (pdfjsFilePath) {
fallbackWorkerSrc = pdfjsFilePath.replace(/(\.(?:min\.)?js)(\?.*)?$/i, '.worker$1$2');
}
}
}
var createPDFNetworkStream;
+
function setPDFNetworkStreamFactory(pdfNetworkStreamFactory) {
createPDFNetworkStream = pdfNetworkStreamFactory;
}
+
function getDocument(src) {
var task = new PDFDocumentLoadingTask();
var source;
+
if (typeof src === 'string') {
- source = { url: src };
+ source = {
+ url: src
+ };
} else if ((0, _util.isArrayBuffer)(src)) {
- source = { data: src };
+ source = {
+ data: src
+ };
} else if (src instanceof PDFDataRangeTransport) {
- source = { range: src };
+ source = {
+ range: src
+ };
} else {
- if ((typeof src === 'undefined' ? 'undefined' : _typeof(src)) !== 'object') {
+ if (_typeof(src) !== 'object') {
throw new Error('Invalid parameter in getDocument, ' + 'need either Uint8Array, string or a parameter object');
}
+
if (!src.url && !src.data && !src.range) {
throw new Error('Invalid parameter object: need either .data, .range or .url');
}
+
source = src;
}
+
var params = Object.create(null);
- var rangeTransport = null;
- var worker = null;
+ var rangeTransport = null,
+ worker = null;
+
for (var key in source) {
if (key === 'url' && typeof window !== 'undefined') {
params[key] = new _util.URL(source[key], window.location).href;
@@ -7993,73 +9667,86 @@ function getDocument(src) {
continue;
} else if (key === 'data' && !(source[key] instanceof Uint8Array)) {
var pdfBytes = source[key];
+
if (typeof pdfBytes === 'string') {
params[key] = (0, _util.stringToBytes)(pdfBytes);
- } else if ((typeof pdfBytes === 'undefined' ? 'undefined' : _typeof(pdfBytes)) === 'object' && pdfBytes !== null && !isNaN(pdfBytes.length)) {
+ } else if (_typeof(pdfBytes) === 'object' && pdfBytes !== null && !isNaN(pdfBytes.length)) {
params[key] = new Uint8Array(pdfBytes);
} else if ((0, _util.isArrayBuffer)(pdfBytes)) {
params[key] = new Uint8Array(pdfBytes);
} else {
throw new Error('Invalid PDF binary data: either typed array, ' + 'string or array-like object is expected in the ' + 'data property.');
}
+
continue;
}
+
params[key] = source[key];
}
+
params.rangeChunkSize = params.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE;
params.CMapReaderFactory = params.CMapReaderFactory || _dom_utils.DOMCMapReaderFactory;
params.ignoreErrors = params.stopAtErrors !== true;
params.pdfBug = params.pdfBug === true;
var NativeImageDecoderValues = Object.values(_util.NativeImageDecoding);
+
if (params.nativeImageDecoderSupport === undefined || !NativeImageDecoderValues.includes(params.nativeImageDecoderSupport)) {
params.nativeImageDecoderSupport = _api_compatibility.apiCompatibilityParams.nativeImageDecoderSupport || _util.NativeImageDecoding.DECODE;
}
+
if (!Number.isInteger(params.maxImageSize)) {
params.maxImageSize = -1;
}
+
if (typeof params.isEvalSupported !== 'boolean') {
params.isEvalSupported = true;
}
+
if (typeof params.disableFontFace !== 'boolean') {
params.disableFontFace = _api_compatibility.apiCompatibilityParams.disableFontFace || false;
}
+
if (typeof params.disableRange !== 'boolean') {
params.disableRange = false;
}
+
if (typeof params.disableStream !== 'boolean') {
params.disableStream = false;
}
+
if (typeof params.disableAutoFetch !== 'boolean') {
params.disableAutoFetch = false;
}
+
if (typeof params.disableCreateObjectURL !== 'boolean') {
params.disableCreateObjectURL = _api_compatibility.apiCompatibilityParams.disableCreateObjectURL || false;
}
+
(0, _util.setVerbosityLevel)(params.verbosity);
+
if (!worker) {
var workerParams = {
postMessageTransfers: params.postMessageTransfers,
- verbosity: params.verbosity
+ verbosity: params.verbosity,
+ port: _worker_options.GlobalWorkerOptions.workerPort
};
- var workerPort = _worker_options.GlobalWorkerOptions.workerPort;
- if (workerPort) {
- workerParams.port = workerPort;
- worker = PDFWorker.fromPort(workerParams);
- } else {
- worker = new PDFWorker(workerParams);
- }
+ worker = workerParams.port ? PDFWorker.fromPort(workerParams) : new PDFWorker(workerParams);
task._worker = worker;
}
+
var docId = task.docId;
worker.promise.then(function () {
if (task.destroyed) {
throw new Error('Loading aborted');
}
+
return _fetchDocument(worker, params, rangeTransport, docId).then(function (workerId) {
if (task.destroyed) {
throw new Error('Loading aborted');
}
- var networkStream = void 0;
+
+ var networkStream;
+
if (rangeTransport) {
networkStream = new _transport_stream.PDFDataTransportStream({
length: params.length,
@@ -8078,6 +9765,7 @@ function getDocument(src) {
disableStream: params.disableStream
});
}
+
var messageHandler = new _message_handler.MessageHandler(docId, workerId, worker.port);
messageHandler.postMessageTransfers = worker.postMessageTransfers;
var transport = new WorkerTransport(messageHandler, task, networkStream, params);
@@ -8087,17 +9775,20 @@ function getDocument(src) {
}).catch(task._capability.reject);
return task;
}
+
function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed'));
}
+
if (pdfDataRangeTransport) {
source.length = pdfDataRangeTransport.length;
source.initialData = pdfDataRangeTransport.initialData;
}
+
return worker.messageHandler.sendWithPromise('GetDocRequest', {
docId: docId,
- apiVersion: '2.1.28',
+ apiVersion: '2.1.124',
source: {
data: source.data,
url: source.url,
@@ -8118,47 +9809,69 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) {
throw new Error('Worker was destroyed');
}
+
return workerId;
});
}
+
var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() {
var nextDocumentId = 0;
- function PDFDocumentLoadingTask() {
- this._capability = (0, _util.createPromiseCapability)();
- this._transport = null;
- this._worker = null;
- this.docId = 'd' + nextDocumentId++;
- this.destroyed = false;
- this.onPassword = null;
- this.onProgress = null;
- this.onUnsupportedFeature = null;
- }
- PDFDocumentLoadingTask.prototype = {
- get promise() {
- return this._capability.promise;
- },
- destroy: function destroy() {
- var _this = this;
- this.destroyed = true;
- var transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
- return transportDestroyed.then(function () {
- _this._transport = null;
- if (_this._worker) {
- _this._worker.destroy();
- _this._worker = null;
- }
- });
- },
+ var PDFDocumentLoadingTask =
+ /*#__PURE__*/
+ function () {
+ function PDFDocumentLoadingTask() {
+ _classCallCheck(this, PDFDocumentLoadingTask);
+
+ this._capability = (0, _util.createPromiseCapability)();
+ this._transport = null;
+ this._worker = null;
+ this.docId = 'd' + nextDocumentId++;
+ this.destroyed = false;
+ this.onPassword = null;
+ this.onProgress = null;
+ this.onUnsupportedFeature = null;
+ }
+
+ _createClass(PDFDocumentLoadingTask, [{
+ key: "destroy",
+ value: function destroy() {
+ var _this = this;
+
+ this.destroyed = true;
+ var transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
+ return transportDestroyed.then(function () {
+ _this._transport = null;
+
+ if (_this._worker) {
+ _this._worker.destroy();
+
+ _this._worker = null;
+ }
+ });
+ }
+ }, {
+ key: "then",
+ value: function then(onFulfilled, onRejected) {
+ (0, _util.deprecated)('PDFDocumentLoadingTask.then method, ' + 'use the `promise` getter instead.');
+ return this.promise.then.apply(this.promise, arguments);
+ }
+ }, {
+ key: "promise",
+ get: function get() {
+ return this._capability.promise;
+ }
+ }]);
+
+ return PDFDocumentLoadingTask;
+ }();
- then: function PDFDocumentLoadingTask_then(onFulfilled, onRejected) {
- return this.promise.then.apply(this.promise, arguments);
- }
- };
return PDFDocumentLoadingTask;
}();
-var PDFDataRangeTransport = function () {
+var PDFDataRangeTransport =
+/*#__PURE__*/
+function () {
function PDFDataRangeTransport(length, initialData) {
_classCallCheck(this, PDFDataRangeTransport);
@@ -8171,22 +9884,22 @@ var PDFDataRangeTransport = function () {
}
_createClass(PDFDataRangeTransport, [{
- key: 'addRangeListener',
+ key: "addRangeListener",
value: function addRangeListener(listener) {
this._rangeListeners.push(listener);
}
}, {
- key: 'addProgressListener',
+ key: "addProgressListener",
value: function addProgressListener(listener) {
this._progressListeners.push(listener);
}
}, {
- key: 'addProgressiveReadListener',
+ key: "addProgressiveReadListener",
value: function addProgressiveReadListener(listener) {
this._progressiveReadListeners.push(listener);
}
}, {
- key: 'onDataRange',
+ key: "onDataRange",
value: function onDataRange(begin, chunk) {
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
@@ -8195,7 +9908,6 @@ var PDFDataRangeTransport = function () {
try {
for (var _iterator = this._rangeListeners[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var listener = _step.value;
-
listener(begin, chunk);
}
} catch (err) {
@@ -8203,7 +9915,7 @@ var PDFDataRangeTransport = function () {
_iteratorError = err;
} finally {
try {
- if (!_iteratorNormalCompletion && _iterator.return) {
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
_iterator.return();
}
} finally {
@@ -8214,7 +9926,7 @@ var PDFDataRangeTransport = function () {
}
}
}, {
- key: 'onDataProgress',
+ key: "onDataProgress",
value: function onDataProgress(loaded) {
var _this2 = this;
@@ -8226,7 +9938,6 @@ var PDFDataRangeTransport = function () {
try {
for (var _iterator2 = _this2._progressListeners[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
var listener = _step2.value;
-
listener(loaded);
}
} catch (err) {
@@ -8234,7 +9945,7 @@ var PDFDataRangeTransport = function () {
_iteratorError2 = err;
} finally {
try {
- if (!_iteratorNormalCompletion2 && _iterator2.return) {
+ if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
_iterator2.return();
}
} finally {
@@ -8246,7 +9957,7 @@ var PDFDataRangeTransport = function () {
});
}
}, {
- key: 'onDataProgressiveRead',
+ key: "onDataProgressiveRead",
value: function onDataProgressiveRead(chunk) {
var _this3 = this;
@@ -8258,7 +9969,6 @@ var PDFDataRangeTransport = function () {
try {
for (var _iterator3 = _this3._progressiveReadListeners[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
var listener = _step3.value;
-
listener(chunk);
}
} catch (err) {
@@ -8266,7 +9976,7 @@ var PDFDataRangeTransport = function () {
_iteratorError3 = err;
} finally {
try {
- if (!_iteratorNormalCompletion3 && _iterator3.return) {
+ if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
_iterator3.return();
}
} finally {
@@ -8278,24 +9988,28 @@ var PDFDataRangeTransport = function () {
});
}
}, {
- key: 'transportReady',
+ key: "transportReady",
value: function transportReady() {
this._readyCapability.resolve();
}
}, {
- key: 'requestDataRange',
+ key: "requestDataRange",
value: function requestDataRange(begin, end) {
(0, _util.unreachable)('Abstract method PDFDataRangeTransport.requestDataRange');
}
}, {
- key: 'abort',
+ key: "abort",
value: function abort() {}
}]);
return PDFDataRangeTransport;
}();
-var PDFDocumentProxy = function () {
+exports.PDFDataRangeTransport = PDFDataRangeTransport;
+
+var PDFDocumentProxy =
+/*#__PURE__*/
+function () {
function PDFDocumentProxy(pdfInfo, transport, loadingTask) {
_classCallCheck(this, PDFDocumentProxy);
@@ -8305,97 +10019,97 @@ var PDFDocumentProxy = function () {
}
_createClass(PDFDocumentProxy, [{
- key: 'getPage',
+ key: "getPage",
value: function getPage(pageNumber) {
return this._transport.getPage(pageNumber);
}
}, {
- key: 'getPageIndex',
+ key: "getPageIndex",
value: function getPageIndex(ref) {
return this._transport.getPageIndex(ref);
}
}, {
- key: 'getDestinations',
+ key: "getDestinations",
value: function getDestinations() {
return this._transport.getDestinations();
}
}, {
- key: 'getDestination',
+ key: "getDestination",
value: function getDestination(id) {
return this._transport.getDestination(id);
}
}, {
- key: 'getPageLabels',
+ key: "getPageLabels",
value: function getPageLabels() {
return this._transport.getPageLabels();
}
}, {
- key: 'getPageMode',
+ key: "getPageMode",
value: function getPageMode() {
return this._transport.getPageMode();
}
}, {
- key: 'getAttachments',
+ key: "getAttachments",
value: function getAttachments() {
return this._transport.getAttachments();
}
}, {
- key: 'getJavaScript',
+ key: "getJavaScript",
value: function getJavaScript() {
return this._transport.getJavaScript();
}
}, {
- key: 'getOutline',
+ key: "getOutline",
value: function getOutline() {
return this._transport.getOutline();
}
}, {
- key: 'getPermissions',
+ key: "getPermissions",
value: function getPermissions() {
return this._transport.getPermissions();
}
}, {
- key: 'getMetadata',
+ key: "getMetadata",
value: function getMetadata() {
return this._transport.getMetadata();
}
}, {
- key: 'getData',
+ key: "getData",
value: function getData() {
return this._transport.getData();
}
}, {
- key: 'getDownloadInfo',
+ key: "getDownloadInfo",
value: function getDownloadInfo() {
return this._transport.downloadInfoCapability.promise;
}
}, {
- key: 'getStats',
+ key: "getStats",
value: function getStats() {
return this._transport.getStats();
}
}, {
- key: 'cleanup',
+ key: "cleanup",
value: function cleanup() {
this._transport.startCleanup();
}
}, {
- key: 'destroy',
+ key: "destroy",
value: function destroy() {
return this.loadingTask.destroy();
}
}, {
- key: 'numPages',
+ key: "numPages",
get: function get() {
return this._pdfInfo.numPages;
}
}, {
- key: 'fingerprint',
+ key: "fingerprint",
get: function get() {
return this._pdfInfo.fingerprint;
}
}, {
- key: 'loadingParams',
+ key: "loadingParams",
get: function get() {
return this._transport.loadingParams;
}
@@ -8404,13 +10118,19 @@ var PDFDocumentProxy = function () {
return PDFDocumentProxy;
}();
-var PDFPageProxy = function PDFPageProxyClosure() {
+exports.PDFDocumentProxy = PDFDocumentProxy;
+
+var PDFPageProxy =
+/*#__PURE__*/
+function () {
function PDFPageProxy(pageIndex, pageInfo, transport) {
var pdfBug = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+ _classCallCheck(this, PDFPageProxy);
+
this.pageIndex = pageIndex;
this._pageInfo = pageInfo;
- this.transport = transport;
+ this._transport = transport;
this._stats = pdfBug ? new _dom_utils.StatTimer() : _dom_utils.DummyStatTimer;
this._pdfBug = pdfBug;
this.commonObjs = transport.commonObjs;
@@ -8420,55 +10140,81 @@ var PDFPageProxy = function PDFPageProxyClosure() {
this.intentStates = Object.create(null);
this.destroyed = false;
}
- PDFPageProxy.prototype = {
- get pageNumber() {
- return this.pageIndex + 1;
- },
- get rotate() {
- return this._pageInfo.rotate;
- },
- get ref() {
- return this._pageInfo.ref;
- },
- get userUnit() {
- return this._pageInfo.userUnit;
- },
- get view() {
- return this._pageInfo.view;
- },
- getViewport: function getViewport(scale) {
- var rotate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rotate;
- var dontFlip = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
+ _createClass(PDFPageProxy, [{
+ key: "getViewport",
+ value: function getViewport() {
+ var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+ scale = _ref.scale,
+ _ref$rotation = _ref.rotation,
+ rotation = _ref$rotation === void 0 ? this.rotate : _ref$rotation,
+ _ref$dontFlip = _ref.dontFlip,
+ dontFlip = _ref$dontFlip === void 0 ? false : _ref$dontFlip;
+
+ if (arguments.length > 1 || typeof arguments[0] === 'number') {
+ (0, _util.deprecated)('getViewport is called with obsolete arguments.');
+ scale = arguments[0];
+ rotation = typeof arguments[1] === 'number' ? arguments[1] : this.rotate;
+ dontFlip = typeof arguments[2] === 'boolean' ? arguments[2] : false;
+ }
return new _dom_utils.PageViewport({
viewBox: this.view,
scale: scale,
- rotation: rotate,
+ rotation: rotation,
dontFlip: dontFlip
});
- },
+ }
+ }, {
+ key: "getAnnotations",
+ value: function getAnnotations() {
+ var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+ _ref2$intent = _ref2.intent,
+ intent = _ref2$intent === void 0 ? null : _ref2$intent;
- getAnnotations: function PDFPageProxy_getAnnotations(params) {
- var intent = params && params.intent || null;
if (!this.annotationsPromise || this.annotationsIntent !== intent) {
- this.annotationsPromise = this.transport.getAnnotations(this.pageIndex, intent);
+ this.annotationsPromise = this._transport.getAnnotations(this.pageIndex, intent);
this.annotationsIntent = intent;
}
+
return this.annotationsPromise;
- },
- render: function PDFPageProxy_render(params) {
+ }
+ }, {
+ key: "render",
+ value: function render(_ref3) {
var _this4 = this;
+ var canvasContext = _ref3.canvasContext,
+ viewport = _ref3.viewport,
+ _ref3$intent = _ref3.intent,
+ intent = _ref3$intent === void 0 ? 'display' : _ref3$intent,
+ _ref3$enableWebGL = _ref3.enableWebGL,
+ enableWebGL = _ref3$enableWebGL === void 0 ? false : _ref3$enableWebGL,
+ _ref3$renderInteracti = _ref3.renderInteractiveForms,
+ renderInteractiveForms = _ref3$renderInteracti === void 0 ? false : _ref3$renderInteracti,
+ _ref3$transform = _ref3.transform,
+ transform = _ref3$transform === void 0 ? null : _ref3$transform,
+ _ref3$imageLayer = _ref3.imageLayer,
+ imageLayer = _ref3$imageLayer === void 0 ? null : _ref3$imageLayer,
+ _ref3$canvasFactory = _ref3.canvasFactory,
+ canvasFactory = _ref3$canvasFactory === void 0 ? null : _ref3$canvasFactory,
+ _ref3$background = _ref3.background,
+ background = _ref3$background === void 0 ? null : _ref3$background;
var stats = this._stats;
stats.time('Overall');
this.pendingCleanup = false;
- var renderingIntent = params.intent === 'print' ? 'print' : 'display';
- var canvasFactory = params.canvasFactory || new _dom_utils.DOMCanvasFactory();
- var webGLContext = new _webgl.WebGLContext({ enable: params.enableWebGL });
+ var renderingIntent = intent === 'print' ? 'print' : 'display';
+ var canvasFactoryInstance = canvasFactory || new _dom_utils.DOMCanvasFactory();
+ var webGLContext = new _webgl.WebGLContext({
+ enable: enableWebGL
+ });
+
if (!this.intentStates[renderingIntent]) {
this.intentStates[renderingIntent] = Object.create(null);
}
+
var intentState = this.intentStates[renderingIntent];
+
if (!intentState.displayReadyCapability) {
intentState.receivingOperatorList = true;
intentState.displayReadyCapability = (0, _util.createPromiseCapability)();
@@ -8478,34 +10224,60 @@ var PDFPageProxy = function PDFPageProxyClosure() {
lastChunk: false
};
stats.time('Page Request');
- this.transport.messageHandler.send('RenderPageRequest', {
+
+ this._transport.messageHandler.send('RenderPageRequest', {
pageIndex: this.pageNumber - 1,
intent: renderingIntent,
- renderInteractiveForms: params.renderInteractiveForms === true
+ renderInteractiveForms: renderInteractiveForms === true
});
}
+
var complete = function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
+
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
+
if (_this4.cleanupAfterRender) {
_this4.pendingCleanup = true;
}
+
_this4._tryCleanup();
+
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
+
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
};
- var internalRenderTask = new InternalRenderTask(complete, params, this.objs, this.commonObjs, intentState.operatorList, this.pageNumber, canvasFactory, webGLContext, this._pdfBug);
- internalRenderTask.useRequestAnimationFrame = renderingIntent !== 'print';
+
+ var internalRenderTask = new InternalRenderTask({
+ callback: complete,
+ params: {
+ canvasContext: canvasContext,
+ viewport: viewport,
+ transform: transform,
+ imageLayer: imageLayer,
+ background: background
+ },
+ objs: this.objs,
+ commonObjs: this.commonObjs,
+ operatorList: intentState.operatorList,
+ pageNumber: this.pageNumber,
+ canvasFactory: canvasFactoryInstance,
+ webGLContext: webGLContext,
+ useRequestAnimationFrame: renderingIntent !== 'print',
+ pdfBug: this._pdfBug
+ });
+
if (!intentState.renderTasks) {
intentState.renderTasks = [];
}
+
intentState.renderTasks.push(internalRenderTask);
var renderTask = internalRenderTask.task;
intentState.displayReadyCapability.promise.then(function (transparency) {
@@ -8513,28 +10285,36 @@ var PDFPageProxy = function PDFPageProxyClosure() {
complete();
return;
}
+
stats.time('Rendering');
internalRenderTask.initializeGraphics(transparency);
internalRenderTask.operatorListChanged();
}).catch(complete);
return renderTask;
- },
- getOperatorList: function PDFPageProxy_getOperatorList() {
+ }
+ }, {
+ key: "getOperatorList",
+ value: function getOperatorList() {
function operatorListChanged() {
if (intentState.operatorList.lastChunk) {
intentState.opListReadCapability.resolve(intentState.operatorList);
var i = intentState.renderTasks.indexOf(opListTask);
+
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
}
}
+
var renderingIntent = 'oplist';
+
if (!this.intentStates[renderingIntent]) {
this.intentStates[renderingIntent] = Object.create(null);
}
+
var intentState = this.intentStates[renderingIntent];
var opListTask;
+
if (!intentState.opListReadCapability) {
opListTask = {};
opListTask.operatorListChanged = operatorListChanged;
@@ -8547,50 +10327,64 @@ var PDFPageProxy = function PDFPageProxyClosure() {
argsArray: [],
lastChunk: false
};
+
this._stats.time('Page Request');
- this.transport.messageHandler.send('RenderPageRequest', {
+
+ this._transport.messageHandler.send('RenderPageRequest', {
pageIndex: this.pageIndex,
intent: renderingIntent
});
}
+
return intentState.opListReadCapability.promise;
- },
- streamTextContent: function streamTextContent() {
- var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+ }
+ }, {
+ key: "streamTextContent",
+ value: function streamTextContent() {
+ var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+ _ref4$normalizeWhites = _ref4.normalizeWhitespace,
+ normalizeWhitespace = _ref4$normalizeWhites === void 0 ? false : _ref4$normalizeWhites,
+ _ref4$disableCombineT = _ref4.disableCombineTextItems,
+ disableCombineTextItems = _ref4$disableCombineT === void 0 ? false : _ref4$disableCombineT;
var TEXT_CONTENT_CHUNK_SIZE = 100;
- return this.transport.messageHandler.sendWithStream('GetTextContent', {
+ return this._transport.messageHandler.sendWithStream('GetTextContent', {
pageIndex: this.pageNumber - 1,
- normalizeWhitespace: params.normalizeWhitespace === true,
- combineTextItems: params.disableCombineTextItems !== true
+ normalizeWhitespace: normalizeWhitespace === true,
+ combineTextItems: disableCombineTextItems !== true
}, {
highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
size: function size(textContent) {
return textContent.items.length;
}
});
- },
-
- getTextContent: function PDFPageProxy_getTextContent(params) {
- params = params || {};
+ }
+ }, {
+ key: "getTextContent",
+ value: function getTextContent() {
+ var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
var readableStream = this.streamTextContent(params);
return new Promise(function (resolve, reject) {
function pump() {
- reader.read().then(function (_ref) {
+ reader.read().then(function (_ref5) {
var _textContent$items;
- var value = _ref.value,
- done = _ref.done;
+ var value = _ref5.value,
+ done = _ref5.done;
if (done) {
resolve(textContent);
return;
}
+
Object.assign(textContent.styles, value.styles);
+
(_textContent$items = textContent.items).push.apply(_textContent$items, _toConsumableArray(value.items));
+
pump();
}, reject);
}
+
var reader = readableStream.getReader();
var textContent = {
items: [],
@@ -8598,15 +10392,18 @@ var PDFPageProxy = function PDFPageProxyClosure() {
};
pump();
});
- },
- _destroy: function PDFPageProxy_destroy() {
+ }
+ }, {
+ key: "_destroy",
+ value: function _destroy() {
this.destroyed = true;
- this.transport.pageCache[this.pageIndex] = null;
+ this._transport.pageCache[this.pageIndex] = null;
var waitOn = [];
Object.keys(this.intentStates).forEach(function (intent) {
if (intent === 'oplist') {
return;
}
+
var intentState = this.intentStates[intent];
intentState.renderTasks.forEach(function (renderTask) {
var renderCompleted = renderTask.capability.promise.catch(function () {});
@@ -8618,14 +10415,18 @@ var PDFPageProxy = function PDFPageProxyClosure() {
this.annotationsPromise = null;
this.pendingCleanup = false;
return Promise.all(waitOn);
- },
- cleanup: function cleanup() {
+ }
+ }, {
+ key: "cleanup",
+ value: function cleanup() {
var resetStats = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
this.pendingCleanup = true;
+
this._tryCleanup(resetStats);
- },
- _tryCleanup: function _tryCleanup() {
+ }
+ }, {
+ key: "_tryCleanup",
+ value: function _tryCleanup() {
var resetStats = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (!this.pendingCleanup || Object.keys(this.intentStates).some(function (intent) {
@@ -8634,47 +10435,90 @@ var PDFPageProxy = function PDFPageProxyClosure() {
}, this)) {
return;
}
+
Object.keys(this.intentStates).forEach(function (intent) {
delete this.intentStates[intent];
}, this);
this.objs.clear();
this.annotationsPromise = null;
+
if (resetStats && this._stats instanceof _dom_utils.StatTimer) {
this._stats = new _dom_utils.StatTimer();
}
- this.pendingCleanup = false;
- },
- _startRenderPage: function PDFPageProxy_startRenderPage(transparency, intent) {
+ this.pendingCleanup = false;
+ }
+ }, {
+ key: "_startRenderPage",
+ value: function _startRenderPage(transparency, intent) {
var intentState = this.intentStates[intent];
+
if (intentState.displayReadyCapability) {
intentState.displayReadyCapability.resolve(transparency);
}
- },
- _renderPageChunk: function PDFPageProxy_renderPageChunk(operatorListChunk, intent) {
+ }
+ }, {
+ key: "_renderPageChunk",
+ value: function _renderPageChunk(operatorListChunk, intent) {
var intentState = this.intentStates[intent];
- var i, ii;
- for (i = 0, ii = operatorListChunk.length; i < ii; i++) {
+
+ for (var i = 0, ii = operatorListChunk.length; i < ii; i++) {
intentState.operatorList.fnArray.push(operatorListChunk.fnArray[i]);
intentState.operatorList.argsArray.push(operatorListChunk.argsArray[i]);
}
+
intentState.operatorList.lastChunk = operatorListChunk.lastChunk;
- for (i = 0; i < intentState.renderTasks.length; i++) {
- intentState.renderTasks[i].operatorListChanged();
+
+ for (var _i = 0; _i < intentState.renderTasks.length; _i++) {
+ intentState.renderTasks[_i].operatorListChanged();
}
+
if (operatorListChunk.lastChunk) {
intentState.receivingOperatorList = false;
+
this._tryCleanup();
}
- },
- get stats() {
+ }
+ }, {
+ key: "pageNumber",
+ get: function get() {
+ return this.pageIndex + 1;
+ }
+ }, {
+ key: "rotate",
+ get: function get() {
+ return this._pageInfo.rotate;
+ }
+ }, {
+ key: "ref",
+ get: function get() {
+ return this._pageInfo.ref;
+ }
+ }, {
+ key: "userUnit",
+ get: function get() {
+ return this._pageInfo.userUnit;
+ }
+ }, {
+ key: "view",
+ get: function get() {
+ return this._pageInfo.view;
+ }
+ }, {
+ key: "stats",
+ get: function get() {
return this._stats instanceof _dom_utils.StatTimer ? this._stats : null;
}
- };
+ }]);
+
return PDFPageProxy;
}();
-var LoopbackPort = function () {
+exports.PDFPageProxy = PDFPageProxy;
+
+var LoopbackPort =
+/*#__PURE__*/
+function () {
function LoopbackPort() {
var defer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
@@ -8686,21 +10530,24 @@ var LoopbackPort = function () {
}
_createClass(LoopbackPort, [{
- key: 'postMessage',
+ key: "postMessage",
value: function postMessage(obj, transfers) {
var _this5 = this;
function cloneValue(value) {
- if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) !== 'object' || value === null) {
+ if (_typeof(value) !== 'object' || value === null) {
return value;
}
+
if (cloned.has(value)) {
return cloned.get(value);
}
- var result;
- var buffer;
+
+ var buffer, result;
+
if ((buffer = value.buffer) && (0, _util.isArrayBuffer)(buffer)) {
var transferable = transfers && transfers.includes(buffer);
+
if (value === buffer) {
result = value;
} else if (transferable) {
@@ -8708,32 +10555,47 @@ var LoopbackPort = function () {
} else {
result = new value.constructor(value);
}
+
cloned.set(value, result);
return result;
}
+
result = Array.isArray(value) ? [] : {};
cloned.set(value, result);
+
for (var i in value) {
- var desc,
+ var desc = void 0,
p = value;
+
while (!(desc = Object.getOwnPropertyDescriptor(p, i))) {
p = Object.getPrototypeOf(p);
}
+
if (typeof desc.value === 'undefined' || typeof desc.value === 'function') {
continue;
}
+
result[i] = cloneValue(desc.value);
}
+
return result;
}
+
if (!this._defer) {
this._listeners.forEach(function (listener) {
- listener.call(this, { data: obj });
+ listener.call(this, {
+ data: obj
+ });
}, this);
+
return;
}
+
var cloned = new WeakMap();
- var e = { data: cloneValue(obj) };
+ var e = {
+ data: cloneValue(obj)
+ };
+
this._deferred.then(function () {
_this5._listeners.forEach(function (listener) {
listener.call(this, e);
@@ -8741,18 +10603,19 @@ var LoopbackPort = function () {
});
}
}, {
- key: 'addEventListener',
+ key: "addEventListener",
value: function addEventListener(name, listener) {
this._listeners.push(listener);
}
}, {
- key: 'removeEventListener',
+ key: "removeEventListener",
value: function removeEventListener(name, listener) {
var i = this._listeners.indexOf(listener);
+
this._listeners.splice(i, 1);
}
}, {
- key: 'terminate',
+ key: "terminate",
value: function terminate() {
this._listeners = [];
}
@@ -8761,226 +10624,309 @@ var LoopbackPort = function () {
return LoopbackPort;
}();
+exports.LoopbackPort = LoopbackPort;
+
var PDFWorker = function PDFWorkerClosure() {
+ var pdfWorkerPorts = new WeakMap();
var nextFakeWorkerId = 0;
- function getWorkerSrc() {
+ var fakeWorkerFilesLoadedCapability;
+
+ function _getWorkerSrc() {
if (_worker_options.GlobalWorkerOptions.workerSrc) {
return _worker_options.GlobalWorkerOptions.workerSrc;
}
+
if (typeof fallbackWorkerSrc !== 'undefined') {
return fallbackWorkerSrc;
}
+
throw new Error('No "GlobalWorkerOptions.workerSrc" specified.');
}
+
function getMainThreadWorkerMessageHandler() {
try {
if (typeof window !== 'undefined') {
return window.pdfjsWorker && window.pdfjsWorker.WorkerMessageHandler;
}
} catch (ex) {}
+
return null;
}
- var fakeWorkerFilesLoadedCapability = void 0;
+
function setupFakeWorkerGlobal() {
if (fakeWorkerFilesLoadedCapability) {
return fakeWorkerFilesLoadedCapability.promise;
}
+
fakeWorkerFilesLoadedCapability = (0, _util.createPromiseCapability)();
var mainWorkerMessageHandler = getMainThreadWorkerMessageHandler();
+
if (mainWorkerMessageHandler) {
fakeWorkerFilesLoadedCapability.resolve(mainWorkerMessageHandler);
return fakeWorkerFilesLoadedCapability.promise;
}
+
var loader = fakeWorkerFilesLoader || function () {
- return (0, _dom_utils.loadScript)(getWorkerSrc()).then(function () {
+ return (0, _dom_utils.loadScript)(_getWorkerSrc()).then(function () {
return window.pdfjsWorker.WorkerMessageHandler;
});
};
+
loader().then(fakeWorkerFilesLoadedCapability.resolve, fakeWorkerFilesLoadedCapability.reject);
return fakeWorkerFilesLoadedCapability.promise;
}
+
function createCDNWrapper(url) {
var wrapper = 'importScripts(\'' + url + '\');';
return _util.URL.createObjectURL(new Blob([wrapper]));
}
- var pdfWorkerPorts = new WeakMap();
- function PDFWorker() {
- var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
- _ref2$name = _ref2.name,
- name = _ref2$name === undefined ? null : _ref2$name,
- _ref2$port = _ref2.port,
- port = _ref2$port === undefined ? null : _ref2$port,
- _ref2$postMessageTran = _ref2.postMessageTransfers,
- postMessageTransfers = _ref2$postMessageTran === undefined ? true : _ref2$postMessageTran,
- _ref2$verbosity = _ref2.verbosity,
- verbosity = _ref2$verbosity === undefined ? (0, _util.getVerbosityLevel)() : _ref2$verbosity;
-
- if (port && pdfWorkerPorts.has(port)) {
- throw new Error('Cannot use more than one PDFWorker per port');
- }
- this.name = name;
- this.destroyed = false;
- this.postMessageTransfers = postMessageTransfers !== false;
- this.verbosity = verbosity;
- this._readyCapability = (0, _util.createPromiseCapability)();
- this._port = null;
- this._webWorker = null;
- this._messageHandler = null;
- if (port) {
- pdfWorkerPorts.set(port, this);
- this._initializeFromPort(port);
- return;
- }
- this._initialize();
- }
- PDFWorker.prototype = {
- get promise() {
- return this._readyCapability.promise;
- },
- get port() {
- return this._port;
- },
- get messageHandler() {
- return this._messageHandler;
- },
- _initializeFromPort: function PDFWorker_initializeFromPort(port) {
- this._port = port;
- this._messageHandler = new _message_handler.MessageHandler('main', 'worker', port);
- this._messageHandler.on('ready', function () {});
- this._readyCapability.resolve();
- },
- _initialize: function PDFWorker_initialize() {
- var _this6 = this;
- if (typeof Worker !== 'undefined' && !isWorkerDisabled && !getMainThreadWorkerMessageHandler()) {
- var workerSrc = getWorkerSrc();
- try {
- if (!(0, _util.isSameOrigin)(window.location.href, workerSrc)) {
- workerSrc = createCDNWrapper(new _util.URL(workerSrc, window.location).href);
- }
- var worker = new Worker(workerSrc);
- var messageHandler = new _message_handler.MessageHandler('main', 'worker', worker);
- var terminateEarly = function terminateEarly() {
- worker.removeEventListener('error', onWorkerError);
- messageHandler.destroy();
- worker.terminate();
- if (_this6.destroyed) {
- _this6._readyCapability.reject(new Error('Worker was destroyed'));
- } else {
- _this6._setupFakeWorker();
- }
- };
- var onWorkerError = function onWorkerError() {
- if (!_this6._webWorker) {
- terminateEarly();
- }
- };
- worker.addEventListener('error', onWorkerError);
- messageHandler.on('test', function (data) {
- worker.removeEventListener('error', onWorkerError);
- if (_this6.destroyed) {
- terminateEarly();
- return;
- }
- if (data && data.supportTypedArray) {
- _this6._messageHandler = messageHandler;
- _this6._port = worker;
- _this6._webWorker = worker;
- if (!data.supportTransfers) {
- _this6.postMessageTransfers = false;
- }
- _this6._readyCapability.resolve();
- messageHandler.send('configure', { verbosity: _this6.verbosity });
- } else {
- _this6._setupFakeWorker();
- messageHandler.destroy();
- worker.terminate();
- }
- });
- messageHandler.on('ready', function (data) {
- worker.removeEventListener('error', onWorkerError);
- if (_this6.destroyed) {
- terminateEarly();
- return;
- }
- try {
- sendTest();
- } catch (e) {
- _this6._setupFakeWorker();
- }
- });
- var sendTest = function sendTest() {
- var testObj = new Uint8Array([_this6.postMessageTransfers ? 255 : 0]);
- try {
- messageHandler.send('test', testObj, [testObj.buffer]);
- } catch (ex) {
- (0, _util.info)('Cannot use postMessage transfers');
- testObj[0] = 0;
- messageHandler.send('test', testObj);
- }
- };
- sendTest();
- return;
- } catch (e) {
- (0, _util.info)('The worker has been disabled.');
- }
- }
- this._setupFakeWorker();
- },
- _setupFakeWorker: function PDFWorker_setupFakeWorker() {
- var _this7 = this;
+ var PDFWorker =
+ /*#__PURE__*/
+ function () {
+ function PDFWorker() {
+ var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+ _ref6$name = _ref6.name,
+ name = _ref6$name === void 0 ? null : _ref6$name,
+ _ref6$port = _ref6.port,
+ port = _ref6$port === void 0 ? null : _ref6$port,
+ _ref6$postMessageTran = _ref6.postMessageTransfers,
+ postMessageTransfers = _ref6$postMessageTran === void 0 ? true : _ref6$postMessageTran,
+ _ref6$verbosity = _ref6.verbosity,
+ verbosity = _ref6$verbosity === void 0 ? (0, _util.getVerbosityLevel)() : _ref6$verbosity;
+
+ _classCallCheck(this, PDFWorker);
- if (!isWorkerDisabled) {
- (0, _util.warn)('Setting up fake worker.');
- isWorkerDisabled = true;
+ if (port && pdfWorkerPorts.has(port)) {
+ throw new Error('Cannot use more than one PDFWorker per port');
}
- setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
- if (_this7.destroyed) {
- _this7._readyCapability.reject(new Error('Worker was destroyed'));
- return;
- }
- var port = new LoopbackPort();
- _this7._port = port;
- var id = 'fake' + nextFakeWorkerId++;
- var workerHandler = new _message_handler.MessageHandler(id + '_worker', id, port);
- WorkerMessageHandler.setup(workerHandler, port);
- var messageHandler = new _message_handler.MessageHandler(id, id + '_worker', port);
- _this7._messageHandler = messageHandler;
- _this7._readyCapability.resolve();
- }).catch(function (reason) {
- _this7._readyCapability.reject(new Error('Setting up fake worker failed: "' + reason.message + '".'));
- });
- },
- destroy: function PDFWorker_destroy() {
- this.destroyed = true;
- if (this._webWorker) {
- this._webWorker.terminate();
- this._webWorker = null;
- }
- pdfWorkerPorts.delete(this._port);
+
+ this.name = name;
+ this.destroyed = false;
+ this.postMessageTransfers = postMessageTransfers !== false;
+ this.verbosity = verbosity;
+ this._readyCapability = (0, _util.createPromiseCapability)();
this._port = null;
- if (this._messageHandler) {
- this._messageHandler.destroy();
- this._messageHandler = null;
+ this._webWorker = null;
+ this._messageHandler = null;
+
+ if (port) {
+ pdfWorkerPorts.set(port, this);
+
+ this._initializeFromPort(port);
+
+ return;
}
+
+ this._initialize();
}
- };
- PDFWorker.fromPort = function (params) {
- if (!params || !params.port) {
- throw new Error('PDFWorker.fromPort - invalid method signature.');
- }
- if (pdfWorkerPorts.has(params.port)) {
- return pdfWorkerPorts.get(params.port);
- }
- return new PDFWorker(params);
- };
- PDFWorker.getWorkerSrc = function () {
- return getWorkerSrc();
- };
+
+ _createClass(PDFWorker, [{
+ key: "_initializeFromPort",
+ value: function _initializeFromPort(port) {
+ this._port = port;
+ this._messageHandler = new _message_handler.MessageHandler('main', 'worker', port);
+
+ this._messageHandler.on('ready', function () {});
+
+ this._readyCapability.resolve();
+ }
+ }, {
+ key: "_initialize",
+ value: function _initialize() {
+ var _this6 = this;
+
+ if (typeof Worker !== 'undefined' && !isWorkerDisabled && !getMainThreadWorkerMessageHandler()) {
+ var workerSrc = _getWorkerSrc();
+
+ try {
+ if (!(0, _util.isSameOrigin)(window.location.href, workerSrc)) {
+ workerSrc = createCDNWrapper(new _util.URL(workerSrc, window.location).href);
+ }
+
+ var worker = new Worker(workerSrc);
+ var messageHandler = new _message_handler.MessageHandler('main', 'worker', worker);
+
+ var terminateEarly = function terminateEarly() {
+ worker.removeEventListener('error', onWorkerError);
+ messageHandler.destroy();
+ worker.terminate();
+
+ if (_this6.destroyed) {
+ _this6._readyCapability.reject(new Error('Worker was destroyed'));
+ } else {
+ _this6._setupFakeWorker();
+ }
+ };
+
+ var onWorkerError = function onWorkerError() {
+ if (!_this6._webWorker) {
+ terminateEarly();
+ }
+ };
+
+ worker.addEventListener('error', onWorkerError);
+ messageHandler.on('test', function (data) {
+ worker.removeEventListener('error', onWorkerError);
+
+ if (_this6.destroyed) {
+ terminateEarly();
+ return;
+ }
+
+ if (data && data.supportTypedArray) {
+ _this6._messageHandler = messageHandler;
+ _this6._port = worker;
+ _this6._webWorker = worker;
+
+ if (!data.supportTransfers) {
+ _this6.postMessageTransfers = false;
+ }
+
+ _this6._readyCapability.resolve();
+
+ messageHandler.send('configure', {
+ verbosity: _this6.verbosity
+ });
+ } else {
+ _this6._setupFakeWorker();
+
+ messageHandler.destroy();
+ worker.terminate();
+ }
+ });
+ messageHandler.on('ready', function (data) {
+ worker.removeEventListener('error', onWorkerError);
+
+ if (_this6.destroyed) {
+ terminateEarly();
+ return;
+ }
+
+ try {
+ sendTest();
+ } catch (e) {
+ _this6._setupFakeWorker();
+ }
+ });
+
+ var sendTest = function sendTest() {
+ var testObj = new Uint8Array([_this6.postMessageTransfers ? 255 : 0]);
+
+ try {
+ messageHandler.send('test', testObj, [testObj.buffer]);
+ } catch (ex) {
+ (0, _util.info)('Cannot use postMessage transfers');
+ testObj[0] = 0;
+ messageHandler.send('test', testObj);
+ }
+ };
+
+ sendTest();
+ return;
+ } catch (e) {
+ (0, _util.info)('The worker has been disabled.');
+ }
+ }
+
+ this._setupFakeWorker();
+ }
+ }, {
+ key: "_setupFakeWorker",
+ value: function _setupFakeWorker() {
+ var _this7 = this;
+
+ if (!isWorkerDisabled) {
+ (0, _util.warn)('Setting up fake worker.');
+ isWorkerDisabled = true;
+ }
+
+ setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
+ if (_this7.destroyed) {
+ _this7._readyCapability.reject(new Error('Worker was destroyed'));
+
+ return;
+ }
+
+ var port = new LoopbackPort();
+ _this7._port = port;
+ var id = 'fake' + nextFakeWorkerId++;
+ var workerHandler = new _message_handler.MessageHandler(id + '_worker', id, port);
+ WorkerMessageHandler.setup(workerHandler, port);
+ var messageHandler = new _message_handler.MessageHandler(id, id + '_worker', port);
+ _this7._messageHandler = messageHandler;
+
+ _this7._readyCapability.resolve();
+ }).catch(function (reason) {
+ _this7._readyCapability.reject(new Error("Setting up fake worker failed: \"".concat(reason.message, "\".")));
+ });
+ }
+ }, {
+ key: "destroy",
+ value: function destroy() {
+ this.destroyed = true;
+
+ if (this._webWorker) {
+ this._webWorker.terminate();
+
+ this._webWorker = null;
+ }
+
+ pdfWorkerPorts.delete(this._port);
+ this._port = null;
+
+ if (this._messageHandler) {
+ this._messageHandler.destroy();
+
+ this._messageHandler = null;
+ }
+ }
+ }, {
+ key: "promise",
+ get: function get() {
+ return this._readyCapability.promise;
+ }
+ }, {
+ key: "port",
+ get: function get() {
+ return this._port;
+ }
+ }, {
+ key: "messageHandler",
+ get: function get() {
+ return this._messageHandler;
+ }
+ }], [{
+ key: "fromPort",
+ value: function fromPort(params) {
+ if (!params || !params.port) {
+ throw new Error('PDFWorker.fromPort - invalid method signature.');
+ }
+
+ if (pdfWorkerPorts.has(params.port)) {
+ return pdfWorkerPorts.get(params.port);
+ }
+
+ return new PDFWorker(params);
+ }
+ }, {
+ key: "getWorkerSrc",
+ value: function getWorkerSrc() {
+ return _getWorkerSrc();
+ }
+ }]);
+
+ return PDFWorker;
+ }();
+
return PDFWorker;
}();
-var WorkerTransport = function () {
+exports.PDFWorker = PDFWorker;
+
+var WorkerTransport =
+/*#__PURE__*/
+function () {
function WorkerTransport(messageHandler, loadingTask, networkStream, params) {
_classCallCheck(this, WorkerTransport);
@@ -9006,18 +10952,21 @@ var WorkerTransport = function () {
}
_createClass(WorkerTransport, [{
- key: 'destroy',
+ key: "destroy",
value: function destroy() {
var _this8 = this;
if (this.destroyCapability) {
return this.destroyCapability.promise;
}
+
this.destroyed = true;
this.destroyCapability = (0, _util.createPromiseCapability)();
+
if (this._passwordCapability) {
this._passwordCapability.reject(new Error('Worker was destroyed during onPassword callback'));
}
+
var waitOn = [];
this.pageCache.forEach(function (page) {
if (page) {
@@ -9030,49 +10979,56 @@ var WorkerTransport = function () {
waitOn.push(terminated);
Promise.all(waitOn).then(function () {
_this8.fontLoader.clear();
+
if (_this8._networkStream) {
_this8._networkStream.cancelAllRequests();
}
+
if (_this8.messageHandler) {
_this8.messageHandler.destroy();
+
_this8.messageHandler = null;
}
+
_this8.destroyCapability.resolve();
}, this.destroyCapability.reject);
return this.destroyCapability.promise;
}
}, {
- key: 'setupMessageHandler',
+ key: "setupMessageHandler",
value: function setupMessageHandler() {
var messageHandler = this.messageHandler,
loadingTask = this.loadingTask;
-
messageHandler.on('GetReader', function (data, sink) {
var _this9 = this;
(0, _util.assert)(this._networkStream);
this._fullReader = this._networkStream.getFullReader();
+
this._fullReader.onProgress = function (evt) {
_this9._lastProgress = {
loaded: evt.loaded,
total: evt.total
};
};
+
sink.onPull = function () {
- _this9._fullReader.read().then(function (_ref3) {
- var value = _ref3.value,
- done = _ref3.done;
+ _this9._fullReader.read().then(function (_ref7) {
+ var value = _ref7.value,
+ done = _ref7.done;
if (done) {
sink.close();
return;
}
+
(0, _util.assert)((0, _util.isArrayBuffer)(value));
sink.enqueue(new Uint8Array(value), 1, [value]);
}).catch(function (reason) {
sink.error(reason);
});
};
+
sink.onCancel = function (reason) {
_this9._fullReader.cancel(reason);
};
@@ -9087,6 +11043,7 @@ var WorkerTransport = function () {
if (_this10._lastProgress && loadingTask.onProgress) {
loadingTask.onProgress(_this10._lastProgress);
}
+
fullReader.onProgress = function (evt) {
if (loadingTask.onProgress) {
loadingTask.onProgress({
@@ -9096,6 +11053,7 @@ var WorkerTransport = function () {
}
};
}
+
headersCapability.resolve({
isStreamingSupported: fullReader.isStreamingSupported,
isRangeSupported: fullReader.isRangeSupported,
@@ -9106,41 +11064,49 @@ var WorkerTransport = function () {
}, this);
messageHandler.on('GetRangeReader', function (data, sink) {
(0, _util.assert)(this._networkStream);
+
var rangeReader = this._networkStream.getRangeReader(data.begin, data.end);
+
sink.onPull = function () {
- rangeReader.read().then(function (_ref4) {
- var value = _ref4.value,
- done = _ref4.done;
+ rangeReader.read().then(function (_ref8) {
+ var value = _ref8.value,
+ done = _ref8.done;
if (done) {
sink.close();
return;
}
+
(0, _util.assert)((0, _util.isArrayBuffer)(value));
sink.enqueue(new Uint8Array(value), 1, [value]);
}).catch(function (reason) {
sink.error(reason);
});
};
+
sink.onCancel = function (reason) {
rangeReader.cancel(reason);
};
}, this);
- messageHandler.on('GetDoc', function (_ref5) {
- var pdfInfo = _ref5.pdfInfo;
-
+ messageHandler.on('GetDoc', function (_ref9) {
+ var pdfInfo = _ref9.pdfInfo;
this.numPages = pdfInfo.numPages;
this.pdfDocument = new PDFDocumentProxy(pdfInfo, this, loadingTask);
+
loadingTask._capability.resolve(this.pdfDocument);
}, this);
messageHandler.on('PasswordRequest', function (exception) {
var _this11 = this;
this._passwordCapability = (0, _util.createPromiseCapability)();
+
if (loadingTask.onPassword) {
var updatePassword = function updatePassword(password) {
- _this11._passwordCapability.resolve({ password: password });
+ _this11._passwordCapability.resolve({
+ password: password
+ });
};
+
try {
loadingTask.onPassword(updatePassword, exception.code);
} catch (ex) {
@@ -9149,6 +11115,7 @@ var WorkerTransport = function () {
} else {
this._passwordCapability.reject(new _util.PasswordException(exception.message, exception.code));
}
+
return this._passwordCapability.promise;
}, this);
messageHandler.on('PasswordException', function (exception) {
@@ -9173,21 +11140,27 @@ var WorkerTransport = function () {
total: data.length
});
}
+
this.downloadInfoCapability.resolve(data);
}, this);
messageHandler.on('StartRenderPage', function (data) {
if (this.destroyed) {
return;
}
+
var page = this.pageCache[data.pageIndex];
+
page._stats.timeEnd('Page Request');
+
page._startRenderPage(data.transparency, data.intent);
}, this);
messageHandler.on('RenderPageChunk', function (data) {
if (this.destroyed) {
return;
}
+
var page = this.pageCache[data.pageIndex];
+
page._renderPageChunk(data.operatorList, data.intent);
}, this);
messageHandler.on('commonobj', function (data) {
@@ -9202,26 +11175,31 @@ var WorkerTransport = function () {
type = _data[1],
exportedData = _data[2];
- if (this.commonObjs.hasData(id)) {
+ if (this.commonObjs.has(id)) {
return;
}
+
switch (type) {
case 'Font':
var params = this._params;
+
if ('error' in exportedData) {
var exportedError = exportedData.error;
- (0, _util.warn)('Error during font loading: ' + exportedError);
+ (0, _util.warn)("Error during font loading: ".concat(exportedError));
this.commonObjs.resolve(id, exportedError);
break;
}
+
var fontRegistry = null;
- if (params.pdfBug && _global_scope2.default.FontInspector && _global_scope2.default.FontInspector.enabled) {
+
+ if (params.pdfBug && _global_scope.default.FontInspector && _global_scope.default.FontInspector.enabled) {
fontRegistry = {
registerFont: function registerFont(font, url) {
- _global_scope2.default['FontInspector'].fontAdded(font, url);
+ _global_scope.default['FontInspector'].fontAdded(font, url);
}
};
}
+
var font = new _font_loader.FontFaceObject(exportedData, {
isEvalSupported: params.isEvalSupported,
disableFontFace: params.disableFontFace,
@@ -9229,16 +11207,20 @@ var WorkerTransport = function () {
onUnsupportedFeature: this._onUnsupportedFeature.bind(this),
fontRegistry: fontRegistry
});
+
var fontReady = function fontReady(fontObjs) {
_this12.commonObjs.resolve(id, font);
};
+
this.fontLoader.bind([font], fontReady);
break;
+
case 'FontPath':
this.commonObjs.resolve(id, exportedData);
break;
+
default:
- throw new Error('Got unknown common object type ' + type);
+ throw new Error("Got unknown common object type ".concat(type));
}
}, this);
messageHandler.on('obj', function (data) {
@@ -9253,38 +11235,48 @@ var WorkerTransport = function () {
imageData = _data2[3];
var pageProxy = this.pageCache[pageIndex];
- if (pageProxy.objs.hasData(id)) {
+
+ if (pageProxy.objs.has(id)) {
return;
}
+
switch (type) {
case 'JpegStream':
return new Promise(function (resolve, reject) {
var img = new Image();
+
img.onload = function () {
resolve(img);
};
+
img.onerror = function () {
reject(new Error('Error during JPEG image loading'));
};
+
img.src = imageData;
}).then(function (img) {
pageProxy.objs.resolve(id, img);
});
+
case 'Image':
pageProxy.objs.resolve(id, imageData);
var MAX_IMAGE_SIZE_TO_STORE = 8000000;
+
if (imageData && 'data' in imageData && imageData.data.length > MAX_IMAGE_SIZE_TO_STORE) {
pageProxy.cleanupAfterRender = true;
}
+
break;
+
default:
- throw new Error('Got unknown object type ' + type);
+ throw new Error("Got unknown object type ".concat(type));
}
}, this);
messageHandler.on('DocProgress', function (data) {
if (this.destroyed) {
return;
}
+
if (loadingTask.onProgress) {
loadingTask.onProgress({
loaded: data.loaded,
@@ -9296,15 +11288,19 @@ var WorkerTransport = function () {
if (this.destroyed) {
return;
}
+
var page = this.pageCache[data.pageNum - 1];
var intentState = page.intentStates[data.intent];
+
if (intentState.displayReadyCapability) {
intentState.displayReadyCapability.reject(data.error);
} else {
throw new Error(data.error);
}
+
if (intentState.operatorList) {
intentState.operatorList.lastChunk = true;
+
for (var i = 0; i < intentState.renderTasks.length; i++) {
intentState.renderTasks[i].operatorListChanged();
}
@@ -9315,6 +11311,7 @@ var WorkerTransport = function () {
if (this.destroyed) {
return Promise.reject(new Error('Worker was destroyed'));
}
+
if (typeof document === 'undefined') {
return Promise.reject(new Error('"document" is not defined.'));
}
@@ -9326,8 +11323,10 @@ var WorkerTransport = function () {
if (components !== 3 && components !== 1) {
return Promise.reject(new Error('Only 3 components or 1 component can be returned'));
}
+
return new Promise(function (resolve, reject) {
var img = new Image();
+
img.onload = function () {
var width = img.width;
var height = img.height;
@@ -9340,6 +11339,7 @@ var WorkerTransport = function () {
var tmpCtx = tmpCanvas.getContext('2d');
tmpCtx.drawImage(img, 0, 0);
var data = tmpCtx.getImageData(0, 0, width, height).data;
+
if (components === 3) {
for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
buf[j] = data[i];
@@ -9347,19 +11347,22 @@ var WorkerTransport = function () {
buf[j + 2] = data[i + 2];
}
} else if (components === 1) {
- for (var _i = 0, _j = 0; _i < rgbaLength; _i += 4, _j++) {
- buf[_j] = data[_i];
+ for (var _i2 = 0, _j = 0; _i2 < rgbaLength; _i2 += 4, _j++) {
+ buf[_j] = data[_i2];
}
}
+
resolve({
data: buf,
width: width,
height: height
});
};
+
img.onerror = function () {
reject(new Error('JpegDecode failed to load image'));
};
+
img.src = imageUrl;
});
}, this);
@@ -9367,42 +11370,52 @@ var WorkerTransport = function () {
if (this.destroyed) {
return Promise.reject(new Error('Worker was destroyed'));
}
- return this.CMapReaderFactory.fetch({ name: data.name });
+
+ return this.CMapReaderFactory.fetch({
+ name: data.name
+ });
}, this);
}
}, {
- key: '_onUnsupportedFeature',
- value: function _onUnsupportedFeature(_ref6) {
- var featureId = _ref6.featureId;
+ key: "_onUnsupportedFeature",
+ value: function _onUnsupportedFeature(_ref10) {
+ var featureId = _ref10.featureId;
if (this.destroyed) {
return;
}
+
if (this.loadingTask.onUnsupportedFeature) {
this.loadingTask.onUnsupportedFeature(featureId);
}
}
}, {
- key: 'getData',
+ key: "getData",
value: function getData() {
return this.messageHandler.sendWithPromise('GetData', null);
}
}, {
- key: 'getPage',
+ key: "getPage",
value: function getPage(pageNumber) {
var _this13 = this;
if (!Number.isInteger(pageNumber) || pageNumber <= 0 || pageNumber > this.numPages) {
return Promise.reject(new Error('Invalid page request'));
}
+
var pageIndex = pageNumber - 1;
+
if (pageIndex in this.pagePromises) {
return this.pagePromises[pageIndex];
}
- var promise = this.messageHandler.sendWithPromise('GetPage', { pageIndex: pageIndex }).then(function (pageInfo) {
+
+ var promise = this.messageHandler.sendWithPromise('GetPage', {
+ pageIndex: pageIndex
+ }).then(function (pageInfo) {
if (_this13.destroyed) {
throw new Error('Transport destroyed');
}
+
var page = new PDFPageProxy(pageIndex, pageInfo, _this13, _this13._params.pdfBug);
_this13.pageCache[pageIndex] = page;
return page;
@@ -9411,14 +11424,16 @@ var WorkerTransport = function () {
return promise;
}
}, {
- key: 'getPageIndex',
+ key: "getPageIndex",
value: function getPageIndex(ref) {
- return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref }).catch(function (reason) {
+ return this.messageHandler.sendWithPromise('GetPageIndex', {
+ ref: ref
+ }).catch(function (reason) {
return Promise.reject(new Error(reason));
});
}
}, {
- key: 'getAnnotations',
+ key: "getAnnotations",
value: function getAnnotations(pageIndex, intent) {
return this.messageHandler.sendWithPromise('GetAnnotations', {
pageIndex: pageIndex,
@@ -9426,50 +11441,53 @@ var WorkerTransport = function () {
});
}
}, {
- key: 'getDestinations',
+ key: "getDestinations",
value: function getDestinations() {
return this.messageHandler.sendWithPromise('GetDestinations', null);
}
}, {
- key: 'getDestination',
+ key: "getDestination",
value: function getDestination(id) {
if (typeof id !== 'string') {
return Promise.reject(new Error('Invalid destination request.'));
}
- return this.messageHandler.sendWithPromise('GetDestination', { id: id });
+
+ return this.messageHandler.sendWithPromise('GetDestination', {
+ id: id
+ });
}
}, {
- key: 'getPageLabels',
+ key: "getPageLabels",
value: function getPageLabels() {
return this.messageHandler.sendWithPromise('GetPageLabels', null);
}
}, {
- key: 'getPageMode',
+ key: "getPageMode",
value: function getPageMode() {
return this.messageHandler.sendWithPromise('GetPageMode', null);
}
}, {
- key: 'getAttachments',
+ key: "getAttachments",
value: function getAttachments() {
return this.messageHandler.sendWithPromise('GetAttachments', null);
}
}, {
- key: 'getJavaScript',
+ key: "getJavaScript",
value: function getJavaScript() {
return this.messageHandler.sendWithPromise('GetJavaScript', null);
}
}, {
- key: 'getOutline',
+ key: "getOutline",
value: function getOutline() {
return this.messageHandler.sendWithPromise('GetOutline', null);
}
}, {
- key: 'getPermissions',
+ key: "getPermissions",
value: function getPermissions() {
return this.messageHandler.sendWithPromise('GetPermissions', null);
}
}, {
- key: 'getMetadata',
+ key: "getMetadata",
value: function getMetadata() {
var _this14 = this;
@@ -9482,28 +11500,31 @@ var WorkerTransport = function () {
});
}
}, {
- key: 'getStats',
+ key: "getStats",
value: function getStats() {
return this.messageHandler.sendWithPromise('GetStats', null);
}
}, {
- key: 'startCleanup',
+ key: "startCleanup",
value: function startCleanup() {
var _this15 = this;
this.messageHandler.sendWithPromise('Cleanup', null).then(function () {
for (var i = 0, ii = _this15.pageCache.length; i < ii; i++) {
var page = _this15.pageCache[i];
+
if (page) {
page.cleanup();
}
}
+
_this15.commonObjs.clear();
+
_this15.fontLoader.clear();
});
}
}, {
- key: 'loadingParams',
+ key: "loadingParams",
get: function get() {
var params = this._params;
return (0, _util.shadow)(this, 'loadingParams', {
@@ -9518,223 +11539,315 @@ var WorkerTransport = function () {
return WorkerTransport;
}();
-var PDFObjects = function PDFObjectsClosure() {
+var PDFObjects =
+/*#__PURE__*/
+function () {
function PDFObjects() {
- this.objs = Object.create(null);
+ _classCallCheck(this, PDFObjects);
+
+ this._objs = Object.create(null);
}
- PDFObjects.prototype = {
- ensureObj: function PDFObjects_ensureObj(objId) {
- if (this.objs[objId]) {
- return this.objs[objId];
+
+ _createClass(PDFObjects, [{
+ key: "_ensureObj",
+ value: function _ensureObj(objId) {
+ if (this._objs[objId]) {
+ return this._objs[objId];
}
- var obj = {
+
+ return this._objs[objId] = {
capability: (0, _util.createPromiseCapability)(),
data: null,
resolved: false
};
- this.objs[objId] = obj;
- return obj;
- },
- get: function PDFObjects_get(objId, callback) {
+ }
+ }, {
+ key: "get",
+ value: function get(objId) {
+ var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
if (callback) {
- this.ensureObj(objId).capability.promise.then(callback);
+ this._ensureObj(objId).capability.promise.then(callback);
+
return null;
}
- var obj = this.objs[objId];
+
+ var obj = this._objs[objId];
+
if (!obj || !obj.resolved) {
- throw new Error('Requesting object that isn\'t resolved yet ' + objId);
+ throw new Error("Requesting object that isn't resolved yet ".concat(objId, "."));
}
+
return obj.data;
- },
- resolve: function PDFObjects_resolve(objId, data) {
- var obj = this.ensureObj(objId);
+ }
+ }, {
+ key: "has",
+ value: function has(objId) {
+ var obj = this._objs[objId];
+ return obj ? obj.resolved : false;
+ }
+ }, {
+ key: "resolve",
+ value: function resolve(objId, data) {
+ var obj = this._ensureObj(objId);
+
obj.resolved = true;
obj.data = data;
obj.capability.resolve(data);
- },
- isResolved: function PDFObjects_isResolved(objId) {
- var objs = this.objs;
- if (!objs[objId]) {
- return false;
- }
- return objs[objId].resolved;
- },
- hasData: function PDFObjects_hasData(objId) {
- return this.isResolved(objId);
- },
- getData: function PDFObjects_getData(objId) {
- var objs = this.objs;
- if (!objs[objId] || !objs[objId].resolved) {
- return null;
- }
- return objs[objId].data;
- },
- clear: function PDFObjects_clear() {
- this.objs = Object.create(null);
}
- };
+ }, {
+ key: "clear",
+ value: function clear() {
+ this._objs = Object.create(null);
+ }
+ }]);
+
return PDFObjects;
}();
-var RenderTask = function RenderTaskClosure() {
+
+var RenderTask =
+/*#__PURE__*/
+function () {
function RenderTask(internalRenderTask) {
+ _classCallCheck(this, RenderTask);
+
this._internalRenderTask = internalRenderTask;
this.onContinue = null;
}
- RenderTask.prototype = {
- get promise() {
- return this._internalRenderTask.capability.promise;
- },
- cancel: function RenderTask_cancel() {
+
+ _createClass(RenderTask, [{
+ key: "cancel",
+ value: function cancel() {
this._internalRenderTask.cancel();
- },
- then: function RenderTask_then(onFulfilled, onRejected) {
+ }
+ }, {
+ key: "then",
+ value: function then(onFulfilled, onRejected) {
+ (0, _util.deprecated)('RenderTask.then method, use the `promise` getter instead.');
return this.promise.then.apply(this.promise, arguments);
}
- };
+ }, {
+ key: "promise",
+ get: function get() {
+ return this._internalRenderTask.capability.promise;
+ }
+ }]);
+
return RenderTask;
}();
+
var InternalRenderTask = function InternalRenderTaskClosure() {
var canvasInRendering = new WeakSet();
- function InternalRenderTask(callback, params, objs, commonObjs, operatorList, pageNumber, canvasFactory, webGLContext) {
- var pdfBug = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
- this.callback = callback;
- this.params = params;
- this.objs = objs;
- this.commonObjs = commonObjs;
- this.operatorListIdx = null;
- this.operatorList = operatorList;
- this.pageNumber = pageNumber;
- this.canvasFactory = canvasFactory;
- this.webGLContext = webGLContext;
- this._pdfBug = pdfBug;
- this.running = false;
- this.graphicsReadyCallback = null;
- this.graphicsReady = false;
- this.useRequestAnimationFrame = false;
- this.cancelled = false;
- this.capability = (0, _util.createPromiseCapability)();
- this.task = new RenderTask(this);
- this._continueBound = this._continue.bind(this);
- this._scheduleNextBound = this._scheduleNext.bind(this);
- this._nextBound = this._next.bind(this);
- this._canvas = params.canvasContext.canvas;
- }
- InternalRenderTask.prototype = {
- initializeGraphics: function initializeGraphics(transparency) {
- if (this.cancelled) {
- return;
- }
- if (this._canvas) {
- if (canvasInRendering.has(this._canvas)) {
- throw new Error('Cannot use the same canvas during multiple render() operations. ' + 'Use different canvas or ensure previous operations were ' + 'cancelled or completed.');
+ var InternalRenderTask =
+ /*#__PURE__*/
+ function () {
+ function InternalRenderTask(_ref11) {
+ var callback = _ref11.callback,
+ params = _ref11.params,
+ objs = _ref11.objs,
+ commonObjs = _ref11.commonObjs,
+ operatorList = _ref11.operatorList,
+ pageNumber = _ref11.pageNumber,
+ canvasFactory = _ref11.canvasFactory,
+ webGLContext = _ref11.webGLContext,
+ _ref11$useRequestAnim = _ref11.useRequestAnimationFrame,
+ useRequestAnimationFrame = _ref11$useRequestAnim === void 0 ? false : _ref11$useRequestAnim,
+ _ref11$pdfBug = _ref11.pdfBug,
+ pdfBug = _ref11$pdfBug === void 0 ? false : _ref11$pdfBug;
+
+ _classCallCheck(this, InternalRenderTask);
+
+ this.callback = callback;
+ this.params = params;
+ this.objs = objs;
+ this.commonObjs = commonObjs;
+ this.operatorListIdx = null;
+ this.operatorList = operatorList;
+ this.pageNumber = pageNumber;
+ this.canvasFactory = canvasFactory;
+ this.webGLContext = webGLContext;
+ this._pdfBug = pdfBug;
+ this.running = false;
+ this.graphicsReadyCallback = null;
+ this.graphicsReady = false;
+ this._useRequestAnimationFrame = useRequestAnimationFrame === true && typeof window !== 'undefined';
+ this.cancelled = false;
+ this.capability = (0, _util.createPromiseCapability)();
+ this.task = new RenderTask(this);
+ this._continueBound = this._continue.bind(this);
+ this._scheduleNextBound = this._scheduleNext.bind(this);
+ this._nextBound = this._next.bind(this);
+ this._canvas = params.canvasContext.canvas;
+ }
+
+ _createClass(InternalRenderTask, [{
+ key: "initializeGraphics",
+ value: function initializeGraphics() {
+ var transparency = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+ if (this.cancelled) {
+ return;
}
- canvasInRendering.add(this._canvas);
- }
- if (this._pdfBug && _global_scope2.default.StepperManager && _global_scope2.default.StepperManager.enabled) {
- this.stepper = _global_scope2.default.StepperManager.create(this.pageNumber - 1);
- this.stepper.init(this.operatorList);
- this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
- }
- var params = this.params;
- this.gfx = new _canvas.CanvasGraphics(params.canvasContext, this.commonObjs, this.objs, this.canvasFactory, this.webGLContext, params.imageLayer);
- this.gfx.beginDrawing({
- transform: params.transform,
- viewport: params.viewport,
- transparency: transparency,
- background: params.background
- });
- this.operatorListIdx = 0;
- this.graphicsReady = true;
- if (this.graphicsReadyCallback) {
- this.graphicsReadyCallback();
- }
- },
- cancel: function InternalRenderTask_cancel() {
- this.running = false;
- this.cancelled = true;
- if (this.gfx) {
- this.gfx.endDrawing();
- }
- if (this._canvas) {
- canvasInRendering.delete(this._canvas);
- }
- this.callback(new _dom_utils.RenderingCancelledException('Rendering cancelled, page ' + this.pageNumber, 'canvas'));
- },
- operatorListChanged: function InternalRenderTask_operatorListChanged() {
- if (!this.graphicsReady) {
- if (!this.graphicsReadyCallback) {
- this.graphicsReadyCallback = this._continueBound;
+ if (this._canvas) {
+ if (canvasInRendering.has(this._canvas)) {
+ throw new Error('Cannot use the same canvas during multiple render() operations. ' + 'Use different canvas or ensure previous operations were ' + 'cancelled or completed.');
+ }
+
+ canvasInRendering.add(this._canvas);
+ }
+
+ if (this._pdfBug && _global_scope.default.StepperManager && _global_scope.default.StepperManager.enabled) {
+ this.stepper = _global_scope.default.StepperManager.create(this.pageNumber - 1);
+ this.stepper.init(this.operatorList);
+ this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
+ }
+
+ var _this$params = this.params,
+ canvasContext = _this$params.canvasContext,
+ viewport = _this$params.viewport,
+ transform = _this$params.transform,
+ imageLayer = _this$params.imageLayer,
+ background = _this$params.background;
+ this.gfx = new _canvas.CanvasGraphics(canvasContext, this.commonObjs, this.objs, this.canvasFactory, this.webGLContext, imageLayer);
+ this.gfx.beginDrawing({
+ transform: transform,
+ viewport: viewport,
+ transparency: transparency,
+ background: background
+ });
+ this.operatorListIdx = 0;
+ this.graphicsReady = true;
+
+ if (this.graphicsReadyCallback) {
+ this.graphicsReadyCallback();
}
- return;
- }
- if (this.stepper) {
- this.stepper.updateOperatorList(this.operatorList);
- }
- if (this.running) {
- return;
- }
- this._continue();
- },
- _continue: function InternalRenderTask__continue() {
- this.running = true;
- if (this.cancelled) {
- return;
}
- if (this.task.onContinue) {
- this.task.onContinue(this._scheduleNextBound);
- } else {
- this._scheduleNext();
+ }, {
+ key: "cancel",
+ value: function cancel() {
+ this.running = false;
+ this.cancelled = true;
+
+ if (this.gfx) {
+ this.gfx.endDrawing();
+ }
+
+ if (this._canvas) {
+ canvasInRendering.delete(this._canvas);
+ }
+
+ this.callback(new _dom_utils.RenderingCancelledException('Rendering cancelled, page ' + this.pageNumber, 'canvas'));
}
- },
- _scheduleNext: function InternalRenderTask__scheduleNext() {
- var _this16 = this;
+ }, {
+ key: "operatorListChanged",
+ value: function operatorListChanged() {
+ if (!this.graphicsReady) {
+ if (!this.graphicsReadyCallback) {
+ this.graphicsReadyCallback = this._continueBound;
+ }
- if (this.useRequestAnimationFrame && typeof window !== 'undefined') {
- window.requestAnimationFrame(function () {
- _this16._nextBound().catch(_this16.callback);
- });
- } else {
- Promise.resolve().then(this._nextBound).catch(this.callback);
+ return;
+ }
+
+ if (this.stepper) {
+ this.stepper.updateOperatorList(this.operatorList);
+ }
+
+ if (this.running) {
+ return;
+ }
+
+ this._continue();
}
- },
- _next: function InternalRenderTask__next() {
- var _this17 = this;
+ }, {
+ key: "_continue",
+ value: function _continue() {
+ this.running = true;
- return new Promise(function () {
- if (_this17.cancelled) {
+ if (this.cancelled) {
return;
}
- _this17.operatorListIdx = _this17.gfx.executeOperatorList(_this17.operatorList, _this17.operatorListIdx, _this17._continueBound, _this17.stepper);
- if (_this17.operatorListIdx === _this17.operatorList.argsArray.length) {
- _this17.running = false;
- if (_this17.operatorList.lastChunk) {
- _this17.gfx.endDrawing();
- if (_this17._canvas) {
- canvasInRendering.delete(_this17._canvas);
+
+ if (this.task.onContinue) {
+ this.task.onContinue(this._scheduleNextBound);
+ } else {
+ this._scheduleNext();
+ }
+ }
+ }, {
+ key: "_scheduleNext",
+ value: function _scheduleNext() {
+ var _this16 = this;
+
+ if (this._useRequestAnimationFrame) {
+ window.requestAnimationFrame(function () {
+ _this16._nextBound().catch(_this16.callback);
+ });
+ } else {
+ Promise.resolve().then(this._nextBound).catch(this.callback);
+ }
+ }
+ }, {
+ key: "_next",
+ value: function () {
+ var _next2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
+ return _regenerator.default.wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ if (!this.cancelled) {
+ _context.next = 2;
+ break;
+ }
+
+ return _context.abrupt("return");
+
+ case 2:
+ this.operatorListIdx = this.gfx.executeOperatorList(this.operatorList, this.operatorListIdx, this._continueBound, this.stepper);
+
+ if (this.operatorListIdx === this.operatorList.argsArray.length) {
+ this.running = false;
+
+ if (this.operatorList.lastChunk) {
+ this.gfx.endDrawing();
+
+ if (this._canvas) {
+ canvasInRendering.delete(this._canvas);
+ }
+
+ this.callback();
+ }
+ }
+
+ case 4:
+ case "end":
+ return _context.stop();
+ }
}
- _this17.callback();
- }
+ }, _callee, this);
+ }));
+
+ function _next() {
+ return _next2.apply(this, arguments);
}
- });
- }
- };
+
+ return _next;
+ }()
+ }]);
+
+ return InternalRenderTask;
+ }();
+
return InternalRenderTask;
}();
-var version, build;
-{
- exports.version = version = '2.1.28';
- exports.build = build = 'ec76aa53';
-}
-exports.getDocument = getDocument;
-exports.LoopbackPort = LoopbackPort;
-exports.PDFDataRangeTransport = PDFDataRangeTransport;
-exports.PDFWorker = PDFWorker;
-exports.PDFDocumentProxy = PDFDocumentProxy;
-exports.PDFPageProxy = PDFPageProxy;
-exports.setPDFNetworkStreamFactory = setPDFNetworkStreamFactory;
+
+var version = '2.1.124';
exports.version = version;
+var build = '74461b0a';
exports.build = build;
/***/ }),
@@ -9744,1592 +11857,2522 @@ exports.build = build;
"use strict";
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.loadScript = exports.DummyStatTimer = exports.StatTimer = exports.DOMSVGFactory = exports.DOMCMapReaderFactory = exports.DOMCanvasFactory = exports.DEFAULT_LINK_REL = exports.LinkTarget = exports.getFilenameFromUrl = exports.addLinkAttributes = exports.RenderingCancelledException = exports.PageViewport = undefined;
+module.exports = __w_pdfjs_require__(135);
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+/***/ }),
+/* 135 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
-var _util = __w_pdfjs_require__(1);
+"use strict";
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var DEFAULT_LINK_REL = 'noopener noreferrer nofollow';
-var SVG_NS = 'http://www.w3.org/2000/svg';
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-var DOMCanvasFactory = function () {
- function DOMCanvasFactory() {
- _classCallCheck(this, DOMCanvasFactory);
- }
+var g = function () {
+ return this || (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" && self;
+}() || Function("return this")();
- _createClass(DOMCanvasFactory, [{
- key: 'create',
- value: function create(width, height) {
- if (width <= 0 || height <= 0) {
- throw new Error('invalid canvas size');
- }
- var canvas = document.createElement('canvas');
- var context = canvas.getContext('2d');
- canvas.width = width;
- canvas.height = height;
- return {
- canvas: canvas,
- context: context
- };
- }
- }, {
- key: 'reset',
- value: function reset(canvasAndContext, width, height) {
- if (!canvasAndContext.canvas) {
- throw new Error('canvas is not specified');
- }
- if (width <= 0 || height <= 0) {
- throw new Error('invalid canvas size');
- }
- canvasAndContext.canvas.width = width;
- canvasAndContext.canvas.height = height;
- }
- }, {
- key: 'destroy',
- value: function destroy(canvasAndContext) {
- if (!canvasAndContext.canvas) {
- throw new Error('canvas is not specified');
- }
- canvasAndContext.canvas.width = 0;
- canvasAndContext.canvas.height = 0;
- canvasAndContext.canvas = null;
- canvasAndContext.context = null;
- }
- }]);
+var hadRuntime = g.regeneratorRuntime && Object.getOwnPropertyNames(g).indexOf("regeneratorRuntime") >= 0;
+var oldRuntime = hadRuntime && g.regeneratorRuntime;
+g.regeneratorRuntime = undefined;
+module.exports = __w_pdfjs_require__(136);
- return DOMCanvasFactory;
-}();
+if (hadRuntime) {
+ g.regeneratorRuntime = oldRuntime;
+} else {
+ try {
+ delete g.regeneratorRuntime;
+ } catch (e) {
+ g.regeneratorRuntime = undefined;
+ }
+}
-var DOMCMapReaderFactory = function () {
- function DOMCMapReaderFactory(_ref) {
- var _ref$baseUrl = _ref.baseUrl,
- baseUrl = _ref$baseUrl === undefined ? null : _ref$baseUrl,
- _ref$isCompressed = _ref.isCompressed,
- isCompressed = _ref$isCompressed === undefined ? false : _ref$isCompressed;
+/***/ }),
+/* 136 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
- _classCallCheck(this, DOMCMapReaderFactory);
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
- this.baseUrl = baseUrl;
- this.isCompressed = isCompressed;
- }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
- _createClass(DOMCMapReaderFactory, [{
- key: 'fetch',
- value: function fetch(_ref2) {
- var _this = this;
+!function (global) {
+ "use strict";
- var name = _ref2.name;
+ var Op = Object.prototype;
+ var hasOwn = Op.hasOwnProperty;
+ var undefined;
+ var $Symbol = typeof Symbol === "function" ? Symbol : {};
+ var iteratorSymbol = $Symbol.iterator || "@@iterator";
+ var asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator";
+ var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
+ var inModule = ( false ? undefined : _typeof(module)) === "object";
+ var runtime = global.regeneratorRuntime;
- if (!this.baseUrl) {
- return Promise.reject(new Error('The CMap "baseUrl" parameter must be specified, ensure that ' + 'the "cMapUrl" and "cMapPacked" API parameters are provided.'));
- }
- if (!name) {
- return Promise.reject(new Error('CMap name must be specified.'));
- }
- return new Promise(function (resolve, reject) {
- var url = _this.baseUrl + name + (_this.isCompressed ? '.bcmap' : '');
- var request = new XMLHttpRequest();
- request.open('GET', url, true);
- if (_this.isCompressed) {
- request.responseType = 'arraybuffer';
- }
- request.onreadystatechange = function () {
- if (request.readyState !== XMLHttpRequest.DONE) {
- return;
- }
- if (request.status === 200 || request.status === 0) {
- var data = void 0;
- if (_this.isCompressed && request.response) {
- data = new Uint8Array(request.response);
- } else if (!_this.isCompressed && request.responseText) {
- data = (0, _util.stringToBytes)(request.responseText);
- }
- if (data) {
- resolve({
- cMapData: data,
- compressionType: _this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
- });
- return;
- }
- }
- reject(new Error('Unable to load ' + (_this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
- };
- request.send(null);
- });
+ if (runtime) {
+ if (inModule) {
+ module.exports = runtime;
}
- }]);
- return DOMCMapReaderFactory;
-}();
+ return;
+ }
-var DOMSVGFactory = function () {
- function DOMSVGFactory() {
- _classCallCheck(this, DOMSVGFactory);
+ runtime = global.regeneratorRuntime = inModule ? module.exports : {};
+
+ function wrap(innerFn, outerFn, self, tryLocsList) {
+ var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
+ var generator = Object.create(protoGenerator.prototype);
+ var context = new Context(tryLocsList || []);
+ generator._invoke = makeInvokeMethod(innerFn, self, context);
+ return generator;
}
- _createClass(DOMSVGFactory, [{
- key: 'create',
- value: function create(width, height) {
- (0, _util.assert)(width > 0 && height > 0, 'Invalid SVG dimensions');
- var svg = document.createElementNS(SVG_NS, 'svg:svg');
- svg.setAttribute('version', '1.1');
- svg.setAttribute('width', width + 'px');
- svg.setAttribute('height', height + 'px');
- svg.setAttribute('preserveAspectRatio', 'none');
- svg.setAttribute('viewBox', '0 0 ' + width + ' ' + height);
- return svg;
- }
- }, {
- key: 'createElement',
- value: function createElement(type) {
- (0, _util.assert)(typeof type === 'string', 'Invalid SVG element type');
- return document.createElementNS(SVG_NS, type);
+ runtime.wrap = wrap;
+
+ function tryCatch(fn, obj, arg) {
+ try {
+ return {
+ type: "normal",
+ arg: fn.call(obj, arg)
+ };
+ } catch (err) {
+ return {
+ type: "throw",
+ arg: err
+ };
}
- }]);
+ }
- return DOMSVGFactory;
-}();
+ var GenStateSuspendedStart = "suspendedStart";
+ var GenStateSuspendedYield = "suspendedYield";
+ var GenStateExecuting = "executing";
+ var GenStateCompleted = "completed";
+ var ContinueSentinel = {};
-var PageViewport = function () {
- function PageViewport(_ref3) {
- var viewBox = _ref3.viewBox,
- scale = _ref3.scale,
- rotation = _ref3.rotation,
- _ref3$offsetX = _ref3.offsetX,
- offsetX = _ref3$offsetX === undefined ? 0 : _ref3$offsetX,
- _ref3$offsetY = _ref3.offsetY,
- offsetY = _ref3$offsetY === undefined ? 0 : _ref3$offsetY,
- _ref3$dontFlip = _ref3.dontFlip,
- dontFlip = _ref3$dontFlip === undefined ? false : _ref3$dontFlip;
+ function Generator() {}
- _classCallCheck(this, PageViewport);
+ function GeneratorFunction() {}
- this.viewBox = viewBox;
- this.scale = scale;
- this.rotation = rotation;
- this.offsetX = offsetX;
- this.offsetY = offsetY;
- var centerX = (viewBox[2] + viewBox[0]) / 2;
- var centerY = (viewBox[3] + viewBox[1]) / 2;
- var rotateA = void 0,
- rotateB = void 0,
- rotateC = void 0,
- rotateD = void 0;
- rotation = rotation % 360;
- rotation = rotation < 0 ? rotation + 360 : rotation;
- switch (rotation) {
- case 180:
- rotateA = -1;
- rotateB = 0;
- rotateC = 0;
- rotateD = 1;
- break;
- case 90:
- rotateA = 0;
- rotateB = 1;
- rotateC = 1;
- rotateD = 0;
- break;
- case 270:
- rotateA = 0;
- rotateB = -1;
- rotateC = -1;
- rotateD = 0;
- break;
- default:
- rotateA = 1;
- rotateB = 0;
- rotateC = 0;
- rotateD = -1;
- break;
- }
- if (dontFlip) {
- rotateC = -rotateC;
- rotateD = -rotateD;
- }
- var offsetCanvasX = void 0,
- offsetCanvasY = void 0;
- var width = void 0,
- height = void 0;
- if (rotateA === 0) {
- offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
- offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
- width = Math.abs(viewBox[3] - viewBox[1]) * scale;
- height = Math.abs(viewBox[2] - viewBox[0]) * scale;
- } else {
- offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
- offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
- width = Math.abs(viewBox[2] - viewBox[0]) * scale;
- height = Math.abs(viewBox[3] - viewBox[1]) * scale;
- }
- this.transform = [rotateA * scale, rotateB * scale, rotateC * scale, rotateD * scale, offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY, offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY];
- this.width = width;
- this.height = height;
- }
+ function GeneratorFunctionPrototype() {}
- _createClass(PageViewport, [{
- key: 'clone',
- value: function clone() {
- var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
- _ref4$scale = _ref4.scale,
- scale = _ref4$scale === undefined ? this.scale : _ref4$scale,
- _ref4$rotation = _ref4.rotation,
- rotation = _ref4$rotation === undefined ? this.rotation : _ref4$rotation,
- _ref4$dontFlip = _ref4.dontFlip,
- dontFlip = _ref4$dontFlip === undefined ? false : _ref4$dontFlip;
+ var IteratorPrototype = {};
- return new PageViewport({
- viewBox: this.viewBox.slice(),
- scale: scale,
- rotation: rotation,
- offsetX: this.offsetX,
- offsetY: this.offsetY,
- dontFlip: dontFlip
- });
- }
- }, {
- key: 'convertToViewportPoint',
- value: function convertToViewportPoint(x, y) {
- return _util.Util.applyTransform([x, y], this.transform);
- }
- }, {
- key: 'convertToViewportRectangle',
- value: function convertToViewportRectangle(rect) {
- var tl = _util.Util.applyTransform([rect[0], rect[1]], this.transform);
- var br = _util.Util.applyTransform([rect[2], rect[3]], this.transform);
- return [tl[0], tl[1], br[0], br[1]];
- }
- }, {
- key: 'convertToPdfPoint',
- value: function convertToPdfPoint(x, y) {
- return _util.Util.applyInverseTransform([x, y], this.transform);
- }
- }]);
+ IteratorPrototype[iteratorSymbol] = function () {
+ return this;
+ };
- return PageViewport;
-}();
+ var getProto = Object.getPrototypeOf;
+ var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
-var RenderingCancelledException = function RenderingCancelledException() {
- function RenderingCancelledException(msg, type) {
- this.message = msg;
- this.type = type;
+ if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
+ IteratorPrototype = NativeIteratorPrototype;
}
- RenderingCancelledException.prototype = new Error();
- RenderingCancelledException.prototype.name = 'RenderingCancelledException';
- RenderingCancelledException.constructor = RenderingCancelledException;
- return RenderingCancelledException;
-}();
-var LinkTarget = {
- NONE: 0,
- SELF: 1,
- BLANK: 2,
- PARENT: 3,
- TOP: 4
-};
-var LinkTargetStringMap = ['', '_self', '_blank', '_parent', '_top'];
-function addLinkAttributes(link) {
- var _ref5 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
- url = _ref5.url,
- target = _ref5.target,
- rel = _ref5.rel;
- link.href = link.title = url ? (0, _util.removeNullCharacters)(url) : '';
- if (url) {
- var LinkTargetValues = Object.values(LinkTarget);
- var targetIndex = LinkTargetValues.includes(target) ? target : LinkTarget.NONE;
- link.target = LinkTargetStringMap[targetIndex];
- link.rel = typeof rel === 'string' ? rel : DEFAULT_LINK_REL;
- }
-}
-function getFilenameFromUrl(url) {
- var anchor = url.indexOf('#');
- var query = url.indexOf('?');
- var end = Math.min(anchor > 0 ? anchor : url.length, query > 0 ? query : url.length);
- return url.substring(url.lastIndexOf('/', end) + 1, end);
-}
+ var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
+ GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
+ GeneratorFunctionPrototype.constructor = GeneratorFunction;
+ GeneratorFunctionPrototype[toStringTagSymbol] = GeneratorFunction.displayName = "GeneratorFunction";
-var StatTimer = function () {
- function StatTimer() {
- var enable = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+ function defineIteratorMethods(prototype) {
+ ["next", "throw", "return"].forEach(function (method) {
+ prototype[method] = function (arg) {
+ return this._invoke(method, arg);
+ };
+ });
+ }
- _classCallCheck(this, StatTimer);
+ runtime.isGeneratorFunction = function (genFun) {
+ var ctor = typeof genFun === "function" && genFun.constructor;
+ return ctor ? ctor === GeneratorFunction || (ctor.displayName || ctor.name) === "GeneratorFunction" : false;
+ };
- this.enabled = !!enable;
- this.started = Object.create(null);
- this.times = [];
- }
+ runtime.mark = function (genFun) {
+ if (Object.setPrototypeOf) {
+ Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
+ } else {
+ genFun.__proto__ = GeneratorFunctionPrototype;
- _createClass(StatTimer, [{
- key: 'time',
- value: function time(name) {
- if (!this.enabled) {
- return;
- }
- if (name in this.started) {
- (0, _util.warn)('Timer is already running for ' + name);
- }
- this.started[name] = Date.now();
- }
- }, {
- key: 'timeEnd',
- value: function timeEnd(name) {
- if (!this.enabled) {
- return;
- }
- if (!(name in this.started)) {
- (0, _util.warn)('Timer has not been started for ' + name);
+ if (!(toStringTagSymbol in genFun)) {
+ genFun[toStringTagSymbol] = "GeneratorFunction";
}
- this.times.push({
- 'name': name,
- 'start': this.started[name],
- 'end': Date.now()
- });
- delete this.started[name];
}
- }, {
- key: 'toString',
- value: function toString() {
- var times = this.times;
- var out = '',
- longest = 0;
- for (var i = 0, ii = times.length; i < ii; ++i) {
- var name = times[i]['name'];
- if (name.length > longest) {
- longest = name.length;
+
+ genFun.prototype = Object.create(Gp);
+ return genFun;
+ };
+
+ runtime.awrap = function (arg) {
+ return {
+ __await: arg
+ };
+ };
+
+ function AsyncIterator(generator) {
+ function invoke(method, arg, resolve, reject) {
+ var record = tryCatch(generator[method], generator, arg);
+
+ if (record.type === "throw") {
+ reject(record.arg);
+ } else {
+ var result = record.arg;
+ var value = result.value;
+
+ if (value && _typeof(value) === "object" && hasOwn.call(value, "__await")) {
+ return Promise.resolve(value.__await).then(function (value) {
+ invoke("next", value, resolve, reject);
+ }, function (err) {
+ invoke("throw", err, resolve, reject);
+ });
}
+
+ return Promise.resolve(value).then(function (unwrapped) {
+ result.value = unwrapped;
+ resolve(result);
+ }, function (error) {
+ return invoke("throw", error, resolve, reject);
+ });
}
- for (var _i = 0, _ii = times.length; _i < _ii; ++_i) {
- var span = times[_i];
- var duration = span.end - span.start;
- out += span['name'].padEnd(longest) + ' ' + duration + 'ms\n';
- }
- return out;
}
- }]);
- return StatTimer;
-}();
+ var previousPromise;
-var DummyStatTimer = function () {
- function DummyStatTimer() {
- _classCallCheck(this, DummyStatTimer);
+ function enqueue(method, arg) {
+ function callInvokeWithMethodAndArg() {
+ return new Promise(function (resolve, reject) {
+ invoke(method, arg, resolve, reject);
+ });
+ }
- (0, _util.unreachable)('Cannot initialize DummyStatTimer.');
+ return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+ }
+
+ this._invoke = enqueue;
}
- _createClass(DummyStatTimer, null, [{
- key: 'time',
- value: function time(name) {}
- }, {
- key: 'timeEnd',
- value: function timeEnd(name) {}
- }, {
- key: 'toString',
- value: function toString() {
- return '';
- }
- }]);
-
- return DummyStatTimer;
-}();
+ defineIteratorMethods(AsyncIterator.prototype);
-function loadScript(src) {
- return new Promise(function (resolve, reject) {
- var script = document.createElement('script');
- script.src = src;
- script.onload = resolve;
- script.onerror = function () {
- reject(new Error('Cannot load script at: ' + script.src));
- };
- (document.head || document.documentElement).appendChild(script);
- });
-}
-exports.PageViewport = PageViewport;
-exports.RenderingCancelledException = RenderingCancelledException;
-exports.addLinkAttributes = addLinkAttributes;
-exports.getFilenameFromUrl = getFilenameFromUrl;
-exports.LinkTarget = LinkTarget;
-exports.DEFAULT_LINK_REL = DEFAULT_LINK_REL;
-exports.DOMCanvasFactory = DOMCanvasFactory;
-exports.DOMCMapReaderFactory = DOMCMapReaderFactory;
-exports.DOMSVGFactory = DOMSVGFactory;
-exports.StatTimer = StatTimer;
-exports.DummyStatTimer = DummyStatTimer;
-exports.loadScript = loadScript;
+ AsyncIterator.prototype[asyncIteratorSymbol] = function () {
+ return this;
+ };
-/***/ }),
-/* 135 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+ runtime.AsyncIterator = AsyncIterator;
-"use strict";
+ runtime.async = function (innerFn, outerFn, self, tryLocsList) {
+ var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList));
+ return runtime.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
+ return result.done ? result.value : iter.next();
+ });
+ };
+ function makeInvokeMethod(innerFn, self, context) {
+ var state = GenStateSuspendedStart;
+ return function invoke(method, arg) {
+ if (state === GenStateExecuting) {
+ throw new Error("Generator is already running");
+ }
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.FontLoader = exports.FontFaceObject = undefined;
+ if (state === GenStateCompleted) {
+ if (method === "throw") {
+ throw arg;
+ }
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+ return doneResult();
+ }
-var _util = __w_pdfjs_require__(1);
+ context.method = method;
+ context.arg = arg;
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+ while (true) {
+ var delegate = context.delegate;
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+ if (delegate) {
+ var delegateResult = maybeInvokeDelegate(delegate, context);
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+ if (delegateResult) {
+ if (delegateResult === ContinueSentinel) continue;
+ return delegateResult;
+ }
+ }
-var BaseFontLoader = function () {
- function BaseFontLoader(docId) {
- _classCallCheck(this, BaseFontLoader);
+ if (context.method === "next") {
+ context.sent = context._sent = context.arg;
+ } else if (context.method === "throw") {
+ if (state === GenStateSuspendedStart) {
+ state = GenStateCompleted;
+ throw context.arg;
+ }
- if (this.constructor === BaseFontLoader) {
- (0, _util.unreachable)('Cannot initialize BaseFontLoader.');
- }
- this.docId = docId;
- this.nativeFontFaces = [];
- this.styleElement = null;
- this.loadingContext = {
- requests: [],
- nextRequestId: 0
- };
- }
+ context.dispatchException(context.arg);
+ } else if (context.method === "return") {
+ context.abrupt("return", context.arg);
+ }
- _createClass(BaseFontLoader, [{
- key: 'addNativeFontFace',
- value: function addNativeFontFace(nativeFontFace) {
- this.nativeFontFaces.push(nativeFontFace);
- document.fonts.add(nativeFontFace);
- }
- }, {
- key: 'insertRule',
- value: function insertRule(rule) {
- var styleElement = this.styleElement;
- if (!styleElement) {
- styleElement = this.styleElement = document.createElement('style');
- styleElement.id = 'PDFJS_FONT_STYLE_TAG_' + this.docId;
- document.documentElement.getElementsByTagName('head')[0].appendChild(styleElement);
- }
- var styleSheet = styleElement.sheet;
- styleSheet.insertRule(rule, styleSheet.cssRules.length);
- }
- }, {
- key: 'clear',
- value: function clear() {
- this.nativeFontFaces.forEach(function (nativeFontFace) {
- document.fonts.delete(nativeFontFace);
- });
- this.nativeFontFaces.length = 0;
- if (this.styleElement) {
- this.styleElement.remove();
- this.styleElement = null;
- }
- }
- }, {
- key: 'bind',
- value: function bind(fonts, callback) {
- var rules = [];
- var fontsToLoad = [];
- var fontLoadPromises = [];
- var getNativeFontPromise = function getNativeFontPromise(nativeFontFace) {
- return nativeFontFace.loaded.catch(function (reason) {
- (0, _util.warn)('Failed to load font "' + nativeFontFace.family + '": ' + reason);
- });
- };
- var _iteratorNormalCompletion = true;
- var _didIteratorError = false;
- var _iteratorError = undefined;
+ state = GenStateExecuting;
+ var record = tryCatch(innerFn, self, context);
- try {
- for (var _iterator = fonts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
- var font = _step.value;
+ if (record.type === "normal") {
+ state = context.done ? GenStateCompleted : GenStateSuspendedYield;
- if (font.attached || font.missingFile) {
+ if (record.arg === ContinueSentinel) {
continue;
}
- font.attached = true;
- if (this.isFontLoadingAPISupported) {
- var nativeFontFace = font.createNativeFontFace();
- if (nativeFontFace) {
- this.addNativeFontFace(nativeFontFace);
- fontLoadPromises.push(getNativeFontPromise(nativeFontFace));
- }
- } else {
- var rule = font.createFontFaceRule();
- if (rule) {
- this.insertRule(rule);
- rules.push(rule);
- fontsToLoad.push(font);
- }
- }
- }
- } catch (err) {
- _didIteratorError = true;
- _iteratorError = err;
- } finally {
- try {
- if (!_iteratorNormalCompletion && _iterator.return) {
- _iterator.return();
- }
- } finally {
- if (_didIteratorError) {
- throw _iteratorError;
- }
- }
- }
- var request = this._queueLoadingCallback(callback);
- if (this.isFontLoadingAPISupported) {
- Promise.all(fontLoadPromises).then(request.complete);
- } else if (rules.length > 0 && !this.isSyncFontLoadingSupported) {
- this._prepareFontLoadEvent(rules, fontsToLoad, request);
- } else {
- request.complete();
- }
- }
- }, {
- key: '_queueLoadingCallback',
- value: function _queueLoadingCallback(callback) {
- function completeRequest() {
- (0, _util.assert)(!request.done, 'completeRequest() cannot be called twice.');
- request.done = true;
- while (context.requests.length > 0 && context.requests[0].done) {
- var otherRequest = context.requests.shift();
- setTimeout(otherRequest.callback, 0);
+ return {
+ value: record.arg,
+ done: context.done
+ };
+ } else if (record.type === "throw") {
+ state = GenStateCompleted;
+ context.method = "throw";
+ context.arg = record.arg;
}
}
- var context = this.loadingContext;
- var request = {
- id: 'pdfjs-font-loading-' + context.nextRequestId++,
- done: false,
- complete: completeRequest,
- callback: callback
- };
- context.requests.push(request);
- return request;
- }
- }, {
- key: '_prepareFontLoadEvent',
- value: function _prepareFontLoadEvent(rules, fontsToLoad, request) {
- (0, _util.unreachable)('Abstract method `_prepareFontLoadEvent`.');
- }
- }, {
- key: 'isFontLoadingAPISupported',
- get: function get() {
- (0, _util.unreachable)('Abstract method `isFontLoadingAPISupported`.');
- }
- }, {
- key: 'isSyncFontLoadingSupported',
- get: function get() {
- (0, _util.unreachable)('Abstract method `isSyncFontLoadingSupported`.');
- }
- }, {
- key: '_loadTestFont',
- get: function get() {
- (0, _util.unreachable)('Abstract method `_loadTestFont`.');
- }
- }]);
+ };
+ }
- return BaseFontLoader;
-}();
+ function maybeInvokeDelegate(delegate, context) {
+ var method = delegate.iterator[context.method];
-var FontLoader = void 0;
-{
- exports.FontLoader = FontLoader = function (_BaseFontLoader) {
- _inherits(GenericFontLoader, _BaseFontLoader);
+ if (method === undefined) {
+ context.delegate = null;
- function GenericFontLoader(docId) {
- _classCallCheck(this, GenericFontLoader);
+ if (context.method === "throw") {
+ if (delegate.iterator.return) {
+ context.method = "return";
+ context.arg = undefined;
+ maybeInvokeDelegate(delegate, context);
- var _this = _possibleConstructorReturn(this, (GenericFontLoader.__proto__ || Object.getPrototypeOf(GenericFontLoader)).call(this, docId));
+ if (context.method === "throw") {
+ return ContinueSentinel;
+ }
+ }
- _this.loadTestFontId = 0;
- return _this;
+ context.method = "throw";
+ context.arg = new TypeError("The iterator does not provide a 'throw' method");
+ }
+
+ return ContinueSentinel;
}
- _createClass(GenericFontLoader, [{
- key: '_prepareFontLoadEvent',
- value: function _prepareFontLoadEvent(rules, fonts, request) {
- function int32(data, offset) {
- return data.charCodeAt(offset) << 24 | data.charCodeAt(offset + 1) << 16 | data.charCodeAt(offset + 2) << 8 | data.charCodeAt(offset + 3) & 0xff;
- }
- function spliceString(s, offset, remove, insert) {
- var chunk1 = s.substring(0, offset);
- var chunk2 = s.substring(offset + remove);
- return chunk1 + insert + chunk2;
- }
- var i = void 0,
- ii = void 0;
- var canvas = document.createElement('canvas');
- canvas.width = 1;
- canvas.height = 1;
- var ctx = canvas.getContext('2d');
- var called = 0;
- function isFontReady(name, callback) {
- called++;
- if (called > 30) {
- (0, _util.warn)('Load test font never loaded.');
- callback();
- return;
- }
- ctx.font = '30px ' + name;
- ctx.fillText('.', 0, 20);
- var imageData = ctx.getImageData(0, 0, 1, 1);
- if (imageData.data[3] > 0) {
- callback();
- return;
- }
- setTimeout(isFontReady.bind(null, name, callback));
- }
- var loadTestFontId = 'lt' + Date.now() + this.loadTestFontId++;
- var data = this._loadTestFont;
- var COMMENT_OFFSET = 976;
- data = spliceString(data, COMMENT_OFFSET, loadTestFontId.length, loadTestFontId);
- var CFF_CHECKSUM_OFFSET = 16;
- var XXXX_VALUE = 0x58585858;
- var checksum = int32(data, CFF_CHECKSUM_OFFSET);
- for (i = 0, ii = loadTestFontId.length - 3; i < ii; i += 4) {
- checksum = checksum - XXXX_VALUE + int32(loadTestFontId, i) | 0;
- }
- if (i < loadTestFontId.length) {
- checksum = checksum - XXXX_VALUE + int32(loadTestFontId + 'XXX', i) | 0;
- }
- data = spliceString(data, CFF_CHECKSUM_OFFSET, 4, (0, _util.string32)(checksum));
- var url = 'url(data:font/opentype;base64,' + btoa(data) + ');';
- var rule = '@font-face {font-family:"' + loadTestFontId + '";src:' + url + '}';
- this.insertRule(rule);
- var names = [];
- for (i = 0, ii = fonts.length; i < ii; i++) {
- names.push(fonts[i].loadedName);
- }
- names.push(loadTestFontId);
- var div = document.createElement('div');
- div.setAttribute('style', 'visibility: hidden;' + 'width: 10px; height: 10px;' + 'position: absolute; top: 0px; left: 0px;');
- for (i = 0, ii = names.length; i < ii; ++i) {
- var span = document.createElement('span');
- span.textContent = 'Hi';
- span.style.fontFamily = names[i];
- div.appendChild(span);
- }
- document.body.appendChild(div);
- isFontReady(loadTestFontId, function () {
- document.body.removeChild(div);
- request.complete();
- });
- }
- }, {
- key: 'isFontLoadingAPISupported',
- get: function get() {
- var supported = typeof document !== 'undefined' && !!document.fonts;
- if (supported && typeof navigator !== 'undefined') {
- var m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(navigator.userAgent);
- if (m && m[1] < 63) {
- supported = false;
- }
- }
- return (0, _util.shadow)(this, 'isFontLoadingAPISupported', supported);
- }
- }, {
- key: 'isSyncFontLoadingSupported',
- get: function get() {
- var supported = false;
- if (typeof navigator === 'undefined') {
- supported = true;
- } else {
- var m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(navigator.userAgent);
- if (m && m[1] >= 14) {
- supported = true;
- }
- }
- return (0, _util.shadow)(this, 'isSyncFontLoadingSupported', supported);
- }
- }, {
- key: '_loadTestFont',
- get: function get() {
- var getLoadTestFont = function getLoadTestFont() {
- return atob('T1RUTwALAIAAAwAwQ0ZGIDHtZg4AAAOYAAAAgUZGVE1lkzZwAAAEHAAAABxHREVGABQA' + 'FQAABDgAAAAeT1MvMlYNYwkAAAEgAAAAYGNtYXABDQLUAAACNAAAAUJoZWFk/xVFDQAA' + 'ALwAAAA2aGhlYQdkA+oAAAD0AAAAJGhtdHgD6AAAAAAEWAAAAAZtYXhwAAJQAAAAARgA' + 'AAAGbmFtZVjmdH4AAAGAAAAAsXBvc3T/hgAzAAADeAAAACAAAQAAAAEAALZRFsRfDzz1' + 'AAsD6AAAAADOBOTLAAAAAM4KHDwAAAAAA+gDIQAAAAgAAgAAAAAAAAABAAADIQAAAFoD' + '6AAAAAAD6AABAAAAAAAAAAAAAAAAAAAAAQAAUAAAAgAAAAQD6AH0AAUAAAKKArwAAACM' + 'AooCvAAAAeAAMQECAAACAAYJAAAAAAAAAAAAAQAAAAAAAAAAAAAAAFBmRWQAwAAuAC4D' + 'IP84AFoDIQAAAAAAAQAAAAAAAAAAACAAIAABAAAADgCuAAEAAAAAAAAAAQAAAAEAAAAA' + 'AAEAAQAAAAEAAAAAAAIAAQAAAAEAAAAAAAMAAQAAAAEAAAAAAAQAAQAAAAEAAAAAAAUA' + 'AQAAAAEAAAAAAAYAAQAAAAMAAQQJAAAAAgABAAMAAQQJAAEAAgABAAMAAQQJAAIAAgAB' + 'AAMAAQQJAAMAAgABAAMAAQQJAAQAAgABAAMAAQQJAAUAAgABAAMAAQQJAAYAAgABWABY' + 'AAAAAAAAAwAAAAMAAAAcAAEAAAAAADwAAwABAAAAHAAEACAAAAAEAAQAAQAAAC7//wAA' + 'AC7////TAAEAAAAAAAABBgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAD/gwAyAAAAAQAAAAAAAAAAAAAAAAAA' + 'AAABAAQEAAEBAQJYAAEBASH4DwD4GwHEAvgcA/gXBIwMAYuL+nz5tQXkD5j3CBLnEQAC' + 'AQEBIVhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYAAABAQAADwACAQEEE/t3' + 'Dov6fAH6fAT+fPp8+nwHDosMCvm1Cvm1DAz6fBQAAAAAAAABAAAAAMmJbzEAAAAAzgTj' + 'FQAAAADOBOQpAAEAAAAAAAAADAAUAAQAAAABAAAAAgABAAAAAAAAAAAD6AAAAAAAAA==');
- };
- return (0, _util.shadow)(this, '_loadTestFont', getLoadTestFont());
- }
- }]);
-
- return GenericFontLoader;
- }(BaseFontLoader);
-}
-var IsEvalSupportedCached = {
- get value() {
- return (0, _util.shadow)(this, 'value', (0, _util.isEvalSupported)());
- }
-};
+ var record = tryCatch(method, delegate.iterator, context.arg);
-var FontFaceObject = function () {
- function FontFaceObject(translatedData, _ref) {
- var _ref$isEvalSupported = _ref.isEvalSupported,
- isEvalSupported = _ref$isEvalSupported === undefined ? true : _ref$isEvalSupported,
- _ref$disableFontFace = _ref.disableFontFace,
- disableFontFace = _ref$disableFontFace === undefined ? false : _ref$disableFontFace,
- _ref$ignoreErrors = _ref.ignoreErrors,
- ignoreErrors = _ref$ignoreErrors === undefined ? false : _ref$ignoreErrors,
- _ref$onUnsupportedFea = _ref.onUnsupportedFeature,
- onUnsupportedFeature = _ref$onUnsupportedFea === undefined ? null : _ref$onUnsupportedFea,
- _ref$fontRegistry = _ref.fontRegistry,
- fontRegistry = _ref$fontRegistry === undefined ? null : _ref$fontRegistry;
+ if (record.type === "throw") {
+ context.method = "throw";
+ context.arg = record.arg;
+ context.delegate = null;
+ return ContinueSentinel;
+ }
- _classCallCheck(this, FontFaceObject);
+ var info = record.arg;
- this.compiledGlyphs = Object.create(null);
- for (var i in translatedData) {
- this[i] = translatedData[i];
+ if (!info) {
+ context.method = "throw";
+ context.arg = new TypeError("iterator result is not an object");
+ context.delegate = null;
+ return ContinueSentinel;
}
- this.isEvalSupported = isEvalSupported !== false;
- this.disableFontFace = disableFontFace === true;
- this.ignoreErrors = ignoreErrors === true;
- this._onUnsupportedFeature = onUnsupportedFeature;
- this.fontRegistry = fontRegistry;
- }
- _createClass(FontFaceObject, [{
- key: 'createNativeFontFace',
- value: function createNativeFontFace() {
- if (!this.data || this.disableFontFace) {
- return null;
- }
- var nativeFontFace = new FontFace(this.loadedName, this.data, {});
- if (this.fontRegistry) {
- this.fontRegistry.registerFont(this);
- }
- return nativeFontFace;
- }
- }, {
- key: 'createFontFaceRule',
- value: function createFontFaceRule() {
- if (!this.data || this.disableFontFace) {
- return null;
- }
- var data = (0, _util.bytesToString)(new Uint8Array(this.data));
- var url = 'url(data:' + this.mimetype + ';base64,' + btoa(data) + ');';
- var rule = '@font-face {font-family:"' + this.loadedName + '";src:' + url + '}';
- if (this.fontRegistry) {
- this.fontRegistry.registerFont(this, url);
- }
- return rule;
- }
- }, {
- key: 'getPathGenerator',
- value: function getPathGenerator(objs, character) {
- if (this.compiledGlyphs[character] !== undefined) {
- return this.compiledGlyphs[character];
- }
- var cmds = void 0,
- current = void 0;
- try {
- cmds = objs.get(this.loadedName + '_path_' + character);
- } catch (ex) {
- if (!this.ignoreErrors) {
- throw ex;
- }
- if (this._onUnsupportedFeature) {
- this._onUnsupportedFeature({ featureId: _util.UNSUPPORTED_FEATURES.font });
- }
- (0, _util.warn)('getPathGenerator - ignoring character: "' + ex + '".');
- return this.compiledGlyphs[character] = function (c, size) {};
- }
- if (this.isEvalSupported && IsEvalSupportedCached.value) {
- var args = void 0,
- js = '';
- for (var i = 0, ii = cmds.length; i < ii; i++) {
- current = cmds[i];
- if (current.args !== undefined) {
- args = current.args.join(',');
- } else {
- args = '';
- }
- js += 'c.' + current.cmd + '(' + args + ');\n';
- }
- return this.compiledGlyphs[character] = new Function('c', 'size', js);
+ if (info.done) {
+ context[delegate.resultName] = info.value;
+ context.next = delegate.nextLoc;
+
+ if (context.method !== "return") {
+ context.method = "next";
+ context.arg = undefined;
}
- return this.compiledGlyphs[character] = function (c, size) {
- for (var _i = 0, _ii = cmds.length; _i < _ii; _i++) {
- current = cmds[_i];
- if (current.cmd === 'scale') {
- current.args = [size, -size];
- }
- c[current.cmd].apply(c, current.args);
- }
- };
+ } else {
+ return info;
}
- }]);
- return FontFaceObject;
-}();
+ context.delegate = null;
+ return ContinueSentinel;
+ }
-exports.FontFaceObject = FontFaceObject;
-exports.FontLoader = FontLoader;
+ defineIteratorMethods(Gp);
+ Gp[toStringTagSymbol] = "Generator";
-/***/ }),
-/* 136 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+ Gp[iteratorSymbol] = function () {
+ return this;
+ };
-"use strict";
+ Gp.toString = function () {
+ return "[object Generator]";
+ };
+ function pushTryEntry(locs) {
+ var entry = {
+ tryLoc: locs[0]
+ };
-var compatibilityParams = Object.create(null);
-{
- var isNodeJS = __w_pdfjs_require__(4);
- var userAgent = typeof navigator !== 'undefined' && navigator.userAgent || '';
- var isIE = /Trident/.test(userAgent);
- var isIOSChrome = /CriOS/.test(userAgent);
- (function checkOnBlobSupport() {
- if (isIE || isIOSChrome) {
- compatibilityParams.disableCreateObjectURL = true;
+ if (1 in locs) {
+ entry.catchLoc = locs[1];
}
- })();
- (function checkFontFaceAndImage() {
- if (isNodeJS()) {
- compatibilityParams.disableFontFace = true;
- compatibilityParams.nativeImageDecoderSupport = 'none';
+
+ if (2 in locs) {
+ entry.finallyLoc = locs[2];
+ entry.afterLoc = locs[3];
}
- })();
-}
-exports.apiCompatibilityParams = Object.freeze(compatibilityParams);
-/***/ }),
-/* 137 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+ this.tryEntries.push(entry);
+ }
-"use strict";
+ function resetTryEntry(entry) {
+ var record = entry.completion || {};
+ record.type = "normal";
+ delete record.arg;
+ entry.completion = record;
+ }
+ function Context(tryLocsList) {
+ this.tryEntries = [{
+ tryLoc: "root"
+ }];
+ tryLocsList.forEach(pushTryEntry, this);
+ this.reset(true);
+ }
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.CanvasGraphics = undefined;
+ runtime.keys = function (object) {
+ var keys = [];
-var _util = __w_pdfjs_require__(1);
+ for (var key in object) {
+ keys.push(key);
+ }
-var _pattern_helper = __w_pdfjs_require__(138);
+ keys.reverse();
+ return function next() {
+ while (keys.length) {
+ var key = keys.pop();
-var MIN_FONT_SIZE = 16;
-var MAX_FONT_SIZE = 100;
-var MAX_GROUP_SIZE = 4096;
-var MIN_WIDTH_FACTOR = 0.65;
-var COMPILE_TYPE3_GLYPHS = true;
-var MAX_SIZE_TO_COMPILE = 1000;
-var FULL_CHUNK_HEIGHT = 16;
-var IsLittleEndianCached = {
- get value() {
- return (0, _util.shadow)(IsLittleEndianCached, 'value', (0, _util.isLittleEndian)());
- }
-};
-function addContextCurrentTransform(ctx) {
- if (!ctx.mozCurrentTransform) {
- ctx._originalSave = ctx.save;
- ctx._originalRestore = ctx.restore;
- ctx._originalRotate = ctx.rotate;
- ctx._originalScale = ctx.scale;
- ctx._originalTranslate = ctx.translate;
- ctx._originalTransform = ctx.transform;
- ctx._originalSetTransform = ctx.setTransform;
- ctx._transformMatrix = ctx._transformMatrix || [1, 0, 0, 1, 0, 0];
- ctx._transformStack = [];
- Object.defineProperty(ctx, 'mozCurrentTransform', {
- get: function getCurrentTransform() {
- return this._transformMatrix;
- }
- });
- Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
- get: function getCurrentTransformInverse() {
- var m = this._transformMatrix;
- var a = m[0],
- b = m[1],
- c = m[2],
- d = m[3],
- e = m[4],
- f = m[5];
- var ad_bc = a * d - b * c;
- var bc_ad = b * c - a * d;
- return [d / ad_bc, b / bc_ad, c / bc_ad, a / ad_bc, (d * e - c * f) / bc_ad, (b * e - a * f) / ad_bc];
+ if (key in object) {
+ next.value = key;
+ next.done = false;
+ return next;
+ }
}
- });
- ctx.save = function ctxSave() {
- var old = this._transformMatrix;
- this._transformStack.push(old);
- this._transformMatrix = old.slice(0, 6);
- this._originalSave();
+
+ next.done = true;
+ return next;
};
- ctx.restore = function ctxRestore() {
- var prev = this._transformStack.pop();
- if (prev) {
- this._transformMatrix = prev;
- this._originalRestore();
+ };
+
+ function values(iterable) {
+ if (iterable) {
+ var iteratorMethod = iterable[iteratorSymbol];
+
+ if (iteratorMethod) {
+ return iteratorMethod.call(iterable);
}
- };
- ctx.translate = function ctxTranslate(x, y) {
- var m = this._transformMatrix;
- m[4] = m[0] * x + m[2] * y + m[4];
- m[5] = m[1] * x + m[3] * y + m[5];
- this._originalTranslate(x, y);
- };
- ctx.scale = function ctxScale(x, y) {
- var m = this._transformMatrix;
- m[0] = m[0] * x;
- m[1] = m[1] * x;
- m[2] = m[2] * y;
- m[3] = m[3] * y;
- this._originalScale(x, y);
- };
- ctx.transform = function ctxTransform(a, b, c, d, e, f) {
- var m = this._transformMatrix;
- this._transformMatrix = [m[0] * a + m[2] * b, m[1] * a + m[3] * b, m[0] * c + m[2] * d, m[1] * c + m[3] * d, m[0] * e + m[2] * f + m[4], m[1] * e + m[3] * f + m[5]];
- ctx._originalTransform(a, b, c, d, e, f);
- };
- ctx.setTransform = function ctxSetTransform(a, b, c, d, e, f) {
- this._transformMatrix = [a, b, c, d, e, f];
- ctx._originalSetTransform(a, b, c, d, e, f);
- };
- ctx.rotate = function ctxRotate(angle) {
- var cosValue = Math.cos(angle);
- var sinValue = Math.sin(angle);
- var m = this._transformMatrix;
- this._transformMatrix = [m[0] * cosValue + m[2] * sinValue, m[1] * cosValue + m[3] * sinValue, m[0] * -sinValue + m[2] * cosValue, m[1] * -sinValue + m[3] * cosValue, m[4], m[5]];
- this._originalRotate(angle);
+
+ if (typeof iterable.next === "function") {
+ return iterable;
+ }
+
+ if (!isNaN(iterable.length)) {
+ var i = -1,
+ next = function next() {
+ while (++i < iterable.length) {
+ if (hasOwn.call(iterable, i)) {
+ next.value = iterable[i];
+ next.done = false;
+ return next;
+ }
+ }
+
+ next.value = undefined;
+ next.done = true;
+ return next;
+ };
+
+ return next.next = next;
+ }
+ }
+
+ return {
+ next: doneResult
};
}
-}
-var CachedCanvases = function CachedCanvasesClosure() {
- function CachedCanvases(canvasFactory) {
- this.canvasFactory = canvasFactory;
- this.cache = Object.create(null);
+
+ runtime.values = values;
+
+ function doneResult() {
+ return {
+ value: undefined,
+ done: true
+ };
}
- CachedCanvases.prototype = {
- getCanvas: function CachedCanvases_getCanvas(id, width, height, trackTransform) {
- var canvasEntry;
- if (this.cache[id] !== undefined) {
- canvasEntry = this.cache[id];
- this.canvasFactory.reset(canvasEntry, width, height);
- canvasEntry.context.setTransform(1, 0, 0, 1, 0, 0);
- } else {
- canvasEntry = this.canvasFactory.create(width, height);
- this.cache[id] = canvasEntry;
+
+ Context.prototype = {
+ constructor: Context,
+ reset: function reset(skipTempReset) {
+ this.prev = 0;
+ this.next = 0;
+ this.sent = this._sent = undefined;
+ this.done = false;
+ this.delegate = null;
+ this.method = "next";
+ this.arg = undefined;
+ this.tryEntries.forEach(resetTryEntry);
+
+ if (!skipTempReset) {
+ for (var name in this) {
+ if (name.charAt(0) === "t" && hasOwn.call(this, name) && !isNaN(+name.slice(1))) {
+ this[name] = undefined;
+ }
+ }
}
- if (trackTransform) {
- addContextCurrentTransform(canvasEntry.context);
+ },
+ stop: function stop() {
+ this.done = true;
+ var rootEntry = this.tryEntries[0];
+ var rootRecord = rootEntry.completion;
+
+ if (rootRecord.type === "throw") {
+ throw rootRecord.arg;
}
- return canvasEntry;
+
+ return this.rval;
},
- clear: function clear() {
- for (var id in this.cache) {
- var canvasEntry = this.cache[id];
- this.canvasFactory.destroy(canvasEntry);
- delete this.cache[id];
+ dispatchException: function dispatchException(exception) {
+ if (this.done) {
+ throw exception;
}
- }
- };
- return CachedCanvases;
-}();
-function compileType3Glyph(imgData) {
- var POINT_TO_PROCESS_LIMIT = 1000;
- var width = imgData.width,
- height = imgData.height;
- var i,
- j,
- j0,
- width1 = width + 1;
- var points = new Uint8Array(width1 * (height + 1));
- var POINT_TYPES = new Uint8Array([0, 2, 4, 0, 1, 0, 5, 4, 8, 10, 0, 8, 0, 2, 1, 0]);
- var lineSize = width + 7 & ~7,
- data0 = imgData.data;
- var data = new Uint8Array(lineSize * height),
- pos = 0,
- ii;
- for (i = 0, ii = data0.length; i < ii; i++) {
- var mask = 128,
- elem = data0[i];
- while (mask > 0) {
- data[pos++] = elem & mask ? 0 : 255;
- mask >>= 1;
- }
- }
- var count = 0;
- pos = 0;
- if (data[pos] !== 0) {
- points[0] = 1;
- ++count;
- }
- for (j = 1; j < width; j++) {
- if (data[pos] !== data[pos + 1]) {
- points[j] = data[pos] ? 2 : 1;
- ++count;
- }
- pos++;
- }
- if (data[pos] !== 0) {
- points[j] = 2;
- ++count;
- }
- for (i = 1; i < height; i++) {
- pos = i * lineSize;
- j0 = i * width1;
- if (data[pos - lineSize] !== data[pos]) {
- points[j0] = data[pos] ? 1 : 8;
- ++count;
- }
- var sum = (data[pos] ? 4 : 0) + (data[pos - lineSize] ? 8 : 0);
- for (j = 1; j < width; j++) {
- sum = (sum >> 2) + (data[pos + 1] ? 4 : 0) + (data[pos - lineSize + 1] ? 8 : 0);
- if (POINT_TYPES[sum]) {
- points[j0 + j] = POINT_TYPES[sum];
- ++count;
+
+ var context = this;
+
+ function handle(loc, caught) {
+ record.type = "throw";
+ record.arg = exception;
+ context.next = loc;
+
+ if (caught) {
+ context.method = "next";
+ context.arg = undefined;
+ }
+
+ return !!caught;
}
- pos++;
- }
- if (data[pos - lineSize] !== data[pos]) {
- points[j0 + j] = data[pos] ? 2 : 4;
- ++count;
- }
- if (count > POINT_TO_PROCESS_LIMIT) {
- return null;
- }
- }
- pos = lineSize * (height - 1);
- j0 = i * width1;
- if (data[pos] !== 0) {
- points[j0] = 8;
- ++count;
- }
- for (j = 1; j < width; j++) {
- if (data[pos] !== data[pos + 1]) {
- points[j0 + j] = data[pos] ? 4 : 8;
- ++count;
- }
- pos++;
- }
- if (data[pos] !== 0) {
- points[j0 + j] = 4;
- ++count;
- }
- if (count > POINT_TO_PROCESS_LIMIT) {
- return null;
- }
- var steps = new Int32Array([0, width1, -1, 0, -width1, 0, 0, 0, 1]);
- var outlines = [];
- for (i = 0; count && i <= height; i++) {
- var p = i * width1;
- var end = p + width;
- while (p < end && !points[p]) {
- p++;
- }
- if (p === end) {
- continue;
- }
- var coords = [p % width1, i];
- var type = points[p],
- p0 = p,
- pp;
- do {
- var step = steps[type];
- do {
- p += step;
- } while (!points[p]);
- pp = points[p];
- if (pp !== 5 && pp !== 10) {
- type = pp;
- points[p] = 0;
- } else {
- type = pp & 0x33 * type >> 4;
- points[p] &= type >> 2 | type << 2;
+
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+ var record = entry.completion;
+
+ if (entry.tryLoc === "root") {
+ return handle("end");
+ }
+
+ if (entry.tryLoc <= this.prev) {
+ var hasCatch = hasOwn.call(entry, "catchLoc");
+ var hasFinally = hasOwn.call(entry, "finallyLoc");
+
+ if (hasCatch && hasFinally) {
+ if (this.prev < entry.catchLoc) {
+ return handle(entry.catchLoc, true);
+ } else if (this.prev < entry.finallyLoc) {
+ return handle(entry.finallyLoc);
+ }
+ } else if (hasCatch) {
+ if (this.prev < entry.catchLoc) {
+ return handle(entry.catchLoc, true);
+ }
+ } else if (hasFinally) {
+ if (this.prev < entry.finallyLoc) {
+ return handle(entry.finallyLoc);
+ }
+ } else {
+ throw new Error("try statement without catch or finally");
+ }
+ }
}
- coords.push(p % width1);
- coords.push(p / width1 | 0);
- --count;
- } while (p0 !== p);
- outlines.push(coords);
- --i;
- }
- var drawOutline = function drawOutline(c) {
- c.save();
- c.scale(1 / width, -1 / height);
- c.translate(0, -height);
- c.beginPath();
- for (var i = 0, ii = outlines.length; i < ii; i++) {
- var o = outlines[i];
- c.moveTo(o[0], o[1]);
- for (var j = 2, jj = o.length; j < jj; j += 2) {
- c.lineTo(o[j], o[j + 1]);
+ },
+ abrupt: function abrupt(type, arg) {
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+
+ if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
+ var finallyEntry = entry;
+ break;
+ }
}
- }
- c.fill();
- c.beginPath();
- c.restore();
- };
- return drawOutline;
-}
-var CanvasExtraState = function CanvasExtraStateClosure() {
- function CanvasExtraState() {
- this.alphaIsShape = false;
- this.fontSize = 0;
- this.fontSizeScale = 1;
- this.textMatrix = _util.IDENTITY_MATRIX;
- this.textMatrixScale = 1;
- this.fontMatrix = _util.FONT_IDENTITY_MATRIX;
- this.leading = 0;
- this.x = 0;
- this.y = 0;
- this.lineX = 0;
- this.lineY = 0;
- this.charSpacing = 0;
- this.wordSpacing = 0;
- this.textHScale = 1;
- this.textRenderingMode = _util.TextRenderingMode.FILL;
- this.textRise = 0;
- this.fillColor = '#000000';
- this.strokeColor = '#000000';
- this.patternFill = false;
- this.fillAlpha = 1;
- this.strokeAlpha = 1;
- this.lineWidth = 1;
- this.activeSMask = null;
- this.resumeSMaskCtx = null;
- }
- CanvasExtraState.prototype = {
- clone: function CanvasExtraState_clone() {
- return Object.create(this);
+
+ if (finallyEntry && (type === "break" || type === "continue") && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc) {
+ finallyEntry = null;
+ }
+
+ var record = finallyEntry ? finallyEntry.completion : {};
+ record.type = type;
+ record.arg = arg;
+
+ if (finallyEntry) {
+ this.method = "next";
+ this.next = finallyEntry.finallyLoc;
+ return ContinueSentinel;
+ }
+
+ return this.complete(record);
},
- setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
- this.x = x;
- this.y = y;
+ complete: function complete(record, afterLoc) {
+ if (record.type === "throw") {
+ throw record.arg;
+ }
+
+ if (record.type === "break" || record.type === "continue") {
+ this.next = record.arg;
+ } else if (record.type === "return") {
+ this.rval = this.arg = record.arg;
+ this.method = "return";
+ this.next = "end";
+ } else if (record.type === "normal" && afterLoc) {
+ this.next = afterLoc;
+ }
+
+ return ContinueSentinel;
+ },
+ finish: function finish(finallyLoc) {
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+
+ if (entry.finallyLoc === finallyLoc) {
+ this.complete(entry.completion, entry.afterLoc);
+ resetTryEntry(entry);
+ return ContinueSentinel;
+ }
+ }
+ },
+ "catch": function _catch(tryLoc) {
+ for (var i = this.tryEntries.length - 1; i >= 0; --i) {
+ var entry = this.tryEntries[i];
+
+ if (entry.tryLoc === tryLoc) {
+ var record = entry.completion;
+
+ if (record.type === "throw") {
+ var thrown = record.arg;
+ resetTryEntry(entry);
+ }
+
+ return thrown;
+ }
+ }
+
+ throw new Error("illegal catch attempt");
+ },
+ delegateYield: function delegateYield(iterable, resultName, nextLoc) {
+ this.delegate = {
+ iterator: values(iterable),
+ resultName: resultName,
+ nextLoc: nextLoc
+ };
+
+ if (this.method === "next") {
+ this.arg = undefined;
+ }
+
+ return ContinueSentinel;
}
};
- return CanvasExtraState;
-}();
-var CanvasGraphics = function CanvasGraphicsClosure() {
- var EXECUTION_TIME = 15;
- var EXECUTION_STEPS = 10;
- function CanvasGraphics(canvasCtx, commonObjs, objs, canvasFactory, webGLContext, imageLayer) {
- this.ctx = canvasCtx;
- this.current = new CanvasExtraState();
- this.stateStack = [];
- this.pendingClip = null;
- this.pendingEOFill = false;
- this.res = null;
- this.xobjs = null;
- this.commonObjs = commonObjs;
- this.objs = objs;
- this.canvasFactory = canvasFactory;
- this.webGLContext = webGLContext;
- this.imageLayer = imageLayer;
- this.groupStack = [];
- this.processingType3 = null;
- this.baseTransform = null;
- this.baseTransformStack = [];
- this.groupLevel = 0;
- this.smaskStack = [];
- this.smaskCounter = 0;
- this.tempSMask = null;
- this.cachedCanvases = new CachedCanvases(this.canvasFactory);
- if (canvasCtx) {
- addContextCurrentTransform(canvasCtx);
- }
- this._cachedGetSinglePixelWidth = null;
- }
- function putBinaryImageData(ctx, imgData) {
- if (typeof ImageData !== 'undefined' && imgData instanceof ImageData) {
- ctx.putImageData(imgData, 0, 0);
- return;
- }
- var height = imgData.height,
- width = imgData.width;
- var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
- var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
- var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
- var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
- var srcPos = 0,
- destPos;
- var src = imgData.data;
- var dest = chunkImgData.data;
- var i, j, thisChunkHeight, elemsInThisChunk;
- if (imgData.kind === _util.ImageKind.GRAYSCALE_1BPP) {
- var srcLength = src.byteLength;
- var dest32 = new Uint32Array(dest.buffer, 0, dest.byteLength >> 2);
- var dest32DataLength = dest32.length;
- var fullSrcDiff = width + 7 >> 3;
- var white = 0xFFFFFFFF;
- var black = IsLittleEndianCached.value ? 0xFF000000 : 0x000000FF;
- for (i = 0; i < totalChunks; i++) {
- thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
- destPos = 0;
- for (j = 0; j < thisChunkHeight; j++) {
- var srcDiff = srcLength - srcPos;
- var k = 0;
- var kEnd = srcDiff > fullSrcDiff ? width : srcDiff * 8 - 7;
- var kEndUnrolled = kEnd & ~7;
- var mask = 0;
- var srcByte = 0;
- for (; k < kEndUnrolled; k += 8) {
- srcByte = src[srcPos++];
- dest32[destPos++] = srcByte & 128 ? white : black;
- dest32[destPos++] = srcByte & 64 ? white : black;
- dest32[destPos++] = srcByte & 32 ? white : black;
- dest32[destPos++] = srcByte & 16 ? white : black;
- dest32[destPos++] = srcByte & 8 ? white : black;
- dest32[destPos++] = srcByte & 4 ? white : black;
- dest32[destPos++] = srcByte & 2 ? white : black;
- dest32[destPos++] = srcByte & 1 ? white : black;
- }
- for (; k < kEnd; k++) {
- if (mask === 0) {
- srcByte = src[srcPos++];
- mask = 128;
- }
- dest32[destPos++] = srcByte & mask ? white : black;
- mask >>= 1;
- }
- }
- while (destPos < dest32DataLength) {
- dest32[destPos++] = 0;
- }
- ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
- }
- } else if (imgData.kind === _util.ImageKind.RGBA_32BPP) {
- j = 0;
- elemsInThisChunk = width * FULL_CHUNK_HEIGHT * 4;
- for (i = 0; i < fullChunks; i++) {
- dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
- srcPos += elemsInThisChunk;
- ctx.putImageData(chunkImgData, 0, j);
- j += FULL_CHUNK_HEIGHT;
- }
- if (i < totalChunks) {
- elemsInThisChunk = width * partialChunkHeight * 4;
- dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
- ctx.putImageData(chunkImgData, 0, j);
+}(function () {
+ return this || (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" && self;
+}() || Function("return this")());
+/* WEBPACK VAR INJECTION */}.call(this, __w_pdfjs_require__(137)(module)))
+
+/***/ }),
+/* 137 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+module.exports = function (module) {
+ if (!module.webpackPolyfill) {
+ module.deprecate = function () {};
+
+ module.paths = [];
+ if (!module.children) module.children = [];
+ Object.defineProperty(module, "loaded", {
+ enumerable: true,
+ get: function get() {
+ return module.l;
}
- } else if (imgData.kind === _util.ImageKind.RGB_24BPP) {
- thisChunkHeight = FULL_CHUNK_HEIGHT;
- elemsInThisChunk = width * thisChunkHeight;
- for (i = 0; i < totalChunks; i++) {
- if (i >= fullChunks) {
- thisChunkHeight = partialChunkHeight;
- elemsInThisChunk = width * thisChunkHeight;
- }
- destPos = 0;
- for (j = elemsInThisChunk; j--;) {
- dest[destPos++] = src[srcPos++];
- dest[destPos++] = src[srcPos++];
- dest[destPos++] = src[srcPos++];
- dest[destPos++] = 255;
- }
- ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ });
+ Object.defineProperty(module, "id", {
+ enumerable: true,
+ get: function get() {
+ return module.i;
}
- } else {
- throw new Error('bad image kind: ' + imgData.kind);
- }
+ });
+ module.webpackPolyfill = 1;
}
- function putBinaryImageMask(ctx, imgData) {
- var height = imgData.height,
- width = imgData.width;
- var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
- var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
- var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
- var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
- var srcPos = 0;
- var src = imgData.data;
- var dest = chunkImgData.data;
- for (var i = 0; i < totalChunks; i++) {
- var thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
- var destPos = 3;
- for (var j = 0; j < thisChunkHeight; j++) {
- var mask = 0;
- for (var k = 0; k < width; k++) {
- if (!mask) {
- var elem = src[srcPos++];
- mask = 128;
- }
- dest[destPos] = elem & mask ? 0 : 255;
- destPos += 4;
- mask >>= 1;
- }
+
+ return module;
+};
+
+/***/ }),
+/* 138 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.addLinkAttributes = addLinkAttributes;
+exports.getFilenameFromUrl = getFilenameFromUrl;
+exports.loadScript = loadScript;
+exports.DummyStatTimer = exports.StatTimer = exports.DOMSVGFactory = exports.DOMCMapReaderFactory = exports.DOMCanvasFactory = exports.DEFAULT_LINK_REL = exports.LinkTarget = exports.RenderingCancelledException = exports.PageViewport = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var DEFAULT_LINK_REL = 'noopener noreferrer nofollow';
+exports.DEFAULT_LINK_REL = DEFAULT_LINK_REL;
+var SVG_NS = 'http://www.w3.org/2000/svg';
+
+var DOMCanvasFactory =
+/*#__PURE__*/
+function () {
+ function DOMCanvasFactory() {
+ _classCallCheck(this, DOMCanvasFactory);
+ }
+
+ _createClass(DOMCanvasFactory, [{
+ key: "create",
+ value: function create(width, height) {
+ if (width <= 0 || height <= 0) {
+ throw new Error('invalid canvas size');
}
- ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+
+ var canvas = document.createElement('canvas');
+ var context = canvas.getContext('2d');
+ canvas.width = width;
+ canvas.height = height;
+ return {
+ canvas: canvas,
+ context: context
+ };
}
- }
- function copyCtxState(sourceCtx, destCtx) {
- var properties = ['strokeStyle', 'fillStyle', 'fillRule', 'globalAlpha', 'lineWidth', 'lineCap', 'lineJoin', 'miterLimit', 'globalCompositeOperation', 'font'];
- for (var i = 0, ii = properties.length; i < ii; i++) {
- var property = properties[i];
- if (sourceCtx[property] !== undefined) {
- destCtx[property] = sourceCtx[property];
+ }, {
+ key: "reset",
+ value: function reset(canvasAndContext, width, height) {
+ if (!canvasAndContext.canvas) {
+ throw new Error('canvas is not specified');
+ }
+
+ if (width <= 0 || height <= 0) {
+ throw new Error('invalid canvas size');
}
+
+ canvasAndContext.canvas.width = width;
+ canvasAndContext.canvas.height = height;
}
- if (sourceCtx.setLineDash !== undefined) {
- destCtx.setLineDash(sourceCtx.getLineDash());
- destCtx.lineDashOffset = sourceCtx.lineDashOffset;
+ }, {
+ key: "destroy",
+ value: function destroy(canvasAndContext) {
+ if (!canvasAndContext.canvas) {
+ throw new Error('canvas is not specified');
+ }
+
+ canvasAndContext.canvas.width = 0;
+ canvasAndContext.canvas.height = 0;
+ canvasAndContext.canvas = null;
+ canvasAndContext.context = null;
}
+ }]);
+
+ return DOMCanvasFactory;
+}();
+
+exports.DOMCanvasFactory = DOMCanvasFactory;
+
+var DOMCMapReaderFactory =
+/*#__PURE__*/
+function () {
+ function DOMCMapReaderFactory(_ref) {
+ var _ref$baseUrl = _ref.baseUrl,
+ baseUrl = _ref$baseUrl === void 0 ? null : _ref$baseUrl,
+ _ref$isCompressed = _ref.isCompressed,
+ isCompressed = _ref$isCompressed === void 0 ? false : _ref$isCompressed;
+
+ _classCallCheck(this, DOMCMapReaderFactory);
+
+ this.baseUrl = baseUrl;
+ this.isCompressed = isCompressed;
}
- function resetCtxToDefault(ctx) {
- ctx.strokeStyle = '#000000';
- ctx.fillStyle = '#000000';
- ctx.fillRule = 'nonzero';
- ctx.globalAlpha = 1;
- ctx.lineWidth = 1;
- ctx.lineCap = 'butt';
- ctx.lineJoin = 'miter';
- ctx.miterLimit = 10;
- ctx.globalCompositeOperation = 'source-over';
- ctx.font = '10px sans-serif';
- if (ctx.setLineDash !== undefined) {
- ctx.setLineDash([]);
- ctx.lineDashOffset = 0;
- }
- }
- function composeSMaskBackdrop(bytes, r0, g0, b0) {
- var length = bytes.length;
- for (var i = 3; i < length; i += 4) {
- var alpha = bytes[i];
- if (alpha === 0) {
- bytes[i - 3] = r0;
- bytes[i - 2] = g0;
- bytes[i - 1] = b0;
- } else if (alpha < 255) {
- var alpha_ = 255 - alpha;
- bytes[i - 3] = bytes[i - 3] * alpha + r0 * alpha_ >> 8;
- bytes[i - 2] = bytes[i - 2] * alpha + g0 * alpha_ >> 8;
- bytes[i - 1] = bytes[i - 1] * alpha + b0 * alpha_ >> 8;
+
+ _createClass(DOMCMapReaderFactory, [{
+ key: "fetch",
+ value: function fetch(_ref2) {
+ var _this = this;
+
+ var name = _ref2.name;
+
+ if (!this.baseUrl) {
+ return Promise.reject(new Error('The CMap "baseUrl" parameter must be specified, ensure that ' + 'the "cMapUrl" and "cMapPacked" API parameters are provided.'));
+ }
+
+ if (!name) {
+ return Promise.reject(new Error('CMap name must be specified.'));
}
+
+ return new Promise(function (resolve, reject) {
+ var url = _this.baseUrl + name + (_this.isCompressed ? '.bcmap' : '');
+ var request = new XMLHttpRequest();
+ request.open('GET', url, true);
+
+ if (_this.isCompressed) {
+ request.responseType = 'arraybuffer';
+ }
+
+ request.onreadystatechange = function () {
+ if (request.readyState !== XMLHttpRequest.DONE) {
+ return;
+ }
+
+ if (request.status === 200 || request.status === 0) {
+ var data;
+
+ if (_this.isCompressed && request.response) {
+ data = new Uint8Array(request.response);
+ } else if (!_this.isCompressed && request.responseText) {
+ data = (0, _util.stringToBytes)(request.responseText);
+ }
+
+ if (data) {
+ resolve({
+ cMapData: data,
+ compressionType: _this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
+ });
+ return;
+ }
+ }
+
+ reject(new Error('Unable to load ' + (_this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
+ };
+
+ request.send(null);
+ });
}
+ }]);
+
+ return DOMCMapReaderFactory;
+}();
+
+exports.DOMCMapReaderFactory = DOMCMapReaderFactory;
+
+var DOMSVGFactory =
+/*#__PURE__*/
+function () {
+ function DOMSVGFactory() {
+ _classCallCheck(this, DOMSVGFactory);
}
- function composeSMaskAlpha(maskData, layerData, transferMap) {
- var length = maskData.length;
- var scale = 1 / 255;
- for (var i = 3; i < length; i += 4) {
- var alpha = transferMap ? transferMap[maskData[i]] : maskData[i];
- layerData[i] = layerData[i] * alpha * scale | 0;
+
+ _createClass(DOMSVGFactory, [{
+ key: "create",
+ value: function create(width, height) {
+ (0, _util.assert)(width > 0 && height > 0, 'Invalid SVG dimensions');
+ var svg = document.createElementNS(SVG_NS, 'svg:svg');
+ svg.setAttribute('version', '1.1');
+ svg.setAttribute('width', width + 'px');
+ svg.setAttribute('height', height + 'px');
+ svg.setAttribute('preserveAspectRatio', 'none');
+ svg.setAttribute('viewBox', '0 0 ' + width + ' ' + height);
+ return svg;
}
- }
- function composeSMaskLuminosity(maskData, layerData, transferMap) {
- var length = maskData.length;
- for (var i = 3; i < length; i += 4) {
- var y = maskData[i - 3] * 77 + maskData[i - 2] * 152 + maskData[i - 1] * 28;
- layerData[i] = transferMap ? layerData[i] * transferMap[y >> 8] >> 8 : layerData[i] * y >> 16;
+ }, {
+ key: "createElement",
+ value: function createElement(type) {
+ (0, _util.assert)(typeof type === 'string', 'Invalid SVG element type');
+ return document.createElementNS(SVG_NS, type);
}
- }
- function genericComposeSMask(maskCtx, layerCtx, width, height, subtype, backdrop, transferMap) {
- var hasBackdrop = !!backdrop;
- var r0 = hasBackdrop ? backdrop[0] : 0;
- var g0 = hasBackdrop ? backdrop[1] : 0;
- var b0 = hasBackdrop ? backdrop[2] : 0;
- var composeFn;
- if (subtype === 'Luminosity') {
- composeFn = composeSMaskLuminosity;
- } else {
- composeFn = composeSMaskAlpha;
+ }]);
+
+ return DOMSVGFactory;
+}();
+
+exports.DOMSVGFactory = DOMSVGFactory;
+
+var PageViewport =
+/*#__PURE__*/
+function () {
+ function PageViewport(_ref3) {
+ var viewBox = _ref3.viewBox,
+ scale = _ref3.scale,
+ rotation = _ref3.rotation,
+ _ref3$offsetX = _ref3.offsetX,
+ offsetX = _ref3$offsetX === void 0 ? 0 : _ref3$offsetX,
+ _ref3$offsetY = _ref3.offsetY,
+ offsetY = _ref3$offsetY === void 0 ? 0 : _ref3$offsetY,
+ _ref3$dontFlip = _ref3.dontFlip,
+ dontFlip = _ref3$dontFlip === void 0 ? false : _ref3$dontFlip;
+
+ _classCallCheck(this, PageViewport);
+
+ this.viewBox = viewBox;
+ this.scale = scale;
+ this.rotation = rotation;
+ this.offsetX = offsetX;
+ this.offsetY = offsetY;
+ var centerX = (viewBox[2] + viewBox[0]) / 2;
+ var centerY = (viewBox[3] + viewBox[1]) / 2;
+ var rotateA, rotateB, rotateC, rotateD;
+ rotation = rotation % 360;
+ rotation = rotation < 0 ? rotation + 360 : rotation;
+
+ switch (rotation) {
+ case 180:
+ rotateA = -1;
+ rotateB = 0;
+ rotateC = 0;
+ rotateD = 1;
+ break;
+
+ case 90:
+ rotateA = 0;
+ rotateB = 1;
+ rotateC = 1;
+ rotateD = 0;
+ break;
+
+ case 270:
+ rotateA = 0;
+ rotateB = -1;
+ rotateC = -1;
+ rotateD = 0;
+ break;
+
+ default:
+ rotateA = 1;
+ rotateB = 0;
+ rotateC = 0;
+ rotateD = -1;
+ break;
}
- var PIXELS_TO_PROCESS = 1048576;
- var chunkSize = Math.min(height, Math.ceil(PIXELS_TO_PROCESS / width));
- for (var row = 0; row < height; row += chunkSize) {
- var chunkHeight = Math.min(chunkSize, height - row);
- var maskData = maskCtx.getImageData(0, row, width, chunkHeight);
- var layerData = layerCtx.getImageData(0, row, width, chunkHeight);
- if (hasBackdrop) {
- composeSMaskBackdrop(maskData.data, r0, g0, b0);
- }
- composeFn(maskData.data, layerData.data, transferMap);
- maskCtx.putImageData(layerData, 0, row);
+
+ if (dontFlip) {
+ rotateC = -rotateC;
+ rotateD = -rotateD;
}
- }
- function composeSMask(ctx, smask, layerCtx, webGLContext) {
- var mask = smask.canvas;
- var maskCtx = smask.context;
- ctx.setTransform(smask.scaleX, 0, 0, smask.scaleY, smask.offsetX, smask.offsetY);
- var backdrop = smask.backdrop || null;
- if (!smask.transferMap && webGLContext.isEnabled) {
- var composed = webGLContext.composeSMask({
- layer: layerCtx.canvas,
- mask: mask,
- properties: {
- subtype: smask.subtype,
- backdrop: backdrop
- }
- });
- ctx.setTransform(1, 0, 0, 1, 0, 0);
- ctx.drawImage(composed, smask.offsetX, smask.offsetY);
- return;
+
+ var offsetCanvasX, offsetCanvasY;
+ var width, height;
+
+ if (rotateA === 0) {
+ offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
+ offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
+ width = Math.abs(viewBox[3] - viewBox[1]) * scale;
+ height = Math.abs(viewBox[2] - viewBox[0]) * scale;
+ } else {
+ offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
+ offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
+ width = Math.abs(viewBox[2] - viewBox[0]) * scale;
+ height = Math.abs(viewBox[3] - viewBox[1]) * scale;
}
- genericComposeSMask(maskCtx, layerCtx, mask.width, mask.height, smask.subtype, backdrop, smask.transferMap);
- ctx.drawImage(mask, 0, 0);
+
+ this.transform = [rotateA * scale, rotateB * scale, rotateC * scale, rotateD * scale, offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY, offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY];
+ this.width = width;
+ this.height = height;
}
- var LINE_CAP_STYLES = ['butt', 'round', 'square'];
- var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
- var NORMAL_CLIP = {};
- var EO_CLIP = {};
- CanvasGraphics.prototype = {
- beginDrawing: function beginDrawing(_ref) {
- var transform = _ref.transform,
- viewport = _ref.viewport,
- transparency = _ref.transparency,
- _ref$background = _ref.background,
- background = _ref$background === undefined ? null : _ref$background;
- var width = this.ctx.canvas.width;
- var height = this.ctx.canvas.height;
- this.ctx.save();
- this.ctx.fillStyle = background || 'rgb(255, 255, 255)';
- this.ctx.fillRect(0, 0, width, height);
- this.ctx.restore();
- if (transparency) {
- var transparentCanvas = this.cachedCanvases.getCanvas('transparent', width, height, true);
- this.compositeCtx = this.ctx;
- this.transparentCanvas = transparentCanvas.canvas;
- this.ctx = transparentCanvas.context;
- this.ctx.save();
- this.ctx.transform.apply(this.ctx, this.compositeCtx.mozCurrentTransform);
- }
- this.ctx.save();
- resetCtxToDefault(this.ctx);
- if (transform) {
- this.ctx.transform.apply(this.ctx, transform);
- }
- this.ctx.transform.apply(this.ctx, viewport.transform);
- this.baseTransform = this.ctx.mozCurrentTransform.slice();
- if (this.imageLayer) {
- this.imageLayer.beginLayout();
- }
- },
+ _createClass(PageViewport, [{
+ key: "clone",
+ value: function clone() {
+ var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+ _ref4$scale = _ref4.scale,
+ scale = _ref4$scale === void 0 ? this.scale : _ref4$scale,
+ _ref4$rotation = _ref4.rotation,
+ rotation = _ref4$rotation === void 0 ? this.rotation : _ref4$rotation,
+ _ref4$dontFlip = _ref4.dontFlip,
+ dontFlip = _ref4$dontFlip === void 0 ? false : _ref4$dontFlip;
- executeOperatorList: function CanvasGraphics_executeOperatorList(operatorList, executionStartIdx, continueCallback, stepper) {
- var argsArray = operatorList.argsArray;
- var fnArray = operatorList.fnArray;
- var i = executionStartIdx || 0;
- var argsArrayLen = argsArray.length;
- if (argsArrayLen === i) {
- return i;
+ return new PageViewport({
+ viewBox: this.viewBox.slice(),
+ scale: scale,
+ rotation: rotation,
+ offsetX: this.offsetX,
+ offsetY: this.offsetY,
+ dontFlip: dontFlip
+ });
+ }
+ }, {
+ key: "convertToViewportPoint",
+ value: function convertToViewportPoint(x, y) {
+ return _util.Util.applyTransform([x, y], this.transform);
+ }
+ }, {
+ key: "convertToViewportRectangle",
+ value: function convertToViewportRectangle(rect) {
+ var tl = _util.Util.applyTransform([rect[0], rect[1]], this.transform);
+
+ var br = _util.Util.applyTransform([rect[2], rect[3]], this.transform);
+
+ return [tl[0], tl[1], br[0], br[1]];
+ }
+ }, {
+ key: "convertToPdfPoint",
+ value: function convertToPdfPoint(x, y) {
+ return _util.Util.applyInverseTransform([x, y], this.transform);
+ }
+ }]);
+
+ return PageViewport;
+}();
+
+exports.PageViewport = PageViewport;
+
+var RenderingCancelledException = function RenderingCancelledException() {
+ function RenderingCancelledException(msg, type) {
+ this.message = msg;
+ this.type = type;
+ }
+
+ RenderingCancelledException.prototype = new Error();
+ RenderingCancelledException.prototype.name = 'RenderingCancelledException';
+ RenderingCancelledException.constructor = RenderingCancelledException;
+ return RenderingCancelledException;
+}();
+
+exports.RenderingCancelledException = RenderingCancelledException;
+var LinkTarget = {
+ NONE: 0,
+ SELF: 1,
+ BLANK: 2,
+ PARENT: 3,
+ TOP: 4
+};
+exports.LinkTarget = LinkTarget;
+var LinkTargetStringMap = ['', '_self', '_blank', '_parent', '_top'];
+
+function addLinkAttributes(link) {
+ var _ref5 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+ url = _ref5.url,
+ target = _ref5.target,
+ rel = _ref5.rel;
+
+ link.href = link.title = url ? (0, _util.removeNullCharacters)(url) : '';
+
+ if (url) {
+ var LinkTargetValues = Object.values(LinkTarget);
+ var targetIndex = LinkTargetValues.includes(target) ? target : LinkTarget.NONE;
+ link.target = LinkTargetStringMap[targetIndex];
+ link.rel = typeof rel === 'string' ? rel : DEFAULT_LINK_REL;
+ }
+}
+
+function getFilenameFromUrl(url) {
+ var anchor = url.indexOf('#');
+ var query = url.indexOf('?');
+ var end = Math.min(anchor > 0 ? anchor : url.length, query > 0 ? query : url.length);
+ return url.substring(url.lastIndexOf('/', end) + 1, end);
+}
+
+var StatTimer =
+/*#__PURE__*/
+function () {
+ function StatTimer() {
+ var enable = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+
+ _classCallCheck(this, StatTimer);
+
+ this.enabled = !!enable;
+ this.started = Object.create(null);
+ this.times = [];
+ }
+
+ _createClass(StatTimer, [{
+ key: "time",
+ value: function time(name) {
+ if (!this.enabled) {
+ return;
}
- var chunkOperations = argsArrayLen - i > EXECUTION_STEPS && typeof continueCallback === 'function';
- var endTime = chunkOperations ? Date.now() + EXECUTION_TIME : 0;
- var steps = 0;
- var commonObjs = this.commonObjs;
- var objs = this.objs;
- var fnId;
- while (true) {
- if (stepper !== undefined && i === stepper.nextBreakPoint) {
- stepper.breakIt(i, continueCallback);
- return i;
- }
- fnId = fnArray[i];
- if (fnId !== _util.OPS.dependency) {
- this[fnId].apply(this, argsArray[i]);
- } else {
- var deps = argsArray[i];
- for (var n = 0, nn = deps.length; n < nn; n++) {
- var depObjId = deps[n];
- var common = depObjId[0] === 'g' && depObjId[1] === '_';
- var objsPool = common ? commonObjs : objs;
- if (!objsPool.isResolved(depObjId)) {
- objsPool.get(depObjId, continueCallback);
- return i;
- }
- }
- }
- i++;
- if (i === argsArrayLen) {
- return i;
- }
- if (chunkOperations && ++steps > EXECUTION_STEPS) {
- if (Date.now() > endTime) {
- continueCallback();
- return i;
- }
- steps = 0;
- }
+
+ if (name in this.started) {
+ (0, _util.warn)('Timer is already running for ' + name);
}
- },
- endDrawing: function CanvasGraphics_endDrawing() {
- if (this.current.activeSMask !== null) {
- this.endSMaskGroup();
+
+ this.started[name] = Date.now();
+ }
+ }, {
+ key: "timeEnd",
+ value: function timeEnd(name) {
+ if (!this.enabled) {
+ return;
}
- this.ctx.restore();
- if (this.transparentCanvas) {
- this.ctx = this.compositeCtx;
- this.ctx.save();
- this.ctx.setTransform(1, 0, 0, 1, 0, 0);
- this.ctx.drawImage(this.transparentCanvas, 0, 0);
- this.ctx.restore();
- this.transparentCanvas = null;
+
+ if (!(name in this.started)) {
+ (0, _util.warn)('Timer has not been started for ' + name);
}
- this.cachedCanvases.clear();
- this.webGLContext.clear();
- if (this.imageLayer) {
- this.imageLayer.endLayout();
+
+ this.times.push({
+ 'name': name,
+ 'start': this.started[name],
+ 'end': Date.now()
+ });
+ delete this.started[name];
+ }
+ }, {
+ key: "toString",
+ value: function toString() {
+ var times = this.times;
+ var out = '',
+ longest = 0;
+
+ for (var i = 0, ii = times.length; i < ii; ++i) {
+ var name = times[i]['name'];
+
+ if (name.length > longest) {
+ longest = name.length;
+ }
}
- },
- setLineWidth: function CanvasGraphics_setLineWidth(width) {
- this.current.lineWidth = width;
- this.ctx.lineWidth = width;
- },
- setLineCap: function CanvasGraphics_setLineCap(style) {
- this.ctx.lineCap = LINE_CAP_STYLES[style];
- },
- setLineJoin: function CanvasGraphics_setLineJoin(style) {
- this.ctx.lineJoin = LINE_JOIN_STYLES[style];
- },
- setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
- this.ctx.miterLimit = limit;
- },
- setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
- var ctx = this.ctx;
- if (ctx.setLineDash !== undefined) {
- ctx.setLineDash(dashArray);
- ctx.lineDashOffset = dashPhase;
+
+ for (var _i = 0, _ii = times.length; _i < _ii; ++_i) {
+ var span = times[_i];
+ var duration = span.end - span.start;
+ out += "".concat(span['name'].padEnd(longest), " ").concat(duration, "ms\n");
}
- },
- setRenderingIntent: function CanvasGraphics_setRenderingIntent(intent) {},
- setFlatness: function CanvasGraphics_setFlatness(flatness) {},
- setGState: function CanvasGraphics_setGState(states) {
- for (var i = 0, ii = states.length; i < ii; i++) {
- var state = states[i];
- var key = state[0];
- var value = state[1];
- switch (key) {
- case 'LW':
- this.setLineWidth(value);
- break;
- case 'LC':
- this.setLineCap(value);
- break;
- case 'LJ':
- this.setLineJoin(value);
- break;
- case 'ML':
- this.setMiterLimit(value);
- break;
- case 'D':
- this.setDash(value[0], value[1]);
- break;
- case 'RI':
- this.setRenderingIntent(value);
- break;
- case 'FL':
- this.setFlatness(value);
- break;
- case 'Font':
- this.setFont(value[0], value[1]);
- break;
- case 'CA':
+
+ return out;
+ }
+ }]);
+
+ return StatTimer;
+}();
+
+exports.StatTimer = StatTimer;
+
+var DummyStatTimer =
+/*#__PURE__*/
+function () {
+ function DummyStatTimer() {
+ _classCallCheck(this, DummyStatTimer);
+
+ (0, _util.unreachable)('Cannot initialize DummyStatTimer.');
+ }
+
+ _createClass(DummyStatTimer, null, [{
+ key: "time",
+ value: function time(name) {}
+ }, {
+ key: "timeEnd",
+ value: function timeEnd(name) {}
+ }, {
+ key: "toString",
+ value: function toString() {
+ return '';
+ }
+ }]);
+
+ return DummyStatTimer;
+}();
+
+exports.DummyStatTimer = DummyStatTimer;
+
+function loadScript(src) {
+ return new Promise(function (resolve, reject) {
+ var script = document.createElement('script');
+ script.src = src;
+ script.onload = resolve;
+
+ script.onerror = function () {
+ reject(new Error("Cannot load script at: ".concat(script.src)));
+ };
+
+ (document.head || document.documentElement).appendChild(script);
+ });
+}
+
+/***/ }),
+/* 139 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.FontLoader = exports.FontFaceObject = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var BaseFontLoader =
+/*#__PURE__*/
+function () {
+ function BaseFontLoader(docId) {
+ _classCallCheck(this, BaseFontLoader);
+
+ if (this.constructor === BaseFontLoader) {
+ (0, _util.unreachable)('Cannot initialize BaseFontLoader.');
+ }
+
+ this.docId = docId;
+ this.nativeFontFaces = [];
+ this.styleElement = null;
+ this.loadingContext = {
+ requests: [],
+ nextRequestId: 0
+ };
+ }
+
+ _createClass(BaseFontLoader, [{
+ key: "addNativeFontFace",
+ value: function addNativeFontFace(nativeFontFace) {
+ this.nativeFontFaces.push(nativeFontFace);
+ document.fonts.add(nativeFontFace);
+ }
+ }, {
+ key: "insertRule",
+ value: function insertRule(rule) {
+ var styleElement = this.styleElement;
+
+ if (!styleElement) {
+ styleElement = this.styleElement = document.createElement('style');
+ styleElement.id = "PDFJS_FONT_STYLE_TAG_".concat(this.docId);
+ document.documentElement.getElementsByTagName('head')[0].appendChild(styleElement);
+ }
+
+ var styleSheet = styleElement.sheet;
+ styleSheet.insertRule(rule, styleSheet.cssRules.length);
+ }
+ }, {
+ key: "clear",
+ value: function clear() {
+ this.nativeFontFaces.forEach(function (nativeFontFace) {
+ document.fonts.delete(nativeFontFace);
+ });
+ this.nativeFontFaces.length = 0;
+
+ if (this.styleElement) {
+ this.styleElement.remove();
+ this.styleElement = null;
+ }
+ }
+ }, {
+ key: "bind",
+ value: function bind(fonts, callback) {
+ var rules = [];
+ var fontsToLoad = [];
+ var fontLoadPromises = [];
+
+ var getNativeFontPromise = function getNativeFontPromise(nativeFontFace) {
+ return nativeFontFace.loaded.catch(function (reason) {
+ (0, _util.warn)("Failed to load font \"".concat(nativeFontFace.family, "\": ").concat(reason));
+ });
+ };
+
+ var _iteratorNormalCompletion = true;
+ var _didIteratorError = false;
+ var _iteratorError = undefined;
+
+ try {
+ for (var _iterator = fonts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+ var font = _step.value;
+
+ if (font.attached || font.missingFile) {
+ continue;
+ }
+
+ font.attached = true;
+
+ if (this.isFontLoadingAPISupported) {
+ var nativeFontFace = font.createNativeFontFace();
+
+ if (nativeFontFace) {
+ this.addNativeFontFace(nativeFontFace);
+ fontLoadPromises.push(getNativeFontPromise(nativeFontFace));
+ }
+ } else {
+ var rule = font.createFontFaceRule();
+
+ if (rule) {
+ this.insertRule(rule);
+ rules.push(rule);
+ fontsToLoad.push(font);
+ }
+ }
+ }
+ } catch (err) {
+ _didIteratorError = true;
+ _iteratorError = err;
+ } finally {
+ try {
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
+ _iterator.return();
+ }
+ } finally {
+ if (_didIteratorError) {
+ throw _iteratorError;
+ }
+ }
+ }
+
+ var request = this._queueLoadingCallback(callback);
+
+ if (this.isFontLoadingAPISupported) {
+ Promise.all(fontLoadPromises).then(request.complete);
+ } else if (rules.length > 0 && !this.isSyncFontLoadingSupported) {
+ this._prepareFontLoadEvent(rules, fontsToLoad, request);
+ } else {
+ request.complete();
+ }
+ }
+ }, {
+ key: "_queueLoadingCallback",
+ value: function _queueLoadingCallback(callback) {
+ function completeRequest() {
+ (0, _util.assert)(!request.done, 'completeRequest() cannot be called twice.');
+ request.done = true;
+
+ while (context.requests.length > 0 && context.requests[0].done) {
+ var otherRequest = context.requests.shift();
+ setTimeout(otherRequest.callback, 0);
+ }
+ }
+
+ var context = this.loadingContext;
+ var request = {
+ id: "pdfjs-font-loading-".concat(context.nextRequestId++),
+ done: false,
+ complete: completeRequest,
+ callback: callback
+ };
+ context.requests.push(request);
+ return request;
+ }
+ }, {
+ key: "_prepareFontLoadEvent",
+ value: function _prepareFontLoadEvent(rules, fontsToLoad, request) {
+ (0, _util.unreachable)('Abstract method `_prepareFontLoadEvent`.');
+ }
+ }, {
+ key: "isFontLoadingAPISupported",
+ get: function get() {
+ (0, _util.unreachable)('Abstract method `isFontLoadingAPISupported`.');
+ }
+ }, {
+ key: "isSyncFontLoadingSupported",
+ get: function get() {
+ (0, _util.unreachable)('Abstract method `isSyncFontLoadingSupported`.');
+ }
+ }, {
+ key: "_loadTestFont",
+ get: function get() {
+ (0, _util.unreachable)('Abstract method `_loadTestFont`.');
+ }
+ }]);
+
+ return BaseFontLoader;
+}();
+
+var FontLoader;
+exports.FontLoader = FontLoader;
+{
+ exports.FontLoader = FontLoader =
+ /*#__PURE__*/
+ function (_BaseFontLoader) {
+ _inherits(GenericFontLoader, _BaseFontLoader);
+
+ function GenericFontLoader(docId) {
+ var _this;
+
+ _classCallCheck(this, GenericFontLoader);
+
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(GenericFontLoader).call(this, docId));
+ _this.loadTestFontId = 0;
+ return _this;
+ }
+
+ _createClass(GenericFontLoader, [{
+ key: "_prepareFontLoadEvent",
+ value: function _prepareFontLoadEvent(rules, fonts, request) {
+ function int32(data, offset) {
+ return data.charCodeAt(offset) << 24 | data.charCodeAt(offset + 1) << 16 | data.charCodeAt(offset + 2) << 8 | data.charCodeAt(offset + 3) & 0xff;
+ }
+
+ function spliceString(s, offset, remove, insert) {
+ var chunk1 = s.substring(0, offset);
+ var chunk2 = s.substring(offset + remove);
+ return chunk1 + insert + chunk2;
+ }
+
+ var i, ii;
+ var canvas = document.createElement('canvas');
+ canvas.width = 1;
+ canvas.height = 1;
+ var ctx = canvas.getContext('2d');
+ var called = 0;
+
+ function isFontReady(name, callback) {
+ called++;
+
+ if (called > 30) {
+ (0, _util.warn)('Load test font never loaded.');
+ callback();
+ return;
+ }
+
+ ctx.font = '30px ' + name;
+ ctx.fillText('.', 0, 20);
+ var imageData = ctx.getImageData(0, 0, 1, 1);
+
+ if (imageData.data[3] > 0) {
+ callback();
+ return;
+ }
+
+ setTimeout(isFontReady.bind(null, name, callback));
+ }
+
+ var loadTestFontId = "lt".concat(Date.now()).concat(this.loadTestFontId++);
+ var data = this._loadTestFont;
+ var COMMENT_OFFSET = 976;
+ data = spliceString(data, COMMENT_OFFSET, loadTestFontId.length, loadTestFontId);
+ var CFF_CHECKSUM_OFFSET = 16;
+ var XXXX_VALUE = 0x58585858;
+ var checksum = int32(data, CFF_CHECKSUM_OFFSET);
+
+ for (i = 0, ii = loadTestFontId.length - 3; i < ii; i += 4) {
+ checksum = checksum - XXXX_VALUE + int32(loadTestFontId, i) | 0;
+ }
+
+ if (i < loadTestFontId.length) {
+ checksum = checksum - XXXX_VALUE + int32(loadTestFontId + 'XXX', i) | 0;
+ }
+
+ data = spliceString(data, CFF_CHECKSUM_OFFSET, 4, (0, _util.string32)(checksum));
+ var url = "url(data:font/opentype;base64,".concat(btoa(data), ");");
+ var rule = "@font-face {font-family:\"".concat(loadTestFontId, "\";src:").concat(url, "}");
+ this.insertRule(rule);
+ var names = [];
+
+ for (i = 0, ii = fonts.length; i < ii; i++) {
+ names.push(fonts[i].loadedName);
+ }
+
+ names.push(loadTestFontId);
+ var div = document.createElement('div');
+ div.setAttribute('style', 'visibility: hidden;' + 'width: 10px; height: 10px;' + 'position: absolute; top: 0px; left: 0px;');
+
+ for (i = 0, ii = names.length; i < ii; ++i) {
+ var span = document.createElement('span');
+ span.textContent = 'Hi';
+ span.style.fontFamily = names[i];
+ div.appendChild(span);
+ }
+
+ document.body.appendChild(div);
+ isFontReady(loadTestFontId, function () {
+ document.body.removeChild(div);
+ request.complete();
+ });
+ }
+ }, {
+ key: "isFontLoadingAPISupported",
+ get: function get() {
+ var supported = typeof document !== 'undefined' && !!document.fonts;
+
+ if (supported && typeof navigator !== 'undefined') {
+ var m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(navigator.userAgent);
+
+ if (m && m[1] < 63) {
+ supported = false;
+ }
+ }
+
+ return (0, _util.shadow)(this, 'isFontLoadingAPISupported', supported);
+ }
+ }, {
+ key: "isSyncFontLoadingSupported",
+ get: function get() {
+ var supported = false;
+
+ if (typeof navigator === 'undefined') {
+ supported = true;
+ } else {
+ var m = /Mozilla\/5.0.*?rv:(\d+).*? Gecko/.exec(navigator.userAgent);
+
+ if (m && m[1] >= 14) {
+ supported = true;
+ }
+ }
+
+ return (0, _util.shadow)(this, 'isSyncFontLoadingSupported', supported);
+ }
+ }, {
+ key: "_loadTestFont",
+ get: function get() {
+ var getLoadTestFont = function getLoadTestFont() {
+ return atob('T1RUTwALAIAAAwAwQ0ZGIDHtZg4AAAOYAAAAgUZGVE1lkzZwAAAEHAAAABxHREVGABQA' + 'FQAABDgAAAAeT1MvMlYNYwkAAAEgAAAAYGNtYXABDQLUAAACNAAAAUJoZWFk/xVFDQAA' + 'ALwAAAA2aGhlYQdkA+oAAAD0AAAAJGhtdHgD6AAAAAAEWAAAAAZtYXhwAAJQAAAAARgA' + 'AAAGbmFtZVjmdH4AAAGAAAAAsXBvc3T/hgAzAAADeAAAACAAAQAAAAEAALZRFsRfDzz1' + 'AAsD6AAAAADOBOTLAAAAAM4KHDwAAAAAA+gDIQAAAAgAAgAAAAAAAAABAAADIQAAAFoD' + '6AAAAAAD6AABAAAAAAAAAAAAAAAAAAAAAQAAUAAAAgAAAAQD6AH0AAUAAAKKArwAAACM' + 'AooCvAAAAeAAMQECAAACAAYJAAAAAAAAAAAAAQAAAAAAAAAAAAAAAFBmRWQAwAAuAC4D' + 'IP84AFoDIQAAAAAAAQAAAAAAAAAAACAAIAABAAAADgCuAAEAAAAAAAAAAQAAAAEAAAAA' + 'AAEAAQAAAAEAAAAAAAIAAQAAAAEAAAAAAAMAAQAAAAEAAAAAAAQAAQAAAAEAAAAAAAUA' + 'AQAAAAEAAAAAAAYAAQAAAAMAAQQJAAAAAgABAAMAAQQJAAEAAgABAAMAAQQJAAIAAgAB' + 'AAMAAQQJAAMAAgABAAMAAQQJAAQAAgABAAMAAQQJAAUAAgABAAMAAQQJAAYAAgABWABY' + 'AAAAAAAAAwAAAAMAAAAcAAEAAAAAADwAAwABAAAAHAAEACAAAAAEAAQAAQAAAC7//wAA' + 'AC7////TAAEAAAAAAAABBgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' + 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAD/gwAyAAAAAQAAAAAAAAAAAAAAAAAA' + 'AAABAAQEAAEBAQJYAAEBASH4DwD4GwHEAvgcA/gXBIwMAYuL+nz5tQXkD5j3CBLnEQAC' + 'AQEBIVhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYAAABAQAADwACAQEEE/t3' + 'Dov6fAH6fAT+fPp8+nwHDosMCvm1Cvm1DAz6fBQAAAAAAAABAAAAAMmJbzEAAAAAzgTj' + 'FQAAAADOBOQpAAEAAAAAAAAADAAUAAQAAAABAAAAAgABAAAAAAAAAAAD6AAAAAAAAA==');
+ };
+
+ return (0, _util.shadow)(this, '_loadTestFont', getLoadTestFont());
+ }
+ }]);
+
+ return GenericFontLoader;
+ }(BaseFontLoader);
+}
+var IsEvalSupportedCached = {
+ get value() {
+ return (0, _util.shadow)(this, 'value', (0, _util.isEvalSupported)());
+ }
+
+};
+
+var FontFaceObject =
+/*#__PURE__*/
+function () {
+ function FontFaceObject(translatedData, _ref) {
+ var _ref$isEvalSupported = _ref.isEvalSupported,
+ isEvalSupported = _ref$isEvalSupported === void 0 ? true : _ref$isEvalSupported,
+ _ref$disableFontFace = _ref.disableFontFace,
+ disableFontFace = _ref$disableFontFace === void 0 ? false : _ref$disableFontFace,
+ _ref$ignoreErrors = _ref.ignoreErrors,
+ ignoreErrors = _ref$ignoreErrors === void 0 ? false : _ref$ignoreErrors,
+ _ref$onUnsupportedFea = _ref.onUnsupportedFeature,
+ onUnsupportedFeature = _ref$onUnsupportedFea === void 0 ? null : _ref$onUnsupportedFea,
+ _ref$fontRegistry = _ref.fontRegistry,
+ fontRegistry = _ref$fontRegistry === void 0 ? null : _ref$fontRegistry;
+
+ _classCallCheck(this, FontFaceObject);
+
+ this.compiledGlyphs = Object.create(null);
+
+ for (var i in translatedData) {
+ this[i] = translatedData[i];
+ }
+
+ this.isEvalSupported = isEvalSupported !== false;
+ this.disableFontFace = disableFontFace === true;
+ this.ignoreErrors = ignoreErrors === true;
+ this._onUnsupportedFeature = onUnsupportedFeature;
+ this.fontRegistry = fontRegistry;
+ }
+
+ _createClass(FontFaceObject, [{
+ key: "createNativeFontFace",
+ value: function createNativeFontFace() {
+ if (!this.data || this.disableFontFace) {
+ return null;
+ }
+
+ var nativeFontFace = new FontFace(this.loadedName, this.data, {});
+
+ if (this.fontRegistry) {
+ this.fontRegistry.registerFont(this);
+ }
+
+ return nativeFontFace;
+ }
+ }, {
+ key: "createFontFaceRule",
+ value: function createFontFaceRule() {
+ if (!this.data || this.disableFontFace) {
+ return null;
+ }
+
+ var data = (0, _util.bytesToString)(new Uint8Array(this.data));
+ var url = "url(data:".concat(this.mimetype, ";base64,").concat(btoa(data), ");");
+ var rule = "@font-face {font-family:\"".concat(this.loadedName, "\";src:").concat(url, "}");
+
+ if (this.fontRegistry) {
+ this.fontRegistry.registerFont(this, url);
+ }
+
+ return rule;
+ }
+ }, {
+ key: "getPathGenerator",
+ value: function getPathGenerator(objs, character) {
+ if (this.compiledGlyphs[character] !== undefined) {
+ return this.compiledGlyphs[character];
+ }
+
+ var cmds, current;
+
+ try {
+ cmds = objs.get(this.loadedName + '_path_' + character);
+ } catch (ex) {
+ if (!this.ignoreErrors) {
+ throw ex;
+ }
+
+ if (this._onUnsupportedFeature) {
+ this._onUnsupportedFeature({
+ featureId: _util.UNSUPPORTED_FEATURES.font
+ });
+ }
+
+ (0, _util.warn)("getPathGenerator - ignoring character: \"".concat(ex, "\"."));
+ return this.compiledGlyphs[character] = function (c, size) {};
+ }
+
+ if (this.isEvalSupported && IsEvalSupportedCached.value) {
+ var args,
+ js = '';
+
+ for (var i = 0, ii = cmds.length; i < ii; i++) {
+ current = cmds[i];
+
+ if (current.args !== undefined) {
+ args = current.args.join(',');
+ } else {
+ args = '';
+ }
+
+ js += 'c.' + current.cmd + '(' + args + ');\n';
+ }
+
+ return this.compiledGlyphs[character] = new Function('c', 'size', js);
+ }
+
+ return this.compiledGlyphs[character] = function (c, size) {
+ for (var _i = 0, _ii = cmds.length; _i < _ii; _i++) {
+ current = cmds[_i];
+
+ if (current.cmd === 'scale') {
+ current.args = [size, -size];
+ }
+
+ c[current.cmd].apply(c, current.args);
+ }
+ };
+ }
+ }]);
+
+ return FontFaceObject;
+}();
+
+exports.FontFaceObject = FontFaceObject;
+
+/***/ }),
+/* 140 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+var compatibilityParams = Object.create(null);
+{
+ var isNodeJS = __w_pdfjs_require__(4);
+
+ var userAgent = typeof navigator !== 'undefined' && navigator.userAgent || '';
+ var isIE = /Trident/.test(userAgent);
+ var isIOSChrome = /CriOS/.test(userAgent);
+
+ (function checkOnBlobSupport() {
+ if (isIE || isIOSChrome) {
+ compatibilityParams.disableCreateObjectURL = true;
+ }
+ })();
+
+ (function checkFontFaceAndImage() {
+ if (isNodeJS()) {
+ compatibilityParams.disableFontFace = true;
+ compatibilityParams.nativeImageDecoderSupport = 'none';
+ }
+ })();
+}
+exports.apiCompatibilityParams = Object.freeze(compatibilityParams);
+
+/***/ }),
+/* 141 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.CanvasGraphics = void 0;
+
+var _util = __w_pdfjs_require__(1);
+
+var _pattern_helper = __w_pdfjs_require__(142);
+
+var MIN_FONT_SIZE = 16;
+var MAX_FONT_SIZE = 100;
+var MAX_GROUP_SIZE = 4096;
+var MIN_WIDTH_FACTOR = 0.65;
+var COMPILE_TYPE3_GLYPHS = true;
+var MAX_SIZE_TO_COMPILE = 1000;
+var FULL_CHUNK_HEIGHT = 16;
+var IsLittleEndianCached = {
+ get value() {
+ return (0, _util.shadow)(IsLittleEndianCached, 'value', (0, _util.isLittleEndian)());
+ }
+
+};
+
+function addContextCurrentTransform(ctx) {
+ if (!ctx.mozCurrentTransform) {
+ ctx._originalSave = ctx.save;
+ ctx._originalRestore = ctx.restore;
+ ctx._originalRotate = ctx.rotate;
+ ctx._originalScale = ctx.scale;
+ ctx._originalTranslate = ctx.translate;
+ ctx._originalTransform = ctx.transform;
+ ctx._originalSetTransform = ctx.setTransform;
+ ctx._transformMatrix = ctx._transformMatrix || [1, 0, 0, 1, 0, 0];
+ ctx._transformStack = [];
+ Object.defineProperty(ctx, 'mozCurrentTransform', {
+ get: function getCurrentTransform() {
+ return this._transformMatrix;
+ }
+ });
+ Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
+ get: function getCurrentTransformInverse() {
+ var m = this._transformMatrix;
+ var a = m[0],
+ b = m[1],
+ c = m[2],
+ d = m[3],
+ e = m[4],
+ f = m[5];
+ var ad_bc = a * d - b * c;
+ var bc_ad = b * c - a * d;
+ return [d / ad_bc, b / bc_ad, c / bc_ad, a / ad_bc, (d * e - c * f) / bc_ad, (b * e - a * f) / ad_bc];
+ }
+ });
+
+ ctx.save = function ctxSave() {
+ var old = this._transformMatrix;
+
+ this._transformStack.push(old);
+
+ this._transformMatrix = old.slice(0, 6);
+
+ this._originalSave();
+ };
+
+ ctx.restore = function ctxRestore() {
+ var prev = this._transformStack.pop();
+
+ if (prev) {
+ this._transformMatrix = prev;
+
+ this._originalRestore();
+ }
+ };
+
+ ctx.translate = function ctxTranslate(x, y) {
+ var m = this._transformMatrix;
+ m[4] = m[0] * x + m[2] * y + m[4];
+ m[5] = m[1] * x + m[3] * y + m[5];
+
+ this._originalTranslate(x, y);
+ };
+
+ ctx.scale = function ctxScale(x, y) {
+ var m = this._transformMatrix;
+ m[0] = m[0] * x;
+ m[1] = m[1] * x;
+ m[2] = m[2] * y;
+ m[3] = m[3] * y;
+
+ this._originalScale(x, y);
+ };
+
+ ctx.transform = function ctxTransform(a, b, c, d, e, f) {
+ var m = this._transformMatrix;
+ this._transformMatrix = [m[0] * a + m[2] * b, m[1] * a + m[3] * b, m[0] * c + m[2] * d, m[1] * c + m[3] * d, m[0] * e + m[2] * f + m[4], m[1] * e + m[3] * f + m[5]];
+
+ ctx._originalTransform(a, b, c, d, e, f);
+ };
+
+ ctx.setTransform = function ctxSetTransform(a, b, c, d, e, f) {
+ this._transformMatrix = [a, b, c, d, e, f];
+
+ ctx._originalSetTransform(a, b, c, d, e, f);
+ };
+
+ ctx.rotate = function ctxRotate(angle) {
+ var cosValue = Math.cos(angle);
+ var sinValue = Math.sin(angle);
+ var m = this._transformMatrix;
+ this._transformMatrix = [m[0] * cosValue + m[2] * sinValue, m[1] * cosValue + m[3] * sinValue, m[0] * -sinValue + m[2] * cosValue, m[1] * -sinValue + m[3] * cosValue, m[4], m[5]];
+
+ this._originalRotate(angle);
+ };
+ }
+}
+
+var CachedCanvases = function CachedCanvasesClosure() {
+ function CachedCanvases(canvasFactory) {
+ this.canvasFactory = canvasFactory;
+ this.cache = Object.create(null);
+ }
+
+ CachedCanvases.prototype = {
+ getCanvas: function CachedCanvases_getCanvas(id, width, height, trackTransform) {
+ var canvasEntry;
+
+ if (this.cache[id] !== undefined) {
+ canvasEntry = this.cache[id];
+ this.canvasFactory.reset(canvasEntry, width, height);
+ canvasEntry.context.setTransform(1, 0, 0, 1, 0, 0);
+ } else {
+ canvasEntry = this.canvasFactory.create(width, height);
+ this.cache[id] = canvasEntry;
+ }
+
+ if (trackTransform) {
+ addContextCurrentTransform(canvasEntry.context);
+ }
+
+ return canvasEntry;
+ },
+ clear: function clear() {
+ for (var id in this.cache) {
+ var canvasEntry = this.cache[id];
+ this.canvasFactory.destroy(canvasEntry);
+ delete this.cache[id];
+ }
+ }
+ };
+ return CachedCanvases;
+}();
+
+function compileType3Glyph(imgData) {
+ var POINT_TO_PROCESS_LIMIT = 1000;
+ var width = imgData.width,
+ height = imgData.height;
+ var i,
+ j,
+ j0,
+ width1 = width + 1;
+ var points = new Uint8Array(width1 * (height + 1));
+ var POINT_TYPES = new Uint8Array([0, 2, 4, 0, 1, 0, 5, 4, 8, 10, 0, 8, 0, 2, 1, 0]);
+ var lineSize = width + 7 & ~7,
+ data0 = imgData.data;
+ var data = new Uint8Array(lineSize * height),
+ pos = 0,
+ ii;
+
+ for (i = 0, ii = data0.length; i < ii; i++) {
+ var mask = 128,
+ elem = data0[i];
+
+ while (mask > 0) {
+ data[pos++] = elem & mask ? 0 : 255;
+ mask >>= 1;
+ }
+ }
+
+ var count = 0;
+ pos = 0;
+
+ if (data[pos] !== 0) {
+ points[0] = 1;
+ ++count;
+ }
+
+ for (j = 1; j < width; j++) {
+ if (data[pos] !== data[pos + 1]) {
+ points[j] = data[pos] ? 2 : 1;
+ ++count;
+ }
+
+ pos++;
+ }
+
+ if (data[pos] !== 0) {
+ points[j] = 2;
+ ++count;
+ }
+
+ for (i = 1; i < height; i++) {
+ pos = i * lineSize;
+ j0 = i * width1;
+
+ if (data[pos - lineSize] !== data[pos]) {
+ points[j0] = data[pos] ? 1 : 8;
+ ++count;
+ }
+
+ var sum = (data[pos] ? 4 : 0) + (data[pos - lineSize] ? 8 : 0);
+
+ for (j = 1; j < width; j++) {
+ sum = (sum >> 2) + (data[pos + 1] ? 4 : 0) + (data[pos - lineSize + 1] ? 8 : 0);
+
+ if (POINT_TYPES[sum]) {
+ points[j0 + j] = POINT_TYPES[sum];
+ ++count;
+ }
+
+ pos++;
+ }
+
+ if (data[pos - lineSize] !== data[pos]) {
+ points[j0 + j] = data[pos] ? 2 : 4;
+ ++count;
+ }
+
+ if (count > POINT_TO_PROCESS_LIMIT) {
+ return null;
+ }
+ }
+
+ pos = lineSize * (height - 1);
+ j0 = i * width1;
+
+ if (data[pos] !== 0) {
+ points[j0] = 8;
+ ++count;
+ }
+
+ for (j = 1; j < width; j++) {
+ if (data[pos] !== data[pos + 1]) {
+ points[j0 + j] = data[pos] ? 4 : 8;
+ ++count;
+ }
+
+ pos++;
+ }
+
+ if (data[pos] !== 0) {
+ points[j0 + j] = 4;
+ ++count;
+ }
+
+ if (count > POINT_TO_PROCESS_LIMIT) {
+ return null;
+ }
+
+ var steps = new Int32Array([0, width1, -1, 0, -width1, 0, 0, 0, 1]);
+ var outlines = [];
+
+ for (i = 0; count && i <= height; i++) {
+ var p = i * width1;
+ var end = p + width;
+
+ while (p < end && !points[p]) {
+ p++;
+ }
+
+ if (p === end) {
+ continue;
+ }
+
+ var coords = [p % width1, i];
+ var type = points[p],
+ p0 = p,
+ pp;
+
+ do {
+ var step = steps[type];
+
+ do {
+ p += step;
+ } while (!points[p]);
+
+ pp = points[p];
+
+ if (pp !== 5 && pp !== 10) {
+ type = pp;
+ points[p] = 0;
+ } else {
+ type = pp & 0x33 * type >> 4;
+ points[p] &= type >> 2 | type << 2;
+ }
+
+ coords.push(p % width1);
+ coords.push(p / width1 | 0);
+ --count;
+ } while (p0 !== p);
+
+ outlines.push(coords);
+ --i;
+ }
+
+ var drawOutline = function drawOutline(c) {
+ c.save();
+ c.scale(1 / width, -1 / height);
+ c.translate(0, -height);
+ c.beginPath();
+
+ for (var i = 0, ii = outlines.length; i < ii; i++) {
+ var o = outlines[i];
+ c.moveTo(o[0], o[1]);
+
+ for (var j = 2, jj = o.length; j < jj; j += 2) {
+ c.lineTo(o[j], o[j + 1]);
+ }
+ }
+
+ c.fill();
+ c.beginPath();
+ c.restore();
+ };
+
+ return drawOutline;
+}
+
+var CanvasExtraState = function CanvasExtraStateClosure() {
+ function CanvasExtraState() {
+ this.alphaIsShape = false;
+ this.fontSize = 0;
+ this.fontSizeScale = 1;
+ this.textMatrix = _util.IDENTITY_MATRIX;
+ this.textMatrixScale = 1;
+ this.fontMatrix = _util.FONT_IDENTITY_MATRIX;
+ this.leading = 0;
+ this.x = 0;
+ this.y = 0;
+ this.lineX = 0;
+ this.lineY = 0;
+ this.charSpacing = 0;
+ this.wordSpacing = 0;
+ this.textHScale = 1;
+ this.textRenderingMode = _util.TextRenderingMode.FILL;
+ this.textRise = 0;
+ this.fillColor = '#000000';
+ this.strokeColor = '#000000';
+ this.patternFill = false;
+ this.fillAlpha = 1;
+ this.strokeAlpha = 1;
+ this.lineWidth = 1;
+ this.activeSMask = null;
+ this.resumeSMaskCtx = null;
+ }
+
+ CanvasExtraState.prototype = {
+ clone: function CanvasExtraState_clone() {
+ return Object.create(this);
+ },
+ setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
+ this.x = x;
+ this.y = y;
+ }
+ };
+ return CanvasExtraState;
+}();
+
+var CanvasGraphics = function CanvasGraphicsClosure() {
+ var EXECUTION_TIME = 15;
+ var EXECUTION_STEPS = 10;
+
+ function CanvasGraphics(canvasCtx, commonObjs, objs, canvasFactory, webGLContext, imageLayer) {
+ this.ctx = canvasCtx;
+ this.current = new CanvasExtraState();
+ this.stateStack = [];
+ this.pendingClip = null;
+ this.pendingEOFill = false;
+ this.res = null;
+ this.xobjs = null;
+ this.commonObjs = commonObjs;
+ this.objs = objs;
+ this.canvasFactory = canvasFactory;
+ this.webGLContext = webGLContext;
+ this.imageLayer = imageLayer;
+ this.groupStack = [];
+ this.processingType3 = null;
+ this.baseTransform = null;
+ this.baseTransformStack = [];
+ this.groupLevel = 0;
+ this.smaskStack = [];
+ this.smaskCounter = 0;
+ this.tempSMask = null;
+ this.cachedCanvases = new CachedCanvases(this.canvasFactory);
+
+ if (canvasCtx) {
+ addContextCurrentTransform(canvasCtx);
+ }
+
+ this._cachedGetSinglePixelWidth = null;
+ }
+
+ function putBinaryImageData(ctx, imgData) {
+ if (typeof ImageData !== 'undefined' && imgData instanceof ImageData) {
+ ctx.putImageData(imgData, 0, 0);
+ return;
+ }
+
+ var height = imgData.height,
+ width = imgData.width;
+ var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
+ var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
+ var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
+ var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
+ var srcPos = 0,
+ destPos;
+ var src = imgData.data;
+ var dest = chunkImgData.data;
+ var i, j, thisChunkHeight, elemsInThisChunk;
+
+ if (imgData.kind === _util.ImageKind.GRAYSCALE_1BPP) {
+ var srcLength = src.byteLength;
+ var dest32 = new Uint32Array(dest.buffer, 0, dest.byteLength >> 2);
+ var dest32DataLength = dest32.length;
+ var fullSrcDiff = width + 7 >> 3;
+ var white = 0xFFFFFFFF;
+ var black = IsLittleEndianCached.value ? 0xFF000000 : 0x000000FF;
+
+ for (i = 0; i < totalChunks; i++) {
+ thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
+ destPos = 0;
+
+ for (j = 0; j < thisChunkHeight; j++) {
+ var srcDiff = srcLength - srcPos;
+ var k = 0;
+ var kEnd = srcDiff > fullSrcDiff ? width : srcDiff * 8 - 7;
+ var kEndUnrolled = kEnd & ~7;
+ var mask = 0;
+ var srcByte = 0;
+
+ for (; k < kEndUnrolled; k += 8) {
+ srcByte = src[srcPos++];
+ dest32[destPos++] = srcByte & 128 ? white : black;
+ dest32[destPos++] = srcByte & 64 ? white : black;
+ dest32[destPos++] = srcByte & 32 ? white : black;
+ dest32[destPos++] = srcByte & 16 ? white : black;
+ dest32[destPos++] = srcByte & 8 ? white : black;
+ dest32[destPos++] = srcByte & 4 ? white : black;
+ dest32[destPos++] = srcByte & 2 ? white : black;
+ dest32[destPos++] = srcByte & 1 ? white : black;
+ }
+
+ for (; k < kEnd; k++) {
+ if (mask === 0) {
+ srcByte = src[srcPos++];
+ mask = 128;
+ }
+
+ dest32[destPos++] = srcByte & mask ? white : black;
+ mask >>= 1;
+ }
+ }
+
+ while (destPos < dest32DataLength) {
+ dest32[destPos++] = 0;
+ }
+
+ ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ }
+ } else if (imgData.kind === _util.ImageKind.RGBA_32BPP) {
+ j = 0;
+ elemsInThisChunk = width * FULL_CHUNK_HEIGHT * 4;
+
+ for (i = 0; i < fullChunks; i++) {
+ dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
+ srcPos += elemsInThisChunk;
+ ctx.putImageData(chunkImgData, 0, j);
+ j += FULL_CHUNK_HEIGHT;
+ }
+
+ if (i < totalChunks) {
+ elemsInThisChunk = width * partialChunkHeight * 4;
+ dest.set(src.subarray(srcPos, srcPos + elemsInThisChunk));
+ ctx.putImageData(chunkImgData, 0, j);
+ }
+ } else if (imgData.kind === _util.ImageKind.RGB_24BPP) {
+ thisChunkHeight = FULL_CHUNK_HEIGHT;
+ elemsInThisChunk = width * thisChunkHeight;
+
+ for (i = 0; i < totalChunks; i++) {
+ if (i >= fullChunks) {
+ thisChunkHeight = partialChunkHeight;
+ elemsInThisChunk = width * thisChunkHeight;
+ }
+
+ destPos = 0;
+
+ for (j = elemsInThisChunk; j--;) {
+ dest[destPos++] = src[srcPos++];
+ dest[destPos++] = src[srcPos++];
+ dest[destPos++] = src[srcPos++];
+ dest[destPos++] = 255;
+ }
+
+ ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ }
+ } else {
+ throw new Error("bad image kind: ".concat(imgData.kind));
+ }
+ }
+
+ function putBinaryImageMask(ctx, imgData) {
+ var height = imgData.height,
+ width = imgData.width;
+ var partialChunkHeight = height % FULL_CHUNK_HEIGHT;
+ var fullChunks = (height - partialChunkHeight) / FULL_CHUNK_HEIGHT;
+ var totalChunks = partialChunkHeight === 0 ? fullChunks : fullChunks + 1;
+ var chunkImgData = ctx.createImageData(width, FULL_CHUNK_HEIGHT);
+ var srcPos = 0;
+ var src = imgData.data;
+ var dest = chunkImgData.data;
+
+ for (var i = 0; i < totalChunks; i++) {
+ var thisChunkHeight = i < fullChunks ? FULL_CHUNK_HEIGHT : partialChunkHeight;
+ var destPos = 3;
+
+ for (var j = 0; j < thisChunkHeight; j++) {
+ var mask = 0;
+
+ for (var k = 0; k < width; k++) {
+ if (!mask) {
+ var elem = src[srcPos++];
+ mask = 128;
+ }
+
+ dest[destPos] = elem & mask ? 0 : 255;
+ destPos += 4;
+ mask >>= 1;
+ }
+ }
+
+ ctx.putImageData(chunkImgData, 0, i * FULL_CHUNK_HEIGHT);
+ }
+ }
+
+ function copyCtxState(sourceCtx, destCtx) {
+ var properties = ['strokeStyle', 'fillStyle', 'fillRule', 'globalAlpha', 'lineWidth', 'lineCap', 'lineJoin', 'miterLimit', 'globalCompositeOperation', 'font'];
+
+ for (var i = 0, ii = properties.length; i < ii; i++) {
+ var property = properties[i];
+
+ if (sourceCtx[property] !== undefined) {
+ destCtx[property] = sourceCtx[property];
+ }
+ }
+
+ if (sourceCtx.setLineDash !== undefined) {
+ destCtx.setLineDash(sourceCtx.getLineDash());
+ destCtx.lineDashOffset = sourceCtx.lineDashOffset;
+ }
+ }
+
+ function resetCtxToDefault(ctx) {
+ ctx.strokeStyle = '#000000';
+ ctx.fillStyle = '#000000';
+ ctx.fillRule = 'nonzero';
+ ctx.globalAlpha = 1;
+ ctx.lineWidth = 1;
+ ctx.lineCap = 'butt';
+ ctx.lineJoin = 'miter';
+ ctx.miterLimit = 10;
+ ctx.globalCompositeOperation = 'source-over';
+ ctx.font = '10px sans-serif';
+
+ if (ctx.setLineDash !== undefined) {
+ ctx.setLineDash([]);
+ ctx.lineDashOffset = 0;
+ }
+ }
+
+ function composeSMaskBackdrop(bytes, r0, g0, b0) {
+ var length = bytes.length;
+
+ for (var i = 3; i < length; i += 4) {
+ var alpha = bytes[i];
+
+ if (alpha === 0) {
+ bytes[i - 3] = r0;
+ bytes[i - 2] = g0;
+ bytes[i - 1] = b0;
+ } else if (alpha < 255) {
+ var alpha_ = 255 - alpha;
+ bytes[i - 3] = bytes[i - 3] * alpha + r0 * alpha_ >> 8;
+ bytes[i - 2] = bytes[i - 2] * alpha + g0 * alpha_ >> 8;
+ bytes[i - 1] = bytes[i - 1] * alpha + b0 * alpha_ >> 8;
+ }
+ }
+ }
+
+ function composeSMaskAlpha(maskData, layerData, transferMap) {
+ var length = maskData.length;
+ var scale = 1 / 255;
+
+ for (var i = 3; i < length; i += 4) {
+ var alpha = transferMap ? transferMap[maskData[i]] : maskData[i];
+ layerData[i] = layerData[i] * alpha * scale | 0;
+ }
+ }
+
+ function composeSMaskLuminosity(maskData, layerData, transferMap) {
+ var length = maskData.length;
+
+ for (var i = 3; i < length; i += 4) {
+ var y = maskData[i - 3] * 77 + maskData[i - 2] * 152 + maskData[i - 1] * 28;
+ layerData[i] = transferMap ? layerData[i] * transferMap[y >> 8] >> 8 : layerData[i] * y >> 16;
+ }
+ }
+
+ function genericComposeSMask(maskCtx, layerCtx, width, height, subtype, backdrop, transferMap) {
+ var hasBackdrop = !!backdrop;
+ var r0 = hasBackdrop ? backdrop[0] : 0;
+ var g0 = hasBackdrop ? backdrop[1] : 0;
+ var b0 = hasBackdrop ? backdrop[2] : 0;
+ var composeFn;
+
+ if (subtype === 'Luminosity') {
+ composeFn = composeSMaskLuminosity;
+ } else {
+ composeFn = composeSMaskAlpha;
+ }
+
+ var PIXELS_TO_PROCESS = 1048576;
+ var chunkSize = Math.min(height, Math.ceil(PIXELS_TO_PROCESS / width));
+
+ for (var row = 0; row < height; row += chunkSize) {
+ var chunkHeight = Math.min(chunkSize, height - row);
+ var maskData = maskCtx.getImageData(0, row, width, chunkHeight);
+ var layerData = layerCtx.getImageData(0, row, width, chunkHeight);
+
+ if (hasBackdrop) {
+ composeSMaskBackdrop(maskData.data, r0, g0, b0);
+ }
+
+ composeFn(maskData.data, layerData.data, transferMap);
+ maskCtx.putImageData(layerData, 0, row);
+ }
+ }
+
+ function composeSMask(ctx, smask, layerCtx, webGLContext) {
+ var mask = smask.canvas;
+ var maskCtx = smask.context;
+ ctx.setTransform(smask.scaleX, 0, 0, smask.scaleY, smask.offsetX, smask.offsetY);
+ var backdrop = smask.backdrop || null;
+
+ if (!smask.transferMap && webGLContext.isEnabled) {
+ var composed = webGLContext.composeSMask({
+ layer: layerCtx.canvas,
+ mask: mask,
+ properties: {
+ subtype: smask.subtype,
+ backdrop: backdrop
+ }
+ });
+ ctx.setTransform(1, 0, 0, 1, 0, 0);
+ ctx.drawImage(composed, smask.offsetX, smask.offsetY);
+ return;
+ }
+
+ genericComposeSMask(maskCtx, layerCtx, mask.width, mask.height, smask.subtype, backdrop, smask.transferMap);
+ ctx.drawImage(mask, 0, 0);
+ }
+
+ var LINE_CAP_STYLES = ['butt', 'round', 'square'];
+ var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
+ var NORMAL_CLIP = {};
+ var EO_CLIP = {};
+ CanvasGraphics.prototype = {
+ beginDrawing: function beginDrawing(_ref) {
+ var transform = _ref.transform,
+ viewport = _ref.viewport,
+ _ref$transparency = _ref.transparency,
+ transparency = _ref$transparency === void 0 ? false : _ref$transparency,
+ _ref$background = _ref.background,
+ background = _ref$background === void 0 ? null : _ref$background;
+ var width = this.ctx.canvas.width;
+ var height = this.ctx.canvas.height;
+ this.ctx.save();
+ this.ctx.fillStyle = background || 'rgb(255, 255, 255)';
+ this.ctx.fillRect(0, 0, width, height);
+ this.ctx.restore();
+
+ if (transparency) {
+ var transparentCanvas = this.cachedCanvases.getCanvas('transparent', width, height, true);
+ this.compositeCtx = this.ctx;
+ this.transparentCanvas = transparentCanvas.canvas;
+ this.ctx = transparentCanvas.context;
+ this.ctx.save();
+ this.ctx.transform.apply(this.ctx, this.compositeCtx.mozCurrentTransform);
+ }
+
+ this.ctx.save();
+ resetCtxToDefault(this.ctx);
+
+ if (transform) {
+ this.ctx.transform.apply(this.ctx, transform);
+ }
+
+ this.ctx.transform.apply(this.ctx, viewport.transform);
+ this.baseTransform = this.ctx.mozCurrentTransform.slice();
+
+ if (this.imageLayer) {
+ this.imageLayer.beginLayout();
+ }
+ },
+ executeOperatorList: function CanvasGraphics_executeOperatorList(operatorList, executionStartIdx, continueCallback, stepper) {
+ var argsArray = operatorList.argsArray;
+ var fnArray = operatorList.fnArray;
+ var i = executionStartIdx || 0;
+ var argsArrayLen = argsArray.length;
+
+ if (argsArrayLen === i) {
+ return i;
+ }
+
+ var chunkOperations = argsArrayLen - i > EXECUTION_STEPS && typeof continueCallback === 'function';
+ var endTime = chunkOperations ? Date.now() + EXECUTION_TIME : 0;
+ var steps = 0;
+ var commonObjs = this.commonObjs;
+ var objs = this.objs;
+ var fnId;
+
+ while (true) {
+ if (stepper !== undefined && i === stepper.nextBreakPoint) {
+ stepper.breakIt(i, continueCallback);
+ return i;
+ }
+
+ fnId = fnArray[i];
+
+ if (fnId !== _util.OPS.dependency) {
+ this[fnId].apply(this, argsArray[i]);
+ } else {
+ var deps = argsArray[i];
+
+ for (var n = 0, nn = deps.length; n < nn; n++) {
+ var depObjId = deps[n];
+ var common = depObjId[0] === 'g' && depObjId[1] === '_';
+ var objsPool = common ? commonObjs : objs;
+
+ if (!objsPool.has(depObjId)) {
+ objsPool.get(depObjId, continueCallback);
+ return i;
+ }
+ }
+ }
+
+ i++;
+
+ if (i === argsArrayLen) {
+ return i;
+ }
+
+ if (chunkOperations && ++steps > EXECUTION_STEPS) {
+ if (Date.now() > endTime) {
+ continueCallback();
+ return i;
+ }
+
+ steps = 0;
+ }
+ }
+ },
+ endDrawing: function CanvasGraphics_endDrawing() {
+ if (this.current.activeSMask !== null) {
+ this.endSMaskGroup();
+ }
+
+ this.ctx.restore();
+
+ if (this.transparentCanvas) {
+ this.ctx = this.compositeCtx;
+ this.ctx.save();
+ this.ctx.setTransform(1, 0, 0, 1, 0, 0);
+ this.ctx.drawImage(this.transparentCanvas, 0, 0);
+ this.ctx.restore();
+ this.transparentCanvas = null;
+ }
+
+ this.cachedCanvases.clear();
+ this.webGLContext.clear();
+
+ if (this.imageLayer) {
+ this.imageLayer.endLayout();
+ }
+ },
+ setLineWidth: function CanvasGraphics_setLineWidth(width) {
+ this.current.lineWidth = width;
+ this.ctx.lineWidth = width;
+ },
+ setLineCap: function CanvasGraphics_setLineCap(style) {
+ this.ctx.lineCap = LINE_CAP_STYLES[style];
+ },
+ setLineJoin: function CanvasGraphics_setLineJoin(style) {
+ this.ctx.lineJoin = LINE_JOIN_STYLES[style];
+ },
+ setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
+ this.ctx.miterLimit = limit;
+ },
+ setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
+ var ctx = this.ctx;
+
+ if (ctx.setLineDash !== undefined) {
+ ctx.setLineDash(dashArray);
+ ctx.lineDashOffset = dashPhase;
+ }
+ },
+ setRenderingIntent: function CanvasGraphics_setRenderingIntent(intent) {},
+ setFlatness: function CanvasGraphics_setFlatness(flatness) {},
+ setGState: function CanvasGraphics_setGState(states) {
+ for (var i = 0, ii = states.length; i < ii; i++) {
+ var state = states[i];
+ var key = state[0];
+ var value = state[1];
+
+ switch (key) {
+ case 'LW':
+ this.setLineWidth(value);
+ break;
+
+ case 'LC':
+ this.setLineCap(value);
+ break;
+
+ case 'LJ':
+ this.setLineJoin(value);
+ break;
+
+ case 'ML':
+ this.setMiterLimit(value);
+ break;
+
+ case 'D':
+ this.setDash(value[0], value[1]);
+ break;
+
+ case 'RI':
+ this.setRenderingIntent(value);
+ break;
+
+ case 'FL':
+ this.setFlatness(value);
+ break;
+
+ case 'Font':
+ this.setFont(value[0], value[1]);
+ break;
+
+ case 'CA':
this.current.strokeAlpha = state[1];
break;
+
case 'ca':
this.current.fillAlpha = state[1];
this.ctx.globalAlpha = state[1];
break;
+
case 'BM':
this.ctx.globalCompositeOperation = value;
break;
+
case 'SMask':
if (this.current.activeSMask) {
if (this.stateStack.length > 0 && this.stateStack[this.stateStack.length - 1].activeSMask === this.current.activeSMask) {
@@ -11338,10 +14381,13 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
this.endSMaskGroup();
}
}
+
this.current.activeSMask = value ? this.tempSMask : null;
+
if (this.current.activeSMask) {
this.beginSMaskGroup();
}
+
this.tempSMask = null;
break;
}
@@ -11376,7 +14422,9 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
this.ctx.save();
copyCtxState(groupCtx, this.ctx);
this.current.resumeSMaskCtx = groupCtx;
+
var deltaTransform = _util.Util.transform(this.current.activeSMask.startTransformInverse, groupCtx.mozCurrentTransform);
+
this.ctx.transform.apply(this.ctx, deltaTransform);
groupCtx.save();
groupCtx.setTransform(1, 0, 0, 1, 0, 0);
@@ -11397,7 +14445,9 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
composeSMask(this.ctx, this.current.activeSMask, groupCtx, this.webGLContext);
this.ctx.restore();
copyCtxState(groupCtx, this.ctx);
+
var deltaTransform = _util.Util.transform(this.current.activeSMask.startTransformInverse, groupCtx.mozCurrentTransform);
+
this.ctx.transform.apply(this.ctx, deltaTransform);
},
save: function CanvasGraphics_save() {
@@ -11411,9 +14461,11 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
if (this.current.resumeSMaskCtx) {
this.resumeSMaskGroup();
}
+
if (this.current.activeSMask !== null && (this.stateStack.length === 0 || this.stateStack[this.stateStack.length - 1].activeSMask !== this.current.activeSMask)) {
this.endSMaskGroup();
}
+
if (this.stateStack.length !== 0) {
this.current = this.stateStack.pop();
this.ctx.restore();
@@ -11430,6 +14482,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var current = this.current;
var x = current.x,
y = current.y;
+
for (var i = 0, j = 0, ii = ops.length; i < ii; i++) {
switch (ops[i] | 0) {
case _util.OPS.rectangle:
@@ -11437,12 +14490,15 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
y = args[j++];
var width = args[j++];
var height = args[j++];
+
if (width === 0) {
width = this.getSinglePixelWidth();
}
+
if (height === 0) {
height = this.getSinglePixelWidth();
}
+
var xw = x + width;
var yh = y + height;
this.ctx.moveTo(x, y);
@@ -11452,39 +14508,46 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
this.ctx.lineTo(x, y);
this.ctx.closePath();
break;
+
case _util.OPS.moveTo:
x = args[j++];
y = args[j++];
ctx.moveTo(x, y);
break;
+
case _util.OPS.lineTo:
x = args[j++];
y = args[j++];
ctx.lineTo(x, y);
break;
+
case _util.OPS.curveTo:
x = args[j + 4];
y = args[j + 5];
ctx.bezierCurveTo(args[j], args[j + 1], args[j + 2], args[j + 3], x, y);
j += 6;
break;
+
case _util.OPS.curveTo2:
ctx.bezierCurveTo(x, y, args[j], args[j + 1], args[j + 2], args[j + 3]);
x = args[j + 2];
y = args[j + 3];
j += 4;
break;
+
case _util.OPS.curveTo3:
x = args[j + 2];
y = args[j + 3];
ctx.bezierCurveTo(args[j], args[j + 1], x, y, x, y);
j += 4;
break;
+
case _util.OPS.closePath:
ctx.closePath();
break;
}
}
+
current.setCurrentPoint(x, y);
},
closePath: function CanvasGraphics_closePath() {
@@ -11496,6 +14559,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var strokeColor = this.current.strokeColor;
ctx.lineWidth = Math.max(this.getSinglePixelWidth() * MIN_WIDTH_FACTOR, this.current.lineWidth);
ctx.globalAlpha = this.current.strokeAlpha;
+
if (strokeColor && strokeColor.hasOwnProperty('type') && strokeColor.type === 'Pattern') {
ctx.save();
ctx.strokeStyle = strokeColor.getPattern(ctx, this);
@@ -11504,9 +14568,11 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
} else {
ctx.stroke();
}
+
if (consumePath) {
this.consumePath();
}
+
ctx.globalAlpha = this.current.fillAlpha;
},
closeStroke: function CanvasGraphics_closeStroke() {
@@ -11519,23 +14585,29 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var fillColor = this.current.fillColor;
var isPatternFill = this.current.patternFill;
var needRestore = false;
+
if (isPatternFill) {
ctx.save();
+
if (this.baseTransform) {
ctx.setTransform.apply(ctx, this.baseTransform);
}
+
ctx.fillStyle = fillColor.getPattern(ctx, this);
needRestore = true;
}
+
if (this.pendingEOFill) {
ctx.fill('evenodd');
this.pendingEOFill = false;
} else {
ctx.fill();
}
+
if (needRestore) {
ctx.restore();
}
+
if (consumePath) {
this.consumePath();
}
@@ -11580,18 +14652,22 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
endText: function CanvasGraphics_endText() {
var paths = this.pendingTextPaths;
var ctx = this.ctx;
+
if (paths === undefined) {
ctx.beginPath();
return;
}
+
ctx.save();
ctx.beginPath();
+
for (var i = 0; i < paths.length; i++) {
var path = paths[i];
ctx.setTransform.apply(ctx, path.transform);
ctx.translate(path.x, path.y);
path.addToPath(ctx, path.fontSize);
}
+
ctx.restore();
ctx.clip();
ctx.beginPath();
@@ -11612,24 +14688,31 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
setFont: function CanvasGraphics_setFont(fontRefName, size) {
var fontObj = this.commonObjs.get(fontRefName);
var current = this.current;
+
if (!fontObj) {
- throw new Error('Can\'t find font for ' + fontRefName);
+ throw new Error("Can't find font for ".concat(fontRefName));
}
+
current.fontMatrix = fontObj.fontMatrix ? fontObj.fontMatrix : _util.FONT_IDENTITY_MATRIX;
+
if (current.fontMatrix[0] === 0 || current.fontMatrix[3] === 0) {
(0, _util.warn)('Invalid font matrix for font ' + fontRefName);
}
+
if (size < 0) {
size = -size;
current.fontDirection = -1;
} else {
current.fontDirection = 1;
}
+
this.current.font = fontObj;
this.current.fontSize = size;
+
if (fontObj.isType3Font) {
return;
}
+
var name = fontObj.loadedName || 'sans-serif';
var bold = fontObj.black ? '900' : fontObj.bold ? 'bold' : 'normal';
var italic = fontObj.italic ? 'italic' : 'normal';
@@ -11672,32 +14755,40 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var isAddToPathSet = !!(textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
var patternFill = current.patternFill && font.data;
var addToPath;
+
if (font.disableFontFace || isAddToPathSet || patternFill) {
addToPath = font.getPathGenerator(this.commonObjs, character);
}
+
if (font.disableFontFace || patternFill) {
ctx.save();
ctx.translate(x, y);
ctx.beginPath();
addToPath(ctx, fontSize);
+
if (patternTransform) {
ctx.setTransform.apply(ctx, patternTransform);
}
+
if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
ctx.fill();
}
+
if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
ctx.stroke();
}
+
ctx.restore();
} else {
if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
ctx.fillText(character, x, y);
}
+
if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
ctx.strokeText(character, x, y);
}
}
+
if (isAddToPathSet) {
var paths = this.pendingTextPaths || (this.pendingTextPaths = []);
paths.push({
@@ -11716,24 +14807,31 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
ctx.fillText('I', 0, 10);
var data = ctx.getImageData(0, 0, 10, 10).data;
var enabled = false;
+
for (var i = 3; i < data.length; i += 4) {
if (data[i] > 0 && data[i] < 255) {
enabled = true;
break;
}
}
+
return (0, _util.shadow)(this, 'isFontSubpixelAAEnabled', enabled);
},
+
showText: function CanvasGraphics_showText(glyphs) {
var current = this.current;
var font = current.font;
+
if (font.isType3Font) {
return this.showType3Text(glyphs);
}
+
var fontSize = current.fontSize;
+
if (fontSize === 0) {
return;
}
+
var ctx = this.ctx;
var fontSizeScale = current.fontSizeScale;
var charSpacing = current.charSpacing;
@@ -11747,7 +14845,8 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var widthAdvanceScale = fontSize * current.fontMatrix[0];
var simpleFillText = current.textRenderingMode === _util.TextRenderingMode.FILL && !font.disableFontFace && !current.patternFill;
ctx.save();
- var patternTransform = void 0;
+ var patternTransform;
+
if (current.patternFill) {
ctx.save();
var pattern = current.fillColor.getPattern(ctx, this);
@@ -11755,17 +14854,22 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
ctx.restore();
ctx.fillStyle = pattern;
}
+
ctx.transform.apply(ctx, current.textMatrix);
ctx.translate(current.x, current.y + current.textRise);
+
if (fontDirection > 0) {
ctx.scale(textHScale, -1);
} else {
ctx.scale(textHScale, 1);
}
+
var lineWidth = current.lineWidth;
var scale = current.textMatrixScale;
+
if (scale === 0 || lineWidth === 0) {
var fillStrokeMode = current.textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
+
if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
this._cachedGetSinglePixelWidth = null;
lineWidth = this.getSinglePixelWidth() * MIN_WIDTH_FACTOR;
@@ -11773,25 +14877,31 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
} else {
lineWidth /= scale;
}
+
if (fontSizeScale !== 1.0) {
ctx.scale(fontSizeScale, fontSizeScale);
lineWidth /= fontSizeScale;
}
+
ctx.lineWidth = lineWidth;
var x = 0,
i;
+
for (i = 0; i < glyphsLength; ++i) {
var glyph = glyphs[i];
+
if ((0, _util.isNum)(glyph)) {
x += spacingDir * glyph * fontSize / 1000;
continue;
}
+
var restoreNeeded = false;
var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
var character = glyph.fontChar;
var accent = glyph.accent;
var scaledX, scaledY, scaledAccentX, scaledAccentY;
var width = glyph.width;
+
if (vertical) {
var vmetric, vx, vy;
vmetric = glyph.vmetric || defaultVMetrics;
@@ -11805,8 +14915,10 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
scaledX = x / fontSizeScale;
scaledY = 0;
}
+
if (font.remeasure && width > 0) {
var measuredWidth = ctx.measureText(character).width * 1000 / fontSize * fontSizeScale;
+
if (width < measuredWidth && this.isFontSubpixelAAEnabled) {
var characterScaleX = width / measuredWidth;
restoreNeeded = true;
@@ -11817,11 +14929,13 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
scaledX += (width - measuredWidth) / 2000 * fontSize / fontSizeScale;
}
}
+
if (glyph.isInFont || font.missingFile) {
if (simpleFillText && !accent) {
ctx.fillText(character, scaledX, scaledY);
} else {
this.paintChar(character, scaledX, scaledY, patternTransform);
+
if (accent) {
scaledAccentX = scaledX + accent.offset.x / fontSizeScale;
scaledAccentY = scaledY - accent.offset.y / fontSizeScale;
@@ -11829,17 +14943,21 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
}
}
}
+
var charWidth = width * widthAdvanceScale + spacing * fontDirection;
x += charWidth;
+
if (restoreNeeded) {
ctx.restore();
}
}
+
if (vertical) {
current.y -= x * textHScale;
} else {
current.x += x * textHScale;
}
+
ctx.restore();
},
showType3Text: function CanvasGraphics_showType3Text(glyphs) {
@@ -11856,39 +14974,49 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var glyphsLength = glyphs.length;
var isTextInvisible = current.textRenderingMode === _util.TextRenderingMode.INVISIBLE;
var i, glyph, width, spacingLength;
+
if (isTextInvisible || fontSize === 0) {
return;
}
+
this._cachedGetSinglePixelWidth = null;
ctx.save();
ctx.transform.apply(ctx, current.textMatrix);
ctx.translate(current.x, current.y);
ctx.scale(textHScale, fontDirection);
+
for (i = 0; i < glyphsLength; ++i) {
glyph = glyphs[i];
+
if ((0, _util.isNum)(glyph)) {
spacingLength = spacingDir * glyph * fontSize / 1000;
this.ctx.translate(spacingLength, 0);
current.x += spacingLength * textHScale;
continue;
}
+
var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
var operatorList = font.charProcOperatorList[glyph.operatorListId];
+
if (!operatorList) {
- (0, _util.warn)('Type3 character "' + glyph.operatorListId + '" is not available.');
+ (0, _util.warn)("Type3 character \"".concat(glyph.operatorListId, "\" is not available."));
continue;
}
+
this.processingType3 = glyph;
this.save();
ctx.scale(fontSize, fontSize);
ctx.transform.apply(ctx, fontMatrix);
this.executeOperatorList(operatorList);
this.restore();
+
var transformed = _util.Util.applyTransform([glyph.width, 0], fontMatrix);
+
width = transformed[0] * fontSize + spacing;
ctx.translate(width, 0);
current.x += width * textHScale;
}
+
ctx.restore();
this.processingType3 = null;
},
@@ -11902,6 +15030,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var _this = this;
var pattern;
+
if (IR[0] === 'TilingPattern') {
var color = IR[1];
var baseTransform = this.baseTransform || this.ctx.mozCurrentTransform.slice();
@@ -11914,6 +15043,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
} else {
pattern = (0, _pattern_helper.getShadingPatternFromIR)(IR);
}
+
return pattern;
},
setStrokeColorN: function CanvasGraphics_setStrokeColorN() {
@@ -11925,11 +15055,13 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
},
setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
var color = _util.Util.makeCssRgb(r, g, b);
+
this.ctx.strokeStyle = color;
this.current.strokeColor = color;
},
setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
var color = _util.Util.makeCssRgb(r, g, b);
+
this.ctx.fillStyle = color;
this.current.fillColor = color;
this.current.patternFill = false;
@@ -11940,14 +15072,20 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var pattern = (0, _pattern_helper.getShadingPatternFromIR)(patternIR);
ctx.fillStyle = pattern.getPattern(ctx, this, true);
var inv = ctx.mozCurrentTransformInverse;
+
if (inv) {
var canvas = ctx.canvas;
var width = canvas.width;
var height = canvas.height;
+
var bl = _util.Util.applyTransform([0, 0], inv);
+
var br = _util.Util.applyTransform([0, height], inv);
+
var ul = _util.Util.applyTransform([width, 0], inv);
+
var ur = _util.Util.applyTransform([width, height], inv);
+
var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
@@ -11956,6 +15094,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
} else {
this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
}
+
this.restore();
},
beginInlineImage: function CanvasGraphics_beginInlineImage() {
@@ -11967,10 +15106,13 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix, bbox) {
this.save();
this.baseTransformStack.push(this.baseTransform);
+
if (Array.isArray(matrix) && matrix.length === 6) {
this.transform.apply(this, matrix);
}
+
this.baseTransform = this.ctx.mozCurrentTransform;
+
if (bbox) {
var width = bbox[2] - bbox[0];
var height = bbox[3] - bbox[1];
@@ -11986,20 +15128,27 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
beginGroup: function CanvasGraphics_beginGroup(group) {
this.save();
var currentCtx = this.ctx;
+
if (!group.isolated) {
(0, _util.info)('TODO: Support non-isolated groups.');
}
+
if (group.knockout) {
(0, _util.warn)('Knockout groups not supported.');
}
+
var currentTransform = currentCtx.mozCurrentTransform;
+
if (group.matrix) {
currentCtx.transform.apply(currentCtx, group.matrix);
}
+
if (!group.bbox) {
throw new Error('Bounding box is required.');
}
+
var bounds = _util.Util.getAxialAlignedBoundingBox(group.bbox, currentCtx.mozCurrentTransform);
+
var canvasBounds = [0, 0, currentCtx.canvas.width, currentCtx.canvas.height];
bounds = _util.Util.intersect(bounds, canvasBounds) || [0, 0, 0, 0];
var offsetX = Math.floor(bounds[0]);
@@ -12008,23 +15157,29 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
var drawnHeight = Math.max(Math.ceil(bounds[3]) - offsetY, 1);
var scaleX = 1,
scaleY = 1;
+
if (drawnWidth > MAX_GROUP_SIZE) {
scaleX = drawnWidth / MAX_GROUP_SIZE;
drawnWidth = MAX_GROUP_SIZE;
}
+
if (drawnHeight > MAX_GROUP_SIZE) {
scaleY = drawnHeight / MAX_GROUP_SIZE;
drawnHeight = MAX_GROUP_SIZE;
}
+
var cacheId = 'groupAt' + this.groupLevel;
+
if (group.smask) {
cacheId += '_smask_' + this.smaskCounter++ % 2;
}
+
var scratchCanvas = this.cachedCanvases.getCanvas(cacheId, drawnWidth, drawnHeight, true);
var groupCtx = scratchCanvas.context;
groupCtx.scale(1 / scaleX, 1 / scaleY);
groupCtx.translate(-offsetX, -offsetY);
groupCtx.transform.apply(groupCtx, currentTransform);
+
if (group.smask) {
this.smaskStack.push({
canvas: scratchCanvas.canvas,
@@ -12043,6 +15198,7 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
currentCtx.translate(offsetX, offsetY);
currentCtx.scale(scaleX, scaleY);
}
+
copyCtxState(currentCtx, groupCtx);
this.ctx = groupCtx;
this.setGState([['BM', 'source-over'], ['ca', 1], ['CA', 1]]);
@@ -12054,20 +15210,24 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
this.groupLevel--;
var groupCtx = this.ctx;
this.ctx = this.groupStack.pop();
+
if (this.ctx.imageSmoothingEnabled !== undefined) {
this.ctx.imageSmoothingEnabled = false;
} else {
this.ctx.mozImageSmoothingEnabled = false;
}
+
if (group.smask) {
this.tempSMask = this.smaskStack.pop();
} else {
this.ctx.drawImage(groupCtx.canvas, 0, 0);
}
+
this.restore();
},
beginAnnotations: function CanvasGraphics_beginAnnotations() {
this.save();
+
if (this.baseTransform) {
this.ctx.setTransform.apply(this.ctx, this.baseTransform);
}
@@ -12079,675 +15239,313 @@ var CanvasGraphics = function CanvasGraphicsClosure() {
this.save();
resetCtxToDefault(this.ctx);
this.current = new CanvasExtraState();
+
if (Array.isArray(rect) && rect.length === 4) {
var width = rect[2] - rect[0];
var height = rect[3] - rect[1];
this.ctx.rect(rect[0], rect[1], width, height);
- this.clip();
- this.endPath();
- }
- this.transform.apply(this, transform);
- this.transform.apply(this, matrix);
- },
- endAnnotation: function CanvasGraphics_endAnnotation() {
- this.restore();
- },
- paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
- var domImage = this.objs.get(objId);
- if (!domImage) {
- (0, _util.warn)('Dependent image isn\'t ready yet');
- return;
- }
- this.save();
- var ctx = this.ctx;
- ctx.scale(1 / w, -1 / h);
- ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height, 0, -h, w, h);
- if (this.imageLayer) {
- var currentTransform = ctx.mozCurrentTransformInverse;
- var position = this.getCanvasPosition(0, 0);
- this.imageLayer.appendImage({
- objId: objId,
- left: position[0],
- top: position[1],
- width: w / currentTransform[0],
- height: h / currentTransform[3]
- });
- }
- this.restore();
- },
- paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(img) {
- var ctx = this.ctx;
- var width = img.width,
- height = img.height;
- var fillColor = this.current.fillColor;
- var isPatternFill = this.current.patternFill;
- var glyph = this.processingType3;
- if (COMPILE_TYPE3_GLYPHS && glyph && glyph.compiled === undefined) {
- if (width <= MAX_SIZE_TO_COMPILE && height <= MAX_SIZE_TO_COMPILE) {
- glyph.compiled = compileType3Glyph({
- data: img.data,
- width: width,
- height: height
- });
- } else {
- glyph.compiled = null;
- }
- }
- if (glyph && glyph.compiled) {
- glyph.compiled(ctx);
- return;
- }
- var maskCanvas = this.cachedCanvases.getCanvas('maskCanvas', width, height);
- var maskCtx = maskCanvas.context;
- maskCtx.save();
- putBinaryImageMask(maskCtx, img);
- maskCtx.globalCompositeOperation = 'source-in';
- maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
- maskCtx.fillRect(0, 0, width, height);
- maskCtx.restore();
- this.paintInlineImageXObject(maskCanvas.canvas);
- },
- paintImageMaskXObjectRepeat: function CanvasGraphics_paintImageMaskXObjectRepeat(imgData, scaleX, scaleY, positions) {
- var width = imgData.width;
- var height = imgData.height;
- var fillColor = this.current.fillColor;
- var isPatternFill = this.current.patternFill;
- var maskCanvas = this.cachedCanvases.getCanvas('maskCanvas', width, height);
- var maskCtx = maskCanvas.context;
- maskCtx.save();
- putBinaryImageMask(maskCtx, imgData);
- maskCtx.globalCompositeOperation = 'source-in';
- maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
- maskCtx.fillRect(0, 0, width, height);
- maskCtx.restore();
- var ctx = this.ctx;
- for (var i = 0, ii = positions.length; i < ii; i += 2) {
- ctx.save();
- ctx.transform(scaleX, 0, 0, scaleY, positions[i], positions[i + 1]);
- ctx.scale(1, -1);
- ctx.drawImage(maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
- ctx.restore();
- }
- },
- paintImageMaskXObjectGroup: function CanvasGraphics_paintImageMaskXObjectGroup(images) {
- var ctx = this.ctx;
- var fillColor = this.current.fillColor;
- var isPatternFill = this.current.patternFill;
- for (var i = 0, ii = images.length; i < ii; i++) {
- var image = images[i];
- var width = image.width,
- height = image.height;
- var maskCanvas = this.cachedCanvases.getCanvas('maskCanvas', width, height);
- var maskCtx = maskCanvas.context;
- maskCtx.save();
- putBinaryImageMask(maskCtx, image);
- maskCtx.globalCompositeOperation = 'source-in';
- maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
- maskCtx.fillRect(0, 0, width, height);
- maskCtx.restore();
- ctx.save();
- ctx.transform.apply(ctx, image.transform);
- ctx.scale(1, -1);
- ctx.drawImage(maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
- ctx.restore();
- }
- },
- paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
- var imgData = this.objs.get(objId);
- if (!imgData) {
- (0, _util.warn)('Dependent image isn\'t ready yet');
- return;
- }
- this.paintInlineImageXObject(imgData);
- },
- paintImageXObjectRepeat: function CanvasGraphics_paintImageXObjectRepeat(objId, scaleX, scaleY, positions) {
- var imgData = this.objs.get(objId);
- if (!imgData) {
- (0, _util.warn)('Dependent image isn\'t ready yet');
- return;
- }
- var width = imgData.width;
- var height = imgData.height;
- var map = [];
- for (var i = 0, ii = positions.length; i < ii; i += 2) {
- map.push({
- transform: [scaleX, 0, 0, scaleY, positions[i], positions[i + 1]],
- x: 0,
- y: 0,
- w: width,
- h: height
- });
- }
- this.paintInlineImageXObjectGroup(imgData, map);
- },
- paintInlineImageXObject: function CanvasGraphics_paintInlineImageXObject(imgData) {
- var width = imgData.width;
- var height = imgData.height;
- var ctx = this.ctx;
- this.save();
- ctx.scale(1 / width, -1 / height);
- var currentTransform = ctx.mozCurrentTransformInverse;
- var a = currentTransform[0],
- b = currentTransform[1];
- var widthScale = Math.max(Math.sqrt(a * a + b * b), 1);
- var c = currentTransform[2],
- d = currentTransform[3];
- var heightScale = Math.max(Math.sqrt(c * c + d * d), 1);
- var imgToPaint, tmpCanvas;
- if (typeof HTMLElement === 'function' && imgData instanceof HTMLElement || !imgData.data) {
- imgToPaint = imgData;
- } else {
- tmpCanvas = this.cachedCanvases.getCanvas('inlineImage', width, height);
- var tmpCtx = tmpCanvas.context;
- putBinaryImageData(tmpCtx, imgData);
- imgToPaint = tmpCanvas.canvas;
- }
- var paintWidth = width,
- paintHeight = height;
- var tmpCanvasId = 'prescale1';
- while (widthScale > 2 && paintWidth > 1 || heightScale > 2 && paintHeight > 1) {
- var newWidth = paintWidth,
- newHeight = paintHeight;
- if (widthScale > 2 && paintWidth > 1) {
- newWidth = Math.ceil(paintWidth / 2);
- widthScale /= paintWidth / newWidth;
- }
- if (heightScale > 2 && paintHeight > 1) {
- newHeight = Math.ceil(paintHeight / 2);
- heightScale /= paintHeight / newHeight;
- }
- tmpCanvas = this.cachedCanvases.getCanvas(tmpCanvasId, newWidth, newHeight);
- tmpCtx = tmpCanvas.context;
- tmpCtx.clearRect(0, 0, newWidth, newHeight);
- tmpCtx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight, 0, 0, newWidth, newHeight);
- imgToPaint = tmpCanvas.canvas;
- paintWidth = newWidth;
- paintHeight = newHeight;
- tmpCanvasId = tmpCanvasId === 'prescale1' ? 'prescale2' : 'prescale1';
- }
- ctx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight, 0, -height, width, height);
- if (this.imageLayer) {
- var position = this.getCanvasPosition(0, -height);
- this.imageLayer.appendImage({
- imgData: imgData,
- left: position[0],
- top: position[1],
- width: width / currentTransform[0],
- height: height / currentTransform[3]
- });
- }
- this.restore();
- },
- paintInlineImageXObjectGroup: function CanvasGraphics_paintInlineImageXObjectGroup(imgData, map) {
- var ctx = this.ctx;
- var w = imgData.width;
- var h = imgData.height;
- var tmpCanvas = this.cachedCanvases.getCanvas('inlineImage', w, h);
- var tmpCtx = tmpCanvas.context;
- putBinaryImageData(tmpCtx, imgData);
- for (var i = 0, ii = map.length; i < ii; i++) {
- var entry = map[i];
- ctx.save();
- ctx.transform.apply(ctx, entry.transform);
- ctx.scale(1, -1);
- ctx.drawImage(tmpCanvas.canvas, entry.x, entry.y, entry.w, entry.h, 0, -1, 1, 1);
- if (this.imageLayer) {
- var position = this.getCanvasPosition(entry.x, entry.y);
- this.imageLayer.appendImage({
- imgData: imgData,
- left: position[0],
- top: position[1],
- width: w,
- height: h
- });
- }
- ctx.restore();
- }
- },
- paintSolidColorImageMask: function CanvasGraphics_paintSolidColorImageMask() {
- this.ctx.fillRect(0, 0, 1, 1);
- },
- paintXObject: function CanvasGraphics_paintXObject() {
- (0, _util.warn)('Unsupported \'paintXObject\' command.');
- },
- markPoint: function CanvasGraphics_markPoint(tag) {},
- markPointProps: function CanvasGraphics_markPointProps(tag, properties) {},
- beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {},
- beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(tag, properties) {},
- endMarkedContent: function CanvasGraphics_endMarkedContent() {},
- beginCompat: function CanvasGraphics_beginCompat() {},
- endCompat: function CanvasGraphics_endCompat() {},
- consumePath: function CanvasGraphics_consumePath() {
- var ctx = this.ctx;
- if (this.pendingClip) {
- if (this.pendingClip === EO_CLIP) {
- ctx.clip('evenodd');
- } else {
- ctx.clip();
- }
- this.pendingClip = null;
+ this.clip();
+ this.endPath();
}
- ctx.beginPath();
+
+ this.transform.apply(this, transform);
+ this.transform.apply(this, matrix);
},
- getSinglePixelWidth: function getSinglePixelWidth(scale) {
- if (this._cachedGetSinglePixelWidth === null) {
- var inverse = this.ctx.mozCurrentTransformInverse;
- this._cachedGetSinglePixelWidth = Math.sqrt(Math.max(inverse[0] * inverse[0] + inverse[1] * inverse[1], inverse[2] * inverse[2] + inverse[3] * inverse[3]));
- }
- return this._cachedGetSinglePixelWidth;
+ endAnnotation: function CanvasGraphics_endAnnotation() {
+ this.restore();
},
+ paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
+ var domImage = this.objs.get(objId);
- getCanvasPosition: function CanvasGraphics_getCanvasPosition(x, y) {
- var transform = this.ctx.mozCurrentTransform;
- return [transform[0] * x + transform[2] * y + transform[4], transform[1] * x + transform[3] * y + transform[5]];
- }
- };
- for (var op in _util.OPS) {
- CanvasGraphics.prototype[_util.OPS[op]] = CanvasGraphics.prototype[op];
- }
- return CanvasGraphics;
-}();
-exports.CanvasGraphics = CanvasGraphics;
-
-/***/ }),
-/* 138 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-
-"use strict";
+ if (!domImage) {
+ (0, _util.warn)('Dependent image isn\'t ready yet');
+ return;
+ }
+ this.save();
+ var ctx = this.ctx;
+ ctx.scale(1 / w, -1 / h);
+ ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height, 0, -h, w, h);
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.TilingPattern = exports.getShadingPatternFromIR = undefined;
+ if (this.imageLayer) {
+ var currentTransform = ctx.mozCurrentTransformInverse;
+ var position = this.getCanvasPosition(0, 0);
+ this.imageLayer.appendImage({
+ objId: objId,
+ left: position[0],
+ top: position[1],
+ width: w / currentTransform[0],
+ height: h / currentTransform[3]
+ });
+ }
-var _util = __w_pdfjs_require__(1);
+ this.restore();
+ },
+ paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(img) {
+ var ctx = this.ctx;
+ var width = img.width,
+ height = img.height;
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+ var glyph = this.processingType3;
-var ShadingIRs = {};
-ShadingIRs.RadialAxial = {
- fromIR: function RadialAxial_fromIR(raw) {
- var type = raw[1];
- var colorStops = raw[2];
- var p0 = raw[3];
- var p1 = raw[4];
- var r0 = raw[5];
- var r1 = raw[6];
- return {
- type: 'Pattern',
- getPattern: function RadialAxial_getPattern(ctx) {
- var grad;
- if (type === 'axial') {
- grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
- } else if (type === 'radial') {
- grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
- }
- for (var i = 0, ii = colorStops.length; i < ii; ++i) {
- var c = colorStops[i];
- grad.addColorStop(c[0], c[1]);
- }
- return grad;
- }
- };
- }
-};
-var createMeshCanvas = function createMeshCanvasClosure() {
- function drawTriangle(data, context, p1, p2, p3, c1, c2, c3) {
- var coords = context.coords,
- colors = context.colors;
- var bytes = data.data,
- rowSize = data.width * 4;
- var tmp;
- if (coords[p1 + 1] > coords[p2 + 1]) {
- tmp = p1;
- p1 = p2;
- p2 = tmp;
- tmp = c1;
- c1 = c2;
- c2 = tmp;
- }
- if (coords[p2 + 1] > coords[p3 + 1]) {
- tmp = p2;
- p2 = p3;
- p3 = tmp;
- tmp = c2;
- c2 = c3;
- c3 = tmp;
- }
- if (coords[p1 + 1] > coords[p2 + 1]) {
- tmp = p1;
- p1 = p2;
- p2 = tmp;
- tmp = c1;
- c1 = c2;
- c2 = tmp;
- }
- var x1 = (coords[p1] + context.offsetX) * context.scaleX;
- var y1 = (coords[p1 + 1] + context.offsetY) * context.scaleY;
- var x2 = (coords[p2] + context.offsetX) * context.scaleX;
- var y2 = (coords[p2 + 1] + context.offsetY) * context.scaleY;
- var x3 = (coords[p3] + context.offsetX) * context.scaleX;
- var y3 = (coords[p3 + 1] + context.offsetY) * context.scaleY;
- if (y1 >= y3) {
- return;
- }
- var c1r = colors[c1],
- c1g = colors[c1 + 1],
- c1b = colors[c1 + 2];
- var c2r = colors[c2],
- c2g = colors[c2 + 1],
- c2b = colors[c2 + 2];
- var c3r = colors[c3],
- c3g = colors[c3 + 1],
- c3b = colors[c3 + 2];
- var minY = Math.round(y1),
- maxY = Math.round(y3);
- var xa, car, cag, cab;
- var xb, cbr, cbg, cbb;
- var k;
- for (var y = minY; y <= maxY; y++) {
- if (y < y2) {
- k = y < y1 ? 0 : y1 === y2 ? 1 : (y1 - y) / (y1 - y2);
- xa = x1 - (x1 - x2) * k;
- car = c1r - (c1r - c2r) * k;
- cag = c1g - (c1g - c2g) * k;
- cab = c1b - (c1b - c2b) * k;
- } else {
- k = y > y3 ? 1 : y2 === y3 ? 0 : (y2 - y) / (y2 - y3);
- xa = x2 - (x2 - x3) * k;
- car = c2r - (c2r - c3r) * k;
- cag = c2g - (c2g - c3g) * k;
- cab = c2b - (c2b - c3b) * k;
- }
- k = y < y1 ? 0 : y > y3 ? 1 : (y1 - y) / (y1 - y3);
- xb = x1 - (x1 - x3) * k;
- cbr = c1r - (c1r - c3r) * k;
- cbg = c1g - (c1g - c3g) * k;
- cbb = c1b - (c1b - c3b) * k;
- var x1_ = Math.round(Math.min(xa, xb));
- var x2_ = Math.round(Math.max(xa, xb));
- var j = rowSize * y + x1_ * 4;
- for (var x = x1_; x <= x2_; x++) {
- k = (xa - x) / (xa - xb);
- k = k < 0 ? 0 : k > 1 ? 1 : k;
- bytes[j++] = car - (car - cbr) * k | 0;
- bytes[j++] = cag - (cag - cbg) * k | 0;
- bytes[j++] = cab - (cab - cbb) * k | 0;
- bytes[j++] = 255;
- }
- }
- }
- function drawFigure(data, figure, context) {
- var ps = figure.coords;
- var cs = figure.colors;
- var i, ii;
- switch (figure.type) {
- case 'lattice':
- var verticesPerRow = figure.verticesPerRow;
- var rows = Math.floor(ps.length / verticesPerRow) - 1;
- var cols = verticesPerRow - 1;
- for (i = 0; i < rows; i++) {
- var q = i * verticesPerRow;
- for (var j = 0; j < cols; j++, q++) {
- drawTriangle(data, context, ps[q], ps[q + 1], ps[q + verticesPerRow], cs[q], cs[q + 1], cs[q + verticesPerRow]);
- drawTriangle(data, context, ps[q + verticesPerRow + 1], ps[q + 1], ps[q + verticesPerRow], cs[q + verticesPerRow + 1], cs[q + 1], cs[q + verticesPerRow]);
- }
- }
- break;
- case 'triangles':
- for (i = 0, ii = ps.length; i < ii; i += 3) {
- drawTriangle(data, context, ps[i], ps[i + 1], ps[i + 2], cs[i], cs[i + 1], cs[i + 2]);
- }
- break;
- default:
- throw new Error('illegal figure');
- }
- }
- function createMeshCanvas(bounds, combinesScale, coords, colors, figures, backgroundColor, cachedCanvases, webGLContext) {
- var EXPECTED_SCALE = 1.1;
- var MAX_PATTERN_SIZE = 3000;
- var BORDER_SIZE = 2;
- var offsetX = Math.floor(bounds[0]);
- var offsetY = Math.floor(bounds[1]);
- var boundsWidth = Math.ceil(bounds[2]) - offsetX;
- var boundsHeight = Math.ceil(bounds[3]) - offsetY;
- var width = Math.min(Math.ceil(Math.abs(boundsWidth * combinesScale[0] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
- var height = Math.min(Math.ceil(Math.abs(boundsHeight * combinesScale[1] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
- var scaleX = boundsWidth / width;
- var scaleY = boundsHeight / height;
- var context = {
- coords: coords,
- colors: colors,
- offsetX: -offsetX,
- offsetY: -offsetY,
- scaleX: 1 / scaleX,
- scaleY: 1 / scaleY
- };
- var paddedWidth = width + BORDER_SIZE * 2;
- var paddedHeight = height + BORDER_SIZE * 2;
- var canvas, tmpCanvas, i, ii;
- if (webGLContext.isEnabled) {
- canvas = webGLContext.drawFigures({
- width: width,
- height: height,
- backgroundColor: backgroundColor,
- figures: figures,
- context: context
- });
- tmpCanvas = cachedCanvases.getCanvas('mesh', paddedWidth, paddedHeight, false);
- tmpCanvas.context.drawImage(canvas, BORDER_SIZE, BORDER_SIZE);
- canvas = tmpCanvas.canvas;
- } else {
- tmpCanvas = cachedCanvases.getCanvas('mesh', paddedWidth, paddedHeight, false);
- var tmpCtx = tmpCanvas.context;
- var data = tmpCtx.createImageData(width, height);
- if (backgroundColor) {
- var bytes = data.data;
- for (i = 0, ii = bytes.length; i < ii; i += 4) {
- bytes[i] = backgroundColor[0];
- bytes[i + 1] = backgroundColor[1];
- bytes[i + 2] = backgroundColor[2];
- bytes[i + 3] = 255;
+ if (COMPILE_TYPE3_GLYPHS && glyph && glyph.compiled === undefined) {
+ if (width <= MAX_SIZE_TO_COMPILE && height <= MAX_SIZE_TO_COMPILE) {
+ glyph.compiled = compileType3Glyph({
+ data: img.data,
+ width: width,
+ height: height
+ });
+ } else {
+ glyph.compiled = null;
}
}
- for (i = 0; i < figures.length; i++) {
- drawFigure(data, figures[i], context);
+
+ if (glyph && glyph.compiled) {
+ glyph.compiled(ctx);
+ return;
}
- tmpCtx.putImageData(data, BORDER_SIZE, BORDER_SIZE);
- canvas = tmpCanvas.canvas;
- }
- return {
- canvas: canvas,
- offsetX: offsetX - BORDER_SIZE * scaleX,
- offsetY: offsetY - BORDER_SIZE * scaleY,
- scaleX: scaleX,
- scaleY: scaleY
- };
- }
- return createMeshCanvas;
-}();
-ShadingIRs.Mesh = {
- fromIR: function Mesh_fromIR(raw) {
- var coords = raw[2];
- var colors = raw[3];
- var figures = raw[4];
- var bounds = raw[5];
- var matrix = raw[6];
- var background = raw[8];
- return {
- type: 'Pattern',
- getPattern: function Mesh_getPattern(ctx, owner, shadingFill) {
- var scale;
- if (shadingFill) {
- scale = _util.Util.singularValueDecompose2dScale(ctx.mozCurrentTransform);
- } else {
- scale = _util.Util.singularValueDecompose2dScale(owner.baseTransform);
- if (matrix) {
- var matrixScale = _util.Util.singularValueDecompose2dScale(matrix);
- scale = [scale[0] * matrixScale[0], scale[1] * matrixScale[1]];
- }
- }
- var temporaryPatternCanvas = createMeshCanvas(bounds, scale, coords, colors, figures, shadingFill ? null : background, owner.cachedCanvases, owner.webGLContext);
- if (!shadingFill) {
- ctx.setTransform.apply(ctx, owner.baseTransform);
- if (matrix) {
- ctx.transform.apply(ctx, matrix);
- }
- }
- ctx.translate(temporaryPatternCanvas.offsetX, temporaryPatternCanvas.offsetY);
- ctx.scale(temporaryPatternCanvas.scaleX, temporaryPatternCanvas.scaleY);
- return ctx.createPattern(temporaryPatternCanvas.canvas, 'no-repeat');
+
+ var maskCanvas = this.cachedCanvases.getCanvas('maskCanvas', width, height);
+ var maskCtx = maskCanvas.context;
+ maskCtx.save();
+ putBinaryImageMask(maskCtx, img);
+ maskCtx.globalCompositeOperation = 'source-in';
+ maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
+ maskCtx.fillRect(0, 0, width, height);
+ maskCtx.restore();
+ this.paintInlineImageXObject(maskCanvas.canvas);
+ },
+ paintImageMaskXObjectRepeat: function CanvasGraphics_paintImageMaskXObjectRepeat(imgData, scaleX, scaleY, positions) {
+ var width = imgData.width;
+ var height = imgData.height;
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+ var maskCanvas = this.cachedCanvases.getCanvas('maskCanvas', width, height);
+ var maskCtx = maskCanvas.context;
+ maskCtx.save();
+ putBinaryImageMask(maskCtx, imgData);
+ maskCtx.globalCompositeOperation = 'source-in';
+ maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
+ maskCtx.fillRect(0, 0, width, height);
+ maskCtx.restore();
+ var ctx = this.ctx;
+
+ for (var i = 0, ii = positions.length; i < ii; i += 2) {
+ ctx.save();
+ ctx.transform(scaleX, 0, 0, scaleY, positions[i], positions[i + 1]);
+ ctx.scale(1, -1);
+ ctx.drawImage(maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
+ ctx.restore();
}
- };
- }
-};
-ShadingIRs.Dummy = {
- fromIR: function Dummy_fromIR() {
- return {
- type: 'Pattern',
- getPattern: function Dummy_fromIR_getPattern() {
- return 'hotpink';
+ },
+ paintImageMaskXObjectGroup: function CanvasGraphics_paintImageMaskXObjectGroup(images) {
+ var ctx = this.ctx;
+ var fillColor = this.current.fillColor;
+ var isPatternFill = this.current.patternFill;
+
+ for (var i = 0, ii = images.length; i < ii; i++) {
+ var image = images[i];
+ var width = image.width,
+ height = image.height;
+ var maskCanvas = this.cachedCanvases.getCanvas('maskCanvas', width, height);
+ var maskCtx = maskCanvas.context;
+ maskCtx.save();
+ putBinaryImageMask(maskCtx, image);
+ maskCtx.globalCompositeOperation = 'source-in';
+ maskCtx.fillStyle = isPatternFill ? fillColor.getPattern(maskCtx, this) : fillColor;
+ maskCtx.fillRect(0, 0, width, height);
+ maskCtx.restore();
+ ctx.save();
+ ctx.transform.apply(ctx, image.transform);
+ ctx.scale(1, -1);
+ ctx.drawImage(maskCanvas.canvas, 0, 0, width, height, 0, -1, 1, 1);
+ ctx.restore();
}
- };
- }
-};
-function getShadingPatternFromIR(raw) {
- var shadingIR = ShadingIRs[raw[0]];
- if (!shadingIR) {
- throw new Error('Unknown IR type: ' + raw[0]);
- }
- return shadingIR.fromIR(raw);
-}
-var TilingPattern = function TilingPatternClosure() {
- var PaintType = {
- COLORED: 1,
- UNCOLORED: 2
- };
- var MAX_PATTERN_SIZE = 3000;
- function TilingPattern(IR, color, ctx, canvasGraphicsFactory, baseTransform) {
- this.operatorList = IR[2];
- this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
- this.bbox = IR[4];
- this.xstep = IR[5];
- this.ystep = IR[6];
- this.paintType = IR[7];
- this.tilingType = IR[8];
- this.color = color;
- this.canvasGraphicsFactory = canvasGraphicsFactory;
- this.baseTransform = baseTransform;
- this.type = 'Pattern';
- this.ctx = ctx;
- }
- TilingPattern.prototype = {
- createPatternCanvas: function TilinPattern_createPatternCanvas(owner) {
- var operatorList = this.operatorList;
- var bbox = this.bbox;
- var xstep = this.xstep;
- var ystep = this.ystep;
- var paintType = this.paintType;
- var tilingType = this.tilingType;
- var color = this.color;
- var canvasGraphicsFactory = this.canvasGraphicsFactory;
- (0, _util.info)('TilingType: ' + tilingType);
- var x0 = bbox[0],
- y0 = bbox[1],
- x1 = bbox[2],
- y1 = bbox[3];
- var topLeft = [x0, y0];
- var botRight = [x0 + xstep, y0 + ystep];
- var width = botRight[0] - topLeft[0];
- var height = botRight[1] - topLeft[1];
- var matrixScale = _util.Util.singularValueDecompose2dScale(this.matrix);
- var curMatrixScale = _util.Util.singularValueDecompose2dScale(this.baseTransform);
- var combinedScale = [matrixScale[0] * curMatrixScale[0], matrixScale[1] * curMatrixScale[1]];
- width = Math.min(Math.ceil(Math.abs(width * combinedScale[0])), MAX_PATTERN_SIZE);
- height = Math.min(Math.ceil(Math.abs(height * combinedScale[1])), MAX_PATTERN_SIZE);
- var tmpCanvas = owner.cachedCanvases.getCanvas('pattern', width, height, true);
- var tmpCtx = tmpCanvas.context;
- var graphics = canvasGraphicsFactory.createCanvasGraphics(tmpCtx);
- graphics.groupLevel = owner.groupLevel;
- this.setFillAndStrokeStyleToContext(graphics, paintType, color);
- this.setScale(width, height, xstep, ystep);
- this.transformToScale(graphics);
- var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
- graphics.transform.apply(graphics, tmpTranslate);
- this.clipBbox(graphics, bbox, x0, y0, x1, y1);
- graphics.executeOperatorList(operatorList);
- return tmpCanvas.canvas;
},
- setScale: function TilingPattern_setScale(width, height, xstep, ystep) {
- this.scale = [width / xstep, height / ystep];
+ paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
+ var imgData = this.objs.get(objId);
+
+ if (!imgData) {
+ (0, _util.warn)('Dependent image isn\'t ready yet');
+ return;
+ }
+
+ this.paintInlineImageXObject(imgData);
+ },
+ paintImageXObjectRepeat: function CanvasGraphics_paintImageXObjectRepeat(objId, scaleX, scaleY, positions) {
+ var imgData = this.objs.get(objId);
+
+ if (!imgData) {
+ (0, _util.warn)('Dependent image isn\'t ready yet');
+ return;
+ }
+
+ var width = imgData.width;
+ var height = imgData.height;
+ var map = [];
+
+ for (var i = 0, ii = positions.length; i < ii; i += 2) {
+ map.push({
+ transform: [scaleX, 0, 0, scaleY, positions[i], positions[i + 1]],
+ x: 0,
+ y: 0,
+ w: width,
+ h: height
+ });
+ }
+
+ this.paintInlineImageXObjectGroup(imgData, map);
+ },
+ paintInlineImageXObject: function CanvasGraphics_paintInlineImageXObject(imgData) {
+ var width = imgData.width;
+ var height = imgData.height;
+ var ctx = this.ctx;
+ this.save();
+ ctx.scale(1 / width, -1 / height);
+ var currentTransform = ctx.mozCurrentTransformInverse;
+ var a = currentTransform[0],
+ b = currentTransform[1];
+ var widthScale = Math.max(Math.sqrt(a * a + b * b), 1);
+ var c = currentTransform[2],
+ d = currentTransform[3];
+ var heightScale = Math.max(Math.sqrt(c * c + d * d), 1);
+ var imgToPaint, tmpCanvas;
+
+ if (typeof HTMLElement === 'function' && imgData instanceof HTMLElement || !imgData.data) {
+ imgToPaint = imgData;
+ } else {
+ tmpCanvas = this.cachedCanvases.getCanvas('inlineImage', width, height);
+ var tmpCtx = tmpCanvas.context;
+ putBinaryImageData(tmpCtx, imgData);
+ imgToPaint = tmpCanvas.canvas;
+ }
+
+ var paintWidth = width,
+ paintHeight = height;
+ var tmpCanvasId = 'prescale1';
+
+ while (widthScale > 2 && paintWidth > 1 || heightScale > 2 && paintHeight > 1) {
+ var newWidth = paintWidth,
+ newHeight = paintHeight;
+
+ if (widthScale > 2 && paintWidth > 1) {
+ newWidth = Math.ceil(paintWidth / 2);
+ widthScale /= paintWidth / newWidth;
+ }
+
+ if (heightScale > 2 && paintHeight > 1) {
+ newHeight = Math.ceil(paintHeight / 2);
+ heightScale /= paintHeight / newHeight;
+ }
+
+ tmpCanvas = this.cachedCanvases.getCanvas(tmpCanvasId, newWidth, newHeight);
+ tmpCtx = tmpCanvas.context;
+ tmpCtx.clearRect(0, 0, newWidth, newHeight);
+ tmpCtx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight, 0, 0, newWidth, newHeight);
+ imgToPaint = tmpCanvas.canvas;
+ paintWidth = newWidth;
+ paintHeight = newHeight;
+ tmpCanvasId = tmpCanvasId === 'prescale1' ? 'prescale2' : 'prescale1';
+ }
+
+ ctx.drawImage(imgToPaint, 0, 0, paintWidth, paintHeight, 0, -height, width, height);
+
+ if (this.imageLayer) {
+ var position = this.getCanvasPosition(0, -height);
+ this.imageLayer.appendImage({
+ imgData: imgData,
+ left: position[0],
+ top: position[1],
+ width: width / currentTransform[0],
+ height: height / currentTransform[3]
+ });
+ }
+
+ this.restore();
+ },
+ paintInlineImageXObjectGroup: function CanvasGraphics_paintInlineImageXObjectGroup(imgData, map) {
+ var ctx = this.ctx;
+ var w = imgData.width;
+ var h = imgData.height;
+ var tmpCanvas = this.cachedCanvases.getCanvas('inlineImage', w, h);
+ var tmpCtx = tmpCanvas.context;
+ putBinaryImageData(tmpCtx, imgData);
+
+ for (var i = 0, ii = map.length; i < ii; i++) {
+ var entry = map[i];
+ ctx.save();
+ ctx.transform.apply(ctx, entry.transform);
+ ctx.scale(1, -1);
+ ctx.drawImage(tmpCanvas.canvas, entry.x, entry.y, entry.w, entry.h, 0, -1, 1, 1);
+
+ if (this.imageLayer) {
+ var position = this.getCanvasPosition(entry.x, entry.y);
+ this.imageLayer.appendImage({
+ imgData: imgData,
+ left: position[0],
+ top: position[1],
+ width: w,
+ height: h
+ });
+ }
+
+ ctx.restore();
+ }
},
- transformToScale: function TilingPattern_transformToScale(graphics) {
- var scale = this.scale;
- var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
- graphics.transform.apply(graphics, tmpScale);
+ paintSolidColorImageMask: function CanvasGraphics_paintSolidColorImageMask() {
+ this.ctx.fillRect(0, 0, 1, 1);
},
- scaleToContext: function TilingPattern_scaleToContext() {
- var scale = this.scale;
- this.ctx.scale(1 / scale[0], 1 / scale[1]);
+ paintXObject: function CanvasGraphics_paintXObject() {
+ (0, _util.warn)('Unsupported \'paintXObject\' command.');
},
- clipBbox: function clipBbox(graphics, bbox, x0, y0, x1, y1) {
- if (Array.isArray(bbox) && bbox.length === 4) {
- var bboxWidth = x1 - x0;
- var bboxHeight = y1 - y0;
- graphics.ctx.rect(x0, y0, bboxWidth, bboxHeight);
- graphics.clip();
- graphics.endPath();
+ markPoint: function CanvasGraphics_markPoint(tag) {},
+ markPointProps: function CanvasGraphics_markPointProps(tag, properties) {},
+ beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {},
+ beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(tag, properties) {},
+ endMarkedContent: function CanvasGraphics_endMarkedContent() {},
+ beginCompat: function CanvasGraphics_beginCompat() {},
+ endCompat: function CanvasGraphics_endCompat() {},
+ consumePath: function CanvasGraphics_consumePath() {
+ var ctx = this.ctx;
+
+ if (this.pendingClip) {
+ if (this.pendingClip === EO_CLIP) {
+ ctx.clip('evenodd');
+ } else {
+ ctx.clip();
+ }
+
+ this.pendingClip = null;
}
+
+ ctx.beginPath();
},
- setFillAndStrokeStyleToContext: function setFillAndStrokeStyleToContext(graphics, paintType, color) {
- var context = graphics.ctx,
- current = graphics.current;
- switch (paintType) {
- case PaintType.COLORED:
- var ctx = this.ctx;
- context.fillStyle = ctx.fillStyle;
- context.strokeStyle = ctx.strokeStyle;
- current.fillColor = ctx.fillStyle;
- current.strokeColor = ctx.strokeStyle;
- break;
- case PaintType.UNCOLORED:
- var cssColor = _util.Util.makeCssRgb(color[0], color[1], color[2]);
- context.fillStyle = cssColor;
- context.strokeStyle = cssColor;
- current.fillColor = cssColor;
- current.strokeColor = cssColor;
- break;
- default:
- throw new _util.FormatError('Unsupported paint type: ' + paintType);
+ getSinglePixelWidth: function getSinglePixelWidth(scale) {
+ if (this._cachedGetSinglePixelWidth === null) {
+ var inverse = this.ctx.mozCurrentTransformInverse;
+ this._cachedGetSinglePixelWidth = Math.sqrt(Math.max(inverse[0] * inverse[0] + inverse[1] * inverse[1], inverse[2] * inverse[2] + inverse[3] * inverse[3]));
}
+
+ return this._cachedGetSinglePixelWidth;
},
- getPattern: function TilingPattern_getPattern(ctx, owner) {
- var temporaryPatternCanvas = this.createPatternCanvas(owner);
- ctx = this.ctx;
- ctx.setTransform.apply(ctx, this.baseTransform);
- ctx.transform.apply(ctx, this.matrix);
- this.scaleToContext();
- return ctx.createPattern(temporaryPatternCanvas, 'repeat');
+ getCanvasPosition: function CanvasGraphics_getCanvasPosition(x, y) {
+ var transform = this.ctx.mozCurrentTransform;
+ return [transform[0] * x + transform[2] * y + transform[4], transform[1] * x + transform[3] * y + transform[5]];
}
};
- return TilingPattern;
-}();
-exports.getShadingPatternFromIR = getShadingPatternFromIR;
-exports.TilingPattern = TilingPattern;
-
-/***/ }),
-/* 139 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
-"use strict";
+ for (var op in _util.OPS) {
+ CanvasGraphics.prototype[_util.OPS[op]] = CanvasGraphics.prototype[op];
+ }
+ return CanvasGraphics;
+}();
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-var GlobalWorkerOptions = Object.create(null);
-GlobalWorkerOptions.workerPort = GlobalWorkerOptions.workerPort === undefined ? null : GlobalWorkerOptions.workerPort;
-GlobalWorkerOptions.workerSrc = GlobalWorkerOptions.workerSrc === undefined ? '' : GlobalWorkerOptions.workerSrc;
-exports.GlobalWorkerOptions = GlobalWorkerOptions;
+exports.CanvasGraphics = CanvasGraphics;
/***/ }),
-/* 140 */
+/* 142 */
/***/ (function(module, exports, __w_pdfjs_require__) {
"use strict";
@@ -12756,974 +15554,949 @@ exports.GlobalWorkerOptions = GlobalWorkerOptions;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.MessageHandler = undefined;
-
-var _regenerator = __w_pdfjs_require__(141);
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var resolveCall = function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(fn, args) {
- var thisArg = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
- return _regenerator2.default.wrap(function _callee$(_context) {
- while (1) {
- switch (_context.prev = _context.next) {
- case 0:
- if (fn) {
- _context.next = 2;
- break;
- }
-
- return _context.abrupt('return');
-
- case 2:
- return _context.abrupt('return', fn.apply(thisArg, args));
-
- case 3:
- case 'end':
- return _context.stop();
- }
- }
- }, _callee, this);
- }));
-
- return function resolveCall(_x2, _x3) {
- return _ref.apply(this, arguments);
- };
-}();
+exports.getShadingPatternFromIR = getShadingPatternFromIR;
+exports.TilingPattern = void 0;
var _util = __w_pdfjs_require__(1);
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+var ShadingIRs = {};
+ShadingIRs.RadialAxial = {
+ fromIR: function RadialAxial_fromIR(raw) {
+ var type = raw[1];
+ var colorStops = raw[2];
+ var p0 = raw[3];
+ var p1 = raw[4];
+ var r0 = raw[5];
+ var r1 = raw[6];
+ return {
+ type: 'Pattern',
+ getPattern: function RadialAxial_getPattern(ctx) {
+ var grad;
-function wrapReason(reason) {
- if ((typeof reason === 'undefined' ? 'undefined' : _typeof(reason)) !== 'object') {
- return reason;
- }
- switch (reason.name) {
- case 'AbortException':
- return new _util.AbortException(reason.message);
- case 'MissingPDFException':
- return new _util.MissingPDFException(reason.message);
- case 'UnexpectedResponseException':
- return new _util.UnexpectedResponseException(reason.message, reason.status);
- default:
- return new _util.UnknownErrorException(reason.message, reason.details);
- }
-}
-function makeReasonSerializable(reason) {
- if (!(reason instanceof Error) || reason instanceof _util.AbortException || reason instanceof _util.MissingPDFException || reason instanceof _util.UnexpectedResponseException || reason instanceof _util.UnknownErrorException) {
- return reason;
- }
- return new _util.UnknownErrorException(reason.message, reason.toString());
-}
-function resolveOrReject(capability, success, reason) {
- if (success) {
- capability.resolve();
- } else {
- capability.reject(reason);
- }
-}
-function finalize(promise) {
- return Promise.resolve(promise).catch(function () {});
-}
-function MessageHandler(sourceName, targetName, comObj) {
- var _this = this;
+ if (type === 'axial') {
+ grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
+ } else if (type === 'radial') {
+ grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
+ }
- this.sourceName = sourceName;
- this.targetName = targetName;
- this.comObj = comObj;
- this.callbackId = 1;
- this.streamId = 1;
- this.postMessageTransfers = true;
- this.streamSinks = Object.create(null);
- this.streamControllers = Object.create(null);
- var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
- var ah = this.actionHandler = Object.create(null);
- this._onComObjOnMessage = function (event) {
- var data = event.data;
- if (data.targetName !== _this.sourceName) {
- return;
- }
- if (data.stream) {
- _this._processStreamMessage(data);
- } else if (data.isReply) {
- var callbackId = data.callbackId;
- if (data.callbackId in callbacksCapabilities) {
- var callback = callbacksCapabilities[callbackId];
- delete callbacksCapabilities[callbackId];
- if ('error' in data) {
- callback.reject(wrapReason(data.error));
- } else {
- callback.resolve(data.data);
+ for (var i = 0, ii = colorStops.length; i < ii; ++i) {
+ var c = colorStops[i];
+ grad.addColorStop(c[0], c[1]);
}
- } else {
- throw new Error('Cannot resolve callback ' + callbackId);
- }
- } else if (data.action in ah) {
- var action = ah[data.action];
- if (data.callbackId) {
- var _sourceName = _this.sourceName;
- var _targetName = data.sourceName;
- Promise.resolve().then(function () {
- return action[0].call(action[1], data.data);
- }).then(function (result) {
- comObj.postMessage({
- sourceName: _sourceName,
- targetName: _targetName,
- isReply: true,
- callbackId: data.callbackId,
- data: result
- });
- }, function (reason) {
- comObj.postMessage({
- sourceName: _sourceName,
- targetName: _targetName,
- isReply: true,
- callbackId: data.callbackId,
- error: makeReasonSerializable(reason)
- });
- });
- } else if (data.streamId) {
- _this._createStreamSink(data);
- } else {
- action[0].call(action[1], data.data);
+
+ return grad;
}
- } else {
- throw new Error('Unknown action from worker: ' + data.action);
+ };
+ }
+};
+
+var createMeshCanvas = function createMeshCanvasClosure() {
+ function drawTriangle(data, context, p1, p2, p3, c1, c2, c3) {
+ var coords = context.coords,
+ colors = context.colors;
+ var bytes = data.data,
+ rowSize = data.width * 4;
+ var tmp;
+
+ if (coords[p1 + 1] > coords[p2 + 1]) {
+ tmp = p1;
+ p1 = p2;
+ p2 = tmp;
+ tmp = c1;
+ c1 = c2;
+ c2 = tmp;
}
- };
- comObj.addEventListener('message', this._onComObjOnMessage);
-}
-MessageHandler.prototype = {
- on: function on(actionName, handler, scope) {
- var ah = this.actionHandler;
- if (ah[actionName]) {
- throw new Error('There is already an actionName called "' + actionName + '"');
+
+ if (coords[p2 + 1] > coords[p3 + 1]) {
+ tmp = p2;
+ p2 = p3;
+ p3 = tmp;
+ tmp = c2;
+ c2 = c3;
+ c3 = tmp;
}
- ah[actionName] = [handler, scope];
- },
- send: function send(actionName, data, transfers) {
- var message = {
- sourceName: this.sourceName,
- targetName: this.targetName,
- action: actionName,
- data: data
- };
- this.postMessage(message, transfers);
- },
- sendWithPromise: function sendWithPromise(actionName, data, transfers) {
- var callbackId = this.callbackId++;
- var message = {
- sourceName: this.sourceName,
- targetName: this.targetName,
- action: actionName,
- data: data,
- callbackId: callbackId
- };
- var capability = (0, _util.createPromiseCapability)();
- this.callbacksCapabilities[callbackId] = capability;
- try {
- this.postMessage(message, transfers);
- } catch (e) {
- capability.reject(e);
+
+ if (coords[p1 + 1] > coords[p2 + 1]) {
+ tmp = p1;
+ p1 = p2;
+ p2 = tmp;
+ tmp = c1;
+ c1 = c2;
+ c2 = tmp;
}
- return capability.promise;
- },
- sendWithStream: function sendWithStream(actionName, data, queueingStrategy, transfers) {
- var _this2 = this;
- var streamId = this.streamId++;
- var sourceName = this.sourceName;
- var targetName = this.targetName;
- return new _util.ReadableStream({
- start: function start(controller) {
- var startCapability = (0, _util.createPromiseCapability)();
- _this2.streamControllers[streamId] = {
- controller: controller,
- startCall: startCapability,
- isClosed: false
- };
- _this2.postMessage({
- sourceName: sourceName,
- targetName: targetName,
- action: actionName,
- streamId: streamId,
- data: data,
- desiredSize: controller.desiredSize
- });
- return startCapability.promise;
- },
- pull: function pull(controller) {
- var pullCapability = (0, _util.createPromiseCapability)();
- _this2.streamControllers[streamId].pullCall = pullCapability;
- _this2.postMessage({
- sourceName: sourceName,
- targetName: targetName,
- stream: 'pull',
- streamId: streamId,
- desiredSize: controller.desiredSize
- });
- return pullCapability.promise;
- },
- cancel: function cancel(reason) {
- var cancelCapability = (0, _util.createPromiseCapability)();
- _this2.streamControllers[streamId].cancelCall = cancelCapability;
- _this2.streamControllers[streamId].isClosed = true;
- _this2.postMessage({
- sourceName: sourceName,
- targetName: targetName,
- stream: 'cancel',
- reason: reason,
- streamId: streamId
- });
- return cancelCapability.promise;
- }
- }, queueingStrategy);
- },
- _createStreamSink: function _createStreamSink(data) {
- var _this3 = this;
+ var x1 = (coords[p1] + context.offsetX) * context.scaleX;
+ var y1 = (coords[p1 + 1] + context.offsetY) * context.scaleY;
+ var x2 = (coords[p2] + context.offsetX) * context.scaleX;
+ var y2 = (coords[p2 + 1] + context.offsetY) * context.scaleY;
+ var x3 = (coords[p3] + context.offsetX) * context.scaleX;
+ var y3 = (coords[p3 + 1] + context.offsetY) * context.scaleY;
- var self = this;
- var action = this.actionHandler[data.action];
- var streamId = data.streamId;
- var desiredSize = data.desiredSize;
- var sourceName = this.sourceName;
- var targetName = data.sourceName;
- var capability = (0, _util.createPromiseCapability)();
- var sendStreamRequest = function sendStreamRequest(_ref2) {
- var stream = _ref2.stream,
- chunk = _ref2.chunk,
- transfers = _ref2.transfers,
- success = _ref2.success,
- reason = _ref2.reason;
+ if (y1 >= y3) {
+ return;
+ }
- _this3.postMessage({
- sourceName: sourceName,
- targetName: targetName,
- stream: stream,
- streamId: streamId,
- chunk: chunk,
- success: success,
- reason: reason
- }, transfers);
- };
- var streamSink = {
- enqueue: function enqueue(chunk) {
- var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
- var transfers = arguments[2];
+ var c1r = colors[c1],
+ c1g = colors[c1 + 1],
+ c1b = colors[c1 + 2];
+ var c2r = colors[c2],
+ c2g = colors[c2 + 1],
+ c2b = colors[c2 + 2];
+ var c3r = colors[c3],
+ c3g = colors[c3 + 1],
+ c3b = colors[c3 + 2];
+ var minY = Math.round(y1),
+ maxY = Math.round(y3);
+ var xa, car, cag, cab;
+ var xb, cbr, cbg, cbb;
+ var k;
- if (this.isCancelled) {
- return;
- }
- var lastDesiredSize = this.desiredSize;
- this.desiredSize -= size;
- if (lastDesiredSize > 0 && this.desiredSize <= 0) {
- this.sinkCapability = (0, _util.createPromiseCapability)();
- this.ready = this.sinkCapability.promise;
- }
- sendStreamRequest({
- stream: 'enqueue',
- chunk: chunk,
- transfers: transfers
- });
- },
- close: function close() {
- if (this.isCancelled) {
- return;
- }
- this.isCancelled = true;
- sendStreamRequest({ stream: 'close' });
- delete self.streamSinks[streamId];
- },
- error: function error(reason) {
- if (this.isCancelled) {
- return;
- }
- this.isCancelled = true;
- sendStreamRequest({
- stream: 'error',
- reason: reason
- });
- },
+ for (var y = minY; y <= maxY; y++) {
+ if (y < y2) {
+ k = y < y1 ? 0 : y1 === y2 ? 1 : (y1 - y) / (y1 - y2);
+ xa = x1 - (x1 - x2) * k;
+ car = c1r - (c1r - c2r) * k;
+ cag = c1g - (c1g - c2g) * k;
+ cab = c1b - (c1b - c2b) * k;
+ } else {
+ k = y > y3 ? 1 : y2 === y3 ? 0 : (y2 - y) / (y2 - y3);
+ xa = x2 - (x2 - x3) * k;
+ car = c2r - (c2r - c3r) * k;
+ cag = c2g - (c2g - c3g) * k;
+ cab = c2b - (c2b - c3b) * k;
+ }
+
+ k = y < y1 ? 0 : y > y3 ? 1 : (y1 - y) / (y1 - y3);
+ xb = x1 - (x1 - x3) * k;
+ cbr = c1r - (c1r - c3r) * k;
+ cbg = c1g - (c1g - c3g) * k;
+ cbb = c1b - (c1b - c3b) * k;
+ var x1_ = Math.round(Math.min(xa, xb));
+ var x2_ = Math.round(Math.max(xa, xb));
+ var j = rowSize * y + x1_ * 4;
- sinkCapability: capability,
- onPull: null,
- onCancel: null,
- isCancelled: false,
- desiredSize: desiredSize,
- ready: null
- };
- streamSink.sinkCapability.resolve();
- streamSink.ready = streamSink.sinkCapability.promise;
- this.streamSinks[streamId] = streamSink;
- resolveCall(action[0], [data.data, streamSink], action[1]).then(function () {
- sendStreamRequest({
- stream: 'start_complete',
- success: true
- });
- }, function (reason) {
- sendStreamRequest({
- stream: 'start_complete',
- success: false,
- reason: reason
- });
- });
- },
- _processStreamMessage: function _processStreamMessage(data) {
- var _this4 = this;
+ for (var x = x1_; x <= x2_; x++) {
+ k = (xa - x) / (xa - xb);
+ k = k < 0 ? 0 : k > 1 ? 1 : k;
+ bytes[j++] = car - (car - cbr) * k | 0;
+ bytes[j++] = cag - (cag - cbg) * k | 0;
+ bytes[j++] = cab - (cab - cbb) * k | 0;
+ bytes[j++] = 255;
+ }
+ }
+ }
- var sourceName = this.sourceName;
- var targetName = data.sourceName;
- var streamId = data.streamId;
- var sendStreamResponse = function sendStreamResponse(_ref3) {
- var stream = _ref3.stream,
- success = _ref3.success,
- reason = _ref3.reason;
+ function drawFigure(data, figure, context) {
+ var ps = figure.coords;
+ var cs = figure.colors;
+ var i, ii;
- _this4.comObj.postMessage({
- sourceName: sourceName,
- targetName: targetName,
- stream: stream,
- success: success,
- streamId: streamId,
- reason: reason
- });
- };
- var deleteStreamController = function deleteStreamController() {
- Promise.all([_this4.streamControllers[data.streamId].startCall, _this4.streamControllers[data.streamId].pullCall, _this4.streamControllers[data.streamId].cancelCall].map(function (capability) {
- return capability && finalize(capability.promise);
- })).then(function () {
- delete _this4.streamControllers[data.streamId];
- });
- };
- switch (data.stream) {
- case 'start_complete':
- resolveOrReject(this.streamControllers[data.streamId].startCall, data.success, wrapReason(data.reason));
- break;
- case 'pull_complete':
- resolveOrReject(this.streamControllers[data.streamId].pullCall, data.success, wrapReason(data.reason));
- break;
- case 'pull':
- if (!this.streamSinks[data.streamId]) {
- sendStreamResponse({
- stream: 'pull_complete',
- success: true
- });
- break;
- }
- if (this.streamSinks[data.streamId].desiredSize <= 0 && data.desiredSize > 0) {
- this.streamSinks[data.streamId].sinkCapability.resolve();
- }
- this.streamSinks[data.streamId].desiredSize = data.desiredSize;
- resolveCall(this.streamSinks[data.streamId].onPull).then(function () {
- sendStreamResponse({
- stream: 'pull_complete',
- success: true
- });
- }, function (reason) {
- sendStreamResponse({
- stream: 'pull_complete',
- success: false,
- reason: reason
- });
- });
- break;
- case 'enqueue':
- (0, _util.assert)(this.streamControllers[data.streamId], 'enqueue should have stream controller');
- if (!this.streamControllers[data.streamId].isClosed) {
- this.streamControllers[data.streamId].controller.enqueue(data.chunk);
- }
- break;
- case 'close':
- (0, _util.assert)(this.streamControllers[data.streamId], 'close should have stream controller');
- if (this.streamControllers[data.streamId].isClosed) {
- break;
+ switch (figure.type) {
+ case 'lattice':
+ var verticesPerRow = figure.verticesPerRow;
+ var rows = Math.floor(ps.length / verticesPerRow) - 1;
+ var cols = verticesPerRow - 1;
+
+ for (i = 0; i < rows; i++) {
+ var q = i * verticesPerRow;
+
+ for (var j = 0; j < cols; j++, q++) {
+ drawTriangle(data, context, ps[q], ps[q + 1], ps[q + verticesPerRow], cs[q], cs[q + 1], cs[q + verticesPerRow]);
+ drawTriangle(data, context, ps[q + verticesPerRow + 1], ps[q + 1], ps[q + verticesPerRow], cs[q + verticesPerRow + 1], cs[q + 1], cs[q + verticesPerRow]);
+ }
}
- this.streamControllers[data.streamId].isClosed = true;
- this.streamControllers[data.streamId].controller.close();
- deleteStreamController();
- break;
- case 'error':
- (0, _util.assert)(this.streamControllers[data.streamId], 'error should have stream controller');
- this.streamControllers[data.streamId].controller.error(wrapReason(data.reason));
- deleteStreamController();
- break;
- case 'cancel_complete':
- resolveOrReject(this.streamControllers[data.streamId].cancelCall, data.success, wrapReason(data.reason));
- deleteStreamController();
+
break;
- case 'cancel':
- if (!this.streamSinks[data.streamId]) {
- break;
+
+ case 'triangles':
+ for (i = 0, ii = ps.length; i < ii; i += 3) {
+ drawTriangle(data, context, ps[i], ps[i + 1], ps[i + 2], cs[i], cs[i + 1], cs[i + 2]);
}
- resolveCall(this.streamSinks[data.streamId].onCancel, [wrapReason(data.reason)]).then(function () {
- sendStreamResponse({
- stream: 'cancel_complete',
- success: true
- });
- }, function (reason) {
- sendStreamResponse({
- stream: 'cancel_complete',
- success: false,
- reason: reason
- });
- });
- this.streamSinks[data.streamId].sinkCapability.reject(wrapReason(data.reason));
- this.streamSinks[data.streamId].isCancelled = true;
- delete this.streamSinks[data.streamId];
+
break;
+
default:
- throw new Error('Unexpected stream case');
+ throw new Error('illegal figure');
}
- },
- postMessage: function postMessage(message, transfers) {
- if (transfers && this.postMessageTransfers) {
- this.comObj.postMessage(message, transfers);
+ }
+
+ function createMeshCanvas(bounds, combinesScale, coords, colors, figures, backgroundColor, cachedCanvases, webGLContext) {
+ var EXPECTED_SCALE = 1.1;
+ var MAX_PATTERN_SIZE = 3000;
+ var BORDER_SIZE = 2;
+ var offsetX = Math.floor(bounds[0]);
+ var offsetY = Math.floor(bounds[1]);
+ var boundsWidth = Math.ceil(bounds[2]) - offsetX;
+ var boundsHeight = Math.ceil(bounds[3]) - offsetY;
+ var width = Math.min(Math.ceil(Math.abs(boundsWidth * combinesScale[0] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
+ var height = Math.min(Math.ceil(Math.abs(boundsHeight * combinesScale[1] * EXPECTED_SCALE)), MAX_PATTERN_SIZE);
+ var scaleX = boundsWidth / width;
+ var scaleY = boundsHeight / height;
+ var context = {
+ coords: coords,
+ colors: colors,
+ offsetX: -offsetX,
+ offsetY: -offsetY,
+ scaleX: 1 / scaleX,
+ scaleY: 1 / scaleY
+ };
+ var paddedWidth = width + BORDER_SIZE * 2;
+ var paddedHeight = height + BORDER_SIZE * 2;
+ var canvas, tmpCanvas, i, ii;
+
+ if (webGLContext.isEnabled) {
+ canvas = webGLContext.drawFigures({
+ width: width,
+ height: height,
+ backgroundColor: backgroundColor,
+ figures: figures,
+ context: context
+ });
+ tmpCanvas = cachedCanvases.getCanvas('mesh', paddedWidth, paddedHeight, false);
+ tmpCanvas.context.drawImage(canvas, BORDER_SIZE, BORDER_SIZE);
+ canvas = tmpCanvas.canvas;
} else {
- this.comObj.postMessage(message);
+ tmpCanvas = cachedCanvases.getCanvas('mesh', paddedWidth, paddedHeight, false);
+ var tmpCtx = tmpCanvas.context;
+ var data = tmpCtx.createImageData(width, height);
+
+ if (backgroundColor) {
+ var bytes = data.data;
+
+ for (i = 0, ii = bytes.length; i < ii; i += 4) {
+ bytes[i] = backgroundColor[0];
+ bytes[i + 1] = backgroundColor[1];
+ bytes[i + 2] = backgroundColor[2];
+ bytes[i + 3] = 255;
+ }
+ }
+
+ for (i = 0; i < figures.length; i++) {
+ drawFigure(data, figures[i], context);
+ }
+
+ tmpCtx.putImageData(data, BORDER_SIZE, BORDER_SIZE);
+ canvas = tmpCanvas.canvas;
}
- },
- destroy: function destroy() {
- this.comObj.removeEventListener('message', this._onComObjOnMessage);
+
+ return {
+ canvas: canvas,
+ offsetX: offsetX - BORDER_SIZE * scaleX,
+ offsetY: offsetY - BORDER_SIZE * scaleY,
+ scaleX: scaleX,
+ scaleY: scaleY
+ };
}
-};
-exports.MessageHandler = MessageHandler;
-/***/ }),
-/* 141 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+ return createMeshCanvas;
+}();
-"use strict";
+ShadingIRs.Mesh = {
+ fromIR: function Mesh_fromIR(raw) {
+ var coords = raw[2];
+ var colors = raw[3];
+ var figures = raw[4];
+ var bounds = raw[5];
+ var matrix = raw[6];
+ var background = raw[8];
+ return {
+ type: 'Pattern',
+ getPattern: function Mesh_getPattern(ctx, owner, shadingFill) {
+ var scale;
+
+ if (shadingFill) {
+ scale = _util.Util.singularValueDecompose2dScale(ctx.mozCurrentTransform);
+ } else {
+ scale = _util.Util.singularValueDecompose2dScale(owner.baseTransform);
+
+ if (matrix) {
+ var matrixScale = _util.Util.singularValueDecompose2dScale(matrix);
+
+ scale = [scale[0] * matrixScale[0], scale[1] * matrixScale[1]];
+ }
+ }
+ var temporaryPatternCanvas = createMeshCanvas(bounds, scale, coords, colors, figures, shadingFill ? null : background, owner.cachedCanvases, owner.webGLContext);
-module.exports = __w_pdfjs_require__(142);
+ if (!shadingFill) {
+ ctx.setTransform.apply(ctx, owner.baseTransform);
-/***/ }),
-/* 142 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+ if (matrix) {
+ ctx.transform.apply(ctx, matrix);
+ }
+ }
-"use strict";
+ ctx.translate(temporaryPatternCanvas.offsetX, temporaryPatternCanvas.offsetY);
+ ctx.scale(temporaryPatternCanvas.scaleX, temporaryPatternCanvas.scaleY);
+ return ctx.createPattern(temporaryPatternCanvas.canvas, 'no-repeat');
+ }
+ };
+ }
+};
+ShadingIRs.Dummy = {
+ fromIR: function Dummy_fromIR() {
+ return {
+ type: 'Pattern',
+ getPattern: function Dummy_fromIR_getPattern() {
+ return 'hotpink';
+ }
+ };
+ }
+};
+function getShadingPatternFromIR(raw) {
+ var shadingIR = ShadingIRs[raw[0]];
-var g = function () {
- return this;
-}() || Function("return this")();
-var hadRuntime = g.regeneratorRuntime && Object.getOwnPropertyNames(g).indexOf("regeneratorRuntime") >= 0;
-var oldRuntime = hadRuntime && g.regeneratorRuntime;
-g.regeneratorRuntime = undefined;
-module.exports = __w_pdfjs_require__(143);
-if (hadRuntime) {
- g.regeneratorRuntime = oldRuntime;
-} else {
- try {
- delete g.regeneratorRuntime;
- } catch (e) {
- g.regeneratorRuntime = undefined;
+ if (!shadingIR) {
+ throw new Error("Unknown IR type: ".concat(raw[0]));
}
+
+ return shadingIR.fromIR(raw);
}
-/***/ }),
-/* 143 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+var TilingPattern = function TilingPatternClosure() {
+ var PaintType = {
+ COLORED: 1,
+ UNCOLORED: 2
+ };
+ var MAX_PATTERN_SIZE = 3000;
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
+ function TilingPattern(IR, color, ctx, canvasGraphicsFactory, baseTransform) {
+ this.operatorList = IR[2];
+ this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
+ this.bbox = IR[4];
+ this.xstep = IR[5];
+ this.ystep = IR[6];
+ this.paintType = IR[7];
+ this.tilingType = IR[8];
+ this.color = color;
+ this.canvasGraphicsFactory = canvasGraphicsFactory;
+ this.baseTransform = baseTransform;
+ this.type = 'Pattern';
+ this.ctx = ctx;
+ }
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+ TilingPattern.prototype = {
+ createPatternCanvas: function TilinPattern_createPatternCanvas(owner) {
+ var operatorList = this.operatorList;
+ var bbox = this.bbox;
+ var xstep = this.xstep;
+ var ystep = this.ystep;
+ var paintType = this.paintType;
+ var tilingType = this.tilingType;
+ var color = this.color;
+ var canvasGraphicsFactory = this.canvasGraphicsFactory;
+ (0, _util.info)('TilingType: ' + tilingType);
+ var x0 = bbox[0],
+ y0 = bbox[1],
+ x1 = bbox[2],
+ y1 = bbox[3];
+ var topLeft = [x0, y0];
+ var botRight = [x0 + xstep, y0 + ystep];
+ var width = botRight[0] - topLeft[0];
+ var height = botRight[1] - topLeft[1];
-!function (global) {
- "use strict";
+ var matrixScale = _util.Util.singularValueDecompose2dScale(this.matrix);
- var Op = Object.prototype;
- var hasOwn = Op.hasOwnProperty;
- var undefined;
- var $Symbol = typeof Symbol === "function" ? Symbol : {};
- var iteratorSymbol = $Symbol.iterator || "@@iterator";
- var asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator";
- var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
- var inModule = ( false ? undefined : _typeof(module)) === "object";
- var runtime = global.regeneratorRuntime;
- if (runtime) {
- if (inModule) {
- module.exports = runtime;
- }
- return;
- }
- runtime = global.regeneratorRuntime = inModule ? module.exports : {};
- function wrap(innerFn, outerFn, self, tryLocsList) {
- var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
- var generator = Object.create(protoGenerator.prototype);
- var context = new Context(tryLocsList || []);
- generator._invoke = makeInvokeMethod(innerFn, self, context);
- return generator;
- }
- runtime.wrap = wrap;
- function tryCatch(fn, obj, arg) {
- try {
- return {
- type: "normal",
- arg: fn.call(obj, arg)
- };
- } catch (err) {
- return {
- type: "throw",
- arg: err
- };
- }
- }
- var GenStateSuspendedStart = "suspendedStart";
- var GenStateSuspendedYield = "suspendedYield";
- var GenStateExecuting = "executing";
- var GenStateCompleted = "completed";
- var ContinueSentinel = {};
- function Generator() {}
- function GeneratorFunction() {}
- function GeneratorFunctionPrototype() {}
- var IteratorPrototype = {};
- IteratorPrototype[iteratorSymbol] = function () {
- return this;
- };
- var getProto = Object.getPrototypeOf;
- var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
- if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
- IteratorPrototype = NativeIteratorPrototype;
- }
- var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
- GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
- GeneratorFunctionPrototype.constructor = GeneratorFunction;
- GeneratorFunctionPrototype[toStringTagSymbol] = GeneratorFunction.displayName = "GeneratorFunction";
- function defineIteratorMethods(prototype) {
- ["next", "throw", "return"].forEach(function (method) {
- prototype[method] = function (arg) {
- return this._invoke(method, arg);
- };
- });
- }
- runtime.isGeneratorFunction = function (genFun) {
- var ctor = typeof genFun === "function" && genFun.constructor;
- return ctor ? ctor === GeneratorFunction || (ctor.displayName || ctor.name) === "GeneratorFunction" : false;
- };
- runtime.mark = function (genFun) {
- if (Object.setPrototypeOf) {
- Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
- } else {
- genFun.__proto__ = GeneratorFunctionPrototype;
- if (!(toStringTagSymbol in genFun)) {
- genFun[toStringTagSymbol] = "GeneratorFunction";
- }
- }
- genFun.prototype = Object.create(Gp);
- return genFun;
- };
- runtime.awrap = function (arg) {
- return { __await: arg };
- };
- function AsyncIterator(generator) {
- function invoke(method, arg, resolve, reject) {
- var record = tryCatch(generator[method], generator, arg);
- if (record.type === "throw") {
- reject(record.arg);
- } else {
- var result = record.arg;
- var value = result.value;
- if (value && (typeof value === "undefined" ? "undefined" : _typeof(value)) === "object" && hasOwn.call(value, "__await")) {
- return Promise.resolve(value.__await).then(function (value) {
- invoke("next", value, resolve, reject);
- }, function (err) {
- invoke("throw", err, resolve, reject);
- });
- }
- return Promise.resolve(value).then(function (unwrapped) {
- result.value = unwrapped;
- resolve(result);
- }, reject);
+ var curMatrixScale = _util.Util.singularValueDecompose2dScale(this.baseTransform);
+
+ var combinedScale = [matrixScale[0] * curMatrixScale[0], matrixScale[1] * curMatrixScale[1]];
+ width = Math.min(Math.ceil(Math.abs(width * combinedScale[0])), MAX_PATTERN_SIZE);
+ height = Math.min(Math.ceil(Math.abs(height * combinedScale[1])), MAX_PATTERN_SIZE);
+ var tmpCanvas = owner.cachedCanvases.getCanvas('pattern', width, height, true);
+ var tmpCtx = tmpCanvas.context;
+ var graphics = canvasGraphicsFactory.createCanvasGraphics(tmpCtx);
+ graphics.groupLevel = owner.groupLevel;
+ this.setFillAndStrokeStyleToContext(graphics, paintType, color);
+ this.setScale(width, height, xstep, ystep);
+ this.transformToScale(graphics);
+ var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
+ graphics.transform.apply(graphics, tmpTranslate);
+ this.clipBbox(graphics, bbox, x0, y0, x1, y1);
+ graphics.executeOperatorList(operatorList);
+ return tmpCanvas.canvas;
+ },
+ setScale: function TilingPattern_setScale(width, height, xstep, ystep) {
+ this.scale = [width / xstep, height / ystep];
+ },
+ transformToScale: function TilingPattern_transformToScale(graphics) {
+ var scale = this.scale;
+ var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
+ graphics.transform.apply(graphics, tmpScale);
+ },
+ scaleToContext: function TilingPattern_scaleToContext() {
+ var scale = this.scale;
+ this.ctx.scale(1 / scale[0], 1 / scale[1]);
+ },
+ clipBbox: function clipBbox(graphics, bbox, x0, y0, x1, y1) {
+ if (Array.isArray(bbox) && bbox.length === 4) {
+ var bboxWidth = x1 - x0;
+ var bboxHeight = y1 - y0;
+ graphics.ctx.rect(x0, y0, bboxWidth, bboxHeight);
+ graphics.clip();
+ graphics.endPath();
}
- }
- var previousPromise;
- function enqueue(method, arg) {
- function callInvokeWithMethodAndArg() {
- return new Promise(function (resolve, reject) {
- invoke(method, arg, resolve, reject);
- });
+ },
+ setFillAndStrokeStyleToContext: function setFillAndStrokeStyleToContext(graphics, paintType, color) {
+ var context = graphics.ctx,
+ current = graphics.current;
+
+ switch (paintType) {
+ case PaintType.COLORED:
+ var ctx = this.ctx;
+ context.fillStyle = ctx.fillStyle;
+ context.strokeStyle = ctx.strokeStyle;
+ current.fillColor = ctx.fillStyle;
+ current.strokeColor = ctx.strokeStyle;
+ break;
+
+ case PaintType.UNCOLORED:
+ var cssColor = _util.Util.makeCssRgb(color[0], color[1], color[2]);
+
+ context.fillStyle = cssColor;
+ context.strokeStyle = cssColor;
+ current.fillColor = cssColor;
+ current.strokeColor = cssColor;
+ break;
+
+ default:
+ throw new _util.FormatError("Unsupported paint type: ".concat(paintType));
}
- return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+ },
+ getPattern: function TilingPattern_getPattern(ctx, owner) {
+ var temporaryPatternCanvas = this.createPatternCanvas(owner);
+ ctx = this.ctx;
+ ctx.setTransform.apply(ctx, this.baseTransform);
+ ctx.transform.apply(ctx, this.matrix);
+ this.scaleToContext();
+ return ctx.createPattern(temporaryPatternCanvas, 'repeat');
}
- this._invoke = enqueue;
- }
- defineIteratorMethods(AsyncIterator.prototype);
- AsyncIterator.prototype[asyncIteratorSymbol] = function () {
- return this;
- };
- runtime.AsyncIterator = AsyncIterator;
- runtime.async = function (innerFn, outerFn, self, tryLocsList) {
- var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList));
- return runtime.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
- return result.done ? result.value : iter.next();
- });
};
- function makeInvokeMethod(innerFn, self, context) {
- var state = GenStateSuspendedStart;
- return function invoke(method, arg) {
- if (state === GenStateExecuting) {
- throw new Error("Generator is already running");
- }
- if (state === GenStateCompleted) {
- if (method === "throw") {
- throw arg;
- }
- return doneResult();
- }
- context.method = method;
- context.arg = arg;
- while (true) {
- var delegate = context.delegate;
- if (delegate) {
- var delegateResult = maybeInvokeDelegate(delegate, context);
- if (delegateResult) {
- if (delegateResult === ContinueSentinel) continue;
- return delegateResult;
- }
- }
- if (context.method === "next") {
- context.sent = context._sent = context.arg;
- } else if (context.method === "throw") {
- if (state === GenStateSuspendedStart) {
- state = GenStateCompleted;
- throw context.arg;
- }
- context.dispatchException(context.arg);
- } else if (context.method === "return") {
- context.abrupt("return", context.arg);
- }
- state = GenStateExecuting;
- var record = tryCatch(innerFn, self, context);
- if (record.type === "normal") {
- state = context.done ? GenStateCompleted : GenStateSuspendedYield;
- if (record.arg === ContinueSentinel) {
- continue;
- }
- return {
- value: record.arg,
- done: context.done
- };
- } else if (record.type === "throw") {
- state = GenStateCompleted;
- context.method = "throw";
- context.arg = record.arg;
+ return TilingPattern;
+}();
+
+exports.TilingPattern = TilingPattern;
+
+/***/ }),
+/* 143 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.GlobalWorkerOptions = void 0;
+var GlobalWorkerOptions = Object.create(null);
+exports.GlobalWorkerOptions = GlobalWorkerOptions;
+GlobalWorkerOptions.workerPort = GlobalWorkerOptions.workerPort === undefined ? null : GlobalWorkerOptions.workerPort;
+GlobalWorkerOptions.workerSrc = GlobalWorkerOptions.workerSrc === undefined ? '' : GlobalWorkerOptions.workerSrc;
+
+/***/ }),
+/* 144 */
+/***/ (function(module, exports, __w_pdfjs_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.MessageHandler = MessageHandler;
+
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(134));
+
+var _util = __w_pdfjs_require__(1);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function resolveCall(_x, _x2) {
+ return _resolveCall.apply(this, arguments);
+}
+
+function _resolveCall() {
+ _resolveCall = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(fn, args) {
+ var thisArg,
+ _args = arguments;
+ return _regenerator.default.wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ thisArg = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+
+ if (fn) {
+ _context.next = 3;
+ break;
+ }
+
+ return _context.abrupt("return");
+
+ case 3:
+ return _context.abrupt("return", fn.apply(thisArg, args));
+
+ case 4:
+ case "end":
+ return _context.stop();
}
}
- };
+ }, _callee, this);
+ }));
+ return _resolveCall.apply(this, arguments);
+}
+
+function wrapReason(reason) {
+ if (_typeof(reason) !== 'object') {
+ return reason;
}
- function maybeInvokeDelegate(delegate, context) {
- var method = delegate.iterator[context.method];
- if (method === undefined) {
- context.delegate = null;
- if (context.method === "throw") {
- if (delegate.iterator.return) {
- context.method = "return";
- context.arg = undefined;
- maybeInvokeDelegate(delegate, context);
- if (context.method === "throw") {
- return ContinueSentinel;
- }
+
+ switch (reason.name) {
+ case 'AbortException':
+ return new _util.AbortException(reason.message);
+
+ case 'MissingPDFException':
+ return new _util.MissingPDFException(reason.message);
+
+ case 'UnexpectedResponseException':
+ return new _util.UnexpectedResponseException(reason.message, reason.status);
+
+ default:
+ return new _util.UnknownErrorException(reason.message, reason.details);
+ }
+}
+
+function makeReasonSerializable(reason) {
+ if (!(reason instanceof Error) || reason instanceof _util.AbortException || reason instanceof _util.MissingPDFException || reason instanceof _util.UnexpectedResponseException || reason instanceof _util.UnknownErrorException) {
+ return reason;
+ }
+
+ return new _util.UnknownErrorException(reason.message, reason.toString());
+}
+
+function resolveOrReject(capability, success, reason) {
+ if (success) {
+ capability.resolve();
+ } else {
+ capability.reject(reason);
+ }
+}
+
+function finalize(promise) {
+ return Promise.resolve(promise).catch(function () {});
+}
+
+function MessageHandler(sourceName, targetName, comObj) {
+ var _this = this;
+
+ this.sourceName = sourceName;
+ this.targetName = targetName;
+ this.comObj = comObj;
+ this.callbackId = 1;
+ this.streamId = 1;
+ this.postMessageTransfers = true;
+ this.streamSinks = Object.create(null);
+ this.streamControllers = Object.create(null);
+ var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
+ var ah = this.actionHandler = Object.create(null);
+
+ this._onComObjOnMessage = function (event) {
+ var data = event.data;
+
+ if (data.targetName !== _this.sourceName) {
+ return;
+ }
+
+ if (data.stream) {
+ _this._processStreamMessage(data);
+ } else if (data.isReply) {
+ var callbackId = data.callbackId;
+
+ if (data.callbackId in callbacksCapabilities) {
+ var callback = callbacksCapabilities[callbackId];
+ delete callbacksCapabilities[callbackId];
+
+ if ('error' in data) {
+ callback.reject(wrapReason(data.error));
+ } else {
+ callback.resolve(data.data);
}
- context.method = "throw";
- context.arg = new TypeError("The iterator does not provide a 'throw' method");
+ } else {
+ throw new Error("Cannot resolve callback ".concat(callbackId));
}
- return ContinueSentinel;
- }
- var record = tryCatch(method, delegate.iterator, context.arg);
- if (record.type === "throw") {
- context.method = "throw";
- context.arg = record.arg;
- context.delegate = null;
- return ContinueSentinel;
- }
- var info = record.arg;
- if (!info) {
- context.method = "throw";
- context.arg = new TypeError("iterator result is not an object");
- context.delegate = null;
- return ContinueSentinel;
- }
- if (info.done) {
- context[delegate.resultName] = info.value;
- context.next = delegate.nextLoc;
- if (context.method !== "return") {
- context.method = "next";
- context.arg = undefined;
+ } else if (data.action in ah) {
+ var action = ah[data.action];
+
+ if (data.callbackId) {
+ var _sourceName = _this.sourceName;
+ var _targetName = data.sourceName;
+ Promise.resolve().then(function () {
+ return action[0].call(action[1], data.data);
+ }).then(function (result) {
+ comObj.postMessage({
+ sourceName: _sourceName,
+ targetName: _targetName,
+ isReply: true,
+ callbackId: data.callbackId,
+ data: result
+ });
+ }, function (reason) {
+ comObj.postMessage({
+ sourceName: _sourceName,
+ targetName: _targetName,
+ isReply: true,
+ callbackId: data.callbackId,
+ error: makeReasonSerializable(reason)
+ });
+ });
+ } else if (data.streamId) {
+ _this._createStreamSink(data);
+ } else {
+ action[0].call(action[1], data.data);
}
} else {
- return info;
+ throw new Error("Unknown action from worker: ".concat(data.action));
}
- context.delegate = null;
- return ContinueSentinel;
- }
- defineIteratorMethods(Gp);
- Gp[toStringTagSymbol] = "Generator";
- Gp[iteratorSymbol] = function () {
- return this;
};
- Gp.toString = function () {
- return "[object Generator]";
- };
- function pushTryEntry(locs) {
- var entry = { tryLoc: locs[0] };
- if (1 in locs) {
- entry.catchLoc = locs[1];
- }
- if (2 in locs) {
- entry.finallyLoc = locs[2];
- entry.afterLoc = locs[3];
- }
- this.tryEntries.push(entry);
- }
- function resetTryEntry(entry) {
- var record = entry.completion || {};
- record.type = "normal";
- delete record.arg;
- entry.completion = record;
- }
- function Context(tryLocsList) {
- this.tryEntries = [{ tryLoc: "root" }];
- tryLocsList.forEach(pushTryEntry, this);
- this.reset(true);
- }
- runtime.keys = function (object) {
- var keys = [];
- for (var key in object) {
- keys.push(key);
+
+ comObj.addEventListener('message', this._onComObjOnMessage);
+}
+
+MessageHandler.prototype = {
+ on: function on(actionName, handler, scope) {
+ var ah = this.actionHandler;
+
+ if (ah[actionName]) {
+ throw new Error("There is already an actionName called \"".concat(actionName, "\""));
}
- keys.reverse();
- return function next() {
- while (keys.length) {
- var key = keys.pop();
- if (key in object) {
- next.value = key;
- next.done = false;
- return next;
- }
- }
- next.done = true;
- return next;
+
+ ah[actionName] = [handler, scope];
+ },
+ send: function send(actionName, data, transfers) {
+ var message = {
+ sourceName: this.sourceName,
+ targetName: this.targetName,
+ action: actionName,
+ data: data
};
- };
- function values(iterable) {
- if (iterable) {
- var iteratorMethod = iterable[iteratorSymbol];
- if (iteratorMethod) {
- return iteratorMethod.call(iterable);
- }
- if (typeof iterable.next === "function") {
- return iterable;
- }
- if (!isNaN(iterable.length)) {
- var i = -1,
- next = function next() {
- while (++i < iterable.length) {
- if (hasOwn.call(iterable, i)) {
- next.value = iterable[i];
- next.done = false;
- return next;
- }
- }
- next.value = undefined;
- next.done = true;
- return next;
+ this.postMessage(message, transfers);
+ },
+ sendWithPromise: function sendWithPromise(actionName, data, transfers) {
+ var callbackId = this.callbackId++;
+ var message = {
+ sourceName: this.sourceName,
+ targetName: this.targetName,
+ action: actionName,
+ data: data,
+ callbackId: callbackId
+ };
+ var capability = (0, _util.createPromiseCapability)();
+ this.callbacksCapabilities[callbackId] = capability;
+
+ try {
+ this.postMessage(message, transfers);
+ } catch (e) {
+ capability.reject(e);
+ }
+
+ return capability.promise;
+ },
+ sendWithStream: function sendWithStream(actionName, data, queueingStrategy, transfers) {
+ var _this2 = this;
+
+ var streamId = this.streamId++;
+ var sourceName = this.sourceName;
+ var targetName = this.targetName;
+ return new _util.ReadableStream({
+ start: function start(controller) {
+ var startCapability = (0, _util.createPromiseCapability)();
+ _this2.streamControllers[streamId] = {
+ controller: controller,
+ startCall: startCapability,
+ isClosed: false
};
- return next.next = next;
+
+ _this2.postMessage({
+ sourceName: sourceName,
+ targetName: targetName,
+ action: actionName,
+ streamId: streamId,
+ data: data,
+ desiredSize: controller.desiredSize
+ });
+
+ return startCapability.promise;
+ },
+ pull: function pull(controller) {
+ var pullCapability = (0, _util.createPromiseCapability)();
+ _this2.streamControllers[streamId].pullCall = pullCapability;
+
+ _this2.postMessage({
+ sourceName: sourceName,
+ targetName: targetName,
+ stream: 'pull',
+ streamId: streamId,
+ desiredSize: controller.desiredSize
+ });
+
+ return pullCapability.promise;
+ },
+ cancel: function cancel(reason) {
+ var cancelCapability = (0, _util.createPromiseCapability)();
+ _this2.streamControllers[streamId].cancelCall = cancelCapability;
+ _this2.streamControllers[streamId].isClosed = true;
+
+ _this2.postMessage({
+ sourceName: sourceName,
+ targetName: targetName,
+ stream: 'cancel',
+ reason: reason,
+ streamId: streamId
+ });
+
+ return cancelCapability.promise;
}
- }
- return { next: doneResult };
- }
- runtime.values = values;
- function doneResult() {
- return {
- value: undefined,
- done: true
+ }, queueingStrategy);
+ },
+ _createStreamSink: function _createStreamSink(data) {
+ var _this3 = this;
+
+ var self = this;
+ var action = this.actionHandler[data.action];
+ var streamId = data.streamId;
+ var desiredSize = data.desiredSize;
+ var sourceName = this.sourceName;
+ var targetName = data.sourceName;
+ var capability = (0, _util.createPromiseCapability)();
+
+ var sendStreamRequest = function sendStreamRequest(_ref) {
+ var stream = _ref.stream,
+ chunk = _ref.chunk,
+ transfers = _ref.transfers,
+ success = _ref.success,
+ reason = _ref.reason;
+
+ _this3.postMessage({
+ sourceName: sourceName,
+ targetName: targetName,
+ stream: stream,
+ streamId: streamId,
+ chunk: chunk,
+ success: success,
+ reason: reason
+ }, transfers);
};
- }
- Context.prototype = {
- constructor: Context,
- reset: function reset(skipTempReset) {
- this.prev = 0;
- this.next = 0;
- this.sent = this._sent = undefined;
- this.done = false;
- this.delegate = null;
- this.method = "next";
- this.arg = undefined;
- this.tryEntries.forEach(resetTryEntry);
- if (!skipTempReset) {
- for (var name in this) {
- if (name.charAt(0) === "t" && hasOwn.call(this, name) && !isNaN(+name.slice(1))) {
- this[name] = undefined;
- }
- }
- }
- },
- stop: function stop() {
- this.done = true;
- var rootEntry = this.tryEntries[0];
- var rootRecord = rootEntry.completion;
- if (rootRecord.type === "throw") {
- throw rootRecord.arg;
- }
- return this.rval;
- },
- dispatchException: function dispatchException(exception) {
- if (this.done) {
- throw exception;
- }
- var context = this;
- function handle(loc, caught) {
- record.type = "throw";
- record.arg = exception;
- context.next = loc;
- if (caught) {
- context.method = "next";
- context.arg = undefined;
+
+ var streamSink = {
+ enqueue: function enqueue(chunk) {
+ var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+ var transfers = arguments.length > 2 ? arguments[2] : undefined;
+
+ if (this.isCancelled) {
+ return;
}
- return !!caught;
- }
- for (var i = this.tryEntries.length - 1; i >= 0; --i) {
- var entry = this.tryEntries[i];
- var record = entry.completion;
- if (entry.tryLoc === "root") {
- return handle("end");
+
+ var lastDesiredSize = this.desiredSize;
+ this.desiredSize -= size;
+
+ if (lastDesiredSize > 0 && this.desiredSize <= 0) {
+ this.sinkCapability = (0, _util.createPromiseCapability)();
+ this.ready = this.sinkCapability.promise;
}
- if (entry.tryLoc <= this.prev) {
- var hasCatch = hasOwn.call(entry, "catchLoc");
- var hasFinally = hasOwn.call(entry, "finallyLoc");
- if (hasCatch && hasFinally) {
- if (this.prev < entry.catchLoc) {
- return handle(entry.catchLoc, true);
- } else if (this.prev < entry.finallyLoc) {
- return handle(entry.finallyLoc);
- }
- } else if (hasCatch) {
- if (this.prev < entry.catchLoc) {
- return handle(entry.catchLoc, true);
- }
- } else if (hasFinally) {
- if (this.prev < entry.finallyLoc) {
- return handle(entry.finallyLoc);
- }
- } else {
- throw new Error("try statement without catch or finally");
- }
+
+ sendStreamRequest({
+ stream: 'enqueue',
+ chunk: chunk,
+ transfers: transfers
+ });
+ },
+ close: function close() {
+ if (this.isCancelled) {
+ return;
}
- }
- },
- abrupt: function abrupt(type, arg) {
- for (var i = this.tryEntries.length - 1; i >= 0; --i) {
- var entry = this.tryEntries[i];
- if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
- var finallyEntry = entry;
+
+ this.isCancelled = true;
+ sendStreamRequest({
+ stream: 'close'
+ });
+ delete self.streamSinks[streamId];
+ },
+ error: function error(reason) {
+ if (this.isCancelled) {
+ return;
+ }
+
+ this.isCancelled = true;
+ sendStreamRequest({
+ stream: 'error',
+ reason: reason
+ });
+ },
+ sinkCapability: capability,
+ onPull: null,
+ onCancel: null,
+ isCancelled: false,
+ desiredSize: desiredSize,
+ ready: null
+ };
+ streamSink.sinkCapability.resolve();
+ streamSink.ready = streamSink.sinkCapability.promise;
+ this.streamSinks[streamId] = streamSink;
+ resolveCall(action[0], [data.data, streamSink], action[1]).then(function () {
+ sendStreamRequest({
+ stream: 'start_complete',
+ success: true
+ });
+ }, function (reason) {
+ sendStreamRequest({
+ stream: 'start_complete',
+ success: false,
+ reason: reason
+ });
+ });
+ },
+ _processStreamMessage: function _processStreamMessage(data) {
+ var _this4 = this;
+
+ var sourceName = this.sourceName;
+ var targetName = data.sourceName;
+ var streamId = data.streamId;
+
+ var sendStreamResponse = function sendStreamResponse(_ref2) {
+ var stream = _ref2.stream,
+ success = _ref2.success,
+ reason = _ref2.reason;
+
+ _this4.comObj.postMessage({
+ sourceName: sourceName,
+ targetName: targetName,
+ stream: stream,
+ success: success,
+ streamId: streamId,
+ reason: reason
+ });
+ };
+
+ var deleteStreamController = function deleteStreamController() {
+ Promise.all([_this4.streamControllers[data.streamId].startCall, _this4.streamControllers[data.streamId].pullCall, _this4.streamControllers[data.streamId].cancelCall].map(function (capability) {
+ return capability && finalize(capability.promise);
+ })).then(function () {
+ delete _this4.streamControllers[data.streamId];
+ });
+ };
+
+ switch (data.stream) {
+ case 'start_complete':
+ resolveOrReject(this.streamControllers[data.streamId].startCall, data.success, wrapReason(data.reason));
+ break;
+
+ case 'pull_complete':
+ resolveOrReject(this.streamControllers[data.streamId].pullCall, data.success, wrapReason(data.reason));
+ break;
+
+ case 'pull':
+ if (!this.streamSinks[data.streamId]) {
+ sendStreamResponse({
+ stream: 'pull_complete',
+ success: true
+ });
break;
}
- }
- if (finallyEntry && (type === "break" || type === "continue") && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc) {
- finallyEntry = null;
- }
- var record = finallyEntry ? finallyEntry.completion : {};
- record.type = type;
- record.arg = arg;
- if (finallyEntry) {
- this.method = "next";
- this.next = finallyEntry.finallyLoc;
- return ContinueSentinel;
- }
- return this.complete(record);
- },
- complete: function complete(record, afterLoc) {
- if (record.type === "throw") {
- throw record.arg;
- }
- if (record.type === "break" || record.type === "continue") {
- this.next = record.arg;
- } else if (record.type === "return") {
- this.rval = this.arg = record.arg;
- this.method = "return";
- this.next = "end";
- } else if (record.type === "normal" && afterLoc) {
- this.next = afterLoc;
- }
- return ContinueSentinel;
- },
- finish: function finish(finallyLoc) {
- for (var i = this.tryEntries.length - 1; i >= 0; --i) {
- var entry = this.tryEntries[i];
- if (entry.finallyLoc === finallyLoc) {
- this.complete(entry.completion, entry.afterLoc);
- resetTryEntry(entry);
- return ContinueSentinel;
+
+ if (this.streamSinks[data.streamId].desiredSize <= 0 && data.desiredSize > 0) {
+ this.streamSinks[data.streamId].sinkCapability.resolve();
}
- }
- },
- "catch": function _catch(tryLoc) {
- for (var i = this.tryEntries.length - 1; i >= 0; --i) {
- var entry = this.tryEntries[i];
- if (entry.tryLoc === tryLoc) {
- var record = entry.completion;
- if (record.type === "throw") {
- var thrown = record.arg;
- resetTryEntry(entry);
- }
- return thrown;
+
+ this.streamSinks[data.streamId].desiredSize = data.desiredSize;
+ resolveCall(this.streamSinks[data.streamId].onPull).then(function () {
+ sendStreamResponse({
+ stream: 'pull_complete',
+ success: true
+ });
+ }, function (reason) {
+ sendStreamResponse({
+ stream: 'pull_complete',
+ success: false,
+ reason: reason
+ });
+ });
+ break;
+
+ case 'enqueue':
+ (0, _util.assert)(this.streamControllers[data.streamId], 'enqueue should have stream controller');
+
+ if (!this.streamControllers[data.streamId].isClosed) {
+ this.streamControllers[data.streamId].controller.enqueue(data.chunk);
}
- }
- throw new Error("illegal catch attempt");
- },
- delegateYield: function delegateYield(iterable, resultName, nextLoc) {
- this.delegate = {
- iterator: values(iterable),
- resultName: resultName,
- nextLoc: nextLoc
- };
- if (this.method === "next") {
- this.arg = undefined;
- }
- return ContinueSentinel;
- }
- };
-}(function () {
- return this;
-}() || Function("return this")());
-/* WEBPACK VAR INJECTION */}.call(this, __w_pdfjs_require__(144)(module)))
-/***/ }),
-/* 144 */
-/***/ (function(module, exports, __w_pdfjs_require__) {
+ break;
+
+ case 'close':
+ (0, _util.assert)(this.streamControllers[data.streamId], 'close should have stream controller');
+
+ if (this.streamControllers[data.streamId].isClosed) {
+ break;
+ }
+
+ this.streamControllers[data.streamId].isClosed = true;
+ this.streamControllers[data.streamId].controller.close();
+ deleteStreamController();
+ break;
+
+ case 'error':
+ (0, _util.assert)(this.streamControllers[data.streamId], 'error should have stream controller');
+ this.streamControllers[data.streamId].controller.error(wrapReason(data.reason));
+ deleteStreamController();
+ break;
+
+ case 'cancel_complete':
+ resolveOrReject(this.streamControllers[data.streamId].cancelCall, data.success, wrapReason(data.reason));
+ deleteStreamController();
+ break;
-"use strict";
+ case 'cancel':
+ if (!this.streamSinks[data.streamId]) {
+ break;
+ }
+ resolveCall(this.streamSinks[data.streamId].onCancel, [wrapReason(data.reason)]).then(function () {
+ sendStreamResponse({
+ stream: 'cancel_complete',
+ success: true
+ });
+ }, function (reason) {
+ sendStreamResponse({
+ stream: 'cancel_complete',
+ success: false,
+ reason: reason
+ });
+ });
+ this.streamSinks[data.streamId].sinkCapability.reject(wrapReason(data.reason));
+ this.streamSinks[data.streamId].isCancelled = true;
+ delete this.streamSinks[data.streamId];
+ break;
-module.exports = function (module) {
- if (!module.webpackPolyfill) {
- module.deprecate = function () {};
- module.paths = [];
- if (!module.children) module.children = [];
- Object.defineProperty(module, "loaded", {
- enumerable: true,
- get: function get() {
- return module.l;
- }
- });
- Object.defineProperty(module, "id", {
- enumerable: true,
- get: function get() {
- return module.i;
- }
- });
- module.webpackPolyfill = 1;
+ default:
+ throw new Error('Unexpected stream case');
+ }
+ },
+ postMessage: function postMessage(message, transfers) {
+ if (transfers && this.postMessageTransfers) {
+ this.comObj.postMessage(message, transfers);
+ } else {
+ this.comObj.postMessage(message);
+ }
+ },
+ destroy: function destroy() {
+ this.comObj.removeEventListener('message', this._onComObjOnMessage);
}
- return module;
};
/***/ }),
@@ -13736,9 +16509,7 @@ module.exports = function (module) {
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.Metadata = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.Metadata = void 0;
var _util = __w_pdfjs_require__(1);
@@ -13746,7 +16517,13 @@ var _xml_parser = __w_pdfjs_require__(146);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var Metadata = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var Metadata =
+/*#__PURE__*/
+function () {
function Metadata(data) {
_classCallCheck(this, Metadata);
@@ -13755,13 +16532,14 @@ var Metadata = function () {
var parser = new _xml_parser.SimpleXMLParser();
var xmlDocument = parser.parseFromString(data);
this._metadata = Object.create(null);
+
if (xmlDocument) {
this._parse(xmlDocument);
}
}
_createClass(Metadata, [{
- key: '_repair',
+ key: "_repair",
value: function _repair(data) {
return data.replace(/>\\376\\377([^<]+)/g, function (all, codes) {
var bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g, function (code, d1, d2, d3) {
@@ -13770,49 +16548,65 @@ var Metadata = function () {
switch (name) {
case 'amp':
return '&';
+
case 'apos':
return '\'';
+
case 'gt':
return '>';
+
case 'lt':
return '<';
+
case 'quot':
return '\"';
}
- throw new Error('_repair: ' + name + ' isn\'t defined.');
+
+ throw new Error("_repair: ".concat(name, " isn't defined."));
});
var chars = '';
+
for (var i = 0, ii = bytes.length; i < ii; i += 2) {
var code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
+
if (code >= 32 && code < 127 && code !== 60 && code !== 62 && code !== 38) {
chars += String.fromCharCode(code);
} else {
chars += '&#x' + (0x10000 + code).toString(16).substring(1) + ';';
}
}
+
return '>' + chars;
});
}
}, {
- key: '_parse',
+ key: "_parse",
value: function _parse(xmlDocument) {
var rdf = xmlDocument.documentElement;
+
if (rdf.nodeName.toLowerCase() !== 'rdf:rdf') {
rdf = rdf.firstChild;
+
while (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf') {
rdf = rdf.nextSibling;
}
}
+
var nodeName = rdf ? rdf.nodeName.toLowerCase() : null;
+
if (!rdf || nodeName !== 'rdf:rdf' || !rdf.hasChildNodes()) {
return;
}
+
var children = rdf.childNodes;
+
for (var i = 0, ii = children.length; i < ii; i++) {
var desc = children[i];
+
if (desc.nodeName.toLowerCase() !== 'rdf:description') {
continue;
}
+
for (var j = 0, jj = desc.childNodes.length; j < jj; j++) {
if (desc.childNodes[j].nodeName.toLowerCase() !== '#text') {
var entry = desc.childNodes[j];
@@ -13823,17 +16617,17 @@ var Metadata = function () {
}
}
}, {
- key: 'get',
+ key: "get",
value: function get(name) {
return this._metadata[name] || null;
}
}, {
- key: 'getAll',
+ key: "getAll",
value: function getAll() {
return this._metadata;
}
}, {
- key: 'has',
+ key: "has",
value: function has(name) {
return typeof this._metadata[name] !== 'undefined';
}
@@ -13854,19 +16648,38 @@ exports.Metadata = Metadata;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.SimpleXMLParser = void 0;
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var XMLParserErrorCode = {
NoError: 0,
EndOfDocument: -1,
@@ -13880,26 +16693,31 @@ var XMLParserErrorCode = {
UnterminatedElement: -9,
ElementNeverBegun: -10
};
+
function isWhitespace(s, index) {
var ch = s[index];
return ch === ' ' || ch === '\n' || ch === '\r' || ch === '\t';
}
+
function isWhitespaceString(s) {
for (var i = 0, ii = s.length; i < ii; i++) {
if (!isWhitespace(s, i)) {
return false;
}
}
+
return true;
}
-var XMLParserBase = function () {
+var XMLParserBase =
+/*#__PURE__*/
+function () {
function XMLParserBase() {
_classCallCheck(this, XMLParserBase);
}
_createClass(XMLParserBase, [{
- key: '_resolveEntities',
+ key: "_resolveEntities",
value: function _resolveEntities(s) {
return s.replace(/&([^;]+);/g, function (all, entity) {
if (entity.substring(0, 2) === '#x') {
@@ -13907,57 +16725,74 @@ var XMLParserBase = function () {
} else if (entity.substring(0, 1) === '#') {
return String.fromCharCode(parseInt(entity.substring(1), 10));
}
+
switch (entity) {
case 'lt':
return '<';
+
case 'gt':
return '>';
+
case 'amp':
return '&';
+
case 'quot':
return '\"';
}
+
return this.onResolveEntity(entity);
});
}
}, {
- key: '_parseContent',
+ key: "_parseContent",
value: function _parseContent(s, start) {
var pos = start,
- name = void 0,
+ name,
attributes = [];
+
function skipWs() {
while (pos < s.length && isWhitespace(s, pos)) {
++pos;
}
}
+
while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== '>' && s[pos] !== '/') {
++pos;
}
+
name = s.substring(start, pos);
skipWs();
+
while (pos < s.length && s[pos] !== '>' && s[pos] !== '/' && s[pos] !== '?') {
skipWs();
var attrName = '',
attrValue = '';
+
while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== '=') {
attrName += s[pos];
++pos;
}
+
skipWs();
+
if (s[pos] !== '=') {
return null;
}
+
++pos;
skipWs();
var attrEndChar = s[pos];
+
if (attrEndChar !== '\"' && attrEndChar !== '\'') {
return null;
}
+
var attrEndIndex = s.indexOf(attrEndChar, ++pos);
+
if (attrEndIndex < 0) {
return null;
}
+
attrValue = s.substring(pos, attrEndIndex);
attributes.push({
name: attrName,
@@ -13966,6 +16801,7 @@ var XMLParserBase = function () {
pos = attrEndIndex + 1;
skipWs();
}
+
return {
name: name,
attributes: attributes,
@@ -13973,25 +16809,30 @@ var XMLParserBase = function () {
};
}
}, {
- key: '_parseProcessingInstruction',
+ key: "_parseProcessingInstruction",
value: function _parseProcessingInstruction(s, start) {
var pos = start,
- name = void 0,
- value = void 0;
+ name,
+ value;
+
function skipWs() {
while (pos < s.length && isWhitespace(s, pos)) {
++pos;
}
}
+
while (pos < s.length && !isWhitespace(s, pos) && s[pos] !== '>' && s[pos] !== '/') {
++pos;
}
+
name = s.substring(start, pos);
skipWs();
var attrStart = pos;
+
while (pos < s.length && (s[pos] !== '?' || s[pos + 1] !== '>')) {
++pos;
}
+
value = s.substring(attrStart, pos);
return {
name: name,
@@ -14000,70 +16841,89 @@ var XMLParserBase = function () {
};
}
}, {
- key: 'parseXml',
+ key: "parseXml",
value: function parseXml(s) {
var i = 0;
+
while (i < s.length) {
var ch = s[i];
var j = i;
+
if (ch === '<') {
++j;
var ch2 = s[j];
var q = void 0;
+
switch (ch2) {
case '/':
++j;
q = s.indexOf('>', j);
+
if (q < 0) {
this.onError(XMLParserErrorCode.UnterminatedElement);
return;
}
+
this.onEndElement(s.substring(j, q));
j = q + 1;
break;
+
case '?':
++j;
+
var pi = this._parseProcessingInstruction(s, j);
+
if (s.substring(j + pi.parsed, j + pi.parsed + 2) !== '?>') {
this.onError(XMLParserErrorCode.UnterminatedXmlDeclaration);
return;
}
+
this.onPi(pi.name, pi.value);
j += pi.parsed + 2;
break;
+
case '!':
if (s.substring(j + 1, j + 3) === '--') {
q = s.indexOf('-->', j + 3);
+
if (q < 0) {
this.onError(XMLParserErrorCode.UnterminatedComment);
return;
}
+
this.onComment(s.substring(j + 3, q));
j = q + 3;
} else if (s.substring(j + 1, j + 8) === '[CDATA[') {
q = s.indexOf(']]>', j + 8);
+
if (q < 0) {
this.onError(XMLParserErrorCode.UnterminatedCdat);
return;
}
+
this.onCdata(s.substring(j + 8, q));
j = q + 3;
} else if (s.substring(j + 1, j + 8) === 'DOCTYPE') {
var q2 = s.indexOf('[', j + 8);
var complexDoctype = false;
q = s.indexOf('>', j + 8);
+
if (q < 0) {
this.onError(XMLParserErrorCode.UnterminatedDoctypeDeclaration);
return;
}
+
if (q2 > 0 && q > q2) {
q = s.indexOf(']>', j + 8);
+
if (q < 0) {
this.onError(XMLParserErrorCode.UnterminatedDoctypeDeclaration);
return;
}
+
complexDoctype = true;
}
+
var doctypeContent = s.substring(j + 8, q + (complexDoctype ? 1 : 0));
this.onDoctype(doctypeContent);
j = q + (complexDoctype ? 2 : 1);
@@ -14071,20 +16931,26 @@ var XMLParserBase = function () {
this.onError(XMLParserErrorCode.MalformedElement);
return;
}
+
break;
+
default:
var content = this._parseContent(s, j);
+
if (content === null) {
this.onError(XMLParserErrorCode.MalformedElement);
return;
}
+
var isClosed = false;
+
if (s.substring(j + content.parsed, j + content.parsed + 2) === '/>') {
isClosed = true;
} else if (s.substring(j + content.parsed, j + content.parsed + 1) !== '>') {
this.onError(XMLParserErrorCode.UnterminatedElement);
return;
}
+
this.onBeginElement(content.name, content.attributes, isClosed);
j += content.parsed + (isClosed ? 2 : 1);
break;
@@ -14093,47 +16959,51 @@ var XMLParserBase = function () {
while (j < s.length && s[j] !== '<') {
j++;
}
+
var text = s.substring(i, j);
this.onText(this._resolveEntities(text));
}
+
i = j;
}
}
}, {
- key: 'onResolveEntity',
+ key: "onResolveEntity",
value: function onResolveEntity(name) {
- return '&' + name + ';';
+ return "&".concat(name, ";");
}
}, {
- key: 'onPi',
+ key: "onPi",
value: function onPi(name, value) {}
}, {
- key: 'onComment',
+ key: "onComment",
value: function onComment(text) {}
}, {
- key: 'onCdata',
+ key: "onCdata",
value: function onCdata(text) {}
}, {
- key: 'onDoctype',
+ key: "onDoctype",
value: function onDoctype(doctypeContent) {}
}, {
- key: 'onText',
+ key: "onText",
value: function onText(text) {}
}, {
- key: 'onBeginElement',
+ key: "onBeginElement",
value: function onBeginElement(name, attributes, isEmpty) {}
}, {
- key: 'onEndElement',
+ key: "onEndElement",
value: function onEndElement(name) {}
}, {
- key: 'onError',
+ key: "onError",
value: function onError(code) {}
}]);
return XMLParserBase;
}();
-var SimpleDOMNode = function () {
+var SimpleDOMNode =
+/*#__PURE__*/
+function () {
function SimpleDOMNode(nodeName, nodeValue) {
_classCallCheck(this, SimpleDOMNode);
@@ -14146,27 +17016,28 @@ var SimpleDOMNode = function () {
}
_createClass(SimpleDOMNode, [{
- key: 'hasChildNodes',
+ key: "hasChildNodes",
value: function hasChildNodes() {
return this.childNodes && this.childNodes.length > 0;
}
}, {
- key: 'firstChild',
+ key: "firstChild",
get: function get() {
return this.childNodes[0];
}
}, {
- key: 'nextSibling',
+ key: "nextSibling",
get: function get() {
var index = this.parentNode.childNodes.indexOf(this);
return this.parentNode.childNodes[index + 1];
}
}, {
- key: 'textContent',
+ key: "textContent",
get: function get() {
if (!this.childNodes) {
return this.nodeValue || '';
}
+
return this.childNodes.map(function (child) {
return child.textContent;
}).join('');
@@ -14176,14 +17047,17 @@ var SimpleDOMNode = function () {
return SimpleDOMNode;
}();
-var SimpleXMLParser = function (_XMLParserBase) {
+var SimpleXMLParser =
+/*#__PURE__*/
+function (_XMLParserBase) {
_inherits(SimpleXMLParser, _XMLParserBase);
function SimpleXMLParser() {
- _classCallCheck(this, SimpleXMLParser);
+ var _this;
- var _this = _possibleConstructorReturn(this, (SimpleXMLParser.__proto__ || Object.getPrototypeOf(SimpleXMLParser)).call(this));
+ _classCallCheck(this, SimpleXMLParser);
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(SimpleXMLParser).call(this));
_this._currentFragment = null;
_this._stack = null;
_this._errorCode = XMLParserErrorCode.NoError;
@@ -14191,71 +17065,84 @@ var SimpleXMLParser = function (_XMLParserBase) {
}
_createClass(SimpleXMLParser, [{
- key: 'parseFromString',
+ key: "parseFromString",
value: function parseFromString(data) {
this._currentFragment = [];
this._stack = [];
this._errorCode = XMLParserErrorCode.NoError;
this.parseXml(data);
+
if (this._errorCode !== XMLParserErrorCode.NoError) {
return undefined;
}
- var _currentFragment = _slicedToArray(this._currentFragment, 1),
- documentElement = _currentFragment[0];
+ var _this$_currentFragmen = _slicedToArray(this._currentFragment, 1),
+ documentElement = _this$_currentFragmen[0];
if (!documentElement) {
return undefined;
}
- return { documentElement: documentElement };
+
+ return {
+ documentElement: documentElement
+ };
}
}, {
- key: 'onResolveEntity',
+ key: "onResolveEntity",
value: function onResolveEntity(name) {
switch (name) {
case 'apos':
return '\'';
}
- return _get(SimpleXMLParser.prototype.__proto__ || Object.getPrototypeOf(SimpleXMLParser.prototype), 'onResolveEntity', this).call(this, name);
+
+ return _get(_getPrototypeOf(SimpleXMLParser.prototype), "onResolveEntity", this).call(this, name);
}
}, {
- key: 'onText',
+ key: "onText",
value: function onText(text) {
if (isWhitespaceString(text)) {
return;
}
+
var node = new SimpleDOMNode('#text', text);
+
this._currentFragment.push(node);
}
}, {
- key: 'onCdata',
+ key: "onCdata",
value: function onCdata(text) {
var node = new SimpleDOMNode('#text', text);
+
this._currentFragment.push(node);
}
}, {
- key: 'onBeginElement',
+ key: "onBeginElement",
value: function onBeginElement(name, attributes, isEmpty) {
var node = new SimpleDOMNode(name);
node.childNodes = [];
+
this._currentFragment.push(node);
+
if (isEmpty) {
return;
}
+
this._stack.push(this._currentFragment);
+
this._currentFragment = node.childNodes;
}
}, {
- key: 'onEndElement',
+ key: "onEndElement",
value: function onEndElement(name) {
this._currentFragment = this._stack.pop();
var lastElement = this._currentFragment[this._currentFragment.length - 1];
+
for (var i = 0, ii = lastElement.childNodes.length; i < ii; i++) {
lastElement.childNodes[i].parentNode = lastElement;
}
}
}, {
- key: 'onError',
+ key: "onError",
value: function onError(code) {
this._errorCode = code;
}
@@ -14276,17 +17163,17 @@ exports.SimpleXMLParser = SimpleXMLParser;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFDataTransportStream = undefined;
-
-var _regenerator = __w_pdfjs_require__(141);
+exports.PDFDataTransportStream = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(134));
var _util = __w_pdfjs_require__(1);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
function PDFDataTransportStream(params, pdfDataRangeTransport) {
@@ -14295,33 +17182,46 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
(0, _util.assert)(pdfDataRangeTransport);
this._queuedChunks = [];
var initialData = params.initialData;
+
if (initialData && initialData.length > 0) {
var buffer = new Uint8Array(initialData).buffer;
+
this._queuedChunks.push(buffer);
}
+
this._pdfDataRangeTransport = pdfDataRangeTransport;
this._isStreamingSupported = !params.disableStream;
this._isRangeSupported = !params.disableRange;
this._contentLength = params.length;
this._fullRequestReader = null;
this._rangeReaders = [];
+
this._pdfDataRangeTransport.addRangeListener(function (begin, chunk) {
_this._onReceiveData({
begin: begin,
chunk: chunk
});
});
+
this._pdfDataRangeTransport.addProgressListener(function (loaded) {
- _this._onProgress({ loaded: loaded });
+ _this._onProgress({
+ loaded: loaded
+ });
});
+
this._pdfDataRangeTransport.addProgressiveReadListener(function (chunk) {
- _this._onReceiveData({ chunk: chunk });
+ _this._onReceiveData({
+ chunk: chunk
+ });
});
+
this._pdfDataRangeTransport.transportReady();
}
+
PDFDataTransportStream.prototype = {
_onReceiveData: function PDFDataTransportStream_onReceiveData(args) {
var buffer = new Uint8Array(args.chunk).buffer;
+
if (args.begin === undefined) {
if (this._fullRequestReader) {
this._fullRequestReader._enqueue(buffer);
@@ -14333,22 +17233,29 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
if (rangeReader._begin !== args.begin) {
return false;
}
+
rangeReader._enqueue(buffer);
+
return true;
});
+
(0, _util.assert)(found);
}
},
_onProgress: function PDFDataTransportStream_onDataProgress(evt) {
if (this._rangeReaders.length > 0) {
var firstReader = this._rangeReaders[0];
+
if (firstReader.onProgress) {
- firstReader.onProgress({ loaded: evt.loaded });
+ firstReader.onProgress({
+ loaded: evt.loaded
+ });
}
}
},
_removeRangeReader: function PDFDataTransportStream_removeRangeReader(reader) {
var i = this._rangeReaders.indexOf(reader);
+
if (i >= 0) {
this._rangeReaders.splice(i, 1);
}
@@ -14361,21 +17268,28 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
},
getRangeReader: function PDFDataTransportStream_getRangeReader(begin, end) {
var reader = new PDFDataTransportStreamRangeReader(this, begin, end);
+
this._pdfDataRangeTransport.requestDataRange(begin, end);
+
this._rangeReaders.push(reader);
+
return reader;
},
cancelAllRequests: function PDFDataTransportStream_cancelAllRequests(reason) {
if (this._fullRequestReader) {
this._fullRequestReader.cancel(reason);
}
+
var readers = this._rangeReaders.slice(0);
+
readers.forEach(function (rangeReader) {
rangeReader.cancel(reason);
});
+
this._pdfDataRangeTransport.abort();
}
};
+
function PDFDataTransportStreamReader(stream, queuedChunks) {
this._stream = stream;
this._done = false;
@@ -14386,40 +17300,52 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
stream._fullRequestReader = this;
this.onProgress = null;
}
+
PDFDataTransportStreamReader.prototype = {
_enqueue: function PDFDataTransportStreamReader_enqueue(chunk) {
if (this._done) {
return;
}
+
if (this._requests.length > 0) {
var requestCapability = this._requests.shift();
+
requestCapability.resolve({
value: chunk,
done: false
});
return;
}
+
this._queuedChunks.push(chunk);
},
+
get headersReady() {
return this._headersReady;
},
+
get filename() {
return this._filename;
},
+
get isRangeSupported() {
return this._stream._isRangeSupported;
},
+
get isStreamingSupported() {
return this._stream._isStreamingSupported;
},
+
get contentLength() {
return this._stream._contentLength;
},
+
read: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+ var _read = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
var chunk, requestCapability;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -14429,7 +17355,7 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
}
chunk = this._queuedChunks.shift();
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: chunk,
done: false
});
@@ -14440,7 +17366,7 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
break;
}
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: undefined,
done: true
});
@@ -14449,10 +17375,11 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
requestCapability = (0, _util.createPromiseCapability)();
this._requests.push(requestCapability);
- return _context.abrupt('return', requestCapability.promise);
+
+ return _context.abrupt("return", requestCapability.promise);
case 8:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -14460,23 +17387,25 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
}));
function read() {
- return _ref.apply(this, arguments);
+ return _read.apply(this, arguments);
}
return read;
}(),
-
cancel: function PDFDataTransportStreamReader_cancel(reason) {
this._done = true;
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
}
};
+
function PDFDataTransportStreamRangeReader(stream, begin, end) {
this._stream = stream;
this._begin = begin;
@@ -14486,37 +17415,48 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
this._done = false;
this.onProgress = null;
}
+
PDFDataTransportStreamRangeReader.prototype = {
_enqueue: function PDFDataTransportStreamRangeReader_enqueue(chunk) {
if (this._done) {
return;
}
+
if (this._requests.length === 0) {
this._queuedChunk = chunk;
} else {
var requestsCapability = this._requests.shift();
+
requestsCapability.resolve({
value: chunk,
done: false
});
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
}
+
this._done = true;
+
this._stream._removeRangeReader(this);
},
+
get isStreamingSupported() {
return false;
},
+
read: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+ var _read2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
var chunk, requestCapability;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -14526,9 +17466,8 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
}
chunk = this._queuedChunk;
-
this._queuedChunk = null;
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: chunk,
done: false
});
@@ -14539,7 +17478,7 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
break;
}
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: undefined,
done: true
});
@@ -14548,10 +17487,11 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
requestCapability = (0, _util.createPromiseCapability)();
this._requests.push(requestCapability);
- return _context2.abrupt('return', requestCapability.promise);
+
+ return _context2.abrupt("return", requestCapability.promise);
case 9:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -14559,26 +17499,29 @@ var PDFDataTransportStream = function PDFDataTransportStreamClosure() {
}));
function read() {
- return _ref2.apply(this, arguments);
+ return _read2.apply(this, arguments);
}
return read;
}(),
-
cancel: function PDFDataTransportStreamRangeReader_cancel(reason) {
this._done = true;
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
+
this._stream._removeRangeReader(this);
}
};
return PDFDataTransportStream;
}();
+
exports.PDFDataTransportStream = PDFDataTransportStream;
/***/ }),
@@ -14591,18 +17534,22 @@ exports.PDFDataTransportStream = PDFDataTransportStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.WebGLContext = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.WebGLContext = void 0;
var _util = __w_pdfjs_require__(1);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var WebGLContext = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var WebGLContext =
+/*#__PURE__*/
+function () {
function WebGLContext(_ref) {
var _ref$enable = _ref.enable,
- enable = _ref$enable === undefined ? false : _ref$enable;
+ enable = _ref$enable === void 0 ? false : _ref$enable;
_classCallCheck(this, WebGLContext);
@@ -14610,37 +17557,37 @@ var WebGLContext = function () {
}
_createClass(WebGLContext, [{
- key: 'composeSMask',
+ key: "composeSMask",
value: function composeSMask(_ref2) {
var layer = _ref2.layer,
mask = _ref2.mask,
properties = _ref2.properties;
-
return WebGLUtils.composeSMask(layer, mask, properties);
}
}, {
- key: 'drawFigures',
+ key: "drawFigures",
value: function drawFigures(_ref3) {
var width = _ref3.width,
height = _ref3.height,
backgroundColor = _ref3.backgroundColor,
figures = _ref3.figures,
context = _ref3.context;
-
return WebGLUtils.drawFigures(width, height, backgroundColor, figures, context);
}
}, {
- key: 'clear',
+ key: "clear",
value: function clear() {
WebGLUtils.cleanup();
}
}, {
- key: 'isEnabled',
+ key: "isEnabled",
get: function get() {
var enabled = this._enabled;
+
if (enabled) {
enabled = WebGLUtils.tryInitGL();
}
+
return (0, _util.shadow)(this, 'isEnabled', enabled);
}
}]);
@@ -14648,37 +17595,49 @@ var WebGLContext = function () {
return WebGLContext;
}();
+exports.WebGLContext = WebGLContext;
+
var WebGLUtils = function WebGLUtilsClosure() {
function loadShader(gl, code, shaderType) {
var shader = gl.createShader(shaderType);
gl.shaderSource(shader, code);
gl.compileShader(shader);
var compiled = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
+
if (!compiled) {
var errorMsg = gl.getShaderInfoLog(shader);
throw new Error('Error during shader compilation: ' + errorMsg);
}
+
return shader;
}
+
function createVertexShader(gl, code) {
return loadShader(gl, code, gl.VERTEX_SHADER);
}
+
function createFragmentShader(gl, code) {
return loadShader(gl, code, gl.FRAGMENT_SHADER);
}
+
function createProgram(gl, shaders) {
var program = gl.createProgram();
+
for (var i = 0, ii = shaders.length; i < ii; ++i) {
gl.attachShader(program, shaders[i]);
}
+
gl.linkProgram(program);
var linked = gl.getProgramParameter(program, gl.LINK_STATUS);
+
if (!linked) {
var errorMsg = gl.getProgramInfoLog(program);
throw new Error('Error during program linking: ' + errorMsg);
}
+
return program;
}
+
function createTexture(gl, image, textureId) {
gl.activeTexture(textureId);
var texture = gl.createTexture();
@@ -14690,14 +17649,20 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, image);
return texture;
}
+
var currentGL, currentCanvas;
+
function generateGL() {
if (currentGL) {
return;
}
+
currentCanvas = document.createElement('canvas');
- currentGL = currentCanvas.getContext('webgl', { premultipliedalpha: false });
+ currentGL = currentCanvas.getContext('webgl', {
+ premultipliedalpha: false
+ });
}
+
var smaskVertexShaderCode = '\
attribute vec2 a_position; \
attribute vec2 a_texCoord; \
@@ -14741,6 +17706,7 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl_FragColor = imageColor; \
} ';
var smaskCache = null;
+
function initSmaskGL() {
var canvas, gl;
generateGL();
@@ -14771,12 +17737,15 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl.uniform1i(texMaskLocation, 1);
smaskCache = cache;
}
+
function composeSMask(layer, mask, properties) {
var width = layer.width,
height = layer.height;
+
if (!smaskCache) {
initSmaskGL();
}
+
var cache = smaskCache,
canvas = cache.canvas,
gl = cache.gl;
@@ -14784,11 +17753,13 @@ var WebGLUtils = function WebGLUtilsClosure() {
canvas.height = height;
gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
gl.uniform2f(cache.resolutionLocation, width, height);
+
if (properties.backdrop) {
gl.uniform4f(cache.resolutionLocation, properties.backdrop[0], properties.backdrop[1], properties.backdrop[2], 1);
} else {
gl.uniform4f(cache.resolutionLocation, 0, 0, 0, 0);
}
+
gl.uniform1i(cache.subtypeLocation, properties.subtype === 'Luminosity' ? 1 : 0);
var texture = createTexture(gl, layer, gl.TEXTURE0);
var maskTexture = createTexture(gl, mask, gl.TEXTURE1);
@@ -14808,6 +17779,7 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl.deleteBuffer(buffer);
return canvas;
}
+
var figuresVertexShaderCode = '\
attribute vec2 a_position; \
attribute vec3 a_color; \
@@ -14834,6 +17806,7 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl_FragColor = v_color; \
} ';
var figuresCache = null;
+
function initFiguresGL() {
var canvas, gl;
generateGL();
@@ -14855,10 +17828,12 @@ var WebGLUtils = function WebGLUtilsClosure() {
cache.colorLocation = gl.getAttribLocation(program, 'a_color');
figuresCache = cache;
}
+
function drawFigures(width, height, backgroundColor, figures, context) {
if (!figuresCache) {
initFiguresGL();
}
+
var cache = figuresCache,
canvas = cache.canvas,
gl = cache.gl;
@@ -14868,33 +17843,40 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl.uniform2f(cache.resolutionLocation, width, height);
var count = 0;
var i, ii, rows;
+
for (i = 0, ii = figures.length; i < ii; i++) {
switch (figures[i].type) {
case 'lattice':
rows = figures[i].coords.length / figures[i].verticesPerRow | 0;
count += (rows - 1) * (figures[i].verticesPerRow - 1) * 6;
break;
+
case 'triangles':
count += figures[i].coords.length;
break;
}
}
+
var coords = new Float32Array(count * 2);
var colors = new Uint8Array(count * 3);
var coordsMap = context.coords,
colorsMap = context.colors;
var pIndex = 0,
cIndex = 0;
+
for (i = 0, ii = figures.length; i < ii; i++) {
var figure = figures[i],
ps = figure.coords,
cs = figure.colors;
+
switch (figure.type) {
case 'lattice':
var cols = figure.verticesPerRow;
rows = ps.length / cols | 0;
+
for (var row = 1; row < rows; row++) {
var offset = row * cols + 1;
+
for (var col = 1; col < cols; col++, offset++) {
coords[pIndex] = coordsMap[ps[offset - cols - 1]];
coords[pIndex + 1] = coordsMap[ps[offset - cols - 1] + 1];
@@ -14930,7 +17912,9 @@ var WebGLUtils = function WebGLUtilsClosure() {
cIndex += 18;
}
}
+
break;
+
case 'triangles':
for (var j = 0, jj = ps.length; j < jj; j++) {
coords[pIndex] = coordsMap[ps[j]];
@@ -14941,14 +17925,17 @@ var WebGLUtils = function WebGLUtilsClosure() {
pIndex += 2;
cIndex += 3;
}
+
break;
}
}
+
if (backgroundColor) {
gl.clearColor(backgroundColor[0] / 255, backgroundColor[1] / 255, backgroundColor[2] / 255, 1.0);
} else {
gl.clearColor(0, 0, 0, 0);
}
+
gl.clear(gl.COLOR_BUFFER_BIT);
var coordsBuffer = gl.createBuffer();
gl.bindBuffer(gl.ARRAY_BUFFER, coordsBuffer);
@@ -14968,15 +17955,16 @@ var WebGLUtils = function WebGLUtilsClosure() {
gl.deleteBuffer(colorsBuffer);
return canvas;
}
+
return {
tryInitGL: function tryInitGL() {
try {
generateGL();
return !!currentGL;
} catch (ex) {}
+
return false;
},
-
composeSMask: composeSMask,
drawFigures: drawFigures,
cleanup: function cleanup() {
@@ -14984,16 +17972,17 @@ var WebGLUtils = function WebGLUtilsClosure() {
smaskCache.canvas.width = 0;
smaskCache.canvas.height = 0;
}
+
if (figuresCache && figuresCache.canvas) {
figuresCache.canvas.width = 0;
figuresCache.canvas.height = 0;
}
+
smaskCache = null;
figuresCache = null;
}
};
}();
-exports.WebGLContext = WebGLContext;
/***/ }),
/* 149 */
@@ -15005,25 +17994,26 @@ exports.WebGLContext = WebGLContext;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.renderTextLayer = undefined;
+exports.renderTextLayer = void 0;
var _util = __w_pdfjs_require__(1);
-var _global_scope = __w_pdfjs_require__(3);
-
-var _global_scope2 = _interopRequireDefault(_global_scope);
+var _global_scope = _interopRequireDefault(__w_pdfjs_require__(3));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var renderTextLayer = function renderTextLayerClosure() {
var MAX_TEXT_DIVS_TO_RENDER = 100000;
var NonWhitespaceRegexp = /\S/;
+
function isAllWhitespace(str) {
return !NonWhitespaceRegexp.test(str);
}
+
var styleBuf = ['left: ', 0, 'px; top: ', 0, 'px; font-size: ', 0, 'px; font-family: ', '', ';'];
+
function appendText(task, geom, styles) {
- var textDiv = document.createElement('div');
+ var textDiv = document.createElement('span');
var textDivProperties = {
style: null,
angle: 0,
@@ -15036,27 +18026,38 @@ var renderTextLayer = function renderTextLayerClosure() {
paddingTop: 0,
scale: 1
};
+
task._textDivs.push(textDiv);
+
if (isAllWhitespace(geom.str)) {
textDivProperties.isWhitespace = true;
+
task._textDivProperties.set(textDiv, textDivProperties);
+
return;
}
+
var tx = _util.Util.transform(task._viewport.transform, geom.transform);
+
var angle = Math.atan2(tx[1], tx[0]);
var style = styles[geom.fontName];
+
if (style.vertical) {
angle += Math.PI / 2;
}
+
var fontHeight = Math.sqrt(tx[2] * tx[2] + tx[3] * tx[3]);
var fontAscent = fontHeight;
+
if (style.ascent) {
fontAscent = style.ascent * fontAscent;
} else if (style.descent) {
fontAscent = (1 + style.descent) * fontAscent;
}
+
var left;
var top;
+
if (angle === 0) {
left = tx[4];
top = tx[5] - fontAscent;
@@ -15064,6 +18065,7 @@ var renderTextLayer = function renderTextLayerClosure() {
left = tx[4] + fontAscent * Math.sin(angle);
top = tx[5] - fontAscent * Math.cos(angle);
}
+
styleBuf[1] = left;
styleBuf[3] = top;
styleBuf[5] = fontHeight;
@@ -15071,12 +18073,15 @@ var renderTextLayer = function renderTextLayerClosure() {
textDivProperties.style = styleBuf.join('');
textDiv.setAttribute('style', textDivProperties.style);
textDiv.textContent = geom.str;
+
if (task._fontInspectorEnabled) {
textDiv.dataset.fontName = geom.fontName;
}
+
if (angle !== 0) {
textDivProperties.angle = angle * (180 / Math.PI);
}
+
if (geom.str.length > 1) {
if (style.vertical) {
textDivProperties.canvasWidth = geom.height * task._viewport.scale;
@@ -15084,26 +18089,33 @@ var renderTextLayer = function renderTextLayerClosure() {
textDivProperties.canvasWidth = geom.width * task._viewport.scale;
}
}
+
task._textDivProperties.set(textDiv, textDivProperties);
+
if (task._textContentStream) {
task._layoutText(textDiv);
}
+
if (task._enhanceTextSelection) {
var angleCos = 1,
angleSin = 0;
+
if (angle !== 0) {
angleCos = Math.cos(angle);
angleSin = Math.sin(angle);
}
+
var divWidth = (style.vertical ? geom.height : geom.width) * task._viewport.scale;
var divHeight = fontHeight;
var m, b;
+
if (angle !== 0) {
m = [angleCos, angleSin, -angleSin, angleCos, left, top];
b = _util.Util.getAxialAlignedBoundingBox([0, 0, divWidth, divHeight], m);
} else {
b = [left, top, left + divWidth, top + divHeight];
}
+
task._bounds.push({
left: b[0],
top: b[1],
@@ -15115,41 +18127,53 @@ var renderTextLayer = function renderTextLayerClosure() {
});
}
}
+
function render(task) {
if (task._canceled) {
return;
}
+
var textDivs = task._textDivs;
var capability = task._capability;
var textDivsLength = textDivs.length;
+
if (textDivsLength > MAX_TEXT_DIVS_TO_RENDER) {
task._renderingDone = true;
capability.resolve();
return;
}
+
if (!task._textContentStream) {
for (var i = 0; i < textDivsLength; i++) {
task._layoutText(textDivs[i]);
}
}
+
task._renderingDone = true;
capability.resolve();
}
+
function expand(task) {
var bounds = task._bounds;
var viewport = task._viewport;
var expanded = expandBounds(viewport.width, viewport.height, bounds);
+
for (var i = 0; i < expanded.length; i++) {
var div = bounds[i].div;
+
var divProperties = task._textDivProperties.get(div);
+
if (divProperties.angle === 0) {
divProperties.paddingLeft = bounds[i].left - expanded[i].left;
divProperties.paddingTop = bounds[i].top - expanded[i].top;
divProperties.paddingRight = expanded[i].right - bounds[i].right;
divProperties.paddingBottom = expanded[i].bottom - bounds[i].bottom;
+
task._textDivProperties.set(div, divProperties);
+
continue;
}
+
var e = expanded[i],
b = bounds[i];
var m = b.m,
@@ -15159,6 +18183,7 @@ var renderTextLayer = function renderTextLayerClosure() {
var ts = new Float64Array(64);
points.forEach(function (p, i) {
var t = _util.Util.applyTransform(p, m);
+
ts[i + 0] = c && (e.left - t[0]) / c;
ts[i + 4] = s && (e.top - t[1]) / s;
ts[i + 8] = c && (e.right - t[0]) / c;
@@ -15176,24 +18201,31 @@ var renderTextLayer = function renderTextLayerClosure() {
ts[i + 56] = s && (e.right - t[0]) / s;
ts[i + 60] = c && (e.bottom - t[1]) / -c;
});
+
var findPositiveMin = function findPositiveMin(ts, offset, count) {
var result = 0;
+
for (var i = 0; i < count; i++) {
var t = ts[offset++];
+
if (t > 0) {
result = result ? Math.min(t, result) : t;
}
}
+
return result;
};
+
var boxScale = 1 + Math.min(Math.abs(c), Math.abs(s));
divProperties.paddingLeft = findPositiveMin(ts, 32, 16) / boxScale;
divProperties.paddingTop = findPositiveMin(ts, 48, 16) / boxScale;
divProperties.paddingRight = findPositiveMin(ts, 0, 16) / boxScale;
divProperties.paddingBottom = findPositiveMin(ts, 16, 16) / boxScale;
+
task._textDivProperties.set(div, divProperties);
}
}
+
function expandBounds(width, height, boxes) {
var bounds = boxes.map(function (box, i) {
return {
@@ -15236,6 +18268,7 @@ var renderTextLayer = function renderTextLayerClosure() {
});
return expanded;
}
+
function expandBoundsLTR(width, bounds) {
bounds.sort(function (a, b) {
return a.x1 - b.x1 || a.index - b.index;
@@ -15256,21 +18289,27 @@ var renderTextLayer = function renderTextLayerClosure() {
}];
bounds.forEach(function (boundary) {
var i = 0;
+
while (i < horizon.length && horizon[i].end <= boundary.y1) {
i++;
}
+
var j = horizon.length - 1;
+
while (j >= 0 && horizon[j].start >= boundary.y2) {
j--;
}
+
var horizonPart, affectedBoundary;
var q,
k,
maxXNew = -Infinity;
+
for (q = i; q <= j; q++) {
horizonPart = horizon[q];
affectedBoundary = horizonPart.boundary;
var xNew;
+
if (affectedBoundary.x2 > boundary.x1) {
xNew = affectedBoundary.index > boundary.index ? affectedBoundary.x1New : boundary.x1;
} else if (affectedBoundary.x2New === undefined) {
@@ -15278,14 +18317,18 @@ var renderTextLayer = function renderTextLayerClosure() {
} else {
xNew = affectedBoundary.x2New;
}
+
if (xNew > maxXNew) {
maxXNew = xNew;
}
}
+
boundary.x1New = maxXNew;
+
for (q = i; q <= j; q++) {
horizonPart = horizon[q];
affectedBoundary = horizonPart.boundary;
+
if (affectedBoundary.x2New === undefined) {
if (affectedBoundary.x2 > boundary.x1) {
if (affectedBoundary.index > boundary.index) {
@@ -15298,12 +18341,15 @@ var renderTextLayer = function renderTextLayerClosure() {
affectedBoundary.x2New = Math.max(maxXNew, affectedBoundary.x2);
}
}
+
var changedHorizon = [],
lastBoundary = null;
+
for (q = i; q <= j; q++) {
horizonPart = horizon[q];
affectedBoundary = horizonPart.boundary;
var useBoundary = affectedBoundary.x2 > boundary.x2 ? affectedBoundary : boundary;
+
if (lastBoundary === useBoundary) {
changedHorizon[changedHorizon.length - 1].end = horizonPart.end;
} else {
@@ -15315,6 +18361,7 @@ var renderTextLayer = function renderTextLayerClosure() {
lastBoundary = useBoundary;
}
}
+
if (horizon[i].start < boundary.y1) {
changedHorizon[0].start = boundary.y1;
changedHorizon.unshift({
@@ -15323,6 +18370,7 @@ var renderTextLayer = function renderTextLayerClosure() {
boundary: horizon[i].boundary
});
}
+
if (boundary.y2 < horizon[j].end) {
changedHorizon[changedHorizon.length - 1].end = boundary.y2;
changedHorizon.push({
@@ -15331,35 +18379,45 @@ var renderTextLayer = function renderTextLayerClosure() {
boundary: horizon[j].boundary
});
}
+
for (q = i; q <= j; q++) {
horizonPart = horizon[q];
affectedBoundary = horizonPart.boundary;
+
if (affectedBoundary.x2New !== undefined) {
continue;
}
+
var used = false;
+
for (k = i - 1; !used && k >= 0 && horizon[k].start >= affectedBoundary.y1; k--) {
used = horizon[k].boundary === affectedBoundary;
}
+
for (k = j + 1; !used && k < horizon.length && horizon[k].end <= affectedBoundary.y2; k++) {
used = horizon[k].boundary === affectedBoundary;
}
+
for (k = 0; !used && k < changedHorizon.length; k++) {
used = changedHorizon[k].boundary === affectedBoundary;
}
+
if (!used) {
affectedBoundary.x2New = maxXNew;
}
}
+
Array.prototype.splice.apply(horizon, [i, j - i + 1].concat(changedHorizon));
});
horizon.forEach(function (horizonPart) {
var affectedBoundary = horizonPart.boundary;
+
if (affectedBoundary.x2New === undefined) {
affectedBoundary.x2New = Math.max(width, affectedBoundary.x2);
}
});
}
+
function TextLayerRenderTask(_ref) {
var textContent = _ref.textContent,
textContentStream = _ref.textContentStream,
@@ -15368,7 +18426,6 @@ var renderTextLayer = function renderTextLayerClosure() {
textDivs = _ref.textDivs,
textContentItemsStr = _ref.textContentItemsStr,
enhanceTextSelection = _ref.enhanceTextSelection;
-
this._textContent = textContent;
this._textContentStream = textContentStream;
this._container = container;
@@ -15376,7 +18433,7 @@ var renderTextLayer = function renderTextLayerClosure() {
this._textDivs = textDivs || [];
this._textContentItemsStr = textContentItemsStr || [];
this._enhanceTextSelection = !!enhanceTextSelection;
- this._fontInspectorEnabled = !!(_global_scope2.default.FontInspector && _global_scope2.default.FontInspector.enabled);
+ this._fontInspectorEnabled = !!(_global_scope.default.FontInspector && _global_scope.default.FontInspector.enabled);
this._reader = null;
this._layoutTextLastFontSize = null;
this._layoutTextLastFontFamily = null;
@@ -15388,58 +18445,75 @@ var renderTextLayer = function renderTextLayerClosure() {
this._renderTimer = null;
this._bounds = [];
}
+
TextLayerRenderTask.prototype = {
get promise() {
return this._capability.promise;
},
+
cancel: function TextLayer_cancel() {
if (this._reader) {
this._reader.cancel(new _util.AbortException('text layer task cancelled'));
+
this._reader = null;
}
+
this._canceled = true;
+
if (this._renderTimer !== null) {
clearTimeout(this._renderTimer);
this._renderTimer = null;
}
+
this._capability.reject('canceled');
},
_processItems: function _processItems(items, styleCache) {
for (var i = 0, len = items.length; i < len; i++) {
this._textContentItemsStr.push(items[i].str);
+
appendText(this, items[i], styleCache);
}
},
_layoutText: function _layoutText(textDiv) {
var textLayerFrag = this._container;
+
var textDivProperties = this._textDivProperties.get(textDiv);
+
if (textDivProperties.isWhitespace) {
return;
}
+
var fontSize = textDiv.style.fontSize;
var fontFamily = textDiv.style.fontFamily;
+
if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
this._layoutTextLastFontSize = fontSize;
this._layoutTextLastFontFamily = fontFamily;
}
+
var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
+
var transform = '';
+
if (textDivProperties.canvasWidth !== 0 && width > 0) {
textDivProperties.scale = textDivProperties.canvasWidth / width;
transform = 'scaleX(' + textDivProperties.scale + ')';
}
+
if (textDivProperties.angle !== 0) {
transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
}
+
if (transform !== '') {
textDivProperties.originalTransform = transform;
textDiv.style.transform = transform;
}
+
this._textDivProperties.set(textDiv, textDivProperties);
+
textLayerFrag.appendChild(textDiv);
},
-
_render: function TextLayer_render(timeout) {
var _this = this;
@@ -15447,11 +18521,16 @@ var renderTextLayer = function renderTextLayerClosure() {
var styleCache = Object.create(null);
var canvas = document.createElement('canvas');
canvas.mozOpaque = true;
- this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
+ this._layoutTextCtx = canvas.getContext('2d', {
+ alpha: false
+ });
+
if (this._textContent) {
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
+
this._processItems(textItems, textStyles);
+
capability.resolve();
} else if (this._textContentStream) {
var pump = function pump() {
@@ -15463,18 +18542,24 @@ var renderTextLayer = function renderTextLayerClosure() {
capability.resolve();
return;
}
+
Object.assign(styleCache, value.styles);
+
_this._processItems(value.items, styleCache);
+
pump();
}, capability.reject);
};
+
this._reader = this._textContentStream.getReader();
pump();
} else {
throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
}
+
capability.promise.then(function () {
styleCache = null;
+
if (!timeout) {
render(_this);
} else {
@@ -15489,42 +18574,55 @@ var renderTextLayer = function renderTextLayerClosure() {
if (!this._enhanceTextSelection || !this._renderingDone) {
return;
}
+
if (this._bounds !== null) {
expand(this);
this._bounds = null;
}
+
for (var i = 0, ii = this._textDivs.length; i < ii; i++) {
var div = this._textDivs[i];
+
var divProperties = this._textDivProperties.get(div);
+
if (divProperties.isWhitespace) {
continue;
}
+
if (expandDivs) {
var transform = '',
padding = '';
+
if (divProperties.scale !== 1) {
transform = 'scaleX(' + divProperties.scale + ')';
}
+
if (divProperties.angle !== 0) {
transform = 'rotate(' + divProperties.angle + 'deg) ' + transform;
}
+
if (divProperties.paddingLeft !== 0) {
padding += ' padding-left: ' + divProperties.paddingLeft / divProperties.scale + 'px;';
transform += ' translateX(' + -divProperties.paddingLeft / divProperties.scale + 'px)';
}
+
if (divProperties.paddingTop !== 0) {
padding += ' padding-top: ' + divProperties.paddingTop + 'px;';
transform += ' translateY(' + -divProperties.paddingTop + 'px)';
}
+
if (divProperties.paddingRight !== 0) {
padding += ' padding-right: ' + divProperties.paddingRight / divProperties.scale + 'px;';
}
+
if (divProperties.paddingBottom !== 0) {
padding += ' padding-bottom: ' + divProperties.paddingBottom + 'px;';
}
+
if (padding !== '') {
div.setAttribute('style', divProperties.style + padding);
}
+
if (transform !== '') {
div.style.transform = transform;
}
@@ -15535,6 +18633,7 @@ var renderTextLayer = function renderTextLayerClosure() {
}
}
};
+
function renderTextLayer(renderParameters) {
var task = new TextLayerRenderTask({
textContent: renderParameters.textContent,
@@ -15545,11 +18644,15 @@ var renderTextLayer = function renderTextLayerClosure() {
textContentItemsStr: renderParameters.textContentItemsStr,
enhanceTextSelection: renderParameters.enhanceTextSelection
});
+
task._render(renderParameters.timeout);
+
return task;
}
+
return renderTextLayer;
}();
+
exports.renderTextLayer = renderTextLayer;
/***/ }),
@@ -15562,78 +18665,114 @@ exports.renderTextLayer = renderTextLayer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.AnnotationLayer = undefined;
+exports.AnnotationLayer = void 0;
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+var _dom_utils = __w_pdfjs_require__(138);
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _util = __w_pdfjs_require__(1);
-var _dom_utils = __w_pdfjs_require__(134);
+function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
-var _util = __w_pdfjs_require__(1);
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var AnnotationElementFactory = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var AnnotationElementFactory =
+/*#__PURE__*/
+function () {
function AnnotationElementFactory() {
_classCallCheck(this, AnnotationElementFactory);
}
_createClass(AnnotationElementFactory, null, [{
- key: 'create',
+ key: "create",
value: function create(parameters) {
var subtype = parameters.data.annotationType;
+
switch (subtype) {
case _util.AnnotationType.LINK:
return new LinkAnnotationElement(parameters);
+
case _util.AnnotationType.TEXT:
return new TextAnnotationElement(parameters);
+
case _util.AnnotationType.WIDGET:
var fieldType = parameters.data.fieldType;
+
switch (fieldType) {
case 'Tx':
return new TextWidgetAnnotationElement(parameters);
+
case 'Btn':
if (parameters.data.radioButton) {
return new RadioButtonWidgetAnnotationElement(parameters);
} else if (parameters.data.checkBox) {
return new CheckboxWidgetAnnotationElement(parameters);
}
+
return new PushButtonWidgetAnnotationElement(parameters);
+
case 'Ch':
return new ChoiceWidgetAnnotationElement(parameters);
}
+
return new WidgetAnnotationElement(parameters);
+
case _util.AnnotationType.POPUP:
return new PopupAnnotationElement(parameters);
+
case _util.AnnotationType.LINE:
return new LineAnnotationElement(parameters);
+
case _util.AnnotationType.SQUARE:
return new SquareAnnotationElement(parameters);
+
case _util.AnnotationType.CIRCLE:
return new CircleAnnotationElement(parameters);
+
case _util.AnnotationType.POLYLINE:
return new PolylineAnnotationElement(parameters);
+
case _util.AnnotationType.INK:
return new InkAnnotationElement(parameters);
+
case _util.AnnotationType.POLYGON:
return new PolygonAnnotationElement(parameters);
+
case _util.AnnotationType.HIGHLIGHT:
return new HighlightAnnotationElement(parameters);
+
case _util.AnnotationType.UNDERLINE:
return new UnderlineAnnotationElement(parameters);
+
case _util.AnnotationType.SQUIGGLY:
return new SquigglyAnnotationElement(parameters);
+
case _util.AnnotationType.STRIKEOUT:
return new StrikeOutAnnotationElement(parameters);
+
case _util.AnnotationType.STAMP:
return new StampAnnotationElement(parameters);
+
case _util.AnnotationType.FILEATTACHMENT:
return new FileAttachmentAnnotationElement(parameters);
+
default:
return new AnnotationElement(parameters);
}
@@ -15643,7 +18782,9 @@ var AnnotationElementFactory = function () {
return AnnotationElementFactory;
}();
-var AnnotationElement = function () {
+var AnnotationElement =
+/*#__PURE__*/
+function () {
function AnnotationElement(parameters) {
var isRenderable = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
var ignoreBorder = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -15660,16 +18801,16 @@ var AnnotationElement = function () {
this.imageResourcesPath = parameters.imageResourcesPath;
this.renderInteractiveForms = parameters.renderInteractiveForms;
this.svgFactory = parameters.svgFactory;
+
if (isRenderable) {
this.container = this._createContainer(ignoreBorder);
}
}
_createClass(AnnotationElement, [{
- key: '_createContainer',
+ key: "_createContainer",
value: function _createContainer() {
var ignoreBorder = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
var data = this.data,
page = this.page,
viewport = this.viewport;
@@ -15677,46 +18818,60 @@ var AnnotationElement = function () {
var width = data.rect[2] - data.rect[0];
var height = data.rect[3] - data.rect[1];
container.setAttribute('data-annotation-id', data.id);
+
var rect = _util.Util.normalizeRect([data.rect[0], page.view[3] - data.rect[1] + page.view[1], data.rect[2], page.view[3] - data.rect[3] + page.view[1]]);
+
container.style.transform = 'matrix(' + viewport.transform.join(',') + ')';
container.style.transformOrigin = -rect[0] + 'px ' + -rect[1] + 'px';
+
if (!ignoreBorder && data.borderStyle.width > 0) {
container.style.borderWidth = data.borderStyle.width + 'px';
+
if (data.borderStyle.style !== _util.AnnotationBorderStyleType.UNDERLINE) {
width = width - 2 * data.borderStyle.width;
height = height - 2 * data.borderStyle.width;
}
+
var horizontalRadius = data.borderStyle.horizontalCornerRadius;
var verticalRadius = data.borderStyle.verticalCornerRadius;
+
if (horizontalRadius > 0 || verticalRadius > 0) {
var radius = horizontalRadius + 'px / ' + verticalRadius + 'px';
container.style.borderRadius = radius;
}
+
switch (data.borderStyle.style) {
case _util.AnnotationBorderStyleType.SOLID:
container.style.borderStyle = 'solid';
break;
+
case _util.AnnotationBorderStyleType.DASHED:
container.style.borderStyle = 'dashed';
break;
+
case _util.AnnotationBorderStyleType.BEVELED:
(0, _util.warn)('Unimplemented border style: beveled');
break;
+
case _util.AnnotationBorderStyleType.INSET:
(0, _util.warn)('Unimplemented border style: inset');
break;
+
case _util.AnnotationBorderStyleType.UNDERLINE:
container.style.borderBottomStyle = 'solid';
break;
+
default:
break;
}
+
if (data.color) {
container.style.borderColor = _util.Util.makeCssRgb(data.color[0] | 0, data.color[1] | 0, data.color[2] | 0);
} else {
container.style.borderWidth = 0;
}
}
+
container.style.left = rect[0] + 'px';
container.style.top = rect[1] + 'px';
container.style.width = width + 'px';
@@ -15724,7 +18879,7 @@ var AnnotationElement = function () {
return container;
}
}, {
- key: '_createPopup',
+ key: "_createPopup",
value: function _createPopup(container, trigger, data) {
if (!trigger) {
trigger = document.createElement('div');
@@ -15732,6 +18887,7 @@ var AnnotationElement = function () {
trigger.style.width = container.style.width;
container.appendChild(trigger);
}
+
var popupElement = new PopupElement({
container: container,
trigger: trigger,
@@ -15745,7 +18901,7 @@ var AnnotationElement = function () {
container.appendChild(popup);
}
}, {
- key: 'render',
+ key: "render",
value: function render() {
(0, _util.unreachable)('Abstract method `AnnotationElement.render` called');
}
@@ -15754,29 +18910,31 @@ var AnnotationElement = function () {
return AnnotationElement;
}();
-var LinkAnnotationElement = function (_AnnotationElement) {
+var LinkAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement) {
_inherits(LinkAnnotationElement, _AnnotationElement);
function LinkAnnotationElement(parameters) {
_classCallCheck(this, LinkAnnotationElement);
var isRenderable = !!(parameters.data.url || parameters.data.dest || parameters.data.action);
- return _possibleConstructorReturn(this, (LinkAnnotationElement.__proto__ || Object.getPrototypeOf(LinkAnnotationElement)).call(this, parameters, isRenderable));
+ return _possibleConstructorReturn(this, _getPrototypeOf(LinkAnnotationElement).call(this, parameters, isRenderable));
}
_createClass(LinkAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'linkAnnotation';
var data = this.data,
linkService = this.linkService;
-
var link = document.createElement('a');
(0, _dom_utils.addLinkAttributes)(link, {
url: data.url,
target: data.newWindow ? _dom_utils.LinkTarget.BLANK : linkService.externalLinkTarget,
rel: linkService.externalLinkRel
});
+
if (!data.url) {
if (data.action) {
this._bindNamedAction(link, data.action);
@@ -15784,35 +18942,42 @@ var LinkAnnotationElement = function (_AnnotationElement) {
this._bindLink(link, data.dest);
}
}
+
this.container.appendChild(link);
return this.container;
}
}, {
- key: '_bindLink',
+ key: "_bindLink",
value: function _bindLink(link, destination) {
- var _this2 = this;
+ var _this = this;
link.href = this.linkService.getDestinationHash(destination);
+
link.onclick = function () {
if (destination) {
- _this2.linkService.navigateTo(destination);
+ _this.linkService.navigateTo(destination);
}
+
return false;
};
+
if (destination) {
link.className = 'internalLink';
}
}
}, {
- key: '_bindNamedAction',
+ key: "_bindNamedAction",
value: function _bindNamedAction(link, action) {
- var _this3 = this;
+ var _this2 = this;
link.href = this.linkService.getAnchorUrl('');
+
link.onclick = function () {
- _this3.linkService.executeNamedAction(action);
+ _this2.linkService.executeNamedAction(action);
+
return false;
};
+
link.className = 'internalLink';
}
}]);
@@ -15820,18 +18985,20 @@ var LinkAnnotationElement = function (_AnnotationElement) {
return LinkAnnotationElement;
}(AnnotationElement);
-var TextAnnotationElement = function (_AnnotationElement2) {
+var TextAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement2) {
_inherits(TextAnnotationElement, _AnnotationElement2);
function TextAnnotationElement(parameters) {
_classCallCheck(this, TextAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (TextAnnotationElement.__proto__ || Object.getPrototypeOf(TextAnnotationElement)).call(this, parameters, isRenderable));
+ return _possibleConstructorReturn(this, _getPrototypeOf(TextAnnotationElement).call(this, parameters, isRenderable));
}
_createClass(TextAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'textAnnotation';
var image = document.createElement('img');
@@ -15840,10 +19007,14 @@ var TextAnnotationElement = function (_AnnotationElement2) {
image.src = this.imageResourcesPath + 'annotation-' + this.data.name.toLowerCase() + '.svg';
image.alt = '[{{type}} Annotation]';
image.dataset.l10nId = 'text_annotation_type';
- image.dataset.l10nArgs = JSON.stringify({ type: this.data.name });
+ image.dataset.l10nArgs = JSON.stringify({
+ type: this.data.name
+ });
+
if (!this.data.hasPopup) {
this._createPopup(this.container, image, this.data);
}
+
this.container.appendChild(image);
return this.container;
}
@@ -15852,17 +19023,19 @@ var TextAnnotationElement = function (_AnnotationElement2) {
return TextAnnotationElement;
}(AnnotationElement);
-var WidgetAnnotationElement = function (_AnnotationElement3) {
+var WidgetAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement3) {
_inherits(WidgetAnnotationElement, _AnnotationElement3);
function WidgetAnnotationElement() {
_classCallCheck(this, WidgetAnnotationElement);
- return _possibleConstructorReturn(this, (WidgetAnnotationElement.__proto__ || Object.getPrototypeOf(WidgetAnnotationElement)).apply(this, arguments));
+ return _possibleConstructorReturn(this, _getPrototypeOf(WidgetAnnotationElement).apply(this, arguments));
}
_createClass(WidgetAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
return this.container;
}
@@ -15871,22 +19044,25 @@ var WidgetAnnotationElement = function (_AnnotationElement3) {
return WidgetAnnotationElement;
}(AnnotationElement);
-var TextWidgetAnnotationElement = function (_WidgetAnnotationElem) {
+var TextWidgetAnnotationElement =
+/*#__PURE__*/
+function (_WidgetAnnotationElem) {
_inherits(TextWidgetAnnotationElement, _WidgetAnnotationElem);
function TextWidgetAnnotationElement(parameters) {
_classCallCheck(this, TextWidgetAnnotationElement);
var isRenderable = parameters.renderInteractiveForms || !parameters.data.hasAppearance && !!parameters.data.fieldValue;
- return _possibleConstructorReturn(this, (TextWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(TextWidgetAnnotationElement)).call(this, parameters, isRenderable));
+ return _possibleConstructorReturn(this, _getPrototypeOf(TextWidgetAnnotationElement).call(this, parameters, isRenderable));
}
_createClass(TextWidgetAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
var TEXT_ALIGNMENT = ['left', 'center', 'right'];
this.container.className = 'textWidgetAnnotation';
var element = null;
+
if (this.renderInteractiveForms) {
if (this.data.multiLine) {
element = document.createElement('textarea');
@@ -15896,10 +19072,13 @@ var TextWidgetAnnotationElement = function (_WidgetAnnotationElem) {
element.type = 'text';
element.setAttribute('value', this.data.fieldValue);
}
+
element.disabled = this.data.readOnly;
+
if (this.data.maxLen !== null) {
element.maxLength = this.data.maxLen;
}
+
if (this.data.comb) {
var fieldWidth = this.data.rect[2] - this.data.rect[0];
var combWidth = fieldWidth / this.data.maxLen;
@@ -15912,26 +19091,32 @@ var TextWidgetAnnotationElement = function (_WidgetAnnotationElem) {
element.style.verticalAlign = 'middle';
element.style.display = 'table-cell';
var font = null;
- if (this.data.fontRefName) {
- font = this.page.commonObjs.getData(this.data.fontRefName);
+
+ if (this.data.fontRefName && this.page.commonObjs.has(this.data.fontRefName)) {
+ font = this.page.commonObjs.get(this.data.fontRefName);
}
+
this._setTextStyle(element, font);
}
+
if (this.data.textAlignment !== null) {
element.style.textAlign = TEXT_ALIGNMENT[this.data.textAlignment];
}
+
this.container.appendChild(element);
return this.container;
}
}, {
- key: '_setTextStyle',
+ key: "_setTextStyle",
value: function _setTextStyle(element, font) {
var style = element.style;
style.fontSize = this.data.fontSize + 'px';
style.direction = this.data.fontDirection < 0 ? 'rtl' : 'ltr';
+
if (!font) {
return;
}
+
style.fontWeight = font.black ? font.bold ? '900' : 'bold' : font.bold ? 'bold' : 'normal';
style.fontStyle = font.italic ? 'italic' : 'normal';
var fontFamily = font.loadedName ? '"' + font.loadedName + '", ' : '';
@@ -15943,25 +19128,29 @@ var TextWidgetAnnotationElement = function (_WidgetAnnotationElem) {
return TextWidgetAnnotationElement;
}(WidgetAnnotationElement);
-var CheckboxWidgetAnnotationElement = function (_WidgetAnnotationElem2) {
+var CheckboxWidgetAnnotationElement =
+/*#__PURE__*/
+function (_WidgetAnnotationElem2) {
_inherits(CheckboxWidgetAnnotationElement, _WidgetAnnotationElem2);
function CheckboxWidgetAnnotationElement(parameters) {
_classCallCheck(this, CheckboxWidgetAnnotationElement);
- return _possibleConstructorReturn(this, (CheckboxWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(CheckboxWidgetAnnotationElement)).call(this, parameters, parameters.renderInteractiveForms));
+ return _possibleConstructorReturn(this, _getPrototypeOf(CheckboxWidgetAnnotationElement).call(this, parameters, parameters.renderInteractiveForms));
}
_createClass(CheckboxWidgetAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'buttonWidgetAnnotation checkBox';
var element = document.createElement('input');
element.disabled = this.data.readOnly;
element.type = 'checkbox';
+
if (this.data.fieldValue && this.data.fieldValue !== 'Off') {
element.setAttribute('checked', true);
}
+
this.container.appendChild(element);
return this.container;
}
@@ -15970,26 +19159,30 @@ var CheckboxWidgetAnnotationElement = function (_WidgetAnnotationElem2) {
return CheckboxWidgetAnnotationElement;
}(WidgetAnnotationElement);
-var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) {
+var RadioButtonWidgetAnnotationElement =
+/*#__PURE__*/
+function (_WidgetAnnotationElem3) {
_inherits(RadioButtonWidgetAnnotationElement, _WidgetAnnotationElem3);
function RadioButtonWidgetAnnotationElement(parameters) {
_classCallCheck(this, RadioButtonWidgetAnnotationElement);
- return _possibleConstructorReturn(this, (RadioButtonWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(RadioButtonWidgetAnnotationElement)).call(this, parameters, parameters.renderInteractiveForms));
+ return _possibleConstructorReturn(this, _getPrototypeOf(RadioButtonWidgetAnnotationElement).call(this, parameters, parameters.renderInteractiveForms));
}
_createClass(RadioButtonWidgetAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'buttonWidgetAnnotation radioButton';
var element = document.createElement('input');
element.disabled = this.data.readOnly;
element.type = 'radio';
element.name = this.data.fieldName;
+
if (this.data.fieldValue === this.data.buttonValue) {
element.setAttribute('checked', true);
}
+
this.container.appendChild(element);
return this.container;
}
@@ -15998,19 +19191,22 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) {
return RadioButtonWidgetAnnotationElement;
}(WidgetAnnotationElement);
-var PushButtonWidgetAnnotationElement = function (_LinkAnnotationElemen) {
+var PushButtonWidgetAnnotationElement =
+/*#__PURE__*/
+function (_LinkAnnotationElemen) {
_inherits(PushButtonWidgetAnnotationElement, _LinkAnnotationElemen);
function PushButtonWidgetAnnotationElement() {
_classCallCheck(this, PushButtonWidgetAnnotationElement);
- return _possibleConstructorReturn(this, (PushButtonWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement)).apply(this, arguments));
+ return _possibleConstructorReturn(this, _getPrototypeOf(PushButtonWidgetAnnotationElement).apply(this, arguments));
}
_createClass(PushButtonWidgetAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
- var container = _get(PushButtonWidgetAnnotationElement.prototype.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement.prototype), 'render', this).call(this);
+ var container = _get(_getPrototypeOf(PushButtonWidgetAnnotationElement.prototype), "render", this).call(this);
+
container.className = 'buttonWidgetAnnotation pushButton';
return container;
}
@@ -16019,37 +19215,45 @@ var PushButtonWidgetAnnotationElement = function (_LinkAnnotationElemen) {
return PushButtonWidgetAnnotationElement;
}(LinkAnnotationElement);
-var ChoiceWidgetAnnotationElement = function (_WidgetAnnotationElem4) {
+var ChoiceWidgetAnnotationElement =
+/*#__PURE__*/
+function (_WidgetAnnotationElem4) {
_inherits(ChoiceWidgetAnnotationElement, _WidgetAnnotationElem4);
function ChoiceWidgetAnnotationElement(parameters) {
_classCallCheck(this, ChoiceWidgetAnnotationElement);
- return _possibleConstructorReturn(this, (ChoiceWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(ChoiceWidgetAnnotationElement)).call(this, parameters, parameters.renderInteractiveForms));
+ return _possibleConstructorReturn(this, _getPrototypeOf(ChoiceWidgetAnnotationElement).call(this, parameters, parameters.renderInteractiveForms));
}
_createClass(ChoiceWidgetAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'choiceWidgetAnnotation';
var selectElement = document.createElement('select');
selectElement.disabled = this.data.readOnly;
+
if (!this.data.combo) {
selectElement.size = this.data.options.length;
+
if (this.data.multiSelect) {
selectElement.multiple = true;
}
}
+
for (var i = 0, ii = this.data.options.length; i < ii; i++) {
var option = this.data.options[i];
var optionElement = document.createElement('option');
optionElement.textContent = option.displayValue;
optionElement.value = option.exportValue;
+
if (this.data.fieldValue.includes(option.displayValue)) {
optionElement.setAttribute('selected', true);
}
+
selectElement.appendChild(optionElement);
}
+
this.container.appendChild(selectElement);
return this.container;
}
@@ -16058,29 +19262,35 @@ var ChoiceWidgetAnnotationElement = function (_WidgetAnnotationElem4) {
return ChoiceWidgetAnnotationElement;
}(WidgetAnnotationElement);
-var PopupAnnotationElement = function (_AnnotationElement4) {
+var PopupAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement4) {
_inherits(PopupAnnotationElement, _AnnotationElement4);
function PopupAnnotationElement(parameters) {
_classCallCheck(this, PopupAnnotationElement);
var isRenderable = !!(parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (PopupAnnotationElement.__proto__ || Object.getPrototypeOf(PopupAnnotationElement)).call(this, parameters, isRenderable));
+ return _possibleConstructorReturn(this, _getPrototypeOf(PopupAnnotationElement).call(this, parameters, isRenderable));
}
_createClass(PopupAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
var IGNORE_TYPES = ['Line', 'Square', 'Circle', 'PolyLine', 'Polygon', 'Ink'];
this.container.className = 'popupAnnotation';
+
if (IGNORE_TYPES.includes(this.data.parentType)) {
return this.container;
}
+
var selector = '[data-annotation-id="' + this.data.parentId + '"]';
var parentElement = this.layer.querySelector(selector);
+
if (!parentElement) {
return this.container;
}
+
var popup = new PopupElement({
container: this.container,
trigger: parentElement,
@@ -16100,7 +19310,9 @@ var PopupAnnotationElement = function (_AnnotationElement4) {
return PopupAnnotationElement;
}(AnnotationElement);
-var PopupElement = function () {
+var PopupElement =
+/*#__PURE__*/
+function () {
function PopupElement(parameters) {
_classCallCheck(this, PopupElement);
@@ -16114,7 +19326,7 @@ var PopupElement = function () {
}
_createClass(PopupElement, [{
- key: 'render',
+ key: "render",
value: function render() {
var BACKGROUND_ENLIGHT = 0.7;
var wrapper = document.createElement('div');
@@ -16124,13 +19336,16 @@ var PopupElement = function () {
var popup = document.createElement('div');
popup.className = 'popup';
var color = this.color;
+
if (color) {
var r = BACKGROUND_ENLIGHT * (255 - color[0]) + color[0];
var g = BACKGROUND_ENLIGHT * (255 - color[1]) + color[1];
var b = BACKGROUND_ENLIGHT * (255 - color[2]) + color[2];
popup.style.backgroundColor = _util.Util.makeCssRgb(r | 0, g | 0, b | 0);
}
+
var contents = this._formatContents(this.contents);
+
var title = document.createElement('h1');
title.textContent = this.title;
this.trigger.addEventListener('click', this._toggle.bind(this));
@@ -16143,21 +19358,24 @@ var PopupElement = function () {
return wrapper;
}
}, {
- key: '_formatContents',
+ key: "_formatContents",
value: function _formatContents(contents) {
var p = document.createElement('p');
var lines = contents.split(/(?:\r\n?|\n)/);
+
for (var i = 0, ii = lines.length; i < ii; ++i) {
var line = lines[i];
p.appendChild(document.createTextNode(line));
+
if (i < ii - 1) {
p.appendChild(document.createElement('br'));
}
}
+
return p;
}
}, {
- key: '_toggle',
+ key: "_toggle",
value: function _toggle() {
if (this.pinned) {
this._hide(true);
@@ -16166,26 +19384,28 @@ var PopupElement = function () {
}
}
}, {
- key: '_show',
+ key: "_show",
value: function _show() {
var pin = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (pin) {
this.pinned = true;
}
+
if (this.hideElement.hasAttribute('hidden')) {
this.hideElement.removeAttribute('hidden');
this.container.style.zIndex += 1;
}
}
}, {
- key: '_hide',
+ key: "_hide",
value: function _hide() {
var unpin = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
if (unpin) {
this.pinned = false;
}
+
if (!this.hideElement.hasAttribute('hidden') && !this.pinned) {
this.hideElement.setAttribute('hidden', true);
this.container.style.zIndex -= 1;
@@ -16196,18 +19416,20 @@ var PopupElement = function () {
return PopupElement;
}();
-var LineAnnotationElement = function (_AnnotationElement5) {
+var LineAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement5) {
_inherits(LineAnnotationElement, _AnnotationElement5);
function LineAnnotationElement(parameters) {
_classCallCheck(this, LineAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (LineAnnotationElement.__proto__ || Object.getPrototypeOf(LineAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(LineAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(LineAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'lineAnnotation';
var data = this.data;
@@ -16223,7 +19445,9 @@ var LineAnnotationElement = function (_AnnotationElement5) {
line.setAttribute('stroke', 'transparent');
svg.appendChild(line);
this.container.append(svg);
+
this._createPopup(this.container, line, data);
+
return this.container;
}
}]);
@@ -16231,18 +19455,20 @@ var LineAnnotationElement = function (_AnnotationElement5) {
return LineAnnotationElement;
}(AnnotationElement);
-var SquareAnnotationElement = function (_AnnotationElement6) {
+var SquareAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement6) {
_inherits(SquareAnnotationElement, _AnnotationElement6);
function SquareAnnotationElement(parameters) {
_classCallCheck(this, SquareAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (SquareAnnotationElement.__proto__ || Object.getPrototypeOf(SquareAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(SquareAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(SquareAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'squareAnnotation';
var data = this.data;
@@ -16260,7 +19486,9 @@ var SquareAnnotationElement = function (_AnnotationElement6) {
square.setAttribute('fill', 'none');
svg.appendChild(square);
this.container.append(svg);
+
this._createPopup(this.container, square, data);
+
return this.container;
}
}]);
@@ -16268,18 +19496,20 @@ var SquareAnnotationElement = function (_AnnotationElement6) {
return SquareAnnotationElement;
}(AnnotationElement);
-var CircleAnnotationElement = function (_AnnotationElement7) {
+var CircleAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement7) {
_inherits(CircleAnnotationElement, _AnnotationElement7);
function CircleAnnotationElement(parameters) {
_classCallCheck(this, CircleAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (CircleAnnotationElement.__proto__ || Object.getPrototypeOf(CircleAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(CircleAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(CircleAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'circleAnnotation';
var data = this.data;
@@ -16297,7 +19527,9 @@ var CircleAnnotationElement = function (_AnnotationElement7) {
circle.setAttribute('fill', 'none');
svg.appendChild(circle);
this.container.append(svg);
+
this._createPopup(this.container, circle, data);
+
return this.container;
}
}]);
@@ -16305,23 +19537,25 @@ var CircleAnnotationElement = function (_AnnotationElement7) {
return CircleAnnotationElement;
}(AnnotationElement);
-var PolylineAnnotationElement = function (_AnnotationElement8) {
+var PolylineAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement8) {
_inherits(PolylineAnnotationElement, _AnnotationElement8);
function PolylineAnnotationElement(parameters) {
+ var _this3;
+
_classCallCheck(this, PolylineAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-
- var _this15 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
-
- _this15.containerClassName = 'polylineAnnotation';
- _this15.svgElementName = 'svg:polyline';
- return _this15;
+ _this3 = _possibleConstructorReturn(this, _getPrototypeOf(PolylineAnnotationElement).call(this, parameters, isRenderable, true));
+ _this3.containerClassName = 'polylineAnnotation';
+ _this3.svgElementName = 'svg:polyline';
+ return _this3;
}
_createClass(PolylineAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = this.containerClassName;
var data = this.data;
@@ -16330,11 +19564,13 @@ var PolylineAnnotationElement = function (_AnnotationElement8) {
var svg = this.svgFactory.create(width, height);
var vertices = data.vertices;
var points = [];
+
for (var i = 0, ii = vertices.length; i < ii; i++) {
var x = vertices[i].x - data.rect[0];
var y = data.rect[3] - vertices[i].y;
points.push(x + ',' + y);
}
+
points = points.join(' ');
var borderWidth = data.borderStyle.width;
var polyline = this.svgFactory.createElement(this.svgElementName);
@@ -16344,7 +19580,9 @@ var PolylineAnnotationElement = function (_AnnotationElement8) {
polyline.setAttribute('fill', 'none');
svg.appendChild(polyline);
this.container.append(svg);
+
this._createPopup(this.container, polyline, data);
+
return this.container;
}
}]);
@@ -16352,39 +19590,44 @@ var PolylineAnnotationElement = function (_AnnotationElement8) {
return PolylineAnnotationElement;
}(AnnotationElement);
-var PolygonAnnotationElement = function (_PolylineAnnotationEl) {
+var PolygonAnnotationElement =
+/*#__PURE__*/
+function (_PolylineAnnotationEl) {
_inherits(PolygonAnnotationElement, _PolylineAnnotationEl);
function PolygonAnnotationElement(parameters) {
- _classCallCheck(this, PolygonAnnotationElement);
+ var _this4;
- var _this16 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
+ _classCallCheck(this, PolygonAnnotationElement);
- _this16.containerClassName = 'polygonAnnotation';
- _this16.svgElementName = 'svg:polygon';
- return _this16;
+ _this4 = _possibleConstructorReturn(this, _getPrototypeOf(PolygonAnnotationElement).call(this, parameters));
+ _this4.containerClassName = 'polygonAnnotation';
+ _this4.svgElementName = 'svg:polygon';
+ return _this4;
}
return PolygonAnnotationElement;
}(PolylineAnnotationElement);
-var InkAnnotationElement = function (_AnnotationElement9) {
+var InkAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement9) {
_inherits(InkAnnotationElement, _AnnotationElement9);
function InkAnnotationElement(parameters) {
+ var _this5;
+
_classCallCheck(this, InkAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
-
- var _this17 = _possibleConstructorReturn(this, (InkAnnotationElement.__proto__ || Object.getPrototypeOf(InkAnnotationElement)).call(this, parameters, isRenderable, true));
-
- _this17.containerClassName = 'inkAnnotation';
- _this17.svgElementName = 'svg:polyline';
- return _this17;
+ _this5 = _possibleConstructorReturn(this, _getPrototypeOf(InkAnnotationElement).call(this, parameters, isRenderable, true));
+ _this5.containerClassName = 'inkAnnotation';
+ _this5.svgElementName = 'svg:polyline';
+ return _this5;
}
_createClass(InkAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = this.containerClassName;
var data = this.data;
@@ -16392,14 +19635,17 @@ var InkAnnotationElement = function (_AnnotationElement9) {
var height = data.rect[3] - data.rect[1];
var svg = this.svgFactory.create(width, height);
var inkLists = data.inkLists;
+
for (var i = 0, ii = inkLists.length; i < ii; i++) {
var inkList = inkLists[i];
var points = [];
+
for (var j = 0, jj = inkList.length; j < jj; j++) {
var x = inkList[j].x - data.rect[0];
var y = data.rect[3] - inkList[j].y;
points.push(x + ',' + y);
}
+
points = points.join(' ');
var borderWidth = data.borderStyle.width;
var polyline = this.svgFactory.createElement(this.svgElementName);
@@ -16407,9 +19653,12 @@ var InkAnnotationElement = function (_AnnotationElement9) {
polyline.setAttribute('stroke-width', borderWidth);
polyline.setAttribute('stroke', 'transparent');
polyline.setAttribute('fill', 'none');
+
this._createPopup(this.container, polyline, data);
+
svg.appendChild(polyline);
}
+
this.container.append(svg);
return this.container;
}
@@ -16418,23 +19667,27 @@ var InkAnnotationElement = function (_AnnotationElement9) {
return InkAnnotationElement;
}(AnnotationElement);
-var HighlightAnnotationElement = function (_AnnotationElement10) {
+var HighlightAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement10) {
_inherits(HighlightAnnotationElement, _AnnotationElement10);
function HighlightAnnotationElement(parameters) {
_classCallCheck(this, HighlightAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (HighlightAnnotationElement.__proto__ || Object.getPrototypeOf(HighlightAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(HighlightAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(HighlightAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'highlightAnnotation';
+
if (!this.data.hasPopup) {
this._createPopup(this.container, null, this.data);
}
+
return this.container;
}
}]);
@@ -16442,23 +19695,27 @@ var HighlightAnnotationElement = function (_AnnotationElement10) {
return HighlightAnnotationElement;
}(AnnotationElement);
-var UnderlineAnnotationElement = function (_AnnotationElement11) {
+var UnderlineAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement11) {
_inherits(UnderlineAnnotationElement, _AnnotationElement11);
function UnderlineAnnotationElement(parameters) {
_classCallCheck(this, UnderlineAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (UnderlineAnnotationElement.__proto__ || Object.getPrototypeOf(UnderlineAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(UnderlineAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(UnderlineAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'underlineAnnotation';
+
if (!this.data.hasPopup) {
this._createPopup(this.container, null, this.data);
}
+
return this.container;
}
}]);
@@ -16466,23 +19723,27 @@ var UnderlineAnnotationElement = function (_AnnotationElement11) {
return UnderlineAnnotationElement;
}(AnnotationElement);
-var SquigglyAnnotationElement = function (_AnnotationElement12) {
+var SquigglyAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement12) {
_inherits(SquigglyAnnotationElement, _AnnotationElement12);
function SquigglyAnnotationElement(parameters) {
_classCallCheck(this, SquigglyAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (SquigglyAnnotationElement.__proto__ || Object.getPrototypeOf(SquigglyAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(SquigglyAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(SquigglyAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'squigglyAnnotation';
+
if (!this.data.hasPopup) {
this._createPopup(this.container, null, this.data);
}
+
return this.container;
}
}]);
@@ -16490,23 +19751,27 @@ var SquigglyAnnotationElement = function (_AnnotationElement12) {
return SquigglyAnnotationElement;
}(AnnotationElement);
-var StrikeOutAnnotationElement = function (_AnnotationElement13) {
+var StrikeOutAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement13) {
_inherits(StrikeOutAnnotationElement, _AnnotationElement13);
function StrikeOutAnnotationElement(parameters) {
_classCallCheck(this, StrikeOutAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (StrikeOutAnnotationElement.__proto__ || Object.getPrototypeOf(StrikeOutAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(StrikeOutAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(StrikeOutAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'strikeoutAnnotation';
+
if (!this.data.hasPopup) {
this._createPopup(this.container, null, this.data);
}
+
return this.container;
}
}]);
@@ -16514,23 +19779,27 @@ var StrikeOutAnnotationElement = function (_AnnotationElement13) {
return StrikeOutAnnotationElement;
}(AnnotationElement);
-var StampAnnotationElement = function (_AnnotationElement14) {
+var StampAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement14) {
_inherits(StampAnnotationElement, _AnnotationElement14);
function StampAnnotationElement(parameters) {
_classCallCheck(this, StampAnnotationElement);
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
- return _possibleConstructorReturn(this, (StampAnnotationElement.__proto__ || Object.getPrototypeOf(StampAnnotationElement)).call(this, parameters, isRenderable, true));
+ return _possibleConstructorReturn(this, _getPrototypeOf(StampAnnotationElement).call(this, parameters, isRenderable, true));
}
_createClass(StampAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'stampAnnotation';
+
if (!this.data.hasPopup) {
this._createPopup(this.container, null, this.data);
}
+
return this.container;
}
}]);
@@ -16538,52 +19807,59 @@ var StampAnnotationElement = function (_AnnotationElement14) {
return StampAnnotationElement;
}(AnnotationElement);
-var FileAttachmentAnnotationElement = function (_AnnotationElement15) {
+var FileAttachmentAnnotationElement =
+/*#__PURE__*/
+function (_AnnotationElement15) {
_inherits(FileAttachmentAnnotationElement, _AnnotationElement15);
function FileAttachmentAnnotationElement(parameters) {
- _classCallCheck(this, FileAttachmentAnnotationElement);
+ var _this6;
- var _this23 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
+ _classCallCheck(this, FileAttachmentAnnotationElement);
- var _this23$data$file = _this23.data.file,
- filename = _this23$data$file.filename,
- content = _this23$data$file.content;
+ _this6 = _possibleConstructorReturn(this, _getPrototypeOf(FileAttachmentAnnotationElement).call(this, parameters, true));
+ var _this6$data$file = _this6.data.file,
+ filename = _this6$data$file.filename,
+ content = _this6$data$file.content;
+ _this6.filename = (0, _dom_utils.getFilenameFromUrl)(filename);
+ _this6.content = content;
- _this23.filename = (0, _dom_utils.getFilenameFromUrl)(filename);
- _this23.content = content;
- if (_this23.linkService.eventBus) {
- _this23.linkService.eventBus.dispatch('fileattachmentannotation', {
- source: _this23,
+ if (_this6.linkService.eventBus) {
+ _this6.linkService.eventBus.dispatch('fileattachmentannotation', {
+ source: _assertThisInitialized(_assertThisInitialized(_this6)),
id: (0, _util.stringToPDFString)(filename),
filename: filename,
content: content
});
}
- return _this23;
+
+ return _this6;
}
_createClass(FileAttachmentAnnotationElement, [{
- key: 'render',
+ key: "render",
value: function render() {
this.container.className = 'fileAttachmentAnnotation';
var trigger = document.createElement('div');
trigger.style.height = this.container.style.height;
trigger.style.width = this.container.style.width;
trigger.addEventListener('dblclick', this._download.bind(this));
+
if (!this.data.hasPopup && (this.data.title || this.data.contents)) {
this._createPopup(this.container, trigger, this.data);
}
+
this.container.appendChild(trigger);
return this.container;
}
}, {
- key: '_download',
+ key: "_download",
value: function _download() {
if (!this.downloadManager) {
(0, _util.warn)('Download cannot be started due to unavailable download manager');
return;
}
+
this.downloadManager.downloadData(this.content, this.filename, '');
}
}]);
@@ -16591,19 +19867,23 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement15) {
return FileAttachmentAnnotationElement;
}(AnnotationElement);
-var AnnotationLayer = function () {
+var AnnotationLayer =
+/*#__PURE__*/
+function () {
function AnnotationLayer() {
_classCallCheck(this, AnnotationLayer);
}
_createClass(AnnotationLayer, null, [{
- key: 'render',
+ key: "render",
value: function render(parameters) {
for (var i = 0, ii = parameters.annotations.length; i < ii; i++) {
var data = parameters.annotations[i];
+
if (!data) {
continue;
}
+
var element = AnnotationElementFactory.create({
data: data,
layer: parameters.div,
@@ -16615,21 +19895,24 @@ var AnnotationLayer = function () {
renderInteractiveForms: parameters.renderInteractiveForms || false,
svgFactory: new _dom_utils.DOMSVGFactory()
});
+
if (element.isRenderable) {
parameters.div.appendChild(element.render());
}
}
}
}, {
- key: 'update',
+ key: "update",
value: function update(parameters) {
for (var i = 0, ii = parameters.annotations.length; i < ii; i++) {
var data = parameters.annotations[i];
var element = parameters.div.querySelector('[data-annotation-id="' + data.id + '"]');
+
if (element) {
element.style.transform = 'matrix(' + parameters.viewport.transform.join(',') + ')';
}
}
+
parameters.div.removeAttribute('hidden');
}
}]);
@@ -16649,33 +19932,36 @@ exports.AnnotationLayer = AnnotationLayer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.SVGGraphics = undefined;
+exports.SVGGraphics = void 0;
var _util = __w_pdfjs_require__(1);
-var _dom_utils = __w_pdfjs_require__(134);
-
-var _is_node = __w_pdfjs_require__(4);
+var _dom_utils = __w_pdfjs_require__(138);
-var _is_node2 = _interopRequireDefault(_is_node);
+var _is_node = _interopRequireDefault(__w_pdfjs_require__(4));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var SVGGraphics = function SVGGraphics() {
throw new Error('Not implemented: SVGGraphics');
};
+
+exports.SVGGraphics = SVGGraphics;
{
var SVG_DEFAULTS = {
fontStyle: 'normal',
fontWeight: 'normal',
fillColor: '#000000'
};
+
var convertImgDataToPng = function convertImgDataToPngClosure() {
var PNG_HEADER = new Uint8Array([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
var CHUNK_WRAPPER_SIZE = 12;
var crcTable = new Int32Array(256);
+
for (var i = 0; i < 256; i++) {
var c = i;
+
for (var h = 0; h < 8; h++) {
if (c & 1) {
c = 0xedB88320 ^ c >> 1 & 0x7fffffff;
@@ -16683,17 +19969,22 @@ var SVGGraphics = function SVGGraphics() {
c = c >> 1 & 0x7fffffff;
}
}
+
crcTable[i] = c;
}
+
function crc32(data, start, end) {
var crc = -1;
+
for (var i = start; i < end; i++) {
var a = (crc ^ data[i]) & 0xff;
var b = crcTable[a];
crc = crc >>> 8 ^ b;
}
+
return crc ^ -1;
}
+
function writePngChunk(type, body, data, offset) {
var p = offset;
var len = body.length;
@@ -16715,33 +20006,45 @@ var SVGGraphics = function SVGGraphics() {
data[p + 2] = crc >> 8 & 0xff;
data[p + 3] = crc & 0xff;
}
+
function adler32(data, start, end) {
var a = 1;
var b = 0;
+
for (var i = start; i < end; ++i) {
a = (a + (data[i] & 0xff)) % 65521;
b = (b + a) % 65521;
}
+
return b << 16 | a;
}
+
function deflateSync(literals) {
- if (!(0, _is_node2.default)()) {
+ if (!(0, _is_node.default)()) {
return deflateSyncUncompressed(literals);
}
+
try {
var input;
+
if (parseInt(process.versions.node) >= 8) {
input = literals;
} else {
input = new Buffer(literals);
}
- var output = require('zlib').deflateSync(input, { level: 9 });
+
+ var output = require('zlib').deflateSync(input, {
+ level: 9
+ });
+
return output instanceof Uint8Array ? output : new Uint8Array(output);
} catch (e) {
(0, _util.warn)('Not compressing PNG because zlib.deflateSync is unavailable: ' + e);
}
+
return deflateSyncUncompressed(literals);
}
+
function deflateSyncUncompressed(literals) {
var len = literals.length;
var maxBlockLength = 0xFFFF;
@@ -16751,6 +20054,7 @@ var SVGGraphics = function SVGGraphics() {
idat[pi++] = 0x78;
idat[pi++] = 0x9c;
var pos = 0;
+
while (len > maxBlockLength) {
idat[pi++] = 0x00;
idat[pi++] = 0xff;
@@ -16762,6 +20066,7 @@ var SVGGraphics = function SVGGraphics() {
pos += maxBlockLength;
len -= maxBlockLength;
}
+
idat[pi++] = 0x01;
idat[pi++] = len & 0xff;
idat[pi++] = len >> 8 & 0xff;
@@ -16776,49 +20081,60 @@ var SVGGraphics = function SVGGraphics() {
idat[pi++] = adler & 0xff;
return idat;
}
+
function encode(imgData, kind, forceDataSchema, isMask) {
var width = imgData.width;
var height = imgData.height;
var bitDepth, colorType, lineSize;
var bytes = imgData.data;
+
switch (kind) {
case _util.ImageKind.GRAYSCALE_1BPP:
colorType = 0;
bitDepth = 1;
lineSize = width + 7 >> 3;
break;
+
case _util.ImageKind.RGB_24BPP:
colorType = 2;
bitDepth = 8;
lineSize = width * 3;
break;
+
case _util.ImageKind.RGBA_32BPP:
colorType = 6;
bitDepth = 8;
lineSize = width * 4;
break;
+
default:
throw new Error('invalid format');
}
+
var literals = new Uint8Array((1 + lineSize) * height);
var offsetLiterals = 0,
offsetBytes = 0;
var y, i;
+
for (y = 0; y < height; ++y) {
literals[offsetLiterals++] = 0;
literals.set(bytes.subarray(offsetBytes, offsetBytes + lineSize), offsetLiterals);
offsetBytes += lineSize;
offsetLiterals += lineSize;
}
+
if (kind === _util.ImageKind.GRAYSCALE_1BPP && isMask) {
offsetLiterals = 0;
+
for (y = 0; y < height; y++) {
offsetLiterals++;
+
for (i = 0; i < lineSize; i++) {
literals[offsetLiterals++] ^= 0xFF;
}
}
}
+
var ihdr = new Uint8Array([width >> 24 & 0xff, width >> 16 & 0xff, width >> 8 & 0xff, width & 0xff, height >> 24 & 0xff, height >> 16 & 0xff, height >> 8 & 0xff, height & 0xff, bitDepth, colorType, 0x00, 0x00, 0x00]);
var idat = deflateSync(literals);
var pngLength = PNG_HEADER.length + CHUNK_WRAPPER_SIZE * 3 + ihdr.length + idat.length;
@@ -16833,11 +20149,13 @@ var SVGGraphics = function SVGGraphics() {
writePngChunk('IEND', new Uint8Array(0), data, offset);
return (0, _util.createObjectURL)(data, 'image/png', forceDataSchema);
}
+
return function convertImgDataToPng(imgData, forceDataSchema, isMask) {
var kind = imgData.kind === undefined ? _util.ImageKind.GRAYSCALE_1BPP : imgData.kind;
return encode(imgData, kind, forceDataSchema, isMask);
};
}();
+
var SVGExtraState = function SVGExtraStateClosure() {
function SVGExtraState() {
this.fontSizeScale = 1;
@@ -16870,6 +20188,7 @@ var SVGGraphics = function SVGGraphics() {
this.clipGroup = null;
this.maskId = '';
}
+
SVGExtraState.prototype = {
clone: function SVGExtraState_clone() {
return Object.create(this);
@@ -16881,11 +20200,13 @@ var SVGGraphics = function SVGGraphics() {
};
return SVGExtraState;
}();
+
exports.SVGGraphics = SVGGraphics = function SVGGraphicsClosure() {
function opListToTree(opList) {
var opTree = [];
var tmp = [];
var opListLen = opList.length;
+
for (var x = 0; x < opListLen; x++) {
if (opList[x].fn === 'save') {
opTree.push({
@@ -16897,36 +20218,46 @@ var SVGGraphics = function SVGGraphics() {
opTree = opTree[opTree.length - 1].items;
continue;
}
+
if (opList[x].fn === 'restore') {
opTree = tmp.pop();
} else {
opTree.push(opList[x]);
}
}
+
return opTree;
}
+
function pf(value) {
if (Number.isInteger(value)) {
return value.toString();
}
+
var s = value.toFixed(10);
var i = s.length - 1;
+
if (s[i] !== '0') {
return s;
}
+
do {
i--;
} while (s[i] === '0');
+
return s.substring(0, s[i] === '.' ? i : i + 1);
}
+
function pm(m) {
if (m[4] === 0 && m[5] === 0) {
if (m[1] === 0 && m[2] === 0) {
if (m[0] === 1 && m[3] === 1) {
return '';
}
+
return 'scale(' + pf(m[0]) + ' ' + pf(m[3]) + ')';
}
+
if (m[0] === m[3] && m[1] === -m[2]) {
var a = Math.acos(m[0]) * 180 / Math.PI;
return 'rotate(' + pf(a) + ')';
@@ -16936,8 +20267,10 @@ var SVGGraphics = function SVGGraphics() {
return 'translate(' + pf(m[4]) + ' ' + pf(m[5]) + ')';
}
}
+
return 'matrix(' + pf(m[0]) + ' ' + pf(m[1]) + ' ' + pf(m[2]) + ' ' + pf(m[3]) + ' ' + pf(m[4]) + ' ' + pf(m[5]) + ')';
}
+
function SVGGraphics(commonObjs, objs, forceDataSchema) {
this.svgFactory = new _dom_utils.DOMSVGFactory();
this.current = new SVGExtraState();
@@ -16953,6 +20286,7 @@ var SVGGraphics = function SVGGraphics() {
this.cssStyle = null;
this.forceDataSchema = !!forceDataSchema;
}
+
var XML_NS = 'http://www.w3.org/XML/1998/namespace';
var XLINK_NS = 'http://www.w3.org/1999/xlink';
var LINE_CAP_STYLES = ['butt', 'round', 'square'];
@@ -16983,13 +20317,16 @@ var SVGGraphics = function SVGGraphics() {
var fnArray = operatorList.fnArray;
var fnArrayLen = fnArray.length;
var argsArray = operatorList.argsArray;
+
for (var i = 0; i < fnArrayLen; i++) {
if (_util.OPS.dependency === fnArray[i]) {
var deps = argsArray[i];
+
for (var n = 0, nn = deps.length; n < nn; n++) {
var obj = deps[n];
var common = obj.substring(0, 2) === 'g_';
var promise;
+
if (common) {
promise = new Promise(function (resolve) {
_this.commonObjs.get(obj, resolve);
@@ -16999,10 +20336,12 @@ var SVGGraphics = function SVGGraphics() {
_this.objs.get(obj, resolve);
});
}
+
this.current.dependencies.push(promise);
}
}
}
+
return Promise.all(this.current.dependencies);
},
transform: function SVGGraphics_transform(a, b, c, d, e, f) {
@@ -17014,11 +20353,16 @@ var SVGGraphics = function SVGGraphics() {
var _this2 = this;
this.viewport = viewport;
+
var svgElement = this._initialize(viewport);
+
return this.loadDependencies(operatorList).then(function () {
_this2.transformMatrix = _util.IDENTITY_MATRIX;
+
var opTree = _this2.convertOpList(operatorList);
+
_this2.executeOpTree(opTree);
+
return svgElement;
});
},
@@ -17028,9 +20372,11 @@ var SVGGraphics = function SVGGraphics() {
var fnArrayLen = fnArray.length;
var REVOPS = [];
var opList = [];
+
for (var op in _util.OPS) {
REVOPS[_util.OPS[op]] = op;
}
+
for (var x = 0; x < fnArrayLen; x++) {
var fnId = fnArray[x];
opList.push({
@@ -17039,152 +20385,201 @@ var SVGGraphics = function SVGGraphics() {
'args': argsArray[x]
});
}
+
return opListToTree(opList);
},
executeOpTree: function SVGGraphics_executeOpTree(opTree) {
var opTreeLen = opTree.length;
+
for (var x = 0; x < opTreeLen; x++) {
var fn = opTree[x].fn;
var fnId = opTree[x].fnId;
var args = opTree[x].args;
+
switch (fnId | 0) {
case _util.OPS.beginText:
this.beginText();
break;
+
case _util.OPS.dependency:
break;
+
case _util.OPS.setLeading:
this.setLeading(args);
break;
+
case _util.OPS.setLeadingMoveText:
this.setLeadingMoveText(args[0], args[1]);
break;
+
case _util.OPS.setFont:
this.setFont(args);
break;
+
case _util.OPS.showText:
this.showText(args[0]);
break;
+
case _util.OPS.showSpacedText:
this.showText(args[0]);
break;
+
case _util.OPS.endText:
this.endText();
break;
+
case _util.OPS.moveText:
this.moveText(args[0], args[1]);
break;
+
case _util.OPS.setCharSpacing:
this.setCharSpacing(args[0]);
break;
+
case _util.OPS.setWordSpacing:
this.setWordSpacing(args[0]);
break;
+
case _util.OPS.setHScale:
this.setHScale(args[0]);
break;
+
case _util.OPS.setTextMatrix:
this.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
break;
+
case _util.OPS.setTextRise:
this.setTextRise(args[0]);
break;
+
case _util.OPS.setTextRenderingMode:
this.setTextRenderingMode(args[0]);
break;
+
case _util.OPS.setLineWidth:
this.setLineWidth(args[0]);
break;
+
case _util.OPS.setLineJoin:
this.setLineJoin(args[0]);
break;
+
case _util.OPS.setLineCap:
this.setLineCap(args[0]);
break;
+
case _util.OPS.setMiterLimit:
this.setMiterLimit(args[0]);
break;
+
case _util.OPS.setFillRGBColor:
this.setFillRGBColor(args[0], args[1], args[2]);
break;
+
case _util.OPS.setStrokeRGBColor:
this.setStrokeRGBColor(args[0], args[1], args[2]);
break;
+
case _util.OPS.setDash:
this.setDash(args[0], args[1]);
break;
+
case _util.OPS.setGState:
this.setGState(args[0]);
break;
+
case _util.OPS.fill:
this.fill();
break;
+
case _util.OPS.eoFill:
this.eoFill();
break;
+
case _util.OPS.stroke:
this.stroke();
break;
+
case _util.OPS.fillStroke:
this.fillStroke();
break;
+
case _util.OPS.eoFillStroke:
this.eoFillStroke();
break;
+
case _util.OPS.clip:
this.clip('nonzero');
break;
+
case _util.OPS.eoClip:
this.clip('evenodd');
break;
+
case _util.OPS.paintSolidColorImageMask:
this.paintSolidColorImageMask();
break;
+
case _util.OPS.paintJpegXObject:
this.paintJpegXObject(args[0], args[1], args[2]);
break;
+
case _util.OPS.paintImageXObject:
this.paintImageXObject(args[0]);
break;
+
case _util.OPS.paintInlineImageXObject:
this.paintInlineImageXObject(args[0]);
break;
+
case _util.OPS.paintImageMaskXObject:
this.paintImageMaskXObject(args[0]);
break;
+
case _util.OPS.paintFormXObjectBegin:
this.paintFormXObjectBegin(args[0], args[1]);
break;
+
case _util.OPS.paintFormXObjectEnd:
this.paintFormXObjectEnd();
break;
+
case _util.OPS.closePath:
this.closePath();
break;
+
case _util.OPS.closeStroke:
this.closeStroke();
break;
+
case _util.OPS.closeFillStroke:
this.closeFillStroke();
break;
+
case _util.OPS.closeEOFillStroke:
this.closeEOFillStroke();
break;
+
case _util.OPS.nextLine:
this.nextLine();
break;
+
case _util.OPS.transform:
this.transform(args[0], args[1], args[2], args[3], args[4], args[5]);
break;
+
case _util.OPS.constructPath:
this.constructPath(args[0], args[1]);
break;
+
case _util.OPS.endPath:
this.endPath();
break;
+
case 92:
this.group(opTree[x].items);
break;
+
default:
(0, _util.warn)('Unimplemented operator ' + fn);
break;
@@ -17237,9 +20632,11 @@ var SVGGraphics = function SVGGraphics() {
var current = this.current;
var font = current.font;
var fontSize = current.fontSize;
+
if (fontSize === 0) {
return;
}
+
var charSpacing = current.charSpacing;
var wordSpacing = current.wordSpacing;
var fontDirection = current.fontDirection;
@@ -17249,8 +20646,10 @@ var SVGGraphics = function SVGGraphics() {
var widthAdvanceScale = fontSize * current.fontMatrix[0];
var x = 0,
i;
+
for (i = 0; i < glyphsLength; ++i) {
var glyph = glyphs[i];
+
if (glyph === null) {
x += fontDirection * wordSpacing;
continue;
@@ -17258,38 +20657,48 @@ var SVGGraphics = function SVGGraphics() {
x += -glyph * fontSize * 0.001;
continue;
}
+
var width = glyph.width;
var character = glyph.fontChar;
var spacing = (glyph.isSpace ? wordSpacing : 0) + charSpacing;
var charWidth = width * widthAdvanceScale + spacing * fontDirection;
+
if (!glyph.isInFont && !font.missingFile) {
x += charWidth;
continue;
}
+
current.xcoords.push(current.x + x * textHScale);
current.tspan.textContent += character;
x += charWidth;
}
+
if (vertical) {
current.y -= x * textHScale;
} else {
current.x += x * textHScale;
}
+
current.tspan.setAttributeNS(null, 'x', current.xcoords.map(pf).join(' '));
current.tspan.setAttributeNS(null, 'y', pf(-current.y));
current.tspan.setAttributeNS(null, 'font-family', current.fontFamily);
current.tspan.setAttributeNS(null, 'font-size', pf(current.fontSize) + 'px');
+
if (current.fontStyle !== SVG_DEFAULTS.fontStyle) {
current.tspan.setAttributeNS(null, 'font-style', current.fontStyle);
}
+
if (current.fontWeight !== SVG_DEFAULTS.fontWeight) {
current.tspan.setAttributeNS(null, 'font-weight', current.fontWeight);
}
+
var fillStrokeMode = current.textRenderingMode & _util.TextRenderingMode.FILL_STROKE_MASK;
+
if (fillStrokeMode === _util.TextRenderingMode.FILL || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
if (current.fillColor !== SVG_DEFAULTS.fillColor) {
current.tspan.setAttributeNS(null, 'fill', current.fillColor);
}
+
if (current.fillAlpha < 1) {
current.tspan.setAttributeNS(null, 'fill-opacity', current.fillAlpha);
}
@@ -17298,18 +20707,23 @@ var SVGGraphics = function SVGGraphics() {
} else {
current.tspan.setAttributeNS(null, 'fill', 'none');
}
+
if (fillStrokeMode === _util.TextRenderingMode.STROKE || fillStrokeMode === _util.TextRenderingMode.FILL_STROKE) {
this._setStrokeAttributes(current.tspan);
}
+
var textMatrix = current.textMatrix;
+
if (current.textRise !== 0) {
textMatrix = textMatrix.slice();
textMatrix[5] += current.textRise;
}
+
current.txtElement.setAttributeNS(null, 'transform', pm(textMatrix) + ' scale(1, -1)');
current.txtElement.setAttributeNS(XML_NS, 'xml:space', 'preserve');
current.txtElement.appendChild(current.tspan);
current.txtgrp.appendChild(current.txtElement);
+
this._ensureTransformGroup().appendChild(current.txtElement);
},
setLeadingMoveText: function SVGGraphics_setLeadingMoveText(x, y) {
@@ -17322,6 +20736,7 @@ var SVGGraphics = function SVGGraphics() {
this.cssStyle.setAttributeNS(null, 'type', 'text/css');
this.defs.appendChild(this.cssStyle);
}
+
var url = (0, _util.createObjectURL)(fontObj.data, fontObj.mimetype, this.forceDataSchema);
this.cssStyle.textContent += '@font-face { font-family: "' + fontObj.loadedName + '";' + ' src: url(' + url + '); }\n';
},
@@ -17330,19 +20745,23 @@ var SVGGraphics = function SVGGraphics() {
var fontObj = this.commonObjs.get(details[0]);
var size = details[1];
this.current.font = fontObj;
+
if (this.embedFonts && fontObj.data && !this.embeddedFonts[fontObj.loadedName]) {
this.addFontStyle(fontObj);
this.embeddedFonts[fontObj.loadedName] = fontObj;
}
+
current.fontMatrix = fontObj.fontMatrix ? fontObj.fontMatrix : _util.FONT_IDENTITY_MATRIX;
var bold = fontObj.black ? fontObj.bold ? 'bolder' : 'bold' : fontObj.bold ? 'bold' : 'normal';
var italic = fontObj.italic ? 'italic' : 'normal';
+
if (size < 0) {
size = -size;
current.fontDirection = -1;
} else {
current.fontDirection = 1;
}
+
current.fontSize = size;
current.fontFamily = fontObj.loadedName;
current.fontWeight = bold;
@@ -17353,15 +20772,17 @@ var SVGGraphics = function SVGGraphics() {
},
endText: function endText() {
var current = this.current;
+
if (current.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG && current.txtElement && current.txtElement.hasChildNodes()) {
current.element = current.txtElement;
this.clip('nonzero');
this.endPath();
}
},
-
setLineWidth: function SVGGraphics_setLineWidth(width) {
- this.current.lineWidth = width;
+ if (width > 0) {
+ this.current.lineWidth = width;
+ }
},
setLineCap: function SVGGraphics_setLineCap(style) {
this.current.lineCap = LINE_CAP_STYLES[style];
@@ -17377,6 +20798,7 @@ var SVGGraphics = function SVGGraphics() {
},
setStrokeRGBColor: function SVGGraphics_setStrokeRGBColor(r, g, b) {
var color = _util.Util.makeCssRgb(r, g, b);
+
this.current.strokeColor = color;
},
setFillAlpha: function SVGGraphics_setFillAlpha(fillAlpha) {
@@ -17384,6 +20806,7 @@ var SVGGraphics = function SVGGraphics() {
},
setFillRGBColor: function SVGGraphics_setFillRGBColor(r, g, b) {
var color = _util.Util.makeCssRgb(r, g, b);
+
this.current.fillColor = color;
this.current.tspan = this.svgFactory.createElement('svg:tspan');
this.current.xcoords = [];
@@ -17399,6 +20822,7 @@ var SVGGraphics = function SVGGraphics() {
current.path = this.svgFactory.createElement('svg:path');
var d = [];
var opLength = ops.length;
+
for (var i = 0, j = 0; i < opLength; i++) {
switch (ops[i] | 0) {
case _util.OPS.rectangle:
@@ -17410,42 +20834,51 @@ var SVGGraphics = function SVGGraphics() {
var yh = y + height;
d.push('M', pf(x), pf(y), 'L', pf(xw), pf(y), 'L', pf(xw), pf(yh), 'L', pf(x), pf(yh), 'Z');
break;
+
case _util.OPS.moveTo:
x = args[j++];
y = args[j++];
d.push('M', pf(x), pf(y));
break;
+
case _util.OPS.lineTo:
x = args[j++];
y = args[j++];
d.push('L', pf(x), pf(y));
break;
+
case _util.OPS.curveTo:
x = args[j + 4];
y = args[j + 5];
d.push('C', pf(args[j]), pf(args[j + 1]), pf(args[j + 2]), pf(args[j + 3]), pf(x), pf(y));
j += 6;
break;
+
case _util.OPS.curveTo2:
x = args[j + 2];
y = args[j + 3];
d.push('C', pf(x), pf(y), pf(args[j]), pf(args[j + 1]), pf(args[j + 2]), pf(args[j + 3]));
j += 4;
break;
+
case _util.OPS.curveTo3:
x = args[j + 2];
y = args[j + 3];
d.push('C', pf(args[j]), pf(args[j + 1]), pf(x), pf(y), pf(x), pf(y));
j += 4;
break;
+
case _util.OPS.closePath:
d.push('Z');
break;
}
}
+
current.path.setAttributeNS(null, 'd', d.join(' '));
current.path.setAttributeNS(null, 'fill', 'none');
+
this._ensureTransformGroup().appendChild(current.path);
+
current.element = current.path;
current.setCurrentPoint(x, y);
},
@@ -17453,6 +20886,7 @@ var SVGGraphics = function SVGGraphics() {
if (!this.pendingClip) {
return;
}
+
var current = this.current;
var clipId = 'clippath' + clipCount;
clipCount++;
@@ -17460,14 +20894,17 @@ var SVGGraphics = function SVGGraphics() {
clipPath.setAttributeNS(null, 'id', clipId);
clipPath.setAttributeNS(null, 'transform', pm(this.transformMatrix));
var clipElement = current.element.cloneNode(true);
+
if (this.pendingClip === 'evenodd') {
clipElement.setAttributeNS(null, 'clip-rule', 'evenodd');
} else {
clipElement.setAttributeNS(null, 'clip-rule', 'nonzero');
}
+
this.pendingClip = null;
clipPath.appendChild(clipElement);
this.defs.appendChild(clipPath);
+
if (current.activeClipUrl) {
current.clipGroup = null;
this.extraStack.forEach(function (prev) {
@@ -17475,6 +20912,7 @@ var SVGGraphics = function SVGGraphics() {
});
clipPath.setAttributeNS(null, 'clip-path', current.activeClipUrl);
}
+
current.activeClipUrl = 'url(#' + clipId + ')';
this.tgrp = null;
},
@@ -17483,6 +20921,7 @@ var SVGGraphics = function SVGGraphics() {
},
closePath: function SVGGraphics_closePath() {
var current = this.current;
+
if (current.path) {
var d = current.path.getAttributeNS(null, 'd');
d += 'Z';
@@ -17498,7 +20937,6 @@ var SVGGraphics = function SVGGraphics() {
setTextRenderingMode: function setTextRenderingMode(textRenderingMode) {
this.current.textRenderingMode = textRenderingMode;
},
-
setHScale: function SVGGraphics_setHScale(scale) {
this.current.textHScale = scale / 100;
},
@@ -17507,31 +20945,40 @@ var SVGGraphics = function SVGGraphics() {
var state = states[i];
var key = state[0];
var value = state[1];
+
switch (key) {
case 'LW':
this.setLineWidth(value);
break;
+
case 'LC':
this.setLineCap(value);
break;
+
case 'LJ':
this.setLineJoin(value);
break;
+
case 'ML':
this.setMiterLimit(value);
break;
+
case 'D':
this.setDash(value[0], value[1]);
break;
+
case 'Font':
this.setFont(value);
break;
+
case 'CA':
this.setStrokeAlpha(value);
break;
+
case 'ca':
this.setFillAlpha(value);
break;
+
default:
(0, _util.warn)('Unimplemented graphic state ' + key);
break;
@@ -17540,6 +20987,7 @@ var SVGGraphics = function SVGGraphics() {
},
fill: function SVGGraphics_fill() {
var current = this.current;
+
if (current.element) {
current.element.setAttributeNS(null, 'fill', current.fillColor);
current.element.setAttributeNS(null, 'fill-opacity', current.fillAlpha);
@@ -17548,8 +20996,10 @@ var SVGGraphics = function SVGGraphics() {
},
stroke: function SVGGraphics_stroke() {
var current = this.current;
+
if (current.element) {
this._setStrokeAttributes(current.element);
+
current.element.setAttributeNS(null, 'fill', 'none');
this.endPath();
}
@@ -17565,11 +21015,11 @@ var SVGGraphics = function SVGGraphics() {
element.setAttributeNS(null, 'stroke-dasharray', current.dashArray.map(pf).join(' '));
element.setAttributeNS(null, 'stroke-dashoffset', pf(current.dashPhase) + 'px');
},
-
eoFill: function SVGGraphics_eoFill() {
if (this.current.element) {
this.current.element.setAttributeNS(null, 'fill-rule', 'evenodd');
}
+
this.fill();
},
fillStroke: function SVGGraphics_fillStroke() {
@@ -17580,6 +21030,7 @@ var SVGGraphics = function SVGGraphics() {
if (this.current.element) {
this.current.element.setAttributeNS(null, 'fill-rule', 'evenodd');
}
+
this.fillStroke();
},
closeStroke: function SVGGraphics_closeStroke() {
@@ -17594,7 +21045,6 @@ var SVGGraphics = function SVGGraphics() {
this.closePath();
this.eoFillStroke();
},
-
paintSolidColorImageMask: function SVGGraphics_paintSolidColorImageMask() {
var current = this.current;
var rect = this.svgFactory.createElement('svg:rect');
@@ -17603,6 +21053,7 @@ var SVGGraphics = function SVGGraphics() {
rect.setAttributeNS(null, 'width', '1px');
rect.setAttributeNS(null, 'height', '1px');
rect.setAttributeNS(null, 'fill', current.fillColor);
+
this._ensureTransformGroup().appendChild(rect);
},
paintJpegXObject: function SVGGraphics_paintJpegXObject(objId, w, h) {
@@ -17614,14 +21065,17 @@ var SVGGraphics = function SVGGraphics() {
imgEl.setAttributeNS(null, 'x', '0');
imgEl.setAttributeNS(null, 'y', pf(-h));
imgEl.setAttributeNS(null, 'transform', 'scale(' + pf(1 / w) + ' ' + pf(-1 / h) + ')');
+
this._ensureTransformGroup().appendChild(imgEl);
},
paintImageXObject: function SVGGraphics_paintImageXObject(objId) {
var imgData = this.objs.get(objId);
+
if (!imgData) {
(0, _util.warn)('Dependent image isn\'t ready yet');
return;
}
+
this.paintInlineImageXObject(imgData);
},
paintInlineImageXObject: function SVGGraphics_paintInlineImageXObject(imgData, mask) {
@@ -17642,6 +21096,7 @@ var SVGGraphics = function SVGGraphics() {
imgEl.setAttributeNS(null, 'width', pf(width) + 'px');
imgEl.setAttributeNS(null, 'height', pf(height) + 'px');
imgEl.setAttributeNS(null, 'transform', 'scale(' + pf(1 / width) + ' ' + pf(-1 / height) + ')');
+
if (mask) {
mask.appendChild(imgEl);
} else {
@@ -17664,13 +21119,16 @@ var SVGGraphics = function SVGGraphics() {
rect.setAttributeNS(null, 'fill', fillColor);
rect.setAttributeNS(null, 'mask', 'url(#' + current.maskId + ')');
this.defs.appendChild(mask);
+
this._ensureTransformGroup().appendChild(rect);
+
this.paintInlineImageXObject(imgData, mask);
},
paintFormXObjectBegin: function SVGGraphics_paintFormXObjectBegin(matrix, bbox) {
if (Array.isArray(matrix) && matrix.length === 6) {
this.transform(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]);
}
+
if (bbox) {
var width = bbox[2] - bbox[0];
var height = bbox[3] - bbox[1];
@@ -17696,7 +21154,6 @@ var SVGGraphics = function SVGGraphics() {
this.svg = rootGroup;
return svg;
},
-
_ensureClipGroup: function SVGGraphics_ensureClipGroup() {
if (!this.current.clipGroup) {
var clipGroup = this.svgFactory.createElement('svg:g');
@@ -17704,25 +21161,27 @@ var SVGGraphics = function SVGGraphics() {
this.svg.appendChild(clipGroup);
this.current.clipGroup = clipGroup;
}
+
return this.current.clipGroup;
},
_ensureTransformGroup: function SVGGraphics_ensureTransformGroup() {
if (!this.tgrp) {
this.tgrp = this.svgFactory.createElement('svg:g');
this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
+
if (this.current.activeClipUrl) {
this._ensureClipGroup().appendChild(this.tgrp);
} else {
this.svg.appendChild(this.tgrp);
}
}
+
return this.tgrp;
}
};
return SVGGraphics;
}();
}
-exports.SVGGraphics = SVGGraphics;
/***/ }),
/* 152 */
@@ -17734,13 +21193,9 @@ exports.SVGGraphics = SVGGraphics;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFNodeStream = undefined;
-
-var _regenerator = __w_pdfjs_require__(141);
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
+exports.PDFNodeStream = void 0;
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(134));
var _util = __w_pdfjs_require__(1);
@@ -17748,35 +21203,59 @@ var _network_utils = __w_pdfjs_require__(153);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var fs = require('fs');
+
var http = require('http');
+
var https = require('https');
+
var url = require('url');
var fileUriRegex = /^file:\/\/\/[a-zA-Z]:\//;
+
function parseUrl(sourceUrl) {
var parsedUrl = url.parse(sourceUrl);
+
if (parsedUrl.protocol === 'file:' || parsedUrl.host) {
return parsedUrl;
}
+
if (/^[a-z]:[/\\]/i.test(sourceUrl)) {
- return url.parse('file:///' + sourceUrl);
+ return url.parse("file:///".concat(sourceUrl));
}
+
if (!parsedUrl.host) {
parsedUrl.protocol = 'file:';
}
+
return parsedUrl;
}
-var PDFNodeStream = function () {
+var PDFNodeStream =
+/*#__PURE__*/
+function () {
function PDFNodeStream(source) {
_classCallCheck(this, PDFNodeStream);
@@ -17790,26 +21269,30 @@ var PDFNodeStream = function () {
}
_createClass(PDFNodeStream, [{
- key: 'getFullReader',
+ key: "getFullReader",
value: function getFullReader() {
(0, _util.assert)(!this._fullRequest);
this._fullRequest = this.isFsUrl ? new PDFNodeStreamFsFullReader(this) : new PDFNodeStreamFullReader(this);
return this._fullRequest;
}
}, {
- key: 'getRangeReader',
+ key: "getRangeReader",
value: function getRangeReader(start, end) {
var rangeReader = this.isFsUrl ? new PDFNodeStreamFsRangeReader(this, start, end) : new PDFNodeStreamRangeReader(this, start, end);
+
this._rangeRequestReaders.push(rangeReader);
+
return rangeReader;
}
}, {
- key: 'cancelAllRequests',
+ key: "cancelAllRequests",
value: function cancelAllRequests(reason) {
if (this._fullRequest) {
this._fullRequest.cancel(reason);
}
+
var readers = this._rangeRequestReaders.slice(0);
+
readers.forEach(function (reader) {
reader.cancel(reason);
});
@@ -17819,7 +21302,11 @@ var PDFNodeStream = function () {
return PDFNodeStream;
}();
-var BaseFullReader = function () {
+exports.PDFNodeStream = PDFNodeStream;
+
+var BaseFullReader =
+/*#__PURE__*/
+function () {
function BaseFullReader(stream) {
_classCallCheck(this, BaseFullReader);
@@ -17833,9 +21320,11 @@ var BaseFullReader = function () {
this._filename = null;
this._disableRange = source.disableRange || false;
this._rangeChunkSize = source.rangeChunkSize;
+
if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true;
}
+
this._isStreamingSupported = !source.disableStream;
this._isRangeSupported = !source.disableRange;
this._readableStream = null;
@@ -17844,11 +21333,13 @@ var BaseFullReader = function () {
}
_createClass(BaseFullReader, [{
- key: 'read',
+ key: "read",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+ var _read = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
var chunk, buffer;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -17861,7 +21352,7 @@ var BaseFullReader = function () {
break;
}
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: undefined,
done: true
});
@@ -17883,24 +21374,26 @@ var BaseFullReader = function () {
}
this._readCapability = (0, _util.createPromiseCapability)();
- return _context.abrupt('return', this.read());
+ return _context.abrupt("return", this.read());
case 10:
this._loaded += chunk.length;
+
if (this.onProgress) {
this.onProgress({
loaded: this._loaded,
total: this._contentLength
});
}
+
buffer = new Uint8Array(chunk).buffer;
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: buffer,
done: false
});
case 14:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -17908,28 +21401,31 @@ var BaseFullReader = function () {
}));
function read() {
- return _ref.apply(this, arguments);
+ return _read.apply(this, arguments);
}
return read;
}()
}, {
- key: 'cancel',
+ key: "cancel",
value: function cancel(reason) {
if (!this._readableStream) {
this._error(reason);
+
return;
}
+
this._readableStream.destroy(reason);
}
}, {
- key: '_error',
+ key: "_error",
value: function _error(reason) {
this._storedError = reason;
+
this._readCapability.resolve();
}
}, {
- key: '_setReadableStream',
+ key: "_setReadableStream",
value: function _setReadableStream(readableStream) {
var _this = this;
@@ -17940,40 +21436,43 @@ var BaseFullReader = function () {
readableStream.on('end', function () {
readableStream.destroy();
_this._done = true;
+
_this._readCapability.resolve();
});
readableStream.on('error', function (reason) {
_this._error(reason);
});
+
if (!this._isStreamingSupported && this._isRangeSupported) {
this._error(new _util.AbortException('streaming is disabled'));
}
+
if (this._storedError) {
this._readableStream.destroy(this._storedError);
}
}
}, {
- key: 'headersReady',
+ key: "headersReady",
get: function get() {
return this._headersCapability.promise;
}
}, {
- key: 'filename',
+ key: "filename",
get: function get() {
return this._filename;
}
}, {
- key: 'contentLength',
+ key: "contentLength",
get: function get() {
return this._contentLength;
}
}, {
- key: 'isRangeSupported',
+ key: "isRangeSupported",
get: function get() {
return this._isRangeSupported;
}
}, {
- key: 'isStreamingSupported',
+ key: "isStreamingSupported",
get: function get() {
return this._isStreamingSupported;
}
@@ -17982,7 +21481,9 @@ var BaseFullReader = function () {
return BaseFullReader;
}();
-var BaseRangeReader = function () {
+var BaseRangeReader =
+/*#__PURE__*/
+function () {
function BaseRangeReader(stream) {
_classCallCheck(this, BaseRangeReader);
@@ -17998,11 +21499,13 @@ var BaseRangeReader = function () {
}
_createClass(BaseRangeReader, [{
- key: 'read',
+ key: "read",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+ var _read2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
var chunk, buffer;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -18015,7 +21518,7 @@ var BaseRangeReader = function () {
break;
}
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: undefined,
done: true
});
@@ -18037,21 +21540,25 @@ var BaseRangeReader = function () {
}
this._readCapability = (0, _util.createPromiseCapability)();
- return _context2.abrupt('return', this.read());
+ return _context2.abrupt("return", this.read());
case 10:
this._loaded += chunk.length;
+
if (this.onProgress) {
- this.onProgress({ loaded: this._loaded });
+ this.onProgress({
+ loaded: this._loaded
+ });
}
+
buffer = new Uint8Array(chunk).buffer;
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: buffer,
done: false
});
case 14:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -18059,28 +21566,31 @@ var BaseRangeReader = function () {
}));
function read() {
- return _ref2.apply(this, arguments);
+ return _read2.apply(this, arguments);
}
return read;
}()
}, {
- key: 'cancel',
+ key: "cancel",
value: function cancel(reason) {
if (!this._readableStream) {
this._error(reason);
+
return;
}
+
this._readableStream.destroy(reason);
}
}, {
- key: '_error',
+ key: "_error",
value: function _error(reason) {
this._storedError = reason;
+
this._readCapability.resolve();
}
}, {
- key: '_setReadableStream',
+ key: "_setReadableStream",
value: function _setReadableStream(readableStream) {
var _this2 = this;
@@ -18091,17 +21601,19 @@ var BaseRangeReader = function () {
readableStream.on('end', function () {
readableStream.destroy();
_this2._done = true;
+
_this2._readCapability.resolve();
});
readableStream.on('error', function (reason) {
_this2._error(reason);
});
+
if (this._storedError) {
this._readableStream.destroy(this._storedError);
}
}
}, {
- key: 'isStreamingSupported',
+ key: "isStreamingSupported",
get: function get() {
return this._isStreamingSupported;
}
@@ -18122,23 +21634,32 @@ function createRequestOptions(url, headers) {
};
}
-var PDFNodeStreamFullReader = function (_BaseFullReader) {
+var PDFNodeStreamFullReader =
+/*#__PURE__*/
+function (_BaseFullReader) {
_inherits(PDFNodeStreamFullReader, _BaseFullReader);
function PDFNodeStreamFullReader(stream) {
+ var _this3;
+
_classCallCheck(this, PDFNodeStreamFullReader);
- var _this3 = _possibleConstructorReturn(this, (PDFNodeStreamFullReader.__proto__ || Object.getPrototypeOf(PDFNodeStreamFullReader)).call(this, stream));
+ _this3 = _possibleConstructorReturn(this, _getPrototypeOf(PDFNodeStreamFullReader).call(this, stream));
var handleResponse = function handleResponse(response) {
if (response.statusCode === 404) {
- var error = new _util.MissingPDFException('Missing PDF "' + _this3._url + '".');
+ var error = new _util.MissingPDFException("Missing PDF \"".concat(_this3._url, "\"."));
_this3._storedError = error;
+
_this3._headersCapability.reject(error);
+
return;
}
+
_this3._headersCapability.resolve();
+
_this3._setReadableStream(response);
+
var getResponseHeader = function getResponseHeader(name) {
return _this3._readableStream.headers[name.toLowerCase()];
};
@@ -18156,87 +21677,118 @@ var PDFNodeStreamFullReader = function (_BaseFullReader) {
_this3._contentLength = suggestedLength || _this3._contentLength;
_this3._filename = (0, _network_utils.extractFilenameFromHeader)(getResponseHeader);
};
+
_this3._request = null;
+
if (_this3._url.protocol === 'http:') {
_this3._request = http.request(createRequestOptions(_this3._url, stream.httpHeaders), handleResponse);
} else {
_this3._request = https.request(createRequestOptions(_this3._url, stream.httpHeaders), handleResponse);
}
+
_this3._request.on('error', function (reason) {
_this3._storedError = reason;
+
_this3._headersCapability.reject(reason);
});
+
_this3._request.end();
+
return _this3;
}
return PDFNodeStreamFullReader;
}(BaseFullReader);
-var PDFNodeStreamRangeReader = function (_BaseRangeReader) {
+var PDFNodeStreamRangeReader =
+/*#__PURE__*/
+function (_BaseRangeReader) {
_inherits(PDFNodeStreamRangeReader, _BaseRangeReader);
function PDFNodeStreamRangeReader(stream, start, end) {
- _classCallCheck(this, PDFNodeStreamRangeReader);
+ var _this4;
- var _this4 = _possibleConstructorReturn(this, (PDFNodeStreamRangeReader.__proto__ || Object.getPrototypeOf(PDFNodeStreamRangeReader)).call(this, stream));
+ _classCallCheck(this, PDFNodeStreamRangeReader);
+ _this4 = _possibleConstructorReturn(this, _getPrototypeOf(PDFNodeStreamRangeReader).call(this, stream));
_this4._httpHeaders = {};
+
for (var property in stream.httpHeaders) {
var value = stream.httpHeaders[property];
+
if (typeof value === 'undefined') {
continue;
}
+
_this4._httpHeaders[property] = value;
}
- _this4._httpHeaders['Range'] = 'bytes=' + start + '-' + (end - 1);
+
+ _this4._httpHeaders['Range'] = "bytes=".concat(start, "-").concat(end - 1);
+
var handleResponse = function handleResponse(response) {
if (response.statusCode === 404) {
- var error = new _util.MissingPDFException('Missing PDF "' + _this4._url + '".');
+ var error = new _util.MissingPDFException("Missing PDF \"".concat(_this4._url, "\"."));
_this4._storedError = error;
return;
}
+
_this4._setReadableStream(response);
};
+
_this4._request = null;
+
if (_this4._url.protocol === 'http:') {
_this4._request = http.request(createRequestOptions(_this4._url, _this4._httpHeaders), handleResponse);
} else {
_this4._request = https.request(createRequestOptions(_this4._url, _this4._httpHeaders), handleResponse);
}
+
_this4._request.on('error', function (reason) {
_this4._storedError = reason;
});
+
_this4._request.end();
+
return _this4;
}
return PDFNodeStreamRangeReader;
}(BaseRangeReader);
-var PDFNodeStreamFsFullReader = function (_BaseFullReader2) {
+var PDFNodeStreamFsFullReader =
+/*#__PURE__*/
+function (_BaseFullReader2) {
_inherits(PDFNodeStreamFsFullReader, _BaseFullReader2);
function PDFNodeStreamFsFullReader(stream) {
- _classCallCheck(this, PDFNodeStreamFsFullReader);
+ var _this5;
- var _this5 = _possibleConstructorReturn(this, (PDFNodeStreamFsFullReader.__proto__ || Object.getPrototypeOf(PDFNodeStreamFsFullReader)).call(this, stream));
+ _classCallCheck(this, PDFNodeStreamFsFullReader);
+ _this5 = _possibleConstructorReturn(this, _getPrototypeOf(PDFNodeStreamFsFullReader).call(this, stream));
var path = decodeURIComponent(_this5._url.path);
+
if (fileUriRegex.test(_this5._url.href)) {
path = path.replace(/^\//, '');
}
+
fs.lstat(path, function (error, stat) {
if (error) {
if (error.code === 'ENOENT') {
- error = new _util.MissingPDFException('Missing PDF "' + path + '".');
+ error = new _util.MissingPDFException("Missing PDF \"".concat(path, "\"."));
}
+
_this5._storedError = error;
+
_this5._headersCapability.reject(error);
+
return;
}
+
_this5._contentLength = stat.size;
+
_this5._setReadableStream(fs.createReadStream(path));
+
_this5._headersCapability.resolve();
});
return _this5;
@@ -18245,30 +21797,34 @@ var PDFNodeStreamFsFullReader = function (_BaseFullReader2) {
return PDFNodeStreamFsFullReader;
}(BaseFullReader);
-var PDFNodeStreamFsRangeReader = function (_BaseRangeReader2) {
+var PDFNodeStreamFsRangeReader =
+/*#__PURE__*/
+function (_BaseRangeReader2) {
_inherits(PDFNodeStreamFsRangeReader, _BaseRangeReader2);
function PDFNodeStreamFsRangeReader(stream, start, end) {
- _classCallCheck(this, PDFNodeStreamFsRangeReader);
+ var _this6;
- var _this6 = _possibleConstructorReturn(this, (PDFNodeStreamFsRangeReader.__proto__ || Object.getPrototypeOf(PDFNodeStreamFsRangeReader)).call(this, stream));
+ _classCallCheck(this, PDFNodeStreamFsRangeReader);
+ _this6 = _possibleConstructorReturn(this, _getPrototypeOf(PDFNodeStreamFsRangeReader).call(this, stream));
var path = decodeURIComponent(_this6._url.path);
+
if (fileUriRegex.test(_this6._url.href)) {
path = path.replace(/^\//, '');
}
+
_this6._setReadableStream(fs.createReadStream(path, {
start: start,
end: end - 1
}));
+
return _this6;
}
return PDFNodeStreamFsRangeReader;
}(BaseRangeReader);
-exports.PDFNodeStream = PDFNodeStream;
-
/***/ }),
/* 153 */
/***/ (function(module, exports, __w_pdfjs_require__) {
@@ -18279,7 +21835,10 @@ exports.PDFNodeStream = PDFNodeStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.validateResponseStatus = exports.validateRangeRequestCapabilities = exports.extractFilenameFromHeader = exports.createResponseStatusError = undefined;
+exports.createResponseStatusError = createResponseStatusError;
+exports.extractFilenameFromHeader = extractFilenameFromHeader;
+exports.validateRangeRequestCapabilities = validateRangeRequestCapabilities;
+exports.validateResponseStatus = validateResponseStatus;
var _util = __w_pdfjs_require__(1);
@@ -18290,56 +21849,66 @@ function validateRangeRequestCapabilities(_ref) {
isHttp = _ref.isHttp,
rangeChunkSize = _ref.rangeChunkSize,
disableRange = _ref.disableRange;
-
(0, _util.assert)(rangeChunkSize > 0, 'Range chunk size must be larger than zero');
var returnValues = {
allowRangeRequests: false,
suggestedLength: undefined
};
var length = parseInt(getResponseHeader('Content-Length'), 10);
+
if (!Number.isInteger(length)) {
return returnValues;
}
+
returnValues.suggestedLength = length;
+
if (length <= 2 * rangeChunkSize) {
return returnValues;
}
+
if (disableRange || !isHttp) {
return returnValues;
}
+
if (getResponseHeader('Accept-Ranges') !== 'bytes') {
return returnValues;
}
+
var contentEncoding = getResponseHeader('Content-Encoding') || 'identity';
+
if (contentEncoding !== 'identity') {
return returnValues;
}
+
returnValues.allowRangeRequests = true;
return returnValues;
}
+
function extractFilenameFromHeader(getResponseHeader) {
var contentDisposition = getResponseHeader('Content-Disposition');
+
if (contentDisposition) {
var filename = (0, _content_disposition.getFilenameFromContentDispositionHeader)(contentDisposition);
+
if (/\.pdf$/i.test(filename)) {
return filename;
}
}
+
return null;
}
+
function createResponseStatusError(status, url) {
if (status === 404 || status === 0 && /^file:/.test(url)) {
return new _util.MissingPDFException('Missing PDF "' + url + '".');
}
+
return new _util.UnexpectedResponseException('Unexpected server response (' + status + ') while retrieving PDF "' + url + '".', status);
}
+
function validateResponseStatus(status) {
return status === 200 || status === 206;
}
-exports.createResponseStatusError = createResponseStatusError;
-exports.extractFilenameFromHeader = extractFilenameFromHeader;
-exports.validateRangeRequestCapabilities = validateRangeRequestCapabilities;
-exports.validateResponseStatus = validateResponseStatus;
/***/ }),
/* 154 */
@@ -18351,12 +21920,20 @@ exports.validateResponseStatus = validateResponseStatus;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.getFilenameFromContentDispositionHeader = getFilenameFromContentDispositionHeader;
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
function getFilenameFromContentDispositionHeader(contentDisposition) {
var needsEncodingFixup = true;
var tmp = toParamRegExp('filename\\*', 'i').exec(contentDisposition);
+
if (tmp) {
tmp = tmp[1];
var filename = rfc2616unquote(tmp);
@@ -18365,32 +21942,46 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
filename = rfc2047decode(filename);
return fixupEncoding(filename);
}
+
tmp = rfc2231getparam(contentDisposition);
+
if (tmp) {
var _filename = rfc2047decode(tmp);
+
return fixupEncoding(_filename);
}
+
tmp = toParamRegExp('filename', 'i').exec(contentDisposition);
+
if (tmp) {
tmp = tmp[1];
+
var _filename2 = rfc2616unquote(tmp);
+
_filename2 = rfc2047decode(_filename2);
return fixupEncoding(_filename2);
}
+
function toParamRegExp(attributePattern, flags) {
return new RegExp('(?:^|;)\\s*' + attributePattern + '\\s*=\\s*' + '(' + '[^";\\s][^;\\s]*' + '|' + '"(?:[^"\\\\]|\\\\"?)+"?' + ')', flags);
}
+
function textdecode(encoding, value) {
if (encoding) {
if (!/^[\x00-\xFF]+$/.test(value)) {
return value;
}
+
try {
- var decoder = new TextDecoder(encoding, { fatal: true });
+ var decoder = new TextDecoder(encoding, {
+ fatal: true
+ });
var bytes = new Array(value.length);
+
for (var i = 0; i < value.length; ++i) {
bytes[i] = value.charCodeAt(i);
}
+
value = decoder.decode(new Uint8Array(bytes));
needsEncodingFixup = false;
} catch (e) {
@@ -18402,21 +21993,27 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
}
}
}
+
return value;
}
+
function fixupEncoding(value) {
if (needsEncodingFixup && /[\x80-\xff]/.test(value)) {
value = textdecode('utf-8', value);
+
if (needsEncodingFixup) {
value = textdecode('iso-8859-1', value);
}
}
+
return value;
}
+
function rfc2231getparam(contentDisposition) {
var matches = [],
- match = void 0;
+ match;
var iter = toParamRegExp('filename\\*((?!0\\d)\\d+)(\\*?)', 'ig');
+
while ((match = iter.exec(contentDisposition)) !== null) {
var _match = match,
_match2 = _slicedToArray(_match, 4),
@@ -18425,64 +22022,84 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
part = _match2[3];
n = parseInt(n, 10);
+
if (n in matches) {
if (n === 0) {
break;
}
+
continue;
}
+
matches[n] = [quot, part];
}
+
var parts = [];
- for (var _n = 0; _n < matches.length; ++_n) {
- if (!(_n in matches)) {
+
+ for (var n = 0; n < matches.length; ++n) {
+ if (!(n in matches)) {
break;
}
- var _matches$_n = _slicedToArray(matches[_n], 2),
- _quot = _matches$_n[0],
- _part = _matches$_n[1];
+ var _matches$n = _slicedToArray(matches[n], 2),
+ quot = _matches$n[0],
+ part = _matches$n[1];
+
+ part = rfc2616unquote(part);
- _part = rfc2616unquote(_part);
- if (_quot) {
- _part = unescape(_part);
- if (_n === 0) {
- _part = rfc5987decode(_part);
+ if (quot) {
+ part = unescape(part);
+
+ if (n === 0) {
+ part = rfc5987decode(part);
}
}
- parts.push(_part);
+
+ parts.push(part);
}
+
return parts.join('');
}
+
function rfc2616unquote(value) {
if (value.charAt(0) === '"') {
var parts = value.slice(1).split('\\"');
+
for (var i = 0; i < parts.length; ++i) {
var quotindex = parts[i].indexOf('"');
+
if (quotindex !== -1) {
parts[i] = parts[i].slice(0, quotindex);
parts.length = i + 1;
}
+
parts[i] = parts[i].replace(/\\(.)/g, '$1');
}
+
value = parts.join('"');
}
+
return value;
}
+
function rfc5987decode(extvalue) {
var encodingend = extvalue.indexOf('\'');
+
if (encodingend === -1) {
return extvalue;
}
+
var encoding = extvalue.slice(0, encodingend);
var langvalue = extvalue.slice(encodingend + 1);
var value = langvalue.replace(/^[^']*'/, '');
return textdecode(encoding, value);
}
+
function rfc2047decode(value) {
if (value.slice(0, 2) !== '=?' || /[\x00-\x19\x80-\xff]/.test(value)) {
return value;
}
+
return value.replace(/=\?([\w-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g, function (_, charset, encoding, text) {
if (encoding === 'q' || encoding === 'Q') {
text = text.replace(/_/g, ' ');
@@ -18491,15 +22108,17 @@ function getFilenameFromContentDispositionHeader(contentDisposition) {
});
return textdecode(charset, text);
}
+
try {
text = atob(text);
} catch (e) {}
+
return textdecode(charset, text);
});
}
+
return '';
}
-exports.getFilenameFromContentDispositionHeader = getFilenameFromContentDispositionHeader;
/***/ }),
/* 155 */
@@ -18511,13 +22130,9 @@ exports.getFilenameFromContentDispositionHeader = getFilenameFromContentDisposit
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFFetchStream = undefined;
-
-var _regenerator = __w_pdfjs_require__(141);
+exports.PDFFetchStream = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(134));
var _util = __w_pdfjs_require__(1);
@@ -18525,10 +22140,16 @@ var _network_utils = __w_pdfjs_require__(153);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
function createFetchOptions(headers, withCredentials, abortController) {
return {
method: 'GET',
@@ -18540,7 +22161,9 @@ function createFetchOptions(headers, withCredentials, abortController) {
};
}
-var PDFFetchStream = function () {
+var PDFFetchStream =
+/*#__PURE__*/
+function () {
function PDFFetchStream(source) {
_classCallCheck(this, PDFFetchStream);
@@ -18552,26 +22175,30 @@ var PDFFetchStream = function () {
}
_createClass(PDFFetchStream, [{
- key: 'getFullReader',
+ key: "getFullReader",
value: function getFullReader() {
(0, _util.assert)(!this._fullRequestReader);
this._fullRequestReader = new PDFFetchStreamReader(this);
return this._fullRequestReader;
}
}, {
- key: 'getRangeReader',
+ key: "getRangeReader",
value: function getRangeReader(begin, end) {
var reader = new PDFFetchStreamRangeReader(this, begin, end);
+
this._rangeRequestReaders.push(reader);
+
return reader;
}
}, {
- key: 'cancelAllRequests',
+ key: "cancelAllRequests",
value: function cancelAllRequests(reason) {
if (this._fullRequestReader) {
this._fullRequestReader.cancel(reason);
}
+
var readers = this._rangeRequestReaders.slice(0);
+
readers.forEach(function (reader) {
reader.cancel(reason);
});
@@ -18581,7 +22208,11 @@ var PDFFetchStream = function () {
return PDFFetchStream;
}();
-var PDFFetchStreamReader = function () {
+exports.PDFFetchStream = PDFFetchStream;
+
+var PDFFetchStreamReader =
+/*#__PURE__*/
+function () {
function PDFFetchStreamReader(stream) {
var _this = this;
@@ -18597,29 +22228,39 @@ var PDFFetchStreamReader = function () {
this._headersCapability = (0, _util.createPromiseCapability)();
this._disableRange = source.disableRange || false;
this._rangeChunkSize = source.rangeChunkSize;
+
if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true;
}
+
if (typeof AbortController !== 'undefined') {
this._abortController = new AbortController();
}
+
this._isStreamingSupported = !source.disableStream;
this._isRangeSupported = !source.disableRange;
this._headers = new Headers();
+
for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property];
+
if (typeof value === 'undefined') {
continue;
}
+
this._headers.append(property, value);
}
+
var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url);
}
+
_this._reader = response.body.getReader();
+
_this._headersCapability.resolve();
+
var getResponseHeader = function getResponseHeader(name) {
return response.headers.get(name);
};
@@ -18636,6 +22277,7 @@ var PDFFetchStreamReader = function () {
_this._isRangeSupported = allowRangeRequests;
_this._contentLength = suggestedLength || _this._contentLength;
_this._filename = (0, _network_utils.extractFilenameFromHeader)(getResponseHeader);
+
if (!_this._isStreamingSupported && _this._isRangeSupported) {
_this.cancel(new _util.AbortException('streaming is disabled'));
}
@@ -18644,12 +22286,14 @@ var PDFFetchStreamReader = function () {
}
_createClass(PDFFetchStreamReader, [{
- key: 'read',
+ key: "read",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
- var _ref2, value, done, buffer;
+ var _read = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
+ var _ref, value, done, buffer;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -18661,36 +22305,38 @@ var PDFFetchStreamReader = function () {
return this._reader.read();
case 4:
- _ref2 = _context.sent;
- value = _ref2.value;
- done = _ref2.done;
+ _ref = _context.sent;
+ value = _ref.value;
+ done = _ref.done;
if (!done) {
_context.next = 9;
break;
}
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: value,
done: done
});
case 9:
this._loaded += value.byteLength;
+
if (this.onProgress) {
this.onProgress({
loaded: this._loaded,
total: this._contentLength
});
}
+
buffer = new Uint8Array(value).buffer;
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: buffer,
done: false
});
case 13:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -18698,43 +22344,44 @@ var PDFFetchStreamReader = function () {
}));
function read() {
- return _ref.apply(this, arguments);
+ return _read.apply(this, arguments);
}
return read;
}()
}, {
- key: 'cancel',
+ key: "cancel",
value: function cancel(reason) {
if (this._reader) {
this._reader.cancel(reason);
}
+
if (this._abortController) {
this._abortController.abort();
}
}
}, {
- key: 'headersReady',
+ key: "headersReady",
get: function get() {
return this._headersCapability.promise;
}
}, {
- key: 'filename',
+ key: "filename",
get: function get() {
return this._filename;
}
}, {
- key: 'contentLength',
+ key: "contentLength",
get: function get() {
return this._contentLength;
}
}, {
- key: 'isRangeSupported',
+ key: "isRangeSupported",
get: function get() {
return this._isRangeSupported;
}
}, {
- key: 'isStreamingSupported',
+ key: "isStreamingSupported",
get: function get() {
return this._isStreamingSupported;
}
@@ -18743,7 +22390,9 @@ var PDFFetchStreamReader = function () {
return PDFFetchStreamReader;
}();
-var PDFFetchStreamRangeReader = function () {
+var PDFFetchStreamRangeReader =
+/*#__PURE__*/
+function () {
function PDFFetchStreamRangeReader(stream, begin, end) {
var _this2 = this;
@@ -18756,37 +22405,49 @@ var PDFFetchStreamRangeReader = function () {
this._withCredentials = source.withCredentials;
this._readCapability = (0, _util.createPromiseCapability)();
this._isStreamingSupported = !source.disableStream;
+
if (typeof AbortController !== 'undefined') {
this._abortController = new AbortController();
}
+
this._headers = new Headers();
+
for (var property in this._stream.httpHeaders) {
var value = this._stream.httpHeaders[property];
+
if (typeof value === 'undefined') {
continue;
}
+
this._headers.append(property, value);
}
+
var rangeStr = begin + '-' + (end - 1);
+
this._headers.append('Range', 'bytes=' + rangeStr);
+
var url = source.url;
fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(function (response) {
if (!(0, _network_utils.validateResponseStatus)(response.status)) {
throw (0, _network_utils.createResponseStatusError)(response.status, url);
}
+
_this2._readCapability.resolve();
+
_this2._reader = response.body.getReader();
});
this.onProgress = null;
}
_createClass(PDFFetchStreamRangeReader, [{
- key: 'read',
+ key: "read",
value: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
- var _ref4, value, done, buffer;
+ var _read2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
+ var _ref2, value, done, buffer;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -18798,33 +22459,37 @@ var PDFFetchStreamRangeReader = function () {
return this._reader.read();
case 4:
- _ref4 = _context2.sent;
- value = _ref4.value;
- done = _ref4.done;
+ _ref2 = _context2.sent;
+ value = _ref2.value;
+ done = _ref2.done;
if (!done) {
_context2.next = 9;
break;
}
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: value,
done: done
});
case 9:
this._loaded += value.byteLength;
+
if (this.onProgress) {
- this.onProgress({ loaded: this._loaded });
+ this.onProgress({
+ loaded: this._loaded
+ });
}
+
buffer = new Uint8Array(value).buffer;
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: buffer,
done: false
});
case 13:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -18832,23 +22497,24 @@ var PDFFetchStreamRangeReader = function () {
}));
function read() {
- return _ref3.apply(this, arguments);
+ return _read2.apply(this, arguments);
}
return read;
}()
}, {
- key: 'cancel',
+ key: "cancel",
value: function cancel(reason) {
if (this._reader) {
this._reader.cancel(reason);
}
+
if (this._abortController) {
this._abortController.abort();
}
}
}, {
- key: 'isStreamingSupported',
+ key: "isStreamingSupported",
get: function get() {
return this._isStreamingSupported;
}
@@ -18857,8 +22523,6 @@ var PDFFetchStreamRangeReader = function () {
return PDFFetchStreamRangeReader;
}();
-exports.PDFFetchStream = PDFFetchStream;
-
/***/ }),
/* 156 */
/***/ (function(module, exports, __w_pdfjs_require__) {
@@ -18869,67 +22533,76 @@ exports.PDFFetchStream = PDFFetchStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.NetworkManager = exports.PDFNetworkStream = undefined;
-
-var _regenerator = __w_pdfjs_require__(141);
+exports.PDFNetworkStream = PDFNetworkStream;
+exports.NetworkManager = NetworkManager;
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(134));
var _util = __w_pdfjs_require__(1);
var _network_utils = __w_pdfjs_require__(153);
-var _global_scope = __w_pdfjs_require__(3);
-
-var _global_scope2 = _interopRequireDefault(_global_scope);
+var _global_scope = _interopRequireDefault(__w_pdfjs_require__(3));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
;
var OK_RESPONSE = 200;
var PARTIAL_CONTENT_RESPONSE = 206;
+
function NetworkManager(url, args) {
this.url = url;
args = args || {};
this.isHttp = /^https?:/i.test(url);
this.httpHeaders = this.isHttp && args.httpHeaders || {};
this.withCredentials = args.withCredentials || false;
+
this.getXhr = args.getXhr || function NetworkManager_getXhr() {
return new XMLHttpRequest();
};
+
this.currXhrId = 0;
this.pendingRequests = Object.create(null);
this.loadedRequests = Object.create(null);
}
+
function getArrayBuffer(xhr) {
var data = xhr.response;
+
if (typeof data !== 'string') {
return data;
}
+
var array = (0, _util.stringToBytes)(data);
return array.buffer;
}
+
var supportsMozChunked = function supportsMozChunkedClosure() {
try {
var x = new XMLHttpRequest();
- x.open('GET', _global_scope2.default.location.href);
+ x.open('GET', _global_scope.default.location.href);
x.responseType = 'moz-chunked-arraybuffer';
return x.responseType === 'moz-chunked-arraybuffer';
} catch (e) {
return false;
}
}();
+
NetworkManager.prototype = {
requestRange: function NetworkManager_requestRange(begin, end, listeners) {
var args = {
begin: begin,
end: end
};
+
for (var prop in listeners) {
args[prop] = listeners[prop];
}
+
return this.request(args);
},
requestFull: function NetworkManager_requestFull(listeners) {
@@ -18938,16 +22611,22 @@ NetworkManager.prototype = {
request: function NetworkManager_request(args) {
var xhr = this.getXhr();
var xhrId = this.currXhrId++;
- var pendingRequest = this.pendingRequests[xhrId] = { xhr: xhr };
+ var pendingRequest = this.pendingRequests[xhrId] = {
+ xhr: xhr
+ };
xhr.open('GET', this.url);
xhr.withCredentials = this.withCredentials;
+
for (var property in this.httpHeaders) {
var value = this.httpHeaders[property];
+
if (typeof value === 'undefined') {
continue;
}
+
xhr.setRequestHeader(property, value);
}
+
if (this.isHttp && 'begin' in args && 'end' in args) {
var rangeStr = args.begin + '-' + (args.end - 1);
xhr.setRequestHeader('Range', 'bytes=' + rangeStr);
@@ -18955,7 +22634,9 @@ NetworkManager.prototype = {
} else {
pendingRequest.expectedStatus = 200;
}
+
var useMozChunkedLoading = supportsMozChunked && !!args.onProgressiveData;
+
if (useMozChunkedLoading) {
xhr.responseType = 'moz-chunked-arraybuffer';
pendingRequest.onProgressiveData = args.onProgressiveData;
@@ -18963,11 +22644,13 @@ NetworkManager.prototype = {
} else {
xhr.responseType = 'arraybuffer';
}
+
if (args.onError) {
xhr.onerror = function (evt) {
args.onError(xhr.status);
};
}
+
xhr.onreadystatechange = this.onStateChange.bind(this, xhrId);
xhr.onprogress = this.onProgress.bind(this, xhrId);
pendingRequest.onHeadersReceived = args.onHeadersReceived;
@@ -18979,51 +22662,68 @@ NetworkManager.prototype = {
},
onProgress: function NetworkManager_onProgress(xhrId, evt) {
var pendingRequest = this.pendingRequests[xhrId];
+
if (!pendingRequest) {
return;
}
+
if (pendingRequest.mozChunked) {
var chunk = getArrayBuffer(pendingRequest.xhr);
pendingRequest.onProgressiveData(chunk);
}
+
var onProgress = pendingRequest.onProgress;
+
if (onProgress) {
onProgress(evt);
}
},
onStateChange: function NetworkManager_onStateChange(xhrId, evt) {
var pendingRequest = this.pendingRequests[xhrId];
+
if (!pendingRequest) {
return;
}
+
var xhr = pendingRequest.xhr;
+
if (xhr.readyState >= 2 && pendingRequest.onHeadersReceived) {
pendingRequest.onHeadersReceived();
delete pendingRequest.onHeadersReceived;
}
+
if (xhr.readyState !== 4) {
return;
}
+
if (!(xhrId in this.pendingRequests)) {
return;
}
+
delete this.pendingRequests[xhrId];
+
if (xhr.status === 0 && this.isHttp) {
if (pendingRequest.onError) {
pendingRequest.onError(xhr.status);
}
+
return;
}
+
var xhrStatus = xhr.status || OK_RESPONSE;
var ok_response_on_range_request = xhrStatus === OK_RESPONSE && pendingRequest.expectedStatus === PARTIAL_CONTENT_RESPONSE;
+
if (!ok_response_on_range_request && xhrStatus !== pendingRequest.expectedStatus) {
if (pendingRequest.onError) {
pendingRequest.onError(xhr.status);
}
+
return;
}
+
this.loadedRequests[xhrId] = true;
var chunk = getArrayBuffer(xhr);
+
if (xhrStatus === PARTIAL_CONTENT_RESPONSE) {
var rangeHeader = xhr.getResponseHeader('Content-Range');
var matches = /bytes (\d+)-(\d+)\/(\d+)/.exec(rangeHeader);
@@ -19047,6 +22747,7 @@ NetworkManager.prototype = {
for (var xhrId in this.pendingRequests) {
return true;
}
+
return false;
},
getRequestXhr: function NetworkManager_getXhr(xhrId) {
@@ -19072,6 +22773,7 @@ NetworkManager.prototype = {
xhr.abort();
}
};
+
function PDFNetworkStream(source) {
this._source = source;
this._manager = new NetworkManager(source.url, {
@@ -19082,9 +22784,11 @@ function PDFNetworkStream(source) {
this._fullRequestReader = null;
this._rangeRequestReaders = [];
}
+
PDFNetworkStream.prototype = {
_onRangeRequestReaderClosed: function PDFNetworkStream_onRangeRequestReaderClosed(reader) {
var i = this._rangeRequestReaders.indexOf(reader);
+
if (i >= 0) {
this._rangeRequestReaders.splice(i, 1);
}
@@ -19097,19 +22801,24 @@ PDFNetworkStream.prototype = {
getRangeReader: function PDFNetworkStream_getRangeReader(begin, end) {
var reader = new PDFNetworkStreamRangeRequestReader(this._manager, begin, end);
reader.onClosed = this._onRangeRequestReaderClosed.bind(this);
+
this._rangeRequestReaders.push(reader);
+
return reader;
},
cancelAllRequests: function PDFNetworkStream_cancelAllRequests(reason) {
if (this._fullRequestReader) {
this._fullRequestReader.cancel(reason);
}
+
var readers = this._rangeRequestReaders.slice(0);
+
readers.forEach(function (reader) {
reader.cancel(reason);
});
}
};
+
function PDFNetworkStreamFullRequestReader(manager, source) {
this._manager = manager;
var args = {
@@ -19125,9 +22834,11 @@ function PDFNetworkStreamFullRequestReader(manager, source) {
this._disableRange = source.disableRange || false;
this._contentLength = source.length;
this._rangeChunkSize = source.rangeChunkSize;
+
if (!this._rangeChunkSize && !this._disableRange) {
this._disableRange = true;
}
+
this._isStreamingSupported = false;
this._isRangeSupported = false;
this._cachedChunks = [];
@@ -19137,10 +22848,13 @@ function PDFNetworkStreamFullRequestReader(manager, source) {
this._filename = null;
this.onProgress = null;
}
+
PDFNetworkStreamFullRequestReader.prototype = {
_onHeadersReceived: function PDFNetworkStreamFullRequestReader_onHeadersReceived() {
var fullRequestXhrId = this._fullRequestId;
+
var fullRequestXhr = this._manager.getRequestXhr(fullRequestXhrId);
+
var getResponseHeader = function getResponseHeader(name) {
return fullRequestXhr.getResponseHeader(name);
};
@@ -19157,19 +22871,23 @@ PDFNetworkStreamFullRequestReader.prototype = {
if (allowRangeRequests) {
this._isRangeSupported = true;
}
+
this._contentLength = suggestedLength || this._contentLength;
this._filename = (0, _network_utils.extractFilenameFromHeader)(getResponseHeader);
var networkManager = this._manager;
+
if (networkManager.isStreamingRequest(fullRequestXhrId)) {
this._isStreamingSupported = true;
} else if (this._isRangeSupported) {
networkManager.abortRequest(fullRequestXhrId);
}
+
this._headersReceivedCapability.resolve();
},
_onProgressiveData: function PDFNetworkStreamFullRequestReader_onProgressiveData(chunk) {
if (this._requests.length > 0) {
var requestCapability = this._requests.shift();
+
requestCapability.resolve({
value: chunk,
done: false
@@ -19182,26 +22900,33 @@ PDFNetworkStreamFullRequestReader.prototype = {
if (args) {
this._onProgressiveData(args.chunk);
}
+
this._done = true;
+
if (this._cachedChunks.length > 0) {
return;
}
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
},
_onError: function PDFNetworkStreamFullRequestReader_onError(status) {
var url = this._url;
var exception = (0, _network_utils.createResponseStatusError)(status, url);
this._storedError = exception;
+
this._headersReceivedCapability.reject(exception);
+
this._requests.forEach(function (requestCapability) {
requestCapability.reject(exception);
});
+
this._requests = [];
this._cachedChunks = [];
},
@@ -19213,25 +22938,33 @@ PDFNetworkStreamFullRequestReader.prototype = {
});
}
},
+
get filename() {
return this._filename;
},
+
get isRangeSupported() {
return this._isRangeSupported;
},
+
get isStreamingSupported() {
return this._isStreamingSupported;
},
+
get contentLength() {
return this._contentLength;
},
+
get headersReady() {
return this._headersReceivedCapability.promise;
},
+
read: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+ var _read = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
var chunk, requestCapability;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -19249,7 +22982,7 @@ PDFNetworkStreamFullRequestReader.prototype = {
}
chunk = this._cachedChunks.shift();
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: chunk,
done: false
});
@@ -19260,7 +22993,7 @@ PDFNetworkStreamFullRequestReader.prototype = {
break;
}
- return _context.abrupt('return', {
+ return _context.abrupt("return", {
value: undefined,
done: true
});
@@ -19269,10 +23002,11 @@ PDFNetworkStreamFullRequestReader.prototype = {
requestCapability = (0, _util.createPromiseCapability)();
this._requests.push(requestCapability);
- return _context.abrupt('return', requestCapability.promise);
+
+ return _context.abrupt("return", requestCapability.promise);
case 10:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -19280,28 +23014,33 @@ PDFNetworkStreamFullRequestReader.prototype = {
}));
function read() {
- return _ref.apply(this, arguments);
+ return _read.apply(this, arguments);
}
return read;
}(),
-
cancel: function PDFNetworkStreamFullRequestReader_cancel(reason) {
this._done = true;
+
this._headersReceivedCapability.reject(reason);
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
+
if (this._manager.isPendingRequest(this._fullRequestId)) {
this._manager.abortRequest(this._fullRequestId);
}
+
this._fullRequestReader = null;
}
};
+
function PDFNetworkStreamRangeRequestReader(manager, begin, end) {
this._manager = manager;
var args = {
@@ -19315,6 +23054,7 @@ function PDFNetworkStreamRangeRequestReader(manager, begin, end) {
this.onProgress = null;
this.onClosed = null;
}
+
PDFNetworkStreamRangeRequestReader.prototype = {
_close: function PDFNetworkStreamRangeRequestReader_close() {
if (this.onClosed) {
@@ -19323,8 +23063,10 @@ PDFNetworkStreamRangeRequestReader.prototype = {
},
_onDone: function PDFNetworkStreamRangeRequestReader_onDone(data) {
var chunk = data.chunk;
+
if (this._requests.length > 0) {
var requestCapability = this._requests.shift();
+
requestCapability.resolve({
value: chunk,
done: false
@@ -19332,28 +23074,38 @@ PDFNetworkStreamRangeRequestReader.prototype = {
} else {
this._queuedChunk = chunk;
}
+
this._done = true;
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
+
this._close();
},
_onProgress: function PDFNetworkStreamRangeRequestReader_onProgress(evt) {
if (!this.isStreamingSupported && this.onProgress) {
- this.onProgress({ loaded: evt.loaded });
+ this.onProgress({
+ loaded: evt.loaded
+ });
}
},
+
get isStreamingSupported() {
return false;
},
+
read: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+ var _read2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
var chunk, requestCapability;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -19363,9 +23115,8 @@ PDFNetworkStreamRangeRequestReader.prototype = {
}
chunk = this._queuedChunk;
-
this._queuedChunk = null;
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: chunk,
done: false
});
@@ -19376,7 +23127,7 @@ PDFNetworkStreamRangeRequestReader.prototype = {
break;
}
- return _context2.abrupt('return', {
+ return _context2.abrupt("return", {
value: undefined,
done: true
});
@@ -19385,10 +23136,11 @@ PDFNetworkStreamRangeRequestReader.prototype = {
requestCapability = (0, _util.createPromiseCapability)();
this._requests.push(requestCapability);
- return _context2.abrupt('return', requestCapability.promise);
+
+ return _context2.abrupt("return", requestCapability.promise);
case 9:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -19396,29 +23148,30 @@ PDFNetworkStreamRangeRequestReader.prototype = {
}));
function read() {
- return _ref2.apply(this, arguments);
+ return _read2.apply(this, arguments);
}
return read;
}(),
-
cancel: function PDFNetworkStreamRangeRequestReader_cancel(reason) {
this._done = true;
+
this._requests.forEach(function (requestCapability) {
requestCapability.resolve({
value: undefined,
done: true
});
});
+
this._requests = [];
+
if (this._manager.isPendingRequest(this._requestId)) {
this._manager.abortRequest(this._requestId);
}
+
this._close();
}
};
-exports.PDFNetworkStream = PDFNetworkStream;
-exports.NetworkManager = NetworkManager;
/***/ })
/******/ ]);
diff --git a/public/static/pdf/build/pdf.worker.js b/public/static/pdf/build/pdf.worker.js
index 46fc973d9..924cd3687 100644
--- a/public/static/pdf/build/pdf.worker.js
+++ b/public/static/pdf/build/pdf.worker.js
@@ -123,9 +123,11 @@ return /******/ (function(modules) { // webpackBootstrap
"use strict";
-var pdfjsVersion = '2.1.28';
-var pdfjsBuild = 'ec76aa53';
+var pdfjsVersion = '2.1.124';
+var pdfjsBuild = '74461b0a';
+
var pdfjsCoreWorker = __w_pdfjs_require__(1);
+
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
/***/ }),
@@ -138,19 +140,13 @@ exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.WorkerMessageHandler = exports.WorkerTask = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+exports.WorkerMessageHandler = exports.WorkerTask = void 0;
var _util = __w_pdfjs_require__(2);
var _pdf_manager = __w_pdfjs_require__(134);
-var _is_node = __w_pdfjs_require__(5);
-
-var _is_node2 = _interopRequireDefault(_is_node);
+var _is_node = _interopRequireDefault(__w_pdfjs_require__(5));
var _message_handler = __w_pdfjs_require__(176);
@@ -158,16 +154,28 @@ var _primitives = __w_pdfjs_require__(142);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
var WorkerTask = function WorkerTaskClosure() {
function WorkerTask(name) {
this.name = name;
this.terminated = false;
this._capability = (0, _util.createPromiseCapability)();
}
+
WorkerTask.prototype = {
get finished() {
return this._capability.promise;
},
+
finish: function finish() {
this._capability.resolve();
},
@@ -182,7 +190,9 @@ var WorkerTask = function WorkerTaskClosure() {
};
return WorkerTask;
}();
-;
+
+exports.WorkerTask = WorkerTask;
+
var PDFWorkerStream = function PDFWorkerStreamClosure() {
function PDFWorkerStream(msgHandler) {
this._msgHandler = msgHandler;
@@ -190,6 +200,7 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
this._fullRequestReader = null;
this._rangeRequestReaders = [];
}
+
PDFWorkerStream.prototype = {
getFullReader: function getFullReader() {
(0, _util.assert)(!this._fullRequestReader);
@@ -198,19 +209,24 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
},
getRangeReader: function getRangeReader(begin, end) {
var reader = new PDFWorkerStreamRangeReader(begin, end, this._msgHandler);
+
this._rangeRequestReaders.push(reader);
+
return reader;
},
cancelAllRequests: function cancelAllRequests(reason) {
if (this._fullRequestReader) {
this._fullRequestReader.cancel(reason);
}
+
var readers = this._rangeRequestReaders.slice(0);
+
readers.forEach(function (reader) {
reader.cancel(reason);
});
}
};
+
function PDFWorkerStreamReader(msgHandler) {
var _this = this;
@@ -218,7 +234,9 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
this._contentLength = null;
this._isRangeSupported = false;
this._isStreamingSupported = false;
+
var readableStream = this._msgHandler.sendWithStream('GetReader');
+
this._reader = readableStream.getReader();
this._headersReady = this._msgHandler.sendWithPromise('ReaderHeadersReady').then(function (data) {
_this._isStreamingSupported = data.isStreamingSupported;
@@ -226,19 +244,24 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
_this._contentLength = data.contentLength;
});
}
+
PDFWorkerStreamReader.prototype = {
get headersReady() {
return this._headersReady;
},
+
get contentLength() {
return this._contentLength;
},
+
get isStreamingSupported() {
return this._isStreamingSupported;
},
+
get isRangeSupported() {
return this._isRangeSupported;
},
+
read: function read() {
return this._reader.read().then(function (_ref) {
var value = _ref.value,
@@ -250,6 +273,7 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
done: true
};
}
+
return {
value: value.buffer,
done: false
@@ -260,19 +284,24 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
this._reader.cancel(reason);
}
};
+
function PDFWorkerStreamRangeReader(begin, end, msgHandler) {
this._msgHandler = msgHandler;
this.onProgress = null;
+
var readableStream = this._msgHandler.sendWithStream('GetRangeReader', {
begin: begin,
end: end
});
+
this._reader = readableStream.getReader();
}
+
PDFWorkerStreamRangeReader.prototype = {
get isStreamingSupported() {
return false;
},
+
read: function read() {
return this._reader.read().then(function (_ref2) {
var value = _ref2.value,
@@ -284,6 +313,7 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
done: true
};
}
+
return {
value: value.buffer,
done: false
@@ -296,6 +326,7 @@ var PDFWorkerStream = function PDFWorkerStreamClosure() {
};
return PDFWorkerStream;
}();
+
var WorkerMessageHandler = {
setup: function setup(handler, port) {
var testMessageProcessed = false;
@@ -303,24 +334,30 @@ var WorkerMessageHandler = {
if (testMessageProcessed) {
return;
}
+
testMessageProcessed = true;
+
if (!(data instanceof Uint8Array)) {
handler.send('test', false);
return;
}
+
var supportTransfers = data[0] === 255;
handler.postMessageTransfers = supportTransfers;
var xhr = new XMLHttpRequest();
var responseExists = 'response' in xhr;
+
try {
xhr.responseType;
} catch (e) {
responseExists = false;
}
+
if (!responseExists) {
handler.send('test', false);
return;
}
+
handler.send('test', {
supportTypedArray: true,
supportTransfers: supportTransfers
@@ -339,30 +376,37 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
var apiVersion = docParams.apiVersion;
- var workerVersion = '2.1.28';
+ var workerVersion = '2.1.124';
+
if (apiVersion !== workerVersion) {
- throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
+ throw new Error("The API version \"".concat(apiVersion, "\" does not match ") + "the Worker version \"".concat(workerVersion, "\"."));
}
+
var docId = docParams.docId;
var docBaseUrl = docParams.docBaseUrl;
var workerHandlerName = docParams.docId + '_worker';
var handler = new _message_handler.MessageHandler(workerHandlerName, docId, port);
handler.postMessageTransfers = docParams.postMessageTransfers;
+
function ensureNotTerminated() {
if (terminated) {
throw new Error('Worker was terminated');
}
}
+
function startWorkerTask(task) {
WorkerTasks.push(task);
}
+
function finishWorkerTask(task) {
task.finish();
var i = WorkerTasks.indexOf(task);
WorkerTasks.splice(i, 1);
}
+
function loadDocument(recoveryMode) {
var loadDocumentCapability = (0, _util.createPromiseCapability)();
+
var parseSuccess = function parseSuccess() {
Promise.all([pdfManager.ensureDoc('numPages'), pdfManager.ensureDoc('fingerprint')]).then(function (_ref3) {
var _ref4 = _slicedToArray(_ref3, 2),
@@ -375,9 +419,11 @@ var WorkerMessageHandler = {
});
}, parseFailure);
};
+
var parseFailure = function parseFailure(e) {
loadDocumentCapability.reject(e);
};
+
pdfManager.ensureDoc('checkHeader', []).then(function () {
pdfManager.ensureDoc('parseStartXRef', []).then(function () {
pdfManager.ensureDoc('parse', [recoveryMode]).then(parseSuccess, parseFailure);
@@ -385,10 +431,12 @@ var WorkerMessageHandler = {
}, parseFailure);
return loadDocumentCapability.promise;
}
+
function getPdfManager(data, evaluatorOptions) {
var pdfManagerCapability = (0, _util.createPromiseCapability)();
var pdfManager;
var source = data.source;
+
if (source.data) {
try {
pdfManager = new _pdf_manager.LocalPdfManager(docId, source.data, source.password, evaluatorOptions, docBaseUrl);
@@ -396,21 +444,26 @@ var WorkerMessageHandler = {
} catch (ex) {
pdfManagerCapability.reject(ex);
}
+
return pdfManagerCapability.promise;
}
+
var pdfStream,
cachedChunks = [];
+
try {
pdfStream = new PDFWorkerStream(handler);
} catch (ex) {
pdfManagerCapability.reject(ex);
return pdfManagerCapability.promise;
}
+
var fullRequest = pdfStream.getFullReader();
fullRequest.headersReady.then(function () {
if (!fullRequest.isRangeSupported) {
return;
}
+
var disableAutoFetch = source.disableAutoFetch || fullRequest.isStreamingSupported;
pdfManager = new _pdf_manager.NetworkPdfManager(docId, pdfStream, {
msgHandler: handler,
@@ -420,9 +473,11 @@ var WorkerMessageHandler = {
disableAutoFetch: disableAutoFetch,
rangeChunkSize: source.rangeChunkSize
}, evaluatorOptions, docBaseUrl);
+
for (var i = 0; i < cachedChunks.length; i++) {
pdfManager.sendProgressiveData(cachedChunks[i]);
}
+
cachedChunks = [];
pdfManagerCapability.resolve(pdfManager);
cancelXHRs = null;
@@ -431,66 +486,85 @@ var WorkerMessageHandler = {
cancelXHRs = null;
});
var loaded = 0;
+
var flushChunks = function flushChunks() {
var pdfFile = (0, _util.arraysToBytes)(cachedChunks);
+
if (source.length && pdfFile.length !== source.length) {
(0, _util.warn)('reported HTTP length is different from actual');
}
+
try {
pdfManager = new _pdf_manager.LocalPdfManager(docId, pdfFile, source.password, evaluatorOptions, docBaseUrl);
pdfManagerCapability.resolve(pdfManager);
} catch (ex) {
pdfManagerCapability.reject(ex);
}
+
cachedChunks = [];
};
+
var readPromise = new Promise(function (resolve, reject) {
var readChunk = function readChunk(chunk) {
try {
ensureNotTerminated();
+
if (chunk.done) {
if (!pdfManager) {
flushChunks();
}
+
cancelXHRs = null;
return;
}
+
var data = chunk.value;
loaded += (0, _util.arrayByteLength)(data);
+
if (!fullRequest.isStreamingSupported) {
handler.send('DocProgress', {
loaded: loaded,
total: Math.max(loaded, fullRequest.contentLength || 0)
});
}
+
if (pdfManager) {
pdfManager.sendProgressiveData(data);
} else {
cachedChunks.push(data);
}
+
fullRequest.read().then(readChunk, reject);
} catch (e) {
reject(e);
}
};
+
fullRequest.read().then(readChunk, reject);
});
readPromise.catch(function (e) {
pdfManagerCapability.reject(e);
cancelXHRs = null;
});
+
cancelXHRs = function cancelXHRs() {
pdfStream.cancelAllRequests('abort');
};
+
return pdfManagerCapability.promise;
}
+
function setupDoc(data) {
function onSuccess(doc) {
ensureNotTerminated();
- handler.send('GetDoc', { pdfInfo: doc });
+ handler.send('GetDoc', {
+ pdfInfo: doc
+ });
}
+
function onFailure(e) {
ensureNotTerminated();
+
if (e instanceof _util.PasswordException) {
var task = new WorkerTask('PasswordException: response ' + e.code);
startWorkerTask(task);
@@ -512,14 +586,17 @@ var WorkerMessageHandler = {
handler.send('UnknownError', new _util.UnknownErrorException(e.message, e.toString()));
}
}
+
function pdfManagerReady() {
ensureNotTerminated();
loadDocument(false).then(onSuccess, function loadFailure(ex) {
ensureNotTerminated();
+
if (!(ex instanceof _util.XRefParseException)) {
onFailure(ex);
return;
}
+
pdfManager.requestLoadedStream();
pdfManager.onLoadedStream().then(function () {
ensureNotTerminated();
@@ -527,6 +604,7 @@ var WorkerMessageHandler = {
});
}, onFailure);
}
+
ensureNotTerminated();
var evaluatorOptions = {
forceDataSchema: data.disableCreateObjectURL,
@@ -541,12 +619,16 @@ var WorkerMessageHandler = {
newPdfManager.terminate();
throw new Error('Worker was terminated');
}
+
pdfManager = newPdfManager;
pdfManager.onLoadedStream().then(function (stream) {
- handler.send('DataLoaded', { length: stream.bytes.byteLength });
+ handler.send('DataLoaded', {
+ length: stream.bytes.byteLength
+ });
});
}).then(pdfManagerReady, onFailure);
}
+
handler.on('GetPage', function wphSetupGetPage(data) {
return pdfManager.getPage(data.pageIndex).then(function (page) {
return Promise.all([pdfManager.ensure(page, 'rotate'), pdfManager.ensure(page, 'ref'), pdfManager.ensure(page, 'userUnit'), pdfManager.ensure(page, 'view')]).then(function (_ref5) {
@@ -609,7 +691,6 @@ var WorkerMessageHandler = {
handler.on('GetAnnotations', function (_ref7) {
var pageIndex = _ref7.pageIndex,
intent = _ref7.intent;
-
return pdfManager.getPage(pageIndex).then(function (page) {
return page.getAnnotationsData(intent);
});
@@ -631,28 +712,34 @@ var WorkerMessageHandler = {
(0, _util.info)('page=' + pageNum + ' - getOperatorList: time=' + (Date.now() - start) + 'ms, len=' + operatorList.totalLength);
}, function (e) {
finishWorkerTask(task);
+
if (task.terminated) {
return;
}
- handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
+
+ handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.unknown
+ });
var minimumStackMessage = 'worker.js: while trying to getPage() and getOperatorList()';
var wrappedException;
+
if (typeof e === 'string') {
wrappedException = {
message: e,
stack: minimumStackMessage
};
- } else if ((typeof e === 'undefined' ? 'undefined' : _typeof(e)) === 'object') {
+ } else if (_typeof(e) === 'object') {
wrappedException = {
message: e.message || e.toString(),
stack: e.stack || minimumStackMessage
};
} else {
wrappedException = {
- message: 'Unknown exception type: ' + (typeof e === 'undefined' ? 'undefined' : _typeof(e)),
+ message: 'Unknown exception type: ' + _typeof(e),
stack: minimumStackMessage
};
}
+
handler.send('PageError', {
pageNum: pageNum,
error: wrappedException,
@@ -663,8 +750,11 @@ var WorkerMessageHandler = {
}, this);
handler.on('GetTextContent', function wphExtractText(data, sink) {
var pageIndex = data.pageIndex;
+
sink.onPull = function (desiredSize) {};
+
sink.onCancel = function (reason) {};
+
pdfManager.getPage(pageIndex).then(function (page) {
var task = new WorkerTask('GetTextContent: page ' + pageIndex);
startWorkerTask(task);
@@ -682,9 +772,11 @@ var WorkerMessageHandler = {
sink.close();
}, function (reason) {
finishWorkerTask(task);
+
if (task.terminated) {
return;
}
+
sink.error(reason);
throw reason;
});
@@ -695,13 +787,16 @@ var WorkerMessageHandler = {
});
handler.on('Terminate', function wphTerminate(data) {
terminated = true;
+
if (pdfManager) {
pdfManager.terminate();
pdfManager = null;
}
+
if (cancelXHRs) {
cancelXHRs();
}
+
var waitOn = [];
WorkerTasks.forEach(function (task) {
waitOn.push(task.finished);
@@ -724,14 +819,15 @@ var WorkerMessageHandler = {
handler.send('ready', null);
}
};
+exports.WorkerMessageHandler = WorkerMessageHandler;
+
function isMessagePort(maybePort) {
return typeof maybePort.postMessage === 'function' && 'onmessage' in maybePort;
}
-if (typeof window === 'undefined' && !(0, _is_node2.default)() && typeof self !== 'undefined' && isMessagePort(self)) {
+
+if (typeof window === 'undefined' && !(0, _is_node.default)() && typeof self !== 'undefined' && isMessagePort(self)) {
WorkerMessageHandler.initializeFromPort(self);
}
-exports.WorkerTask = WorkerTask;
-exports.WorkerMessageHandler = WorkerMessageHandler;
/***/ }),
/* 2 */
@@ -743,9 +839,54 @@ exports.WorkerMessageHandler = WorkerMessageHandler;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.unreachable = exports.warn = exports.utf8StringToString = exports.stringToUTF8String = exports.stringToPDFString = exports.stringToBytes = exports.string32 = exports.shadow = exports.setVerbosityLevel = exports.URL = exports.ReadableStream = exports.removeNullCharacters = exports.readUint32 = exports.readUint16 = exports.readInt8 = exports.log2 = exports.isEvalSupported = exports.isLittleEndian = exports.createValidAbsoluteUrl = exports.isSameOrigin = exports.isSpace = exports.isString = exports.isNum = exports.isEmptyObj = exports.isBool = exports.isArrayBuffer = exports.info = exports.getVerbosityLevel = exports.getLookupTableFactory = exports.getInheritableProperty = exports.deprecated = exports.createObjectURL = exports.createPromiseCapability = exports.bytesToString = exports.assert = exports.arraysToBytes = exports.arrayByteLength = exports.FormatError = exports.XRefParseException = exports.toRomanNumerals = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VerbosityLevel = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+exports.toRomanNumerals = toRomanNumerals;
+exports.arrayByteLength = arrayByteLength;
+exports.arraysToBytes = arraysToBytes;
+exports.assert = assert;
+exports.bytesToString = bytesToString;
+exports.createPromiseCapability = createPromiseCapability;
+exports.deprecated = deprecated;
+exports.getInheritableProperty = getInheritableProperty;
+exports.getLookupTableFactory = getLookupTableFactory;
+exports.getVerbosityLevel = getVerbosityLevel;
+exports.info = info;
+exports.isArrayBuffer = isArrayBuffer;
+exports.isBool = isBool;
+exports.isEmptyObj = isEmptyObj;
+exports.isNum = isNum;
+exports.isString = isString;
+exports.isSpace = isSpace;
+exports.isSameOrigin = isSameOrigin;
+exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
+exports.isLittleEndian = isLittleEndian;
+exports.isEvalSupported = isEvalSupported;
+exports.log2 = log2;
+exports.readInt8 = readInt8;
+exports.readUint16 = readUint16;
+exports.readUint32 = readUint32;
+exports.removeNullCharacters = removeNullCharacters;
+exports.setVerbosityLevel = setVerbosityLevel;
+exports.shadow = shadow;
+exports.string32 = string32;
+exports.stringToBytes = stringToBytes;
+exports.stringToPDFString = stringToPDFString;
+exports.stringToUTF8String = stringToUTF8String;
+exports.utf8StringToString = utf8StringToString;
+exports.warn = warn;
+exports.unreachable = unreachable;
+Object.defineProperty(exports, "ReadableStream", {
+ enumerable: true,
+ get: function get() {
+ return _streams_polyfill.ReadableStream;
+ }
+});
+Object.defineProperty(exports, "URL", {
+ enumerable: true,
+ get: function get() {
+ return _url_polyfill.URL;
+ }
+});
+exports.createObjectURL = exports.FormatError = exports.XRefParseException = exports.Util = exports.UnknownErrorException = exports.UnexpectedResponseException = exports.TextRenderingMode = exports.StreamType = exports.PermissionFlag = exports.PasswordResponses = exports.PasswordException = exports.NativeImageDecoding = exports.MissingPDFException = exports.MissingDataException = exports.InvalidPDFException = exports.AbortException = exports.CMapCompressionType = exports.ImageKind = exports.FontType = exports.AnnotationType = exports.AnnotationFlag = exports.AnnotationFieldFlag = exports.AnnotationBorderStyleType = exports.UNSUPPORTED_FEATURES = exports.VerbosityLevel = exports.OPS = exports.IDENTITY_MATRIX = exports.FONT_IDENTITY_MATRIX = void 0;
__w_pdfjs_require__(3);
@@ -753,13 +894,18 @@ var _streams_polyfill = __w_pdfjs_require__(130);
var _url_polyfill = __w_pdfjs_require__(132);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
+exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
var FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0];
+exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
var NativeImageDecoding = {
NONE: 'none',
DECODE: 'decode',
DISPLAY: 'display'
};
+exports.NativeImageDecoding = NativeImageDecoding;
var PermissionFlag = {
PRINT: 0x04,
MODIFY_CONTENTS: 0x08,
@@ -770,6 +916,7 @@ var PermissionFlag = {
ASSEMBLE: 0x400,
PRINT_HIGH_QUALITY: 0x800
};
+exports.PermissionFlag = PermissionFlag;
var TextRenderingMode = {
FILL: 0,
STROKE: 1,
@@ -782,11 +929,13 @@ var TextRenderingMode = {
FILL_STROKE_MASK: 3,
ADD_TO_PATH_FLAG: 4
};
+exports.TextRenderingMode = TextRenderingMode;
var ImageKind = {
GRAYSCALE_1BPP: 1,
RGB_24BPP: 2,
RGBA_32BPP: 3
};
+exports.ImageKind = ImageKind;
var AnnotationType = {
TEXT: 1,
LINK: 2,
@@ -815,6 +964,7 @@ var AnnotationType = {
THREED: 25,
REDACT: 26
};
+exports.AnnotationType = AnnotationType;
var AnnotationFlag = {
INVISIBLE: 0x01,
HIDDEN: 0x02,
@@ -827,6 +977,7 @@ var AnnotationFlag = {
TOGGLENOVIEW: 0x100,
LOCKEDCONTENTS: 0x200
};
+exports.AnnotationFlag = AnnotationFlag;
var AnnotationFieldFlag = {
READONLY: 0x0000001,
REQUIRED: 0x0000002,
@@ -848,6 +999,7 @@ var AnnotationFieldFlag = {
RADIOSINUNISON: 0x2000000,
COMMITONSELCHANGE: 0x4000000
};
+exports.AnnotationFieldFlag = AnnotationFieldFlag;
var AnnotationBorderStyleType = {
SOLID: 1,
DASHED: 2,
@@ -855,6 +1007,7 @@ var AnnotationBorderStyleType = {
INSET: 4,
UNDERLINE: 5
};
+exports.AnnotationBorderStyleType = AnnotationBorderStyleType;
var StreamType = {
UNKNOWN: 0,
FLATE: 1,
@@ -867,6 +1020,7 @@ var StreamType = {
CCF: 8,
RL: 9
};
+exports.StreamType = StreamType;
var FontType = {
UNKNOWN: 0,
TYPE1: 1,
@@ -880,16 +1034,19 @@ var FontType = {
TYPE0: 9,
MMTYPE1: 10
};
+exports.FontType = FontType;
var VerbosityLevel = {
ERRORS: 0,
WARNINGS: 1,
INFOS: 5
};
+exports.VerbosityLevel = VerbosityLevel;
var CMapCompressionType = {
NONE: 0,
BINARY: 1,
STREAM: 2
};
+exports.CMapCompressionType = CMapCompressionType;
var OPS = {
dependency: 1,
setLineWidth: 2,
@@ -983,6 +1140,7 @@ var OPS = {
paintSolidColorImageMask: 90,
constructPath: 91
};
+exports.OPS = OPS;
var UNSUPPORTED_FEATURES = {
unknown: 'unknown',
forms: 'forms',
@@ -991,56 +1149,70 @@ var UNSUPPORTED_FEATURES = {
shadingPattern: 'shadingPattern',
font: 'font'
};
+exports.UNSUPPORTED_FEATURES = UNSUPPORTED_FEATURES;
var PasswordResponses = {
NEED_PASSWORD: 1,
INCORRECT_PASSWORD: 2
};
+exports.PasswordResponses = PasswordResponses;
var verbosity = VerbosityLevel.WARNINGS;
+
function setVerbosityLevel(level) {
if (Number.isInteger(level)) {
verbosity = level;
}
}
+
function getVerbosityLevel() {
return verbosity;
}
+
function info(msg) {
if (verbosity >= VerbosityLevel.INFOS) {
console.log('Info: ' + msg);
}
}
+
function warn(msg) {
if (verbosity >= VerbosityLevel.WARNINGS) {
console.log('Warning: ' + msg);
}
}
+
function deprecated(details) {
console.log('Deprecated API usage: ' + details);
}
+
function unreachable(msg) {
throw new Error(msg);
}
+
function assert(cond, msg) {
if (!cond) {
unreachable(msg);
}
}
+
function isSameOrigin(baseUrl, otherUrl) {
try {
var base = new _url_polyfill.URL(baseUrl);
+
if (!base.origin || base.origin === 'null') {
return false;
}
} catch (e) {
return false;
}
+
var other = new _url_polyfill.URL(otherUrl, base);
return base.origin === other.origin;
}
+
function _isValidProtocol(url) {
if (!url) {
return false;
}
+
switch (url.protocol) {
case 'http:':
case 'https:':
@@ -1048,22 +1220,28 @@ function _isValidProtocol(url) {
case 'mailto:':
case 'tel:':
return true;
+
default:
return false;
}
}
+
function createValidAbsoluteUrl(url, baseUrl) {
if (!url) {
return null;
}
+
try {
var absoluteUrl = baseUrl ? new _url_polyfill.URL(url, baseUrl) : new _url_polyfill.URL(url);
+
if (_isValidProtocol(absoluteUrl)) {
return absoluteUrl;
}
} catch (ex) {}
+
return null;
}
+
function shadow(obj, prop, value) {
Object.defineProperty(obj, prop, {
value: value,
@@ -1073,6 +1251,7 @@ function shadow(obj, prop, value) {
});
return value;
}
+
function getLookupTableFactory(initializer) {
var lookup;
return function () {
@@ -1081,151 +1260,206 @@ function getLookupTableFactory(initializer) {
initializer(lookup);
initializer = null;
}
+
return lookup;
};
}
+
var PasswordException = function PasswordExceptionClosure() {
function PasswordException(msg, code) {
this.name = 'PasswordException';
this.message = msg;
this.code = code;
}
+
PasswordException.prototype = new Error();
PasswordException.constructor = PasswordException;
return PasswordException;
}();
+
+exports.PasswordException = PasswordException;
+
var UnknownErrorException = function UnknownErrorExceptionClosure() {
function UnknownErrorException(msg, details) {
this.name = 'UnknownErrorException';
this.message = msg;
this.details = details;
}
+
UnknownErrorException.prototype = new Error();
UnknownErrorException.constructor = UnknownErrorException;
return UnknownErrorException;
}();
+
+exports.UnknownErrorException = UnknownErrorException;
+
var InvalidPDFException = function InvalidPDFExceptionClosure() {
function InvalidPDFException(msg) {
this.name = 'InvalidPDFException';
this.message = msg;
}
+
InvalidPDFException.prototype = new Error();
InvalidPDFException.constructor = InvalidPDFException;
return InvalidPDFException;
}();
+
+exports.InvalidPDFException = InvalidPDFException;
+
var MissingPDFException = function MissingPDFExceptionClosure() {
function MissingPDFException(msg) {
this.name = 'MissingPDFException';
this.message = msg;
}
+
MissingPDFException.prototype = new Error();
MissingPDFException.constructor = MissingPDFException;
return MissingPDFException;
}();
+
+exports.MissingPDFException = MissingPDFException;
+
var UnexpectedResponseException = function UnexpectedResponseExceptionClosure() {
function UnexpectedResponseException(msg, status) {
this.name = 'UnexpectedResponseException';
this.message = msg;
this.status = status;
}
+
UnexpectedResponseException.prototype = new Error();
UnexpectedResponseException.constructor = UnexpectedResponseException;
return UnexpectedResponseException;
}();
+
+exports.UnexpectedResponseException = UnexpectedResponseException;
+
var MissingDataException = function MissingDataExceptionClosure() {
function MissingDataException(begin, end) {
this.begin = begin;
this.end = end;
this.message = 'Missing data [' + begin + ', ' + end + ')';
}
+
MissingDataException.prototype = new Error();
MissingDataException.prototype.name = 'MissingDataException';
MissingDataException.constructor = MissingDataException;
return MissingDataException;
}();
+
+exports.MissingDataException = MissingDataException;
+
var XRefParseException = function XRefParseExceptionClosure() {
function XRefParseException(msg) {
this.message = msg;
}
+
XRefParseException.prototype = new Error();
XRefParseException.prototype.name = 'XRefParseException';
XRefParseException.constructor = XRefParseException;
return XRefParseException;
}();
+
+exports.XRefParseException = XRefParseException;
+
var FormatError = function FormatErrorClosure() {
function FormatError(msg) {
this.message = msg;
}
+
FormatError.prototype = new Error();
FormatError.prototype.name = 'FormatError';
FormatError.constructor = FormatError;
return FormatError;
}();
+
+exports.FormatError = FormatError;
+
var AbortException = function AbortExceptionClosure() {
function AbortException(msg) {
this.name = 'AbortException';
this.message = msg;
}
+
AbortException.prototype = new Error();
AbortException.constructor = AbortException;
return AbortException;
}();
+
+exports.AbortException = AbortException;
var NullCharactersRegExp = /\x00/g;
+
function removeNullCharacters(str) {
if (typeof str !== 'string') {
warn('The argument for removeNullCharacters must be a string.');
return str;
}
+
return str.replace(NullCharactersRegExp, '');
}
+
function bytesToString(bytes) {
- assert(bytes !== null && (typeof bytes === 'undefined' ? 'undefined' : _typeof(bytes)) === 'object' && bytes.length !== undefined, 'Invalid argument for bytesToString');
+ assert(bytes !== null && _typeof(bytes) === 'object' && bytes.length !== undefined, 'Invalid argument for bytesToString');
var length = bytes.length;
var MAX_ARGUMENT_COUNT = 8192;
+
if (length < MAX_ARGUMENT_COUNT) {
return String.fromCharCode.apply(null, bytes);
}
+
var strBuf = [];
+
for (var i = 0; i < length; i += MAX_ARGUMENT_COUNT) {
var chunkEnd = Math.min(i + MAX_ARGUMENT_COUNT, length);
var chunk = bytes.subarray(i, chunkEnd);
strBuf.push(String.fromCharCode.apply(null, chunk));
}
+
return strBuf.join('');
}
+
function stringToBytes(str) {
assert(typeof str === 'string', 'Invalid argument for stringToBytes');
var length = str.length;
var bytes = new Uint8Array(length);
+
for (var i = 0; i < length; ++i) {
bytes[i] = str.charCodeAt(i) & 0xFF;
}
+
return bytes;
}
+
function arrayByteLength(arr) {
if (arr.length !== undefined) {
return arr.length;
}
+
assert(arr.byteLength !== undefined);
return arr.byteLength;
}
+
function arraysToBytes(arr) {
if (arr.length === 1 && arr[0] instanceof Uint8Array) {
return arr[0];
}
+
var resultLength = 0;
var i,
ii = arr.length;
var item, itemLength;
+
for (i = 0; i < ii; i++) {
item = arr[i];
itemLength = arrayByteLength(item);
resultLength += itemLength;
}
+
var pos = 0;
var data = new Uint8Array(resultLength);
+
for (i = 0; i < ii; i++) {
item = arr[i];
+
if (!(item instanceof Uint8Array)) {
if (typeof item === 'string') {
item = stringToBytes(item);
@@ -1233,36 +1467,46 @@ function arraysToBytes(arr) {
item = new Uint8Array(item);
}
}
+
itemLength = item.byteLength;
data.set(item, pos);
pos += itemLength;
}
+
return data;
}
+
function string32(value) {
return String.fromCharCode(value >> 24 & 0xff, value >> 16 & 0xff, value >> 8 & 0xff, value & 0xff);
}
+
function log2(x) {
if (x <= 0) {
return 0;
}
+
return Math.ceil(Math.log2(x));
}
+
function readInt8(data, start) {
return data[start] << 24 >> 24;
}
+
function readUint16(data, offset) {
return data[offset] << 8 | data[offset + 1];
}
+
function readUint32(data, offset) {
return (data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3]) >>> 0;
}
+
function isLittleEndian() {
var buffer8 = new Uint8Array(4);
buffer8[0] = 1;
var view32 = new Uint32Array(buffer8.buffer, 0, 1);
return view32[0] === 1;
}
+
function isEvalSupported() {
try {
new Function('');
@@ -1271,59 +1515,73 @@ function isEvalSupported() {
return false;
}
}
+
function getInheritableProperty(_ref) {
var dict = _ref.dict,
key = _ref.key,
_ref$getArray = _ref.getArray,
- getArray = _ref$getArray === undefined ? false : _ref$getArray,
+ getArray = _ref$getArray === void 0 ? false : _ref$getArray,
_ref$stopWhenFound = _ref.stopWhenFound,
- stopWhenFound = _ref$stopWhenFound === undefined ? true : _ref$stopWhenFound;
-
+ stopWhenFound = _ref$stopWhenFound === void 0 ? true : _ref$stopWhenFound;
var LOOP_LIMIT = 100;
var loopCount = 0;
- var values = void 0;
+ var values;
+
while (dict) {
var value = getArray ? dict.getArray(key) : dict.get(key);
+
if (value !== undefined) {
if (stopWhenFound) {
return value;
}
+
if (!values) {
values = [];
}
+
values.push(value);
}
+
if (++loopCount > LOOP_LIMIT) {
- warn('getInheritableProperty: maximum loop count exceeded for "' + key + '"');
+ warn("getInheritableProperty: maximum loop count exceeded for \"".concat(key, "\""));
break;
}
+
dict = dict.get('Parent');
}
+
return values;
}
+
var Util = function UtilClosure() {
function Util() {}
+
var rgbBuf = ['rgb(', 0, ',', 0, ',', 0, ')'];
+
Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
rgbBuf[1] = r;
rgbBuf[3] = g;
rgbBuf[5] = b;
return rgbBuf.join('');
};
+
Util.transform = function Util_transform(m1, m2) {
return [m1[0] * m2[0] + m1[2] * m2[1], m1[1] * m2[0] + m1[3] * m2[1], m1[0] * m2[2] + m1[2] * m2[3], m1[1] * m2[2] + m1[3] * m2[3], m1[0] * m2[4] + m1[2] * m2[5] + m1[4], m1[1] * m2[4] + m1[3] * m2[5] + m1[5]];
};
+
Util.applyTransform = function Util_applyTransform(p, m) {
var xt = p[0] * m[0] + p[1] * m[2] + m[4];
var yt = p[0] * m[1] + p[1] * m[3] + m[5];
return [xt, yt];
};
+
Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
var d = m[0] * m[3] - m[1] * m[2];
var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
return [xt, yt];
};
+
Util.getAxialAlignedBoundingBox = function Util_getAxialAlignedBoundingBox(r, m) {
var p1 = Util.applyTransform(r, m);
var p2 = Util.applyTransform(r.slice(2, 4), m);
@@ -1331,13 +1589,16 @@ var Util = function UtilClosure() {
var p4 = Util.applyTransform([r[2], r[1]], m);
return [Math.min(p1[0], p2[0], p3[0], p4[0]), Math.min(p1[1], p2[1], p3[1], p4[1]), Math.max(p1[0], p2[0], p3[0], p4[0]), Math.max(p1[1], p2[1], p3[1], p4[1])];
};
+
Util.inverseTransform = function Util_inverseTransform(m) {
var d = m[0] * m[3] - m[1] * m[2];
return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d, (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
};
+
Util.apply3dTransform = function Util_apply3dTransform(m, v) {
return [m[0] * v[0] + m[1] * v[1] + m[2] * v[2], m[3] * v[0] + m[4] * v[1] + m[5] * v[2], m[6] * v[0] + m[7] * v[1] + m[8] * v[2]];
};
+
Util.singularValueDecompose2dScale = function Util_singularValueDecompose2dScale(m) {
var transpose = [m[0], m[2], m[1], m[3]];
var a = m[0] * transpose[0] + m[1] * transpose[2];
@@ -1350,54 +1611,68 @@ var Util = function UtilClosure() {
var sy = first - second || 1;
return [Math.sqrt(sx), Math.sqrt(sy)];
};
+
Util.normalizeRect = function Util_normalizeRect(rect) {
var r = rect.slice(0);
+
if (rect[0] > rect[2]) {
r[0] = rect[2];
r[2] = rect[0];
}
+
if (rect[1] > rect[3]) {
r[1] = rect[3];
r[3] = rect[1];
}
+
return r;
};
+
Util.intersect = function Util_intersect(rect1, rect2) {
function compare(a, b) {
return a - b;
}
+
var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
result = [];
rect1 = Util.normalizeRect(rect1);
rect2 = Util.normalizeRect(rect2);
+
if (orderedX[0] === rect1[0] && orderedX[1] === rect2[0] || orderedX[0] === rect2[0] && orderedX[1] === rect1[0]) {
result[0] = orderedX[1];
result[2] = orderedX[2];
} else {
return false;
}
+
if (orderedY[0] === rect1[1] && orderedY[1] === rect2[1] || orderedY[0] === rect2[1] && orderedY[1] === rect1[1]) {
result[1] = orderedY[1];
result[3] = orderedY[2];
} else {
return false;
}
+
return result;
};
+
return Util;
}();
+
+exports.Util = Util;
var ROMAN_NUMBER_MAP = ['', 'C', 'CC', 'CCC', 'CD', 'D', 'DC', 'DCC', 'DCCC', 'CM', '', 'X', 'XX', 'XXX', 'XL', 'L', 'LX', 'LXX', 'LXXX', 'XC', '', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'];
+
function toRomanNumerals(number) {
var lowerCase = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
assert(Number.isInteger(number) && number > 0, 'The number should be a positive integer.');
- var pos = void 0,
+ var pos,
romanBuf = [];
+
while (number >= 1000) {
number -= 1000;
romanBuf.push('M');
}
+
pos = number / 100 | 0;
number %= 100;
romanBuf.push(ROMAN_NUMBER_MAP[pos]);
@@ -1408,11 +1683,14 @@ function toRomanNumerals(number) {
var romanStr = romanBuf.join('');
return lowerCase ? romanStr.toLowerCase() : romanStr;
}
+
var PDFStringTranslateTable = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014, 0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C, 0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160, 0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC];
+
function stringToPDFString(str) {
var i,
n = str.length,
strBuf = [];
+
if (str[0] === '\xFE' && str[1] === '\xFF') {
for (i = 2; i < n; i += 2) {
strBuf.push(String.fromCharCode(str.charCodeAt(i) << 8 | str.charCodeAt(i + 1)));
@@ -1423,35 +1701,46 @@ function stringToPDFString(str) {
strBuf.push(code ? String.fromCharCode(code) : str.charAt(i));
}
}
+
return strBuf.join('');
}
+
function stringToUTF8String(str) {
return decodeURIComponent(escape(str));
}
+
function utf8StringToString(str) {
return unescape(encodeURIComponent(str));
}
+
function isEmptyObj(obj) {
for (var key in obj) {
return false;
}
+
return true;
}
+
function isBool(v) {
return typeof v === 'boolean';
}
+
function isNum(v) {
return typeof v === 'number';
}
+
function isString(v) {
return typeof v === 'string';
}
+
function isArrayBuffer(v) {
- return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' && v !== null && v.byteLength !== undefined;
+ return _typeof(v) === 'object' && v !== null && v.byteLength !== undefined;
}
+
function isSpace(ch) {
return ch === 0x20 || ch === 0x09 || ch === 0x0D || ch === 0x0A;
}
+
function createPromiseCapability() {
var capability = {};
capability.promise = new Promise(function (resolve, reject) {
@@ -1460,16 +1749,21 @@ function createPromiseCapability() {
});
return capability;
}
+
var createObjectURL = function createObjectURLClosure() {
var digits = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
return function createObjectURL(data, contentType) {
var forceDataSchema = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
if (!forceDataSchema && _url_polyfill.URL.createObjectURL) {
- var blob = new Blob([data], { type: contentType });
+ var blob = new Blob([data], {
+ type: contentType
+ });
return _url_polyfill.URL.createObjectURL(blob);
}
+
var buffer = 'data:' + contentType + ';base64,';
+
for (var i = 0, ii = data.length; i < ii; i += 3) {
var b1 = data[i] & 0xFF;
var b2 = data[i + 1] & 0xFF;
@@ -1480,74 +1774,12 @@ var createObjectURL = function createObjectURLClosure() {
var d4 = i + 2 < ii ? b3 & 0x3F : 64;
buffer += digits[d1] + digits[d2] + digits[d3] + digits[d4];
}
+
return buffer;
};
}();
-exports.FONT_IDENTITY_MATRIX = FONT_IDENTITY_MATRIX;
-exports.IDENTITY_MATRIX = IDENTITY_MATRIX;
-exports.OPS = OPS;
-exports.VerbosityLevel = VerbosityLevel;
-exports.UNSUPPORTED_FEATURES = UNSUPPORTED_FEATURES;
-exports.AnnotationBorderStyleType = AnnotationBorderStyleType;
-exports.AnnotationFieldFlag = AnnotationFieldFlag;
-exports.AnnotationFlag = AnnotationFlag;
-exports.AnnotationType = AnnotationType;
-exports.FontType = FontType;
-exports.ImageKind = ImageKind;
-exports.CMapCompressionType = CMapCompressionType;
-exports.AbortException = AbortException;
-exports.InvalidPDFException = InvalidPDFException;
-exports.MissingDataException = MissingDataException;
-exports.MissingPDFException = MissingPDFException;
-exports.NativeImageDecoding = NativeImageDecoding;
-exports.PasswordException = PasswordException;
-exports.PasswordResponses = PasswordResponses;
-exports.PermissionFlag = PermissionFlag;
-exports.StreamType = StreamType;
-exports.TextRenderingMode = TextRenderingMode;
-exports.UnexpectedResponseException = UnexpectedResponseException;
-exports.UnknownErrorException = UnknownErrorException;
-exports.Util = Util;
-exports.toRomanNumerals = toRomanNumerals;
-exports.XRefParseException = XRefParseException;
-exports.FormatError = FormatError;
-exports.arrayByteLength = arrayByteLength;
-exports.arraysToBytes = arraysToBytes;
-exports.assert = assert;
-exports.bytesToString = bytesToString;
-exports.createPromiseCapability = createPromiseCapability;
+
exports.createObjectURL = createObjectURL;
-exports.deprecated = deprecated;
-exports.getInheritableProperty = getInheritableProperty;
-exports.getLookupTableFactory = getLookupTableFactory;
-exports.getVerbosityLevel = getVerbosityLevel;
-exports.info = info;
-exports.isArrayBuffer = isArrayBuffer;
-exports.isBool = isBool;
-exports.isEmptyObj = isEmptyObj;
-exports.isNum = isNum;
-exports.isString = isString;
-exports.isSpace = isSpace;
-exports.isSameOrigin = isSameOrigin;
-exports.createValidAbsoluteUrl = createValidAbsoluteUrl;
-exports.isLittleEndian = isLittleEndian;
-exports.isEvalSupported = isEvalSupported;
-exports.log2 = log2;
-exports.readInt8 = readInt8;
-exports.readUint16 = readUint16;
-exports.readUint32 = readUint32;
-exports.removeNullCharacters = removeNullCharacters;
-exports.ReadableStream = _streams_polyfill.ReadableStream;
-exports.URL = _url_polyfill.URL;
-exports.setVerbosityLevel = setVerbosityLevel;
-exports.shadow = shadow;
-exports.string32 = string32;
-exports.stringToBytes = stringToBytes;
-exports.stringToPDFString = stringToPDFString;
-exports.stringToUTF8String = stringToUTF8String;
-exports.utf8StringToString = utf8StringToString;
-exports.warn = warn;
-exports.unreachable = unreachable;
/***/ }),
/* 3 */
@@ -1556,152 +1788,196 @@ exports.unreachable = unreachable;
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var globalScope = __w_pdfjs_require__(4);
+
if (!globalScope._pdfjsCompatibilityChecked) {
globalScope._pdfjsCompatibilityChecked = true;
+
var isNodeJS = __w_pdfjs_require__(5);
- var hasDOM = (typeof window === 'undefined' ? 'undefined' : _typeof(window)) === 'object' && (typeof document === 'undefined' ? 'undefined' : _typeof(document)) === 'object';
+
+ var hasDOM = (typeof window === "undefined" ? "undefined" : _typeof(window)) === 'object' && (typeof document === "undefined" ? "undefined" : _typeof(document)) === 'object';
+
(function checkNodeBtoa() {
if (globalScope.btoa || !isNodeJS()) {
return;
}
+
globalScope.btoa = function (chars) {
return Buffer.from(chars, 'binary').toString('base64');
};
})();
+
(function checkNodeAtob() {
if (globalScope.atob || !isNodeJS()) {
return;
}
+
globalScope.atob = function (input) {
return Buffer.from(input, 'base64').toString('binary');
};
})();
+
(function checkCurrentScript() {
if (!hasDOM) {
return;
}
+
if ('currentScript' in document) {
return;
}
+
Object.defineProperty(document, 'currentScript', {
get: function get() {
var scripts = document.getElementsByTagName('script');
return scripts[scripts.length - 1];
},
-
enumerable: true,
configurable: true
});
})();
+
(function checkChildNodeRemove() {
if (!hasDOM) {
return;
}
+
if (typeof Element.prototype.remove !== 'undefined') {
return;
}
+
Element.prototype.remove = function () {
if (this.parentNode) {
this.parentNode.removeChild(this);
}
};
})();
+
(function checkDOMTokenListToggle() {
if (!hasDOM || isNodeJS()) {
return;
}
+
var div = document.createElement('div');
+
if (div.classList.toggle('test', 0) === false) {
return;
}
+
var originalDOMTokenListToggle = DOMTokenList.prototype.toggle;
+
DOMTokenList.prototype.toggle = function (token) {
if (arguments.length > 1) {
var force = !!arguments[1];
return this[force ? 'add' : 'remove'](token), force;
}
+
return originalDOMTokenListToggle(token);
};
})();
+
(function checkStringIncludes() {
if (String.prototype.includes) {
return;
}
+
__w_pdfjs_require__(6);
})();
+
(function checkArrayIncludes() {
if (Array.prototype.includes) {
return;
}
+
__w_pdfjs_require__(34);
})();
+
(function checkObjectAssign() {
if (Object.assign) {
return;
}
+
__w_pdfjs_require__(43);
})();
+
(function checkMathLog2() {
if (Math.log2) {
return;
}
+
Math.log2 = __w_pdfjs_require__(53);
})();
+
(function checkNumberIsNaN() {
if (Number.isNaN) {
return;
}
+
Number.isNaN = __w_pdfjs_require__(55);
})();
+
(function checkNumberIsInteger() {
if (Number.isInteger) {
return;
}
+
Number.isInteger = __w_pdfjs_require__(57);
})();
+
(function checkPromise() {
if (globalScope.Promise) {
return;
}
+
globalScope.Promise = __w_pdfjs_require__(60);
})();
+
(function checkWeakMap() {
if (globalScope.WeakMap) {
return;
}
+
globalScope.WeakMap = __w_pdfjs_require__(95);
})();
+
(function checkWeakSet() {
if (globalScope.WeakSet) {
return;
}
+
globalScope.WeakSet = __w_pdfjs_require__(112);
})();
+
(function checkStringCodePointAt() {
if (String.codePointAt) {
return;
}
+
String.codePointAt = __w_pdfjs_require__(116);
})();
+
(function checkStringFromCodePoint() {
if (String.fromCodePoint) {
return;
}
+
String.fromCodePoint = __w_pdfjs_require__(118);
})();
+
(function checkSymbol() {
if (globalScope.Symbol) {
return;
}
+
__w_pdfjs_require__(120);
})();
+
(function checkObjectValues() {
if (Object.values) {
return;
}
+
Object.values = __w_pdfjs_require__(127);
})();
}
@@ -1722,10 +1998,10 @@ module.exports = typeof window !== 'undefined' && window.Math === Math ? window
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
module.exports = function isNodeJS() {
- return (typeof process === 'undefined' ? 'undefined' : _typeof(process)) === 'object' && process + '' === '[object process]';
+ return (typeof process === "undefined" ? "undefined" : _typeof(process)) === 'object' && process + '' === '[object process]' && !process.versions['nw'];
};
/***/ }),
@@ -1736,6 +2012,7 @@ module.exports = function isNodeJS() {
__w_pdfjs_require__(7);
+
module.exports = __w_pdfjs_require__(10).String.includes;
/***/ }),
@@ -1746,7 +2023,9 @@ module.exports = __w_pdfjs_require__(10).String.includes;
var $export = __w_pdfjs_require__(8);
+
var context = __w_pdfjs_require__(26);
+
var INCLUDES = 'includes';
$export($export.P + $export.F * __w_pdfjs_require__(33)(INCLUDES), 'String', {
includes: function includes(searchString) {
@@ -1762,11 +2041,17 @@ $export($export.P + $export.F * __w_pdfjs_require__(33)(INCLUDES), 'String', {
var global = __w_pdfjs_require__(9);
+
var core = __w_pdfjs_require__(10);
+
var hide = __w_pdfjs_require__(11);
+
var redefine = __w_pdfjs_require__(21);
+
var ctx = __w_pdfjs_require__(24);
+
var PROTOTYPE = 'prototype';
+
var $export = function $export(type, name, source) {
var IS_FORCED = type & $export.F;
var IS_GLOBAL = type & $export.G;
@@ -1778,6 +2063,7 @@ var $export = function $export(type, name, source) {
var expProto = exports[PROTOTYPE] || (exports[PROTOTYPE] = {});
var key, own, out, exp;
if (IS_GLOBAL) source = name;
+
for (key in source) {
own = !IS_FORCED && target && target[key] !== undefined;
out = (own ? target : source)[key];
@@ -1787,6 +2073,7 @@ var $export = function $export(type, name, source) {
if (IS_PROTO && expProto[key] != out) expProto[key] = out;
}
};
+
global.core = core;
$export.F = 1;
$export.G = 2;
@@ -1815,7 +2102,9 @@ if (typeof __g == 'number') __g = global;
"use strict";
-var core = module.exports = { version: '2.5.7' };
+var core = module.exports = {
+ version: '2.6.1'
+};
if (typeof __e == 'number') __e = core;
/***/ }),
@@ -1826,7 +2115,9 @@ if (typeof __e == 'number') __e = core;
var dP = __w_pdfjs_require__(12);
+
var createDesc = __w_pdfjs_require__(20);
+
module.exports = __w_pdfjs_require__(16) ? function (object, key, value) {
return dP.f(object, key, createDesc(1, value));
} : function (object, key, value) {
@@ -1842,8 +2133,11 @@ module.exports = __w_pdfjs_require__(16) ? function (object, key, value) {
var anObject = __w_pdfjs_require__(13);
+
var IE8_DOM_DEFINE = __w_pdfjs_require__(15);
+
var toPrimitive = __w_pdfjs_require__(19);
+
var dP = Object.defineProperty;
exports.f = __w_pdfjs_require__(16) ? Object.defineProperty : function defineProperty(O, P, Attributes) {
anObject(O);
@@ -1865,6 +2159,7 @@ exports.f = __w_pdfjs_require__(16) ? Object.defineProperty : function definePro
var isObject = __w_pdfjs_require__(14);
+
module.exports = function (it) {
if (!isObject(it)) throw TypeError(it + ' is not an object!');
return it;
@@ -1877,10 +2172,10 @@ module.exports = function (it) {
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
module.exports = function (it) {
- return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) === 'object' ? it !== null : typeof it === 'function';
+ return _typeof(it) === 'object' ? it !== null : typeof it === 'function';
};
/***/ }),
@@ -1936,8 +2231,11 @@ module.exports = function (exec) {
var isObject = __w_pdfjs_require__(14);
+
var document = __w_pdfjs_require__(9).document;
+
var is = isObject(document) && isObject(document.createElement);
+
module.exports = function (it) {
return is ? document.createElement(it) : {};
};
@@ -1950,6 +2248,7 @@ module.exports = function (it) {
var isObject = __w_pdfjs_require__(14);
+
module.exports = function (it, S) {
if (!isObject(it)) return it;
var fn, val;
@@ -1983,20 +2282,27 @@ module.exports = function (bitmap, value) {
var global = __w_pdfjs_require__(9);
+
var hide = __w_pdfjs_require__(11);
+
var has = __w_pdfjs_require__(22);
+
var SRC = __w_pdfjs_require__(23)('src');
+
var TO_STRING = 'toString';
var $toString = Function[TO_STRING];
var TPL = ('' + $toString).split(TO_STRING);
+
__w_pdfjs_require__(10).inspectSource = function (it) {
return $toString.call(it);
};
+
(module.exports = function (O, key, val, safe) {
var isFunction = typeof val == 'function';
if (isFunction) has(val, 'name') || hide(val, 'name', key);
if (O[key] === val) return;
if (isFunction) has(val, SRC) || hide(val, SRC, O[key] ? '' + O[key] : TPL.join(String(key)));
+
if (O === global) {
O[key] = val;
} else if (!safe) {
@@ -2019,6 +2325,7 @@ __w_pdfjs_require__(10).inspectSource = function (it) {
var hasOwnProperty = {}.hasOwnProperty;
+
module.exports = function (it, key) {
return hasOwnProperty.call(it, key);
};
@@ -2032,6 +2339,7 @@ module.exports = function (it, key) {
var id = 0;
var px = Math.random();
+
module.exports = function (key) {
return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36));
};
@@ -2044,23 +2352,28 @@ module.exports = function (key) {
var aFunction = __w_pdfjs_require__(25);
+
module.exports = function (fn, that, length) {
aFunction(fn);
if (that === undefined) return fn;
+
switch (length) {
case 1:
return function (a) {
return fn.call(that, a);
};
+
case 2:
return function (a, b) {
return fn.call(that, a, b);
};
+
case 3:
return function (a, b, c) {
return fn.call(that, a, b, c);
};
}
+
return function () {
return fn.apply(that, arguments);
};
@@ -2086,7 +2399,9 @@ module.exports = function (it) {
var isRegExp = __w_pdfjs_require__(27);
+
var defined = __w_pdfjs_require__(32);
+
module.exports = function (that, searchString, NAME) {
if (isRegExp(searchString)) throw TypeError('String#' + NAME + " doesn't accept regex!");
return String(defined(that));
@@ -2100,8 +2415,11 @@ module.exports = function (that, searchString, NAME) {
var isObject = __w_pdfjs_require__(14);
+
var cof = __w_pdfjs_require__(28);
+
var MATCH = __w_pdfjs_require__(29)('match');
+
module.exports = function (it) {
var isRegExp;
return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : cof(it) == 'RegExp');
@@ -2115,6 +2433,7 @@ module.exports = function (it) {
var toString = {}.toString;
+
module.exports = function (it) {
return toString.call(it).slice(8, -1);
};
@@ -2127,12 +2446,17 @@ module.exports = function (it) {
var store = __w_pdfjs_require__(30)('wks');
+
var uid = __w_pdfjs_require__(23);
+
var _Symbol = __w_pdfjs_require__(9).Symbol;
+
var USE_SYMBOL = typeof _Symbol == 'function';
+
var $exports = module.exports = function (name) {
return store[name] || (store[name] = USE_SYMBOL && _Symbol[name] || (USE_SYMBOL ? _Symbol : uid)('Symbol.' + name));
};
+
$exports.store = store;
/***/ }),
@@ -2143,7 +2467,9 @@ $exports.store = store;
var core = __w_pdfjs_require__(10);
+
var global = __w_pdfjs_require__(9);
+
var SHARED = '__core-js_shared__';
var store = global[SHARED] || (global[SHARED] = {});
(module.exports = function (key, value) {
@@ -2183,8 +2509,10 @@ module.exports = function (it) {
var MATCH = __w_pdfjs_require__(29)('match');
+
module.exports = function (KEY) {
var re = /./;
+
try {
'/./'[KEY](re);
} catch (e) {
@@ -2193,6 +2521,7 @@ module.exports = function (KEY) {
return !'/./'[KEY](re);
} catch (f) {}
}
+
return true;
};
@@ -2204,6 +2533,7 @@ module.exports = function (KEY) {
__w_pdfjs_require__(35);
+
module.exports = __w_pdfjs_require__(10).Array.includes;
/***/ }),
@@ -2214,12 +2544,15 @@ module.exports = __w_pdfjs_require__(10).Array.includes;
var $export = __w_pdfjs_require__(8);
+
var $includes = __w_pdfjs_require__(36)(true);
+
$export($export.P, 'Array', {
includes: function includes(el) {
return $includes(this, el, arguments.length > 1 ? arguments[1] : undefined);
}
});
+
__w_pdfjs_require__(42)('includes');
/***/ }),
@@ -2230,8 +2563,11 @@ __w_pdfjs_require__(42)('includes');
var toIObject = __w_pdfjs_require__(37);
+
var toLength = __w_pdfjs_require__(39);
+
var toAbsoluteIndex = __w_pdfjs_require__(41);
+
module.exports = function (IS_INCLUDES) {
return function ($this, el, fromIndex) {
var O = toIObject($this);
@@ -2245,7 +2581,8 @@ module.exports = function (IS_INCLUDES) {
if (IS_INCLUDES || index in O) {
if (O[index] === el) return IS_INCLUDES || index || 0;
}
- }return !IS_INCLUDES && -1;
+ }
+ return !IS_INCLUDES && -1;
};
};
@@ -2257,7 +2594,9 @@ module.exports = function (IS_INCLUDES) {
var IObject = __w_pdfjs_require__(38);
+
var defined = __w_pdfjs_require__(32);
+
module.exports = function (it) {
return IObject(defined(it));
};
@@ -2270,6 +2609,7 @@ module.exports = function (it) {
var cof = __w_pdfjs_require__(28);
+
module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
return cof(it) == 'String' ? it.split('') : Object(it);
};
@@ -2282,7 +2622,9 @@ module.exports = Object('z').propertyIsEnumerable(0) ? Object : function (it) {
var toInteger = __w_pdfjs_require__(40);
+
var min = Math.min;
+
module.exports = function (it) {
return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0;
};
@@ -2296,6 +2638,7 @@ module.exports = function (it) {
var ceil = Math.ceil;
var floor = Math.floor;
+
module.exports = function (it) {
return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it);
};
@@ -2308,8 +2651,10 @@ module.exports = function (it) {
var toInteger = __w_pdfjs_require__(40);
+
var max = Math.max;
var min = Math.min;
+
module.exports = function (index, length) {
index = toInteger(index);
return index < 0 ? max(index + length, 0) : min(index, length);
@@ -2323,8 +2668,10 @@ module.exports = function (index, length) {
var UNSCOPABLES = __w_pdfjs_require__(29)('unscopables');
+
var ArrayProto = Array.prototype;
if (ArrayProto[UNSCOPABLES] == undefined) __w_pdfjs_require__(11)(ArrayProto, UNSCOPABLES, {});
+
module.exports = function (key) {
ArrayProto[UNSCOPABLES][key] = true;
};
@@ -2337,6 +2684,7 @@ module.exports = function (key) {
__w_pdfjs_require__(44);
+
module.exports = __w_pdfjs_require__(10).Object.assign;
/***/ }),
@@ -2347,7 +2695,10 @@ module.exports = __w_pdfjs_require__(10).Object.assign;
var $export = __w_pdfjs_require__(8);
-$export($export.S + $export.F, 'Object', { assign: __w_pdfjs_require__(45) });
+
+$export($export.S + $export.F, 'Object', {
+ assign: __w_pdfjs_require__(45)
+});
/***/ }),
/* 45 */
@@ -2357,10 +2708,15 @@ $export($export.S + $export.F, 'Object', { assign: __w_pdfjs_require__(45) });
var getKeys = __w_pdfjs_require__(46);
+
var gOPS = __w_pdfjs_require__(50);
+
var pIE = __w_pdfjs_require__(51);
+
var toObject = __w_pdfjs_require__(52);
+
var IObject = __w_pdfjs_require__(38);
+
var $assign = Object.assign;
module.exports = !$assign || __w_pdfjs_require__(17)(function () {
var A = {};
@@ -2378,16 +2734,19 @@ module.exports = !$assign || __w_pdfjs_require__(17)(function () {
var index = 1;
var getSymbols = gOPS.f;
var isEnum = pIE.f;
+
while (aLen > index) {
var S = IObject(arguments[index++]);
var keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S);
var length = keys.length;
var j = 0;
var key;
+
while (length > j) {
if (isEnum.call(S, key = keys[j++])) T[key] = S[key];
}
}
+
return T;
} : $assign;
@@ -2399,7 +2758,9 @@ module.exports = !$assign || __w_pdfjs_require__(17)(function () {
var $keys = __w_pdfjs_require__(47);
+
var enumBugKeys = __w_pdfjs_require__(49);
+
module.exports = Object.keys || function keys(O) {
return $keys(O, enumBugKeys);
};
@@ -2412,21 +2773,30 @@ module.exports = Object.keys || function keys(O) {
var has = __w_pdfjs_require__(22);
+
var toIObject = __w_pdfjs_require__(37);
+
var arrayIndexOf = __w_pdfjs_require__(36)(false);
+
var IE_PROTO = __w_pdfjs_require__(48)('IE_PROTO');
+
module.exports = function (object, names) {
var O = toIObject(object);
var i = 0;
var result = [];
var key;
+
for (key in O) {
if (key != IE_PROTO) has(O, key) && result.push(key);
- }while (names.length > i) {
+ }
+
+ while (names.length > i) {
if (has(O, key = names[i++])) {
~arrayIndexOf(result, key) || result.push(key);
}
- }return result;
+ }
+
+ return result;
};
/***/ }),
@@ -2437,7 +2807,9 @@ module.exports = function (object, names) {
var shared = __w_pdfjs_require__(30)('keys');
+
var uid = __w_pdfjs_require__(23);
+
module.exports = function (key) {
return shared[key] || (shared[key] = uid(key));
};
@@ -2477,6 +2849,7 @@ exports.f = {}.propertyIsEnumerable;
var defined = __w_pdfjs_require__(32);
+
module.exports = function (it) {
return Object(defined(it));
};
@@ -2489,6 +2862,7 @@ module.exports = function (it) {
__w_pdfjs_require__(54);
+
module.exports = __w_pdfjs_require__(10).Math.log2;
/***/ }),
@@ -2499,6 +2873,7 @@ module.exports = __w_pdfjs_require__(10).Math.log2;
var $export = __w_pdfjs_require__(8);
+
$export($export.S, 'Math', {
log2: function log2(x) {
return Math.log(x) / Math.LN2;
@@ -2513,6 +2888,7 @@ $export($export.S, 'Math', {
__w_pdfjs_require__(56);
+
module.exports = __w_pdfjs_require__(10).Number.isNaN;
/***/ }),
@@ -2523,6 +2899,7 @@ module.exports = __w_pdfjs_require__(10).Number.isNaN;
var $export = __w_pdfjs_require__(8);
+
$export($export.S, 'Number', {
isNaN: function isNaN(number) {
return number != number;
@@ -2537,6 +2914,7 @@ $export($export.S, 'Number', {
__w_pdfjs_require__(58);
+
module.exports = __w_pdfjs_require__(10).Number.isInteger;
/***/ }),
@@ -2547,7 +2925,10 @@ module.exports = __w_pdfjs_require__(10).Number.isInteger;
var $export = __w_pdfjs_require__(8);
-$export($export.S, 'Number', { isInteger: __w_pdfjs_require__(59) });
+
+$export($export.S, 'Number', {
+ isInteger: __w_pdfjs_require__(59)
+});
/***/ }),
/* 59 */
@@ -2557,7 +2938,9 @@ $export($export.S, 'Number', { isInteger: __w_pdfjs_require__(59) });
var isObject = __w_pdfjs_require__(14);
+
var floor = Math.floor;
+
module.exports = function isInteger(it) {
return !isObject(it) && isFinite(it) && floor(it) === it;
};
@@ -2570,11 +2953,17 @@ module.exports = function isInteger(it) {
__w_pdfjs_require__(61);
+
__w_pdfjs_require__(63);
+
__w_pdfjs_require__(73);
+
__w_pdfjs_require__(76);
+
__w_pdfjs_require__(93);
+
__w_pdfjs_require__(94);
+
module.exports = __w_pdfjs_require__(10).Promise;
/***/ }),
@@ -2585,8 +2974,10 @@ module.exports = __w_pdfjs_require__(10).Promise;
var classof = __w_pdfjs_require__(62);
+
var test = {};
test[__w_pdfjs_require__(29)('toStringTag')] = 'z';
+
if (test + '' != '[object z]') {
__w_pdfjs_require__(21)(Object.prototype, 'toString', function toString() {
return '[object ' + classof(this) + ']';
@@ -2601,15 +2992,19 @@ if (test + '' != '[object z]') {
var cof = __w_pdfjs_require__(28);
+
var TAG = __w_pdfjs_require__(29)('toStringTag');
+
var ARG = cof(function () {
return arguments;
}()) == 'Arguments';
+
var tryGet = function tryGet(it, key) {
try {
return it[key];
} catch (e) {}
};
+
module.exports = function (it) {
var O, T, B;
return it === undefined ? 'Undefined' : it === null ? 'Null' : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T : ARG ? cof(O) : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B;
@@ -2623,6 +3018,7 @@ module.exports = function (it) {
var $at = __w_pdfjs_require__(64)(true);
+
__w_pdfjs_require__(65)(String, 'String', function (iterated) {
this._t = String(iterated);
this._i = 0;
@@ -2650,7 +3046,9 @@ __w_pdfjs_require__(65)(String, 'String', function (iterated) {
var toInteger = __w_pdfjs_require__(40);
+
var defined = __w_pdfjs_require__(32);
+
module.exports = function (TO_STRING) {
return function (that, pos) {
var s = String(defined(that));
@@ -2671,39 +3069,55 @@ module.exports = function (TO_STRING) {
var LIBRARY = __w_pdfjs_require__(31);
+
var $export = __w_pdfjs_require__(8);
+
var redefine = __w_pdfjs_require__(21);
+
var hide = __w_pdfjs_require__(11);
+
var Iterators = __w_pdfjs_require__(66);
+
var $iterCreate = __w_pdfjs_require__(67);
+
var setToStringTag = __w_pdfjs_require__(71);
+
var getPrototypeOf = __w_pdfjs_require__(72);
+
var ITERATOR = __w_pdfjs_require__(29)('iterator');
+
var BUGGY = !([].keys && 'next' in [].keys());
var FF_ITERATOR = '@@iterator';
var KEYS = 'keys';
var VALUES = 'values';
+
var returnThis = function returnThis() {
return this;
};
+
module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED) {
$iterCreate(Constructor, NAME, next);
+
var getMethod = function getMethod(kind) {
if (!BUGGY && kind in proto) return proto[kind];
+
switch (kind) {
case KEYS:
return function keys() {
return new Constructor(this, kind);
};
+
case VALUES:
return function values() {
return new Constructor(this, kind);
};
}
+
return function entries() {
return new Constructor(this, kind);
};
};
+
var TAG = NAME + ' Iterator';
var DEF_VALUES = DEFAULT == VALUES;
var VALUES_BUG = false;
@@ -2713,24 +3127,31 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
var methods, key, IteratorPrototype;
+
if ($anyNative) {
IteratorPrototype = getPrototypeOf($anyNative.call(new Base()));
+
if (IteratorPrototype !== Object.prototype && IteratorPrototype.next) {
setToStringTag(IteratorPrototype, TAG, true);
if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
}
}
+
if (DEF_VALUES && $native && $native.name !== VALUES) {
VALUES_BUG = true;
+
$default = function values() {
return $native.call(this);
};
}
+
if ((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])) {
hide(proto, ITERATOR, $default);
}
+
Iterators[NAME] = $default;
Iterators[TAG] = returnThis;
+
if (DEFAULT) {
methods = {
values: DEF_VALUES ? $default : getMethod(VALUES),
@@ -2741,6 +3162,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
if (!(key in proto)) redefine(proto, key, methods[key]);
} else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods);
}
+
return methods;
};
@@ -2761,14 +3183,21 @@ module.exports = {};
var create = __w_pdfjs_require__(68);
+
var descriptor = __w_pdfjs_require__(20);
+
var setToStringTag = __w_pdfjs_require__(71);
+
var IteratorPrototype = {};
+
__w_pdfjs_require__(11)(IteratorPrototype, __w_pdfjs_require__(29)('iterator'), function () {
return this;
});
+
module.exports = function (Constructor, NAME, next) {
- Constructor.prototype = create(IteratorPrototype, { next: descriptor(1, next) });
+ Constructor.prototype = create(IteratorPrototype, {
+ next: descriptor(1, next)
+ });
setToStringTag(Constructor, NAME + ' Iterator');
};
@@ -2780,37 +3209,52 @@ module.exports = function (Constructor, NAME, next) {
var anObject = __w_pdfjs_require__(13);
+
var dPs = __w_pdfjs_require__(69);
+
var enumBugKeys = __w_pdfjs_require__(49);
+
var IE_PROTO = __w_pdfjs_require__(48)('IE_PROTO');
+
var Empty = function Empty() {};
+
var PROTOTYPE = 'prototype';
+
var _createDict = function createDict() {
var iframe = __w_pdfjs_require__(18)('iframe');
+
var i = enumBugKeys.length;
var lt = '<';
var gt = '>';
var iframeDocument;
iframe.style.display = 'none';
+
__w_pdfjs_require__(70).appendChild(iframe);
+
iframe.src = 'javascript:';
iframeDocument = iframe.contentWindow.document;
iframeDocument.open();
iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt);
iframeDocument.close();
_createDict = iframeDocument.F;
+
while (i--) {
delete _createDict[PROTOTYPE][enumBugKeys[i]];
- }return _createDict();
+ }
+
+ return _createDict();
};
+
module.exports = Object.create || function create(O, Properties) {
var result;
+
if (O !== null) {
Empty[PROTOTYPE] = anObject(O);
result = new Empty();
Empty[PROTOTYPE] = null;
result[IE_PROTO] = O;
} else result = _createDict();
+
return Properties === undefined ? result : dPs(result, Properties);
};
@@ -2822,17 +3266,23 @@ module.exports = Object.create || function create(O, Properties) {
var dP = __w_pdfjs_require__(12);
+
var anObject = __w_pdfjs_require__(13);
+
var getKeys = __w_pdfjs_require__(46);
+
module.exports = __w_pdfjs_require__(16) ? Object.defineProperties : function defineProperties(O, Properties) {
anObject(O);
var keys = getKeys(Properties);
var length = keys.length;
var i = 0;
var P;
+
while (length > i) {
dP.f(O, P = keys[i++], Properties[P]);
- }return O;
+ }
+
+ return O;
};
/***/ }),
@@ -2843,6 +3293,7 @@ module.exports = __w_pdfjs_require__(16) ? Object.defineProperties : function de
var document = __w_pdfjs_require__(9).document;
+
module.exports = document && document.documentElement;
/***/ }),
@@ -2853,8 +3304,11 @@ module.exports = document && document.documentElement;
var def = __w_pdfjs_require__(12).f;
+
var has = __w_pdfjs_require__(22);
+
var TAG = __w_pdfjs_require__(29)('toStringTag');
+
module.exports = function (it, tag, stat) {
if (it && !has(it = stat ? it : it.prototype, TAG)) def(it, TAG, {
configurable: true,
@@ -2870,15 +3324,21 @@ module.exports = function (it, tag, stat) {
var has = __w_pdfjs_require__(22);
+
var toObject = __w_pdfjs_require__(52);
+
var IE_PROTO = __w_pdfjs_require__(48)('IE_PROTO');
+
var ObjectProto = Object.prototype;
+
module.exports = Object.getPrototypeOf || function (O) {
O = toObject(O);
if (has(O, IE_PROTO)) return O[IE_PROTO];
+
if (typeof O.constructor == 'function' && O instanceof O.constructor) {
return O.constructor.prototype;
}
+
return O instanceof Object ? ObjectProto : null;
};
@@ -2890,12 +3350,19 @@ module.exports = Object.getPrototypeOf || function (O) {
var $iterators = __w_pdfjs_require__(74);
+
var getKeys = __w_pdfjs_require__(46);
+
var redefine = __w_pdfjs_require__(21);
+
var global = __w_pdfjs_require__(9);
+
var hide = __w_pdfjs_require__(11);
+
var Iterators = __w_pdfjs_require__(66);
+
var wks = __w_pdfjs_require__(29);
+
var ITERATOR = wks('iterator');
var TO_STRING_TAG = wks('toStringTag');
var ArrayValues = Iterators.Array;
@@ -2932,12 +3399,14 @@ var DOMIterables = {
TextTrackList: false,
TouchList: false
};
+
for (var collections = getKeys(DOMIterables), i = 0; i < collections.length; i++) {
var NAME = collections[i];
var explicit = DOMIterables[NAME];
var Collection = global[NAME];
var proto = Collection && Collection.prototype;
var key;
+
if (proto) {
if (!proto[ITERATOR]) hide(proto, ITERATOR, ArrayValues);
if (!proto[TO_STRING_TAG]) hide(proto, TO_STRING_TAG, NAME);
@@ -2956,9 +3425,13 @@ for (var collections = getKeys(DOMIterables), i = 0; i < collections.length; i++
var addToUnscopables = __w_pdfjs_require__(42);
+
var step = __w_pdfjs_require__(75);
+
var Iterators = __w_pdfjs_require__(66);
+
var toIObject = __w_pdfjs_require__(37);
+
module.exports = __w_pdfjs_require__(65)(Array, 'Array', function (iterated, kind) {
this._t = toIObject(iterated);
this._i = 0;
@@ -2967,10 +3440,12 @@ module.exports = __w_pdfjs_require__(65)(Array, 'Array', function (iterated, kin
var O = this._t;
var kind = this._k;
var index = this._i++;
+
if (!O || index >= O.length) {
this._t = undefined;
return step(1);
}
+
if (kind == 'keys') return step(0, index);
if (kind == 'values') return step(0, O[index]);
return step(0, [index, O[index]]);
@@ -3002,21 +3477,37 @@ module.exports = function (done, value) {
var LIBRARY = __w_pdfjs_require__(31);
+
var global = __w_pdfjs_require__(9);
+
var ctx = __w_pdfjs_require__(24);
+
var classof = __w_pdfjs_require__(62);
+
var $export = __w_pdfjs_require__(8);
+
var isObject = __w_pdfjs_require__(14);
+
var aFunction = __w_pdfjs_require__(25);
+
var anInstance = __w_pdfjs_require__(77);
+
var forOf = __w_pdfjs_require__(78);
+
var speciesConstructor = __w_pdfjs_require__(82);
+
var task = __w_pdfjs_require__(83).set;
+
var microtask = __w_pdfjs_require__(85)();
+
var newPromiseCapabilityModule = __w_pdfjs_require__(86);
+
var perform = __w_pdfjs_require__(87);
+
var userAgent = __w_pdfjs_require__(88);
+
var promiseResolve = __w_pdfjs_require__(89);
+
var PROMISE = 'Promise';
var TypeError = global.TypeError;
var process = global.process;
@@ -3024,22 +3515,28 @@ var versions = process && process.versions;
var v8 = versions && versions.v8 || '';
var $Promise = global[PROMISE];
var isNode = classof(process) == 'process';
+
var empty = function empty() {};
+
var Internal, newGenericPromiseCapability, OwnPromiseCapability, Wrapper;
var newPromiseCapability = newGenericPromiseCapability = newPromiseCapabilityModule.f;
var USE_NATIVE = !!function () {
try {
var promise = $Promise.resolve(1);
+
var FakePromise = (promise.constructor = {})[__w_pdfjs_require__(29)('species')] = function (exec) {
exec(empty, empty);
};
+
return (isNode || typeof PromiseRejectionEvent == 'function') && promise.then(empty) instanceof FakePromise && v8.indexOf('6.6') !== 0 && userAgent.indexOf('Chrome/66') === -1;
} catch (e) {}
}();
+
var isThenable = function isThenable(it) {
var then;
return isObject(it) && typeof (then = it.then) == 'function' ? then : false;
};
+
var notify = function notify(promise, isReject) {
if (promise._n) return;
promise._n = true;
@@ -3048,26 +3545,31 @@ var notify = function notify(promise, isReject) {
var value = promise._v;
var ok = promise._s == 1;
var i = 0;
+
var run = function run(reaction) {
var handler = ok ? reaction.ok : reaction.fail;
var resolve = reaction.resolve;
var reject = reaction.reject;
var domain = reaction.domain;
var result, then, exited;
+
try {
if (handler) {
if (!ok) {
if (promise._h == 2) onHandleUnhandled(promise);
promise._h = 1;
}
+
if (handler === true) result = value;else {
if (domain) domain.enter();
result = handler(value);
+
if (domain) {
domain.exit();
exited = true;
}
}
+
if (result === reaction.promise) {
reject(TypeError('Promise-chain cycle'));
} else if (then = isThenable(result)) {
@@ -3079,18 +3581,23 @@ var notify = function notify(promise, isReject) {
reject(e);
}
};
+
while (chain.length > i) {
run(chain[i++]);
- }promise._c = [];
+ }
+
+ promise._c = [];
promise._n = false;
if (isReject && !promise._h) onUnhandled(promise);
});
};
+
var onUnhandled = function onUnhandled(promise) {
task.call(global, function () {
var value = promise._v;
var unhandled = isUnhandled(promise);
var result, handler, console;
+
if (unhandled) {
result = perform(function () {
if (isNode) {
@@ -3106,16 +3613,20 @@ var onUnhandled = function onUnhandled(promise) {
});
promise._h = isNode || isUnhandled(promise) ? 2 : 1;
}
+
promise._a = undefined;
if (unhandled && result.e) throw result.v;
});
};
+
var isUnhandled = function isUnhandled(promise) {
return promise._h !== 1 && (promise._a || promise._c).length === 0;
};
+
var onHandleUnhandled = function onHandleUnhandled(promise) {
task.call(global, function () {
var handler;
+
if (isNode) {
process.emit('rejectionHandled', promise);
} else if (handler = global.onrejectionhandled) {
@@ -3126,6 +3637,7 @@ var onHandleUnhandled = function onHandleUnhandled(promise) {
}
});
};
+
var $reject = function $reject(value) {
var promise = this;
if (promise._d) return;
@@ -3136,20 +3648,24 @@ var $reject = function $reject(value) {
if (!promise._a) promise._a = promise._c.slice();
notify(promise, true);
};
+
var $resolve = function $resolve(value) {
var promise = this;
var then;
if (promise._d) return;
promise._d = true;
promise = promise._w || promise;
+
try {
if (promise === value) throw TypeError("Promise can't be resolved itself");
+
if (then = isThenable(value)) {
microtask(function () {
var wrapper = {
_w: promise,
_d: false
};
+
try {
then.call(value, ctx($resolve, wrapper, 1), ctx($reject, wrapper, 1));
} catch (e) {
@@ -3168,17 +3684,20 @@ var $resolve = function $resolve(value) {
}, e);
}
};
+
if (!USE_NATIVE) {
$Promise = function Promise(executor) {
anInstance(this, $Promise, PROMISE, '_h');
aFunction(executor);
Internal.call(this);
+
try {
executor(ctx($resolve, this, 1), ctx($reject, this, 1));
} catch (err) {
$reject.call(this, err);
}
};
+
Internal = function Promise(executor) {
this._c = [];
this._a = undefined;
@@ -3188,13 +3707,16 @@ if (!USE_NATIVE) {
this._h = 0;
this._n = false;
};
+
Internal.prototype = __w_pdfjs_require__(90)($Promise.prototype, {
then: function then(onFulfilled, onRejected) {
var reaction = newPromiseCapability(speciesConstructor(this, $Promise));
reaction.ok = typeof onFulfilled == 'function' ? onFulfilled : true;
reaction.fail = typeof onRejected == 'function' && onRejected;
reaction.domain = isNode ? process.domain : undefined;
+
this._c.push(reaction);
+
if (this._a) this._a.push(reaction);
if (this._s) notify(this, false);
return reaction.promise;
@@ -3203,19 +3725,27 @@ if (!USE_NATIVE) {
return this.then(undefined, onRejected);
}
});
+
OwnPromiseCapability = function OwnPromiseCapability() {
var promise = new Internal();
this.promise = promise;
this.resolve = ctx($resolve, promise, 1);
this.reject = ctx($reject, promise, 1);
};
+
newPromiseCapabilityModule.f = newPromiseCapability = function newPromiseCapability(C) {
return C === $Promise || C === Wrapper ? new OwnPromiseCapability(C) : newGenericPromiseCapability(C);
};
}
-$export($export.G + $export.W + $export.F * !USE_NATIVE, { Promise: $Promise });
+
+$export($export.G + $export.W + $export.F * !USE_NATIVE, {
+ Promise: $Promise
+});
+
__w_pdfjs_require__(71)($Promise, PROMISE);
+
__w_pdfjs_require__(91)(PROMISE);
+
Wrapper = __w_pdfjs_require__(10)[PROMISE];
$export($export.S + $export.F * !USE_NATIVE, PROMISE, {
reject: function reject(r) {
@@ -3284,6 +3814,7 @@ module.exports = function (it, Constructor, name, forbiddenField) {
if (!(it instanceof Constructor) || forbiddenField !== undefined && forbiddenField in it) {
throw TypeError(name + ': incorrect invocation!');
}
+
return it;
};
@@ -3295,13 +3826,20 @@ module.exports = function (it, Constructor, name, forbiddenField) {
var ctx = __w_pdfjs_require__(24);
+
var call = __w_pdfjs_require__(79);
+
var isArrayIter = __w_pdfjs_require__(80);
+
var anObject = __w_pdfjs_require__(13);
+
var toLength = __w_pdfjs_require__(39);
+
var getIterFn = __w_pdfjs_require__(81);
+
var BREAK = {};
var RETURN = {};
+
var _exports = module.exports = function (iterable, entries, fn, that, ITERATOR) {
var iterFn = ITERATOR ? function () {
return iterable;
@@ -3318,6 +3856,7 @@ var _exports = module.exports = function (iterable, entries, fn, that, ITERATOR)
if (result === BREAK || result === RETURN) return result;
}
};
+
_exports.BREAK = BREAK;
_exports.RETURN = RETURN;
@@ -3329,6 +3868,7 @@ _exports.RETURN = RETURN;
var anObject = __w_pdfjs_require__(13);
+
module.exports = function (iterator, fn, value, entries) {
try {
return entries ? fn(anObject(value)[0], value[1]) : fn(value);
@@ -3347,8 +3887,11 @@ module.exports = function (iterator, fn, value, entries) {
var Iterators = __w_pdfjs_require__(66);
+
var ITERATOR = __w_pdfjs_require__(29)('iterator');
+
var ArrayProto = Array.prototype;
+
module.exports = function (it) {
return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it);
};
@@ -3361,8 +3904,11 @@ module.exports = function (it) {
var classof = __w_pdfjs_require__(62);
+
var ITERATOR = __w_pdfjs_require__(29)('iterator');
+
var Iterators = __w_pdfjs_require__(66);
+
module.exports = __w_pdfjs_require__(10).getIteratorMethod = function (it) {
if (it != undefined) return it[ITERATOR] || it['@@iterator'] || Iterators[classof(it)];
};
@@ -3375,8 +3921,11 @@ module.exports = __w_pdfjs_require__(10).getIteratorMethod = function (it) {
var anObject = __w_pdfjs_require__(13);
+
var aFunction = __w_pdfjs_require__(25);
+
var SPECIES = __w_pdfjs_require__(29)('species');
+
module.exports = function (O, D) {
var C = anObject(O).constructor;
var S;
@@ -3391,10 +3940,15 @@ module.exports = function (O, D) {
var ctx = __w_pdfjs_require__(24);
+
var invoke = __w_pdfjs_require__(84);
+
var html = __w_pdfjs_require__(70);
+
var cel = __w_pdfjs_require__(18);
+
var global = __w_pdfjs_require__(9);
+
var process = global.process;
var setTask = global.setImmediate;
var clearTask = global.clearImmediate;
@@ -3404,32 +3958,42 @@ var counter = 0;
var queue = {};
var ONREADYSTATECHANGE = 'onreadystatechange';
var defer, channel, port;
+
var run = function run() {
var id = +this;
+
if (queue.hasOwnProperty(id)) {
var fn = queue[id];
delete queue[id];
fn();
}
};
+
var listener = function listener(event) {
run.call(event.data);
};
+
if (!setTask || !clearTask) {
setTask = function setImmediate(fn) {
var args = [];
var i = 1;
+
while (arguments.length > i) {
args.push(arguments[i++]);
- }queue[++counter] = function () {
+ }
+
+ queue[++counter] = function () {
invoke(typeof fn == 'function' ? fn : Function(fn), args);
};
+
defer(counter);
return counter;
};
+
clearTask = function clearImmediate(id) {
delete queue[id];
};
+
if (__w_pdfjs_require__(28)(process) == 'process') {
defer = function defer(id) {
process.nextTick(ctx(run, id, 1));
@@ -3447,6 +4011,7 @@ if (!setTask || !clearTask) {
defer = function defer(id) {
global.postMessage(id + '', '*');
};
+
global.addEventListener('message', listener, false);
} else if (ONREADYSTATECHANGE in cel('script')) {
defer = function defer(id) {
@@ -3461,6 +4026,7 @@ if (!setTask || !clearTask) {
};
}
}
+
module.exports = {
set: setTask,
clear: clearTask
@@ -3475,18 +4041,24 @@ module.exports = {
module.exports = function (fn, args, that) {
var un = that === undefined;
+
switch (args.length) {
case 0:
return un ? fn() : fn.call(that);
+
case 1:
return un ? fn(args[0]) : fn.call(that, args[0]);
+
case 2:
return un ? fn(args[0], args[1]) : fn.call(that, args[0], args[1]);
+
case 3:
return un ? fn(args[0], args[1], args[2]) : fn.call(that, args[0], args[1], args[2]);
+
case 4:
return un ? fn(args[0], args[1], args[2], args[3]) : fn.call(that, args[0], args[1], args[2], args[3]);
}
+
return fn.apply(that, args);
};
@@ -3498,19 +4070,25 @@ module.exports = function (fn, args, that) {
var global = __w_pdfjs_require__(9);
+
var macrotask = __w_pdfjs_require__(83).set;
+
var Observer = global.MutationObserver || global.WebKitMutationObserver;
var process = global.process;
var Promise = global.Promise;
var isNode = __w_pdfjs_require__(28)(process) == 'process';
+
module.exports = function () {
var head, last, notify;
+
var flush = function flush() {
var parent, fn;
if (isNode && (parent = process.domain)) parent.exit();
+
while (head) {
fn = head.fn;
head = head.next;
+
try {
fn();
} catch (e) {
@@ -3518,9 +4096,11 @@ module.exports = function () {
throw e;
}
}
+
last = undefined;
if (parent) parent.enter();
};
+
if (isNode) {
notify = function notify() {
process.nextTick(flush);
@@ -3528,12 +4108,16 @@ module.exports = function () {
} else if (Observer && !(global.navigator && global.navigator.standalone)) {
var toggle = true;
var node = document.createTextNode('');
- new Observer(flush).observe(node, { characterData: true });
+ new Observer(flush).observe(node, {
+ characterData: true
+ });
+
notify = function notify() {
node.data = toggle = !toggle;
};
} else if (Promise && Promise.resolve) {
var promise = Promise.resolve(undefined);
+
notify = function notify() {
promise.then(flush);
};
@@ -3542,16 +4126,19 @@ module.exports = function () {
macrotask.call(global, flush);
};
}
+
return function (fn) {
var task = {
fn: fn,
next: undefined
};
if (last) last.next = task;
+
if (!head) {
head = task;
notify();
}
+
last = task;
};
};
@@ -3564,6 +4151,7 @@ module.exports = function () {
var aFunction = __w_pdfjs_require__(25);
+
function PromiseCapability(C) {
var resolve, reject;
this.promise = new C(function ($$resolve, $$reject) {
@@ -3574,6 +4162,7 @@ function PromiseCapability(C) {
this.resolve = aFunction(resolve);
this.reject = aFunction(reject);
}
+
module.exports.f = function (C) {
return new PromiseCapability(C);
};
@@ -3607,6 +4196,7 @@ module.exports = function (exec) {
var global = __w_pdfjs_require__(9);
+
var navigator = global.navigator;
module.exports = navigator && navigator.userAgent || '';
@@ -3618,8 +4208,11 @@ module.exports = navigator && navigator.userAgent || '';
var anObject = __w_pdfjs_require__(13);
+
var isObject = __w_pdfjs_require__(14);
+
var newPromiseCapability = __w_pdfjs_require__(86);
+
module.exports = function (C, x) {
anObject(C);
if (isObject(x) && x.constructor === C) return x;
@@ -3637,10 +4230,13 @@ module.exports = function (C, x) {
var redefine = __w_pdfjs_require__(21);
+
module.exports = function (target, src, safe) {
for (var key in src) {
redefine(target, key, src[key], safe);
- }return target;
+ }
+
+ return target;
};
/***/ }),
@@ -3651,9 +4247,13 @@ module.exports = function (target, src, safe) {
var global = __w_pdfjs_require__(9);
+
var dP = __w_pdfjs_require__(12);
+
var DESCRIPTORS = __w_pdfjs_require__(16);
+
var SPECIES = __w_pdfjs_require__(29)('species');
+
module.exports = function (KEY) {
var C = global[KEY];
if (DESCRIPTORS && C && !C[SPECIES]) dP.f(C, SPECIES, {
@@ -3672,30 +4272,42 @@ module.exports = function (KEY) {
var ITERATOR = __w_pdfjs_require__(29)('iterator');
+
var SAFE_CLOSING = false;
+
try {
var riter = [7][ITERATOR]();
+
riter['return'] = function () {
SAFE_CLOSING = true;
};
+
Array.from(riter, function () {
throw 2;
});
} catch (e) {}
+
module.exports = function (exec, skipClosing) {
if (!skipClosing && !SAFE_CLOSING) return false;
var safe = false;
+
try {
var arr = [7];
var iter = arr[ITERATOR]();
+
iter.next = function () {
- return { done: safe = true };
+ return {
+ done: safe = true
+ };
};
+
arr[ITERATOR] = function () {
return iter;
};
+
exec(arr);
} catch (e) {}
+
return safe;
};
@@ -3707,10 +4319,15 @@ module.exports = function (exec, skipClosing) {
var $export = __w_pdfjs_require__(8);
+
var core = __w_pdfjs_require__(10);
+
var global = __w_pdfjs_require__(9);
+
var speciesConstructor = __w_pdfjs_require__(82);
+
var promiseResolve = __w_pdfjs_require__(89);
+
$export($export.P + $export.R, 'Promise', {
'finally': function _finally(onFinally) {
var C = speciesConstructor(this, core.Promise || global.Promise);
@@ -3735,8 +4352,11 @@ $export($export.P + $export.R, 'Promise', {
var $export = __w_pdfjs_require__(8);
+
var newPromiseCapability = __w_pdfjs_require__(86);
+
var perform = __w_pdfjs_require__(87);
+
$export($export.S, 'Promise', {
'try': function _try(callbackfn) {
var promiseCapability = newPromiseCapability.f(this);
@@ -3754,10 +4374,15 @@ $export($export.S, 'Promise', {
__w_pdfjs_require__(61);
+
__w_pdfjs_require__(73);
+
__w_pdfjs_require__(96);
+
__w_pdfjs_require__(108);
+
__w_pdfjs_require__(110);
+
module.exports = __w_pdfjs_require__(10).WeakMap;
/***/ }),
@@ -3768,24 +4393,34 @@ module.exports = __w_pdfjs_require__(10).WeakMap;
var each = __w_pdfjs_require__(97)(0);
+
var redefine = __w_pdfjs_require__(21);
+
var meta = __w_pdfjs_require__(101);
+
var assign = __w_pdfjs_require__(45);
+
var weak = __w_pdfjs_require__(102);
+
var isObject = __w_pdfjs_require__(14);
+
var fails = __w_pdfjs_require__(17);
+
var validate = __w_pdfjs_require__(103);
+
var WEAK_MAP = 'WeakMap';
var getWeak = meta.getWeak;
var isExtensible = Object.isExtensible;
var uncaughtFrozenStore = weak.ufstore;
var tmp = {};
var InternalMap;
+
var wrapper = function wrapper(get) {
return function WeakMap() {
return get(this, arguments.length > 0 ? arguments[0] : undefined);
};
};
+
var methods = {
get: function get(key) {
if (isObject(key)) {
@@ -3798,7 +4433,9 @@ var methods = {
return weak.def(validate(this, WEAK_MAP), key, value);
}
};
+
var $WeakMap = module.exports = __w_pdfjs_require__(104)(WEAK_MAP, wrapper, methods, weak, true, true);
+
if (fails(function () {
return new $WeakMap().set((Object.freeze || Object)(tmp), 7).get(tmp) != 7;
})) {
@@ -3811,9 +4448,12 @@ if (fails(function () {
redefine(proto, key, function (a, b) {
if (isObject(a) && !isExtensible(a)) {
if (!this._f) this._f = new InternalMap();
+
var result = this._f[key](a, b);
+
return key == 'set' ? this : result;
}
+
return method.call(this, a, b);
});
});
@@ -3827,10 +4467,15 @@ if (fails(function () {
var ctx = __w_pdfjs_require__(24);
+
var IObject = __w_pdfjs_require__(38);
+
var toObject = __w_pdfjs_require__(52);
+
var toLength = __w_pdfjs_require__(39);
+
var asc = __w_pdfjs_require__(98);
+
module.exports = function (TYPE, $create) {
var IS_MAP = TYPE == 1;
var IS_FILTER = TYPE == 2;
@@ -3847,24 +4492,31 @@ module.exports = function (TYPE, $create) {
var index = 0;
var result = IS_MAP ? create($this, length) : IS_FILTER ? create($this, 0) : undefined;
var val, res;
+
for (; length > index; index++) {
if (NO_HOLES || index in self) {
val = self[index];
res = f(val, index, O);
+
if (TYPE) {
if (IS_MAP) result[index] = res;else if (res) switch (TYPE) {
case 3:
return true;
+
case 5:
return val;
+
case 6:
return index;
+
case 2:
result.push(val);
} else if (IS_EVERY) return false;
}
}
- }return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : result;
+ }
+
+ return IS_FIND_INDEX ? -1 : IS_SOME || IS_EVERY ? IS_EVERY : result;
};
};
@@ -3876,6 +4528,7 @@ module.exports = function (TYPE, $create) {
var speciesConstructor = __w_pdfjs_require__(99);
+
module.exports = function (original, length) {
return new (speciesConstructor(original))(length);
};
@@ -3888,18 +4541,24 @@ module.exports = function (original, length) {
var isObject = __w_pdfjs_require__(14);
+
var isArray = __w_pdfjs_require__(100);
+
var SPECIES = __w_pdfjs_require__(29)('species');
+
module.exports = function (original) {
var C;
+
if (isArray(original)) {
C = original.constructor;
if (typeof C == 'function' && (C === Array || isArray(C.prototype))) C = undefined;
+
if (isObject(C)) {
C = C[SPECIES];
if (C === null) C = undefined;
}
}
+
return C === undefined ? Array : C;
};
@@ -3911,6 +4570,7 @@ module.exports = function (original) {
var cof = __w_pdfjs_require__(28);
+
module.exports = Array.isArray || function isArray(arg) {
return cof(arg) == 'Array';
};
@@ -3922,19 +4582,26 @@ module.exports = Array.isArray || function isArray(arg) {
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var META = __w_pdfjs_require__(23)('meta');
+
var isObject = __w_pdfjs_require__(14);
+
var has = __w_pdfjs_require__(22);
+
var setDesc = __w_pdfjs_require__(12).f;
+
var id = 0;
+
var isExtensible = Object.isExtensible || function () {
return true;
};
+
var FREEZE = !__w_pdfjs_require__(17)(function () {
return isExtensible(Object.preventExtensions({}));
});
+
var setMeta = function setMeta(it) {
setDesc(it, META, {
value: {
@@ -3943,27 +4610,34 @@ var setMeta = function setMeta(it) {
}
});
};
+
var fastKey = function fastKey(it, create) {
- if (!isObject(it)) return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) == 'symbol' ? it : (typeof it == 'string' ? 'S' : 'P') + it;
+ if (!isObject(it)) return _typeof(it) == 'symbol' ? it : (typeof it == 'string' ? 'S' : 'P') + it;
+
if (!has(it, META)) {
if (!isExtensible(it)) return 'F';
if (!create) return 'E';
setMeta(it);
}
+
return it[META].i;
};
+
var getWeak = function getWeak(it, create) {
if (!has(it, META)) {
if (!isExtensible(it)) return true;
if (!create) return false;
setMeta(it);
}
+
return it[META].w;
};
+
var onFreeze = function onFreeze(it) {
if (FREEZE && meta.NEED && isExtensible(it) && !has(it, META)) setMeta(it);
return it;
};
+
var meta = module.exports = {
KEY: META,
NEED: false,
@@ -3980,28 +4654,41 @@ var meta = module.exports = {
var redefineAll = __w_pdfjs_require__(90);
+
var getWeak = __w_pdfjs_require__(101).getWeak;
+
var anObject = __w_pdfjs_require__(13);
+
var isObject = __w_pdfjs_require__(14);
+
var anInstance = __w_pdfjs_require__(77);
+
var forOf = __w_pdfjs_require__(78);
+
var createArrayMethod = __w_pdfjs_require__(97);
+
var $has = __w_pdfjs_require__(22);
+
var validate = __w_pdfjs_require__(103);
+
var arrayFind = createArrayMethod(5);
var arrayFindIndex = createArrayMethod(6);
var id = 0;
+
var uncaughtFrozenStore = function uncaughtFrozenStore(that) {
return that._l || (that._l = new UncaughtFrozenStore());
};
+
var UncaughtFrozenStore = function UncaughtFrozenStore() {
this.a = [];
};
+
var findUncaughtFrozen = function findUncaughtFrozen(store, key) {
return arrayFind(store.a, function (it) {
return it[0] === key;
});
};
+
UncaughtFrozenStore.prototype = {
get: function get(key) {
var entry = findUncaughtFrozen(this, key);
@@ -4063,6 +4750,7 @@ module.exports = {
var isObject = __w_pdfjs_require__(14);
+
module.exports = function (it, TYPE) {
if (!isObject(it) || it._t !== TYPE) throw TypeError('Incompatible receiver, ' + TYPE + ' required!');
return it;
@@ -4076,23 +4764,36 @@ module.exports = function (it, TYPE) {
var global = __w_pdfjs_require__(9);
+
var $export = __w_pdfjs_require__(8);
+
var redefine = __w_pdfjs_require__(21);
+
var redefineAll = __w_pdfjs_require__(90);
+
var meta = __w_pdfjs_require__(101);
+
var forOf = __w_pdfjs_require__(78);
+
var anInstance = __w_pdfjs_require__(77);
+
var isObject = __w_pdfjs_require__(14);
+
var fails = __w_pdfjs_require__(17);
+
var $iterDetect = __w_pdfjs_require__(92);
+
var setToStringTag = __w_pdfjs_require__(71);
+
var inheritIfRequired = __w_pdfjs_require__(105);
+
module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var Base = global[NAME];
var C = Base;
var ADDER = IS_MAP ? 'set' : 'add';
var proto = C && C.prototype;
var O = {};
+
var fixMethod = function fixMethod(KEY) {
var fn = proto[KEY];
redefine(proto, KEY, KEY == 'delete' ? function (a) {
@@ -4109,6 +4810,7 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
return this;
});
};
+
if (typeof C != 'function' || !(IS_WEAK || proto.forEach && !fails(function () {
new C().entries().next();
}))) {
@@ -4127,10 +4829,14 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var BUGGY_ZERO = !IS_WEAK && fails(function () {
var $instance = new C();
var index = 5;
+
while (index--) {
$instance[ADDER](index, index);
- }return !$instance.has(-0);
+ }
+
+ return !$instance.has(-0);
});
+
if (!ACCEPT_ITERABLES) {
C = wrapper(function (target, iterable) {
anInstance(target, C, NAME);
@@ -4141,14 +4847,17 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
C.prototype = proto;
proto.constructor = C;
}
+
if (THROWS_ON_PRIMITIVES || BUGGY_ZERO) {
fixMethod('delete');
fixMethod('has');
IS_MAP && fixMethod('get');
}
+
if (BUGGY_ZERO || HASNT_CHAINING) fixMethod(ADDER);
if (IS_WEAK && proto.clear) delete proto.clear;
}
+
setToStringTag(C, NAME);
O[NAME] = C;
$export($export.G + $export.W + $export.F * (C != Base), O);
@@ -4164,13 +4873,17 @@ module.exports = function (NAME, wrapper, methods, common, IS_MAP, IS_WEAK) {
var isObject = __w_pdfjs_require__(14);
+
var setPrototypeOf = __w_pdfjs_require__(106).set;
+
module.exports = function (that, target, C) {
var S = target.constructor;
var P;
+
if (S !== C && typeof S == 'function' && (P = S.prototype) !== C.prototype && isObject(P) && setPrototypeOf) {
setPrototypeOf(that, P);
}
+
return that;
};
@@ -4182,11 +4895,14 @@ module.exports = function (that, target, C) {
var isObject = __w_pdfjs_require__(14);
+
var anObject = __w_pdfjs_require__(13);
+
var check = function check(O, proto) {
anObject(O);
if (!isObject(proto) && proto !== null) throw TypeError(proto + ": can't set as prototype!");
};
+
module.exports = {
set: Object.setPrototypeOf || ('__proto__' in {} ? function (test, buggy, set) {
try {
@@ -4196,6 +4912,7 @@ module.exports = {
} catch (e) {
buggy = true;
}
+
return function setPrototypeOf(O, proto) {
check(O, proto);
if (buggy) O.__proto__ = proto;else set(O, proto);
@@ -4213,11 +4930,17 @@ module.exports = {
var pIE = __w_pdfjs_require__(51);
+
var createDesc = __w_pdfjs_require__(20);
+
var toIObject = __w_pdfjs_require__(37);
+
var toPrimitive = __w_pdfjs_require__(19);
+
var has = __w_pdfjs_require__(22);
+
var IE8_DOM_DEFINE = __w_pdfjs_require__(15);
+
var gOPD = Object.getOwnPropertyDescriptor;
exports.f = __w_pdfjs_require__(16) ? gOPD : function getOwnPropertyDescriptor(O, P) {
O = toIObject(O);
@@ -4245,14 +4968,18 @@ __w_pdfjs_require__(109)('WeakMap');
var $export = __w_pdfjs_require__(8);
+
module.exports = function (COLLECTION) {
$export($export.S, COLLECTION, {
of: function of() {
var length = arguments.length;
var A = new Array(length);
+
while (length--) {
A[length] = arguments[length];
- }return new this(A);
+ }
+
+ return new this(A);
}
});
};
@@ -4274,9 +5001,13 @@ __w_pdfjs_require__(111)('WeakMap');
var $export = __w_pdfjs_require__(8);
+
var aFunction = __w_pdfjs_require__(25);
+
var ctx = __w_pdfjs_require__(24);
+
var forOf = __w_pdfjs_require__(78);
+
module.exports = function (COLLECTION) {
$export($export.S, COLLECTION, {
from: function from(source) {
@@ -4287,6 +5018,7 @@ module.exports = function (COLLECTION) {
if (mapping) aFunction(mapFn);
if (source == undefined) return new this();
A = [];
+
if (mapping) {
n = 0;
cb = ctx(mapFn, arguments[2], 2);
@@ -4296,6 +5028,7 @@ module.exports = function (COLLECTION) {
} else {
forOf(source, false, A.push, A);
}
+
return new this(A);
}
});
@@ -4309,10 +5042,15 @@ module.exports = function (COLLECTION) {
__w_pdfjs_require__(61);
+
__w_pdfjs_require__(73);
+
__w_pdfjs_require__(113);
+
__w_pdfjs_require__(114);
+
__w_pdfjs_require__(115);
+
module.exports = __w_pdfjs_require__(10).WeakSet;
/***/ }),
@@ -4323,8 +5061,11 @@ module.exports = __w_pdfjs_require__(10).WeakSet;
var weak = __w_pdfjs_require__(102);
+
var validate = __w_pdfjs_require__(103);
+
var WEAK_SET = 'WeakSet';
+
__w_pdfjs_require__(104)(WEAK_SET, function (get) {
return function WeakSet() {
return get(this, arguments.length > 0 ? arguments[0] : undefined);
@@ -4361,6 +5102,7 @@ __w_pdfjs_require__(111)('WeakSet');
__w_pdfjs_require__(117);
+
module.exports = __w_pdfjs_require__(10).String.codePointAt;
/***/ }),
@@ -4371,7 +5113,9 @@ module.exports = __w_pdfjs_require__(10).String.codePointAt;
var $export = __w_pdfjs_require__(8);
+
var $at = __w_pdfjs_require__(64)(false);
+
$export($export.P, 'String', {
codePointAt: function codePointAt(pos) {
return $at(this, pos);
@@ -4386,6 +5130,7 @@ $export($export.P, 'String', {
__w_pdfjs_require__(119);
+
module.exports = __w_pdfjs_require__(10).String.fromCodePoint;
/***/ }),
@@ -4396,7 +5141,9 @@ module.exports = __w_pdfjs_require__(10).String.fromCodePoint;
var $export = __w_pdfjs_require__(8);
+
var toAbsoluteIndex = __w_pdfjs_require__(41);
+
var fromCharCode = String.fromCharCode;
var $fromCodePoint = String.fromCodePoint;
$export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1), 'String', {
@@ -4405,11 +5152,13 @@ $export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1)
var aLen = arguments.length;
var i = 0;
var code;
+
while (aLen > i) {
code = +arguments[i++];
if (toAbsoluteIndex(code, 0x10ffff) !== code) throw RangeError(code + ' is not a valid code point');
res.push(code < 0x10000 ? fromCharCode(code) : fromCharCode(((code -= 0x10000) >> 10) + 0xd800, code % 0x400 + 0xdc00));
}
+
return res.join('');
}
});
@@ -4422,7 +5171,9 @@ $export($export.S + $export.F * (!!$fromCodePoint && $fromCodePoint.length != 1)
__w_pdfjs_require__(121);
+
__w_pdfjs_require__(61);
+
module.exports = __w_pdfjs_require__(10).Symbol;
/***/ }),
@@ -4432,39 +5183,66 @@ module.exports = __w_pdfjs_require__(10).Symbol;
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var global = __w_pdfjs_require__(9);
+
var has = __w_pdfjs_require__(22);
+
var DESCRIPTORS = __w_pdfjs_require__(16);
+
var $export = __w_pdfjs_require__(8);
+
var redefine = __w_pdfjs_require__(21);
+
var META = __w_pdfjs_require__(101).KEY;
+
var $fails = __w_pdfjs_require__(17);
+
var shared = __w_pdfjs_require__(30);
+
var setToStringTag = __w_pdfjs_require__(71);
+
var uid = __w_pdfjs_require__(23);
+
var wks = __w_pdfjs_require__(29);
+
var wksExt = __w_pdfjs_require__(122);
+
var wksDefine = __w_pdfjs_require__(123);
+
var enumKeys = __w_pdfjs_require__(124);
+
var isArray = __w_pdfjs_require__(100);
+
var anObject = __w_pdfjs_require__(13);
+
var isObject = __w_pdfjs_require__(14);
+
var toIObject = __w_pdfjs_require__(37);
+
var toPrimitive = __w_pdfjs_require__(19);
+
var createDesc = __w_pdfjs_require__(20);
+
var _create = __w_pdfjs_require__(68);
+
var gOPNExt = __w_pdfjs_require__(125);
+
var $GOPD = __w_pdfjs_require__(107);
+
var $DP = __w_pdfjs_require__(12);
+
var $keys = __w_pdfjs_require__(46);
+
var gOPD = $GOPD.f;
var dP = $DP.f;
var gOPN = gOPNExt.f;
var $Symbol = global.Symbol;
var $JSON = global.JSON;
+
var _stringify = $JSON && $JSON.stringify;
+
var PROTOTYPE = 'prototype';
var HIDDEN = wks('_hidden');
var TO_PRIMITIVE = wks('toPrimitive');
@@ -4479,7 +5257,9 @@ var setter = !QObject || !QObject[PROTOTYPE] || !QObject[PROTOTYPE].findChild;
var setSymbolDesc = DESCRIPTORS && $fails(function () {
return _create(dP({}, 'a', {
get: function get() {
- return dP(this, 'a', { value: 7 }).a;
+ return dP(this, 'a', {
+ value: 7
+ }).a;
}
})).a != 7;
}) ? function (it, key, D) {
@@ -4488,51 +5268,67 @@ var setSymbolDesc = DESCRIPTORS && $fails(function () {
dP(it, key, D);
if (protoDesc && it !== ObjectProto) dP(ObjectProto, key, protoDesc);
} : dP;
+
var wrap = function wrap(tag) {
var sym = AllSymbols[tag] = _create($Symbol[PROTOTYPE]);
+
sym._k = tag;
return sym;
};
+
var isSymbol = USE_NATIVE && _typeof($Symbol.iterator) == 'symbol' ? function (it) {
- return (typeof it === 'undefined' ? 'undefined' : _typeof(it)) == 'symbol';
+ return _typeof(it) == 'symbol';
} : function (it) {
return it instanceof $Symbol;
};
+
var $defineProperty = function defineProperty(it, key, D) {
if (it === ObjectProto) $defineProperty(OPSymbols, key, D);
anObject(it);
key = toPrimitive(key, true);
anObject(D);
+
if (has(AllSymbols, key)) {
if (!D.enumerable) {
if (!has(it, HIDDEN)) dP(it, HIDDEN, createDesc(1, {}));
it[HIDDEN][key] = true;
} else {
if (has(it, HIDDEN) && it[HIDDEN][key]) it[HIDDEN][key] = false;
- D = _create(D, { enumerable: createDesc(0, false) });
+ D = _create(D, {
+ enumerable: createDesc(0, false)
+ });
}
+
return setSymbolDesc(it, key, D);
}
+
return dP(it, key, D);
};
+
var $defineProperties = function defineProperties(it, P) {
anObject(it);
var keys = enumKeys(P = toIObject(P));
var i = 0;
var l = keys.length;
var key;
+
while (l > i) {
$defineProperty(it, key = keys[i++], P[key]);
- }return it;
+ }
+
+ return it;
};
+
var $create = function create(it, P) {
return P === undefined ? _create(it) : $defineProperties(_create(it), P);
};
+
var $propertyIsEnumerable = function propertyIsEnumerable(key) {
var E = isEnum.call(this, key = toPrimitive(key, true));
if (this === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key)) return false;
return E || !has(this, key) || !has(AllSymbols, key) || has(this, HIDDEN) && this[HIDDEN][key] ? E : true;
};
+
var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(it, key) {
it = toIObject(it);
key = toPrimitive(key, true);
@@ -4541,42 +5337,52 @@ var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(it, key) {
if (D && has(AllSymbols, key) && !(has(it, HIDDEN) && it[HIDDEN][key])) D.enumerable = true;
return D;
};
+
var $getOwnPropertyNames = function getOwnPropertyNames(it) {
var names = gOPN(toIObject(it));
var result = [];
var i = 0;
var key;
+
while (names.length > i) {
if (!has(AllSymbols, key = names[i++]) && key != HIDDEN && key != META) result.push(key);
}
+
return result;
};
+
var $getOwnPropertySymbols = function getOwnPropertySymbols(it) {
var IS_OP = it === ObjectProto;
var names = gOPN(IS_OP ? OPSymbols : toIObject(it));
var result = [];
var i = 0;
var key;
+
while (names.length > i) {
if (has(AllSymbols, key = names[i++]) && (IS_OP ? has(ObjectProto, key) : true)) result.push(AllSymbols[key]);
}
+
return result;
};
+
if (!USE_NATIVE) {
$Symbol = function _Symbol() {
if (this instanceof $Symbol) throw TypeError('Symbol is not a constructor!');
var tag = uid(arguments.length > 0 ? arguments[0] : undefined);
+
var $set = function $set(value) {
if (this === ObjectProto) $set.call(OPSymbols, value);
if (has(this, HIDDEN) && has(this[HIDDEN], tag)) this[HIDDEN][tag] = false;
setSymbolDesc(this, tag, createDesc(1, value));
};
+
if (DESCRIPTORS && setter) setSymbolDesc(ObjectProto, tag, {
configurable: true,
set: $set
});
return wrap(tag);
};
+
redefine($Symbol[PROTOTYPE], 'toString', function toString() {
return this._k;
});
@@ -4585,24 +5391,35 @@ if (!USE_NATIVE) {
__w_pdfjs_require__(126).f = gOPNExt.f = $getOwnPropertyNames;
__w_pdfjs_require__(51).f = $propertyIsEnumerable;
__w_pdfjs_require__(50).f = $getOwnPropertySymbols;
+
if (DESCRIPTORS && !__w_pdfjs_require__(31)) {
redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true);
}
+
wksExt.f = function (name) {
return wrap(wks(name));
};
}
-$export($export.G + $export.W + $export.F * !USE_NATIVE, { Symbol: $Symbol });
+
+$export($export.G + $export.W + $export.F * !USE_NATIVE, {
+ Symbol: $Symbol
+});
+
for (var es6Symbols = 'hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables'.split(','), j = 0; es6Symbols.length > j;) {
wks(es6Symbols[j++]);
-}for (var wellKnownSymbols = $keys(wks.store), k = 0; wellKnownSymbols.length > k;) {
+}
+
+for (var wellKnownSymbols = $keys(wks.store), k = 0; wellKnownSymbols.length > k;) {
wksDefine(wellKnownSymbols[k++]);
-}$export($export.S + $export.F * !USE_NATIVE, 'Symbol', {
+}
+
+$export($export.S + $export.F * !USE_NATIVE, 'Symbol', {
'for': function _for(key) {
return has(SymbolRegistry, key += '') ? SymbolRegistry[key] : SymbolRegistry[key] = $Symbol(key);
},
keyFor: function keyFor(sym) {
if (!isSymbol(sym)) throw TypeError(sym + ' is not a symbol!');
+
for (var key in SymbolRegistry) {
if (SymbolRegistry[key] === sym) return key;
}
@@ -4624,15 +5441,20 @@ $export($export.S + $export.F * !USE_NATIVE, 'Object', {
});
$JSON && $export($export.S + $export.F * (!USE_NATIVE || $fails(function () {
var S = $Symbol();
- return _stringify([S]) != '[null]' || _stringify({ a: S }) != '{}' || _stringify(Object(S)) != '{}';
+ return _stringify([S]) != '[null]' || _stringify({
+ a: S
+ }) != '{}' || _stringify(Object(S)) != '{}';
})), 'JSON', {
stringify: function stringify(it) {
var args = [it];
var i = 1;
var replacer, $replacer;
+
while (arguments.length > i) {
args.push(arguments[i++]);
- }$replacer = replacer = args[1];
+ }
+
+ $replacer = replacer = args[1];
if (!isObject(replacer) && it === undefined || isSymbol(it)) return;
if (!isArray(replacer)) replacer = function replacer(key, value) {
if (typeof $replacer == 'function') value = $replacer.call(this, key, value);
@@ -4664,13 +5486,20 @@ exports.f = __w_pdfjs_require__(29);
var global = __w_pdfjs_require__(9);
+
var core = __w_pdfjs_require__(10);
+
var LIBRARY = __w_pdfjs_require__(31);
+
var wksExt = __w_pdfjs_require__(122);
+
var defineProperty = __w_pdfjs_require__(12).f;
+
module.exports = function (name) {
var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {});
- if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, { value: wksExt.f(name) });
+ if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, {
+ value: wksExt.f(name)
+ });
};
/***/ }),
@@ -4681,20 +5510,26 @@ module.exports = function (name) {
var getKeys = __w_pdfjs_require__(46);
+
var gOPS = __w_pdfjs_require__(50);
+
var pIE = __w_pdfjs_require__(51);
+
module.exports = function (it) {
var result = getKeys(it);
var getSymbols = gOPS.f;
+
if (getSymbols) {
var symbols = getSymbols(it);
var isEnum = pIE.f;
var i = 0;
var key;
+
while (symbols.length > i) {
if (isEnum.call(it, key = symbols[i++])) result.push(key);
}
}
+
return result;
};
@@ -4705,12 +5540,15 @@ module.exports = function (it) {
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var toIObject = __w_pdfjs_require__(37);
+
var gOPN = __w_pdfjs_require__(126).f;
+
var toString = {}.toString;
-var windowNames = (typeof window === 'undefined' ? 'undefined' : _typeof(window)) == 'object' && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [];
+var windowNames = (typeof window === "undefined" ? "undefined" : _typeof(window)) == 'object' && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : [];
+
var getWindowNames = function getWindowNames(it) {
try {
return gOPN(it);
@@ -4718,6 +5556,7 @@ var getWindowNames = function getWindowNames(it) {
return windowNames.slice();
}
};
+
module.exports.f = function getOwnPropertyNames(it) {
return windowNames && toString.call(it) == '[object Window]' ? getWindowNames(it) : gOPN(toIObject(it));
};
@@ -4730,7 +5569,9 @@ module.exports.f = function getOwnPropertyNames(it) {
var $keys = __w_pdfjs_require__(47);
+
var hiddenKeys = __w_pdfjs_require__(49).concat('length', 'prototype');
+
exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
return $keys(O, hiddenKeys);
};
@@ -4743,6 +5584,7 @@ exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) {
__w_pdfjs_require__(128);
+
module.exports = __w_pdfjs_require__(10).Object.values;
/***/ }),
@@ -4753,7 +5595,9 @@ module.exports = __w_pdfjs_require__(10).Object.values;
var $export = __w_pdfjs_require__(8);
+
var $values = __w_pdfjs_require__(129)(false);
+
$export($export.S, 'Object', {
values: function values(it) {
return $values(it);
@@ -4768,8 +5612,11 @@ $export($export.S, 'Object', {
var getKeys = __w_pdfjs_require__(46);
+
var toIObject = __w_pdfjs_require__(37);
+
var isEnum = __w_pdfjs_require__(51).f;
+
module.exports = function (isEntries) {
return function (it) {
var O = toIObject(it);
@@ -4778,11 +5625,14 @@ module.exports = function (isEntries) {
var i = 0;
var result = [];
var key;
+
while (length > i) {
if (isEnum.call(O, key = keys[i++])) {
result.push(isEntries ? [key, O[key]] : O[key]);
}
- }return result;
+ }
+
+ return result;
};
};
@@ -4794,6 +5644,7 @@ module.exports = function (isEntries) {
var isReadableStreamSupported = false;
+
if (typeof ReadableStream !== 'undefined') {
try {
new ReadableStream({
@@ -4804,6 +5655,7 @@ if (typeof ReadableStream !== 'undefined') {
isReadableStreamSupported = true;
} catch (e) {}
}
+
if (isReadableStreamSupported) {
exports.ReadableStream = ReadableStream;
} else {
@@ -4817,7 +5669,7 @@ if (isReadableStreamSupported) {
"use strict";
-var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof2(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof2 = function _typeof2(obj) { return typeof obj; }; } else { _typeof2 = function _typeof2(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof2(obj); }
(function (e, a) {
for (var i in a) {
@@ -4825,6 +5677,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
})(exports, function (modules) {
var installedModules = {};
+
function __w_pdfjs_require__(moduleId) {
if (installedModules[moduleId]) return installedModules[moduleId].exports;
var module = installedModules[moduleId] = {
@@ -4836,11 +5689,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
module.l = true;
return module.exports;
}
+
__w_pdfjs_require__.m = modules;
__w_pdfjs_require__.c = installedModules;
+
__w_pdfjs_require__.i = function (value) {
return value;
};
+
__w_pdfjs_require__.d = function (exports, name, getter) {
if (!__w_pdfjs_require__.o(exports, name)) {
Object.defineProperty(exports, name, {
@@ -4850,36 +5706,45 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
}
};
+
__w_pdfjs_require__.n = function (module) {
var getter = module && module.__esModule ? function getDefault() {
return module['default'];
} : function getModuleExports() {
return module;
};
+
__w_pdfjs_require__.d(getter, 'a', getter);
+
return getter;
};
+
__w_pdfjs_require__.o = function (object, property) {
return Object.prototype.hasOwnProperty.call(object, property);
};
+
__w_pdfjs_require__.p = "";
return __w_pdfjs_require__(__w_pdfjs_require__.s = 7);
}([function (module, exports, __w_pdfjs_require__) {
"use strict";
var _typeof = typeof Symbol === "function" && _typeof2(Symbol.iterator) === "symbol" ? function (obj) {
- return typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+ return _typeof2(obj);
} : function (obj) {
- return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj === 'undefined' ? 'undefined' : _typeof2(obj);
+ return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : _typeof2(obj);
};
+
var _require = __w_pdfjs_require__(1),
assert = _require.assert;
+
function IsPropertyKey(argument) {
return typeof argument === 'string' || (typeof argument === 'undefined' ? 'undefined' : _typeof(argument)) === 'symbol';
}
+
exports.typeIsObject = function (x) {
return (typeof x === 'undefined' ? 'undefined' : _typeof(x)) === 'object' && x !== null || typeof x === 'function';
};
+
exports.createDataProperty = function (o, p, v) {
assert(exports.typeIsObject(o));
Object.defineProperty(o, p, {
@@ -4889,12 +5754,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
configurable: true
});
};
+
exports.createArrayFromList = function (elements) {
return elements.slice();
};
+
exports.ArrayBufferCopy = function (dest, destOffset, src, srcOffset, n) {
new Uint8Array(dest).set(new Uint8Array(src, srcOffset, n), destOffset);
};
+
exports.CreateIterResultObject = function (value, done) {
assert(typeof done === 'boolean');
var obj = {};
@@ -4912,78 +5780,99 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
return obj;
};
+
exports.IsFiniteNonNegativeNumber = function (v) {
if (Number.isNaN(v)) {
return false;
}
+
if (v === Infinity) {
return false;
}
+
if (v < 0) {
return false;
}
+
return true;
};
+
function Call(F, V, args) {
if (typeof F !== 'function') {
throw new TypeError('Argument is not a function');
}
+
return Function.prototype.apply.call(F, V, args);
}
+
exports.InvokeOrNoop = function (O, P, args) {
assert(O !== undefined);
assert(IsPropertyKey(P));
assert(Array.isArray(args));
var method = O[P];
+
if (method === undefined) {
return undefined;
}
+
return Call(method, O, args);
};
+
exports.PromiseInvokeOrNoop = function (O, P, args) {
assert(O !== undefined);
assert(IsPropertyKey(P));
assert(Array.isArray(args));
+
try {
return Promise.resolve(exports.InvokeOrNoop(O, P, args));
} catch (returnValueE) {
return Promise.reject(returnValueE);
}
};
+
exports.PromiseInvokeOrPerformFallback = function (O, P, args, F, argsF) {
assert(O !== undefined);
assert(IsPropertyKey(P));
assert(Array.isArray(args));
assert(Array.isArray(argsF));
var method = void 0;
+
try {
method = O[P];
} catch (methodE) {
return Promise.reject(methodE);
}
+
if (method === undefined) {
return F.apply(null, argsF);
}
+
try {
return Promise.resolve(Call(method, O, args));
} catch (e) {
return Promise.reject(e);
}
};
+
exports.TransferArrayBuffer = function (O) {
return O.slice();
};
+
exports.ValidateAndNormalizeHighWaterMark = function (highWaterMark) {
highWaterMark = Number(highWaterMark);
+
if (Number.isNaN(highWaterMark) || highWaterMark < 0) {
throw new RangeError('highWaterMark property of a queuing strategy must be non-negative and non-NaN');
}
+
return highWaterMark;
};
+
exports.ValidateAndNormalizeQueuingStrategy = function (size, highWaterMark) {
if (size !== undefined && typeof size !== 'function') {
throw new TypeError('size property of a queuing strategy must be a function');
}
+
highWaterMark = exports.ValidateAndNormalizeHighWaterMark(highWaterMark);
return {
size: size,
@@ -5000,18 +5889,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}, 0);
}
}
+
function AssertionError(message) {
this.name = 'AssertionError';
this.message = message || '';
this.stack = new Error().stack;
}
+
AssertionError.prototype = Object.create(Error.prototype);
AssertionError.prototype.constructor = AssertionError;
+
function assert(value, message) {
if (!value) {
throw new AssertionError(message);
}
}
+
module.exports = {
rethrowAssertionErrorRejection: rethrowAssertionErrorRejection,
AssertionError: AssertionError,
@@ -5030,38 +5923,47 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
Object.defineProperty(target, descriptor.key, descriptor);
}
}
+
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
+
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
+
var _require = __w_pdfjs_require__(0),
InvokeOrNoop = _require.InvokeOrNoop,
PromiseInvokeOrNoop = _require.PromiseInvokeOrNoop,
ValidateAndNormalizeQueuingStrategy = _require.ValidateAndNormalizeQueuingStrategy,
typeIsObject = _require.typeIsObject;
+
var _require2 = __w_pdfjs_require__(1),
assert = _require2.assert,
rethrowAssertionErrorRejection = _require2.rethrowAssertionErrorRejection;
+
var _require3 = __w_pdfjs_require__(3),
DequeueValue = _require3.DequeueValue,
EnqueueValueWithSize = _require3.EnqueueValueWithSize,
PeekQueueValue = _require3.PeekQueueValue,
ResetQueue = _require3.ResetQueue;
+
var WritableStream = function () {
function WritableStream() {
var underlyingSink = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
size = _ref.size,
_ref$highWaterMark = _ref.highWaterMark,
highWaterMark = _ref$highWaterMark === undefined ? 1 : _ref$highWaterMark;
+
_classCallCheck(this, WritableStream);
+
this._state = 'writable';
this._storedError = undefined;
this._writer = undefined;
@@ -5073,21 +5975,27 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
this._pendingAbortRequest = undefined;
this._backpressure = false;
var type = underlyingSink.type;
+
if (type !== undefined) {
throw new RangeError('Invalid type is specified');
}
+
this._writableStreamController = new WritableStreamDefaultController(this, underlyingSink, size, highWaterMark);
+
this._writableStreamController.__startSteps();
}
+
_createClass(WritableStream, [{
key: 'abort',
value: function abort(reason) {
if (IsWritableStream(this) === false) {
return Promise.reject(streamBrandCheckException('abort'));
}
+
if (IsWritableStreamLocked(this) === true) {
return Promise.reject(new TypeError('Cannot abort a stream that already has a writer'));
}
+
return WritableStreamAbort(this, reason);
}
}, {
@@ -5096,6 +6004,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStream(this) === false) {
throw streamBrandCheckException('getWriter');
}
+
return AcquireWritableStreamDefaultWriter(this);
}
}, {
@@ -5104,11 +6013,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStream(this) === false) {
throw streamBrandCheckException('locked');
}
+
return IsWritableStreamLocked(this);
}
}]);
+
return WritableStream;
}();
+
module.exports = {
AcquireWritableStreamDefaultWriter: AcquireWritableStreamDefaultWriter,
IsWritableStream: IsWritableStream,
@@ -5121,43 +6033,58 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
WritableStreamDefaultWriterWrite: WritableStreamDefaultWriterWrite,
WritableStreamCloseQueuedOrInFlight: WritableStreamCloseQueuedOrInFlight
};
+
function AcquireWritableStreamDefaultWriter(stream) {
return new WritableStreamDefaultWriter(stream);
}
+
function IsWritableStream(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_writableStreamController')) {
return false;
}
+
return true;
}
+
function IsWritableStreamLocked(stream) {
assert(IsWritableStream(stream) === true, 'IsWritableStreamLocked should only be used on known writable streams');
+
if (stream._writer === undefined) {
return false;
}
+
return true;
}
+
function WritableStreamAbort(stream, reason) {
var state = stream._state;
+
if (state === 'closed') {
return Promise.resolve(undefined);
}
+
if (state === 'errored') {
return Promise.reject(stream._storedError);
}
+
var error = new TypeError('Requested to abort');
+
if (stream._pendingAbortRequest !== undefined) {
return Promise.reject(error);
}
+
assert(state === 'writable' || state === 'erroring', 'state must be writable or erroring');
var wasAlreadyErroring = false;
+
if (state === 'erroring') {
wasAlreadyErroring = true;
reason = undefined;
}
+
var promise = new Promise(function (resolve, reject) {
stream._pendingAbortRequest = {
_resolve: resolve,
@@ -5166,11 +6093,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_wasAlreadyErroring: wasAlreadyErroring
};
});
+
if (wasAlreadyErroring === false) {
WritableStreamStartErroring(stream, error);
}
+
return promise;
}
+
function WritableStreamAddWriteRequest(stream) {
assert(IsWritableStreamLocked(stream) === true);
assert(stream._state === 'writable');
@@ -5179,19 +6109,24 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_resolve: resolve,
_reject: reject
};
+
stream._writeRequests.push(writeRequest);
});
return promise;
}
+
function WritableStreamDealWithRejection(stream, error) {
var state = stream._state;
+
if (state === 'writable') {
WritableStreamStartErroring(stream, error);
return;
}
+
assert(state === 'erroring');
WritableStreamFinishErroring(stream);
}
+
function WritableStreamStartErroring(stream, reason) {
assert(stream._storedError === undefined, 'stream._storedError === undefined');
assert(stream._state === 'writable', 'state must be writable');
@@ -5200,128 +6135,180 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
stream._state = 'erroring';
stream._storedError = reason;
var writer = stream._writer;
+
if (writer !== undefined) {
WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, reason);
}
+
if (WritableStreamHasOperationMarkedInFlight(stream) === false && controller._started === true) {
WritableStreamFinishErroring(stream);
}
}
+
function WritableStreamFinishErroring(stream) {
assert(stream._state === 'erroring', 'stream._state === erroring');
assert(WritableStreamHasOperationMarkedInFlight(stream) === false, 'WritableStreamHasOperationMarkedInFlight(stream) === false');
stream._state = 'errored';
+
stream._writableStreamController.__errorSteps();
+
var storedError = stream._storedError;
+
for (var i = 0; i < stream._writeRequests.length; i++) {
var writeRequest = stream._writeRequests[i];
+
writeRequest._reject(storedError);
}
+
stream._writeRequests = [];
+
if (stream._pendingAbortRequest === undefined) {
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
return;
}
+
var abortRequest = stream._pendingAbortRequest;
stream._pendingAbortRequest = undefined;
+
if (abortRequest._wasAlreadyErroring === true) {
abortRequest._reject(storedError);
+
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
return;
}
+
var promise = stream._writableStreamController.__abortSteps(abortRequest._reason);
+
promise.then(function () {
abortRequest._resolve();
+
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
}, function (reason) {
abortRequest._reject(reason);
+
WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
});
}
+
function WritableStreamFinishInFlightWrite(stream) {
assert(stream._inFlightWriteRequest !== undefined);
+
stream._inFlightWriteRequest._resolve(undefined);
+
stream._inFlightWriteRequest = undefined;
}
+
function WritableStreamFinishInFlightWriteWithError(stream, error) {
assert(stream._inFlightWriteRequest !== undefined);
+
stream._inFlightWriteRequest._reject(error);
+
stream._inFlightWriteRequest = undefined;
assert(stream._state === 'writable' || stream._state === 'erroring');
WritableStreamDealWithRejection(stream, error);
}
+
function WritableStreamFinishInFlightClose(stream) {
assert(stream._inFlightCloseRequest !== undefined);
+
stream._inFlightCloseRequest._resolve(undefined);
+
stream._inFlightCloseRequest = undefined;
var state = stream._state;
assert(state === 'writable' || state === 'erroring');
+
if (state === 'erroring') {
stream._storedError = undefined;
+
if (stream._pendingAbortRequest !== undefined) {
stream._pendingAbortRequest._resolve();
+
stream._pendingAbortRequest = undefined;
}
}
+
stream._state = 'closed';
var writer = stream._writer;
+
if (writer !== undefined) {
defaultWriterClosedPromiseResolve(writer);
}
+
assert(stream._pendingAbortRequest === undefined, 'stream._pendingAbortRequest === undefined');
assert(stream._storedError === undefined, 'stream._storedError === undefined');
}
+
function WritableStreamFinishInFlightCloseWithError(stream, error) {
assert(stream._inFlightCloseRequest !== undefined);
+
stream._inFlightCloseRequest._reject(error);
+
stream._inFlightCloseRequest = undefined;
assert(stream._state === 'writable' || stream._state === 'erroring');
+
if (stream._pendingAbortRequest !== undefined) {
stream._pendingAbortRequest._reject(error);
+
stream._pendingAbortRequest = undefined;
}
+
WritableStreamDealWithRejection(stream, error);
}
+
function WritableStreamCloseQueuedOrInFlight(stream) {
if (stream._closeRequest === undefined && stream._inFlightCloseRequest === undefined) {
return false;
}
+
return true;
}
+
function WritableStreamHasOperationMarkedInFlight(stream) {
if (stream._inFlightWriteRequest === undefined && stream._inFlightCloseRequest === undefined) {
return false;
}
+
return true;
}
+
function WritableStreamMarkCloseRequestInFlight(stream) {
assert(stream._inFlightCloseRequest === undefined);
assert(stream._closeRequest !== undefined);
stream._inFlightCloseRequest = stream._closeRequest;
stream._closeRequest = undefined;
}
+
function WritableStreamMarkFirstWriteRequestInFlight(stream) {
assert(stream._inFlightWriteRequest === undefined, 'there must be no pending write request');
assert(stream._writeRequests.length !== 0, 'writeRequests must not be empty');
stream._inFlightWriteRequest = stream._writeRequests.shift();
}
+
function WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
assert(stream._state === 'errored', '_stream_.[[state]] is `"errored"`');
+
if (stream._closeRequest !== undefined) {
assert(stream._inFlightCloseRequest === undefined);
+
stream._closeRequest._reject(stream._storedError);
+
stream._closeRequest = undefined;
}
+
var writer = stream._writer;
+
if (writer !== undefined) {
defaultWriterClosedPromiseReject(writer, stream._storedError);
+
writer._closedPromise.catch(function () {});
}
}
+
function WritableStreamUpdateBackpressure(stream, backpressure) {
assert(stream._state === 'writable');
assert(WritableStreamCloseQueuedOrInFlight(stream) === false);
var writer = stream._writer;
+
if (writer !== undefined && backpressure !== stream._backpressure) {
if (backpressure === true) {
defaultWriterReadyPromiseReset(writer);
@@ -5330,30 +6317,39 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
defaultWriterReadyPromiseResolve(writer);
}
}
+
stream._backpressure = backpressure;
}
+
var WritableStreamDefaultWriter = function () {
function WritableStreamDefaultWriter(stream) {
_classCallCheck(this, WritableStreamDefaultWriter);
+
if (IsWritableStream(stream) === false) {
throw new TypeError('WritableStreamDefaultWriter can only be constructed with a WritableStream instance');
}
+
if (IsWritableStreamLocked(stream) === true) {
throw new TypeError('This stream has already been locked for exclusive writing by another writer');
}
+
this._ownerWritableStream = stream;
stream._writer = this;
var state = stream._state;
+
if (state === 'writable') {
if (WritableStreamCloseQueuedOrInFlight(stream) === false && stream._backpressure === true) {
defaultWriterReadyPromiseInitialize(this);
} else {
defaultWriterReadyPromiseInitializeAsResolved(this);
}
+
defaultWriterClosedPromiseInitialize(this);
} else if (state === 'erroring') {
defaultWriterReadyPromiseInitializeAsRejected(this, stream._storedError);
+
this._readyPromise.catch(function () {});
+
defaultWriterClosedPromiseInitialize(this);
} else if (state === 'closed') {
defaultWriterReadyPromiseInitializeAsResolved(this);
@@ -5362,20 +6358,26 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
assert(state === 'errored', 'state must be errored');
var storedError = stream._storedError;
defaultWriterReadyPromiseInitializeAsRejected(this, storedError);
+
this._readyPromise.catch(function () {});
+
defaultWriterClosedPromiseInitializeAsRejected(this, storedError);
+
this._closedPromise.catch(function () {});
}
}
+
_createClass(WritableStreamDefaultWriter, [{
key: 'abort',
value: function abort(reason) {
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('abort'));
}
+
if (this._ownerWritableStream === undefined) {
return Promise.reject(defaultWriterLockException('abort'));
}
+
return WritableStreamDefaultWriterAbort(this, reason);
}
}, {
@@ -5384,13 +6386,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('close'));
}
+
var stream = this._ownerWritableStream;
+
if (stream === undefined) {
return Promise.reject(defaultWriterLockException('close'));
}
+
if (WritableStreamCloseQueuedOrInFlight(stream) === true) {
return Promise.reject(new TypeError('cannot close an already-closing stream'));
}
+
return WritableStreamDefaultWriterClose(this);
}
}, {
@@ -5399,10 +6405,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
throw defaultWriterBrandCheckException('releaseLock');
}
+
var stream = this._ownerWritableStream;
+
if (stream === undefined) {
return;
}
+
assert(stream._writer !== undefined);
WritableStreamDefaultWriterRelease(this);
}
@@ -5412,9 +6421,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('write'));
}
+
if (this._ownerWritableStream === undefined) {
return Promise.reject(defaultWriterLockException('write to'));
}
+
return WritableStreamDefaultWriterWrite(this, chunk);
}
}, {
@@ -5423,6 +6434,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('closed'));
}
+
return this._closedPromise;
}
}, {
@@ -5431,9 +6443,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
throw defaultWriterBrandCheckException('desiredSize');
}
+
if (this._ownerWritableStream === undefined) {
throw defaultWriterLockException('desiredSize');
}
+
return WritableStreamDefaultWriterGetDesiredSize(this);
}
}, {
@@ -5442,32 +6456,41 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsWritableStreamDefaultWriter(this) === false) {
return Promise.reject(defaultWriterBrandCheckException('ready'));
}
+
return this._readyPromise;
}
}]);
+
return WritableStreamDefaultWriter;
}();
+
function IsWritableStreamDefaultWriter(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_ownerWritableStream')) {
return false;
}
+
return true;
}
+
function WritableStreamDefaultWriterAbort(writer, reason) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
return WritableStreamAbort(stream, reason);
}
+
function WritableStreamDefaultWriterClose(writer) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
var state = stream._state;
+
if (state === 'closed' || state === 'errored') {
return Promise.reject(new TypeError('The stream (in ' + state + ' state) is not in the writable state and cannot be closed'));
}
+
assert(state === 'writable' || state === 'erroring');
assert(WritableStreamCloseQueuedOrInFlight(stream) === false);
var promise = new Promise(function (resolve, reject) {
@@ -5477,52 +6500,67 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
};
stream._closeRequest = closeRequest;
});
+
if (stream._backpressure === true && state === 'writable') {
defaultWriterReadyPromiseResolve(writer);
}
+
WritableStreamDefaultControllerClose(stream._writableStreamController);
return promise;
}
+
function WritableStreamDefaultWriterCloseWithErrorPropagation(writer) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
var state = stream._state;
+
if (WritableStreamCloseQueuedOrInFlight(stream) === true || state === 'closed') {
return Promise.resolve();
}
+
if (state === 'errored') {
return Promise.reject(stream._storedError);
}
+
assert(state === 'writable' || state === 'erroring');
return WritableStreamDefaultWriterClose(writer);
}
+
function WritableStreamDefaultWriterEnsureClosedPromiseRejected(writer, error) {
if (writer._closedPromiseState === 'pending') {
defaultWriterClosedPromiseReject(writer, error);
} else {
defaultWriterClosedPromiseResetToRejected(writer, error);
}
+
writer._closedPromise.catch(function () {});
}
+
function WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
if (writer._readyPromiseState === 'pending') {
defaultWriterReadyPromiseReject(writer, error);
} else {
defaultWriterReadyPromiseResetToRejected(writer, error);
}
+
writer._readyPromise.catch(function () {});
}
+
function WritableStreamDefaultWriterGetDesiredSize(writer) {
var stream = writer._ownerWritableStream;
var state = stream._state;
+
if (state === 'errored' || state === 'erroring') {
return null;
}
+
if (state === 'closed') {
return 0;
}
+
return WritableStreamDefaultControllerGetDesiredSize(stream._writableStreamController);
}
+
function WritableStreamDefaultWriterRelease(writer) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
@@ -5533,38 +6571,49 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
stream._writer = undefined;
writer._ownerWritableStream = undefined;
}
+
function WritableStreamDefaultWriterWrite(writer, chunk) {
var stream = writer._ownerWritableStream;
assert(stream !== undefined);
var controller = stream._writableStreamController;
var chunkSize = WritableStreamDefaultControllerGetChunkSize(controller, chunk);
+
if (stream !== writer._ownerWritableStream) {
return Promise.reject(defaultWriterLockException('write to'));
}
+
var state = stream._state;
+
if (state === 'errored') {
return Promise.reject(stream._storedError);
}
+
if (WritableStreamCloseQueuedOrInFlight(stream) === true || state === 'closed') {
return Promise.reject(new TypeError('The stream is closing or closed and cannot be written to'));
}
+
if (state === 'erroring') {
return Promise.reject(stream._storedError);
}
+
assert(state === 'writable');
var promise = WritableStreamAddWriteRequest(stream);
WritableStreamDefaultControllerWrite(controller, chunk, chunkSize);
return promise;
}
+
var WritableStreamDefaultController = function () {
function WritableStreamDefaultController(stream, underlyingSink, size, highWaterMark) {
_classCallCheck(this, WritableStreamDefaultController);
+
if (IsWritableStream(stream) === false) {
throw new TypeError('WritableStreamDefaultController can only be constructed with a WritableStream instance');
}
+
if (stream._writableStreamController !== undefined) {
throw new TypeError('WritableStreamDefaultController instances can only be created by the WritableStream constructor');
}
+
this._controlledWritableStream = stream;
this._underlyingSink = underlyingSink;
this._queue = undefined;
@@ -5577,16 +6626,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var backpressure = WritableStreamDefaultControllerGetBackpressure(this);
WritableStreamUpdateBackpressure(stream, backpressure);
}
+
_createClass(WritableStreamDefaultController, [{
key: 'error',
value: function error(e) {
if (IsWritableStreamDefaultController(this) === false) {
throw new TypeError('WritableStreamDefaultController.prototype.error can only be used on a WritableStreamDefaultController');
}
+
var state = this._controlledWritableStream._state;
+
if (state !== 'writable') {
return;
}
+
WritableStreamDefaultControllerError(this, e);
}
}, {
@@ -5603,6 +6656,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
key: '__startSteps',
value: function __startSteps() {
var _this = this;
+
var startResult = InvokeOrNoop(this._underlyingSink, 'start', [this]);
var stream = this._controlledWritableStream;
Promise.resolve(startResult).then(function () {
@@ -5616,17 +6670,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}).catch(rethrowAssertionErrorRejection);
}
}]);
+
return WritableStreamDefaultController;
}();
+
function WritableStreamDefaultControllerClose(controller) {
EnqueueValueWithSize(controller, 'close', 0);
WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
}
+
function WritableStreamDefaultControllerGetChunkSize(controller, chunk) {
var strategySize = controller._strategySize;
+
if (strategySize === undefined) {
return 1;
}
+
try {
return strategySize(chunk);
} catch (chunkSizeE) {
@@ -5634,64 +6693,86 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return 1;
}
}
+
function WritableStreamDefaultControllerGetDesiredSize(controller) {
return controller._strategyHWM - controller._queueTotalSize;
}
+
function WritableStreamDefaultControllerWrite(controller, chunk, chunkSize) {
- var writeRecord = { chunk: chunk };
+ var writeRecord = {
+ chunk: chunk
+ };
+
try {
EnqueueValueWithSize(controller, writeRecord, chunkSize);
} catch (enqueueE) {
WritableStreamDefaultControllerErrorIfNeeded(controller, enqueueE);
return;
}
+
var stream = controller._controlledWritableStream;
+
if (WritableStreamCloseQueuedOrInFlight(stream) === false && stream._state === 'writable') {
var backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
WritableStreamUpdateBackpressure(stream, backpressure);
}
+
WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
}
+
function IsWritableStreamDefaultController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_underlyingSink')) {
return false;
}
+
return true;
}
+
function WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller) {
var stream = controller._controlledWritableStream;
+
if (controller._started === false) {
return;
}
+
if (stream._inFlightWriteRequest !== undefined) {
return;
}
+
var state = stream._state;
+
if (state === 'closed' || state === 'errored') {
return;
}
+
if (state === 'erroring') {
WritableStreamFinishErroring(stream);
return;
}
+
if (controller._queue.length === 0) {
return;
}
+
var writeRecord = PeekQueueValue(controller);
+
if (writeRecord === 'close') {
WritableStreamDefaultControllerProcessClose(controller);
} else {
WritableStreamDefaultControllerProcessWrite(controller, writeRecord.chunk);
}
}
+
function WritableStreamDefaultControllerErrorIfNeeded(controller, error) {
if (controller._controlledWritableStream._state === 'writable') {
WritableStreamDefaultControllerError(controller, error);
}
}
+
function WritableStreamDefaultControllerProcessClose(controller) {
var stream = controller._controlledWritableStream;
WritableStreamMarkCloseRequestInFlight(stream);
@@ -5704,6 +6785,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
WritableStreamFinishInFlightCloseWithError(stream, reason);
}).catch(rethrowAssertionErrorRejection);
}
+
function WritableStreamDefaultControllerProcessWrite(controller, chunk) {
var stream = controller._controlledWritableStream;
WritableStreamMarkFirstWriteRequestInFlight(stream);
@@ -5713,33 +6795,41 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var state = stream._state;
assert(state === 'writable' || state === 'erroring');
DequeueValue(controller);
+
if (WritableStreamCloseQueuedOrInFlight(stream) === false && state === 'writable') {
var backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
WritableStreamUpdateBackpressure(stream, backpressure);
}
+
WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
}, function (reason) {
WritableStreamFinishInFlightWriteWithError(stream, reason);
}).catch(rethrowAssertionErrorRejection);
}
+
function WritableStreamDefaultControllerGetBackpressure(controller) {
var desiredSize = WritableStreamDefaultControllerGetDesiredSize(controller);
return desiredSize <= 0;
}
+
function WritableStreamDefaultControllerError(controller, error) {
var stream = controller._controlledWritableStream;
assert(stream._state === 'writable');
WritableStreamStartErroring(stream, error);
}
+
function streamBrandCheckException(name) {
return new TypeError('WritableStream.prototype.' + name + ' can only be used on a WritableStream');
}
+
function defaultWriterBrandCheckException(name) {
return new TypeError('WritableStreamDefaultWriter.prototype.' + name + ' can only be used on a WritableStreamDefaultWriter');
}
+
function defaultWriterLockException(name) {
return new TypeError('Cannot ' + name + ' a stream using a released writer');
}
+
function defaultWriterClosedPromiseInitialize(writer) {
writer._closedPromise = new Promise(function (resolve, reject) {
writer._closedPromise_resolve = resolve;
@@ -5747,27 +6837,33 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
writer._closedPromiseState = 'pending';
});
}
+
function defaultWriterClosedPromiseInitializeAsRejected(writer, reason) {
writer._closedPromise = Promise.reject(reason);
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'rejected';
}
+
function defaultWriterClosedPromiseInitializeAsResolved(writer) {
writer._closedPromise = Promise.resolve(undefined);
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'resolved';
}
+
function defaultWriterClosedPromiseReject(writer, reason) {
assert(writer._closedPromise_resolve !== undefined, 'writer._closedPromise_resolve !== undefined');
assert(writer._closedPromise_reject !== undefined, 'writer._closedPromise_reject !== undefined');
assert(writer._closedPromiseState === 'pending', 'writer._closedPromiseState is pending');
+
writer._closedPromise_reject(reason);
+
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'rejected';
}
+
function defaultWriterClosedPromiseResetToRejected(writer, reason) {
assert(writer._closedPromise_resolve === undefined, 'writer._closedPromise_resolve === undefined');
assert(writer._closedPromise_reject === undefined, 'writer._closedPromise_reject === undefined');
@@ -5775,15 +6871,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
writer._closedPromise = Promise.reject(reason);
writer._closedPromiseState = 'rejected';
}
+
function defaultWriterClosedPromiseResolve(writer) {
assert(writer._closedPromise_resolve !== undefined, 'writer._closedPromise_resolve !== undefined');
assert(writer._closedPromise_reject !== undefined, 'writer._closedPromise_reject !== undefined');
assert(writer._closedPromiseState === 'pending', 'writer._closedPromiseState is pending');
+
writer._closedPromise_resolve(undefined);
+
writer._closedPromise_resolve = undefined;
writer._closedPromise_reject = undefined;
writer._closedPromiseState = 'resolved';
}
+
function defaultWriterReadyPromiseInitialize(writer) {
writer._readyPromise = new Promise(function (resolve, reject) {
writer._readyPromise_resolve = resolve;
@@ -5791,26 +6891,32 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
writer._readyPromiseState = 'pending';
}
+
function defaultWriterReadyPromiseInitializeAsRejected(writer, reason) {
writer._readyPromise = Promise.reject(reason);
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'rejected';
}
+
function defaultWriterReadyPromiseInitializeAsResolved(writer) {
writer._readyPromise = Promise.resolve(undefined);
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'fulfilled';
}
+
function defaultWriterReadyPromiseReject(writer, reason) {
assert(writer._readyPromise_resolve !== undefined, 'writer._readyPromise_resolve !== undefined');
assert(writer._readyPromise_reject !== undefined, 'writer._readyPromise_reject !== undefined');
+
writer._readyPromise_reject(reason);
+
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'rejected';
}
+
function defaultWriterReadyPromiseReset(writer) {
assert(writer._readyPromise_resolve === undefined, 'writer._readyPromise_resolve === undefined');
assert(writer._readyPromise_reject === undefined, 'writer._readyPromise_reject === undefined');
@@ -5820,16 +6926,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
writer._readyPromiseState = 'pending';
}
+
function defaultWriterReadyPromiseResetToRejected(writer, reason) {
assert(writer._readyPromise_resolve === undefined, 'writer._readyPromise_resolve === undefined');
assert(writer._readyPromise_reject === undefined, 'writer._readyPromise_reject === undefined');
writer._readyPromise = Promise.reject(reason);
writer._readyPromiseState = 'rejected';
}
+
function defaultWriterReadyPromiseResolve(writer) {
assert(writer._readyPromise_resolve !== undefined, 'writer._readyPromise_resolve !== undefined');
assert(writer._readyPromise_reject !== undefined, 'writer._readyPromise_reject !== undefined');
+
writer._readyPromise_resolve(undefined);
+
writer._readyPromise_resolve = undefined;
writer._readyPromise_reject = undefined;
writer._readyPromiseState = 'fulfilled';
@@ -5839,36 +6949,48 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var _require = __w_pdfjs_require__(0),
IsFiniteNonNegativeNumber = _require.IsFiniteNonNegativeNumber;
+
var _require2 = __w_pdfjs_require__(1),
assert = _require2.assert;
+
exports.DequeueValue = function (container) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: DequeueValue should only be used on containers with [[queue]] and [[queueTotalSize]].');
assert(container._queue.length > 0, 'Spec-level failure: should never dequeue from an empty queue.');
+
var pair = container._queue.shift();
+
container._queueTotalSize -= pair.size;
+
if (container._queueTotalSize < 0) {
container._queueTotalSize = 0;
}
+
return pair.value;
};
+
exports.EnqueueValueWithSize = function (container, value, size) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: EnqueueValueWithSize should only be used on containers with [[queue]] and ' + '[[queueTotalSize]].');
size = Number(size);
+
if (!IsFiniteNonNegativeNumber(size)) {
throw new RangeError('Size must be a finite, non-NaN, non-negative number.');
}
+
container._queue.push({
value: value,
size: size
});
+
container._queueTotalSize += size;
};
+
exports.PeekQueueValue = function (container) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: PeekQueueValue should only be used on containers with [[queue]] and [[queueTotalSize]].');
assert(container._queue.length > 0, 'Spec-level failure: should never peek at an empty queue.');
var pair = container._queue[0];
return pair.value;
};
+
exports.ResetQueue = function (container) {
assert('_queue' in container && '_queueTotalSize' in container, 'Spec-level failure: ResetQueue should only be used on containers with [[queue]] and [[queueTotalSize]].');
container._queue = [];
@@ -5887,17 +7009,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
Object.defineProperty(target, descriptor.key, descriptor);
}
}
+
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
+
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
+
var _require = __w_pdfjs_require__(0),
ArrayBufferCopy = _require.ArrayBufferCopy,
CreateIterResultObject = _require.CreateIterResultObject,
@@ -5907,17 +7032,21 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
TransferArrayBuffer = _require.TransferArrayBuffer,
ValidateAndNormalizeQueuingStrategy = _require.ValidateAndNormalizeQueuingStrategy,
ValidateAndNormalizeHighWaterMark = _require.ValidateAndNormalizeHighWaterMark;
+
var _require2 = __w_pdfjs_require__(0),
createArrayFromList = _require2.createArrayFromList,
createDataProperty = _require2.createDataProperty,
typeIsObject = _require2.typeIsObject;
+
var _require3 = __w_pdfjs_require__(1),
assert = _require3.assert,
rethrowAssertionErrorRejection = _require3.rethrowAssertionErrorRejection;
+
var _require4 = __w_pdfjs_require__(3),
DequeueValue = _require4.DequeueValue,
EnqueueValueWithSize = _require4.EnqueueValueWithSize,
ResetQueue = _require4.ResetQueue;
+
var _require5 = __w_pdfjs_require__(2),
AcquireWritableStreamDefaultWriter = _require5.AcquireWritableStreamDefaultWriter,
IsWritableStream = _require5.IsWritableStream,
@@ -5927,13 +7056,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
WritableStreamDefaultWriterRelease = _require5.WritableStreamDefaultWriterRelease,
WritableStreamDefaultWriterWrite = _require5.WritableStreamDefaultWriterWrite,
WritableStreamCloseQueuedOrInFlight = _require5.WritableStreamCloseQueuedOrInFlight;
+
var ReadableStream = function () {
function ReadableStream() {
var underlyingSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
size = _ref.size,
highWaterMark = _ref.highWaterMark;
+
_classCallCheck(this, ReadableStream);
+
this._state = 'readable';
this._reader = undefined;
this._storedError = undefined;
@@ -5941,29 +7074,35 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
this._readableStreamController = undefined;
var type = underlyingSource.type;
var typeString = String(type);
+
if (typeString === 'bytes') {
if (highWaterMark === undefined) {
highWaterMark = 0;
}
+
this._readableStreamController = new ReadableByteStreamController(this, underlyingSource, highWaterMark);
} else if (type === undefined) {
if (highWaterMark === undefined) {
highWaterMark = 1;
}
+
this._readableStreamController = new ReadableStreamDefaultController(this, underlyingSource, size, highWaterMark);
} else {
throw new RangeError('Invalid type is specified');
}
}
+
_createClass(ReadableStream, [{
key: 'cancel',
value: function cancel(reason) {
if (IsReadableStream(this) === false) {
return Promise.reject(streamBrandCheckException('cancel'));
}
+
if (IsReadableStreamLocked(this) === true) {
return Promise.reject(new TypeError('Cannot cancel a stream that already has a reader'));
}
+
return ReadableStreamCancel(this, reason);
}
}, {
@@ -5971,16 +7110,21 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
value: function getReader() {
var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
mode = _ref2.mode;
+
if (IsReadableStream(this) === false) {
throw streamBrandCheckException('getReader');
}
+
if (mode === undefined) {
return AcquireReadableStreamDefaultReader(this);
}
+
mode = String(mode);
+
if (mode === 'byob') {
return AcquireReadableStreamBYOBReader(this);
}
+
throw new RangeError('Invalid mode is specified');
}
}, {
@@ -5996,25 +7140,32 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
key: 'pipeTo',
value: function pipeTo(dest) {
var _this = this;
+
var _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
preventClose = _ref4.preventClose,
preventAbort = _ref4.preventAbort,
preventCancel = _ref4.preventCancel;
+
if (IsReadableStream(this) === false) {
return Promise.reject(streamBrandCheckException('pipeTo'));
}
+
if (IsWritableStream(dest) === false) {
return Promise.reject(new TypeError('ReadableStream.prototype.pipeTo\'s first argument must be a WritableStream'));
}
+
preventClose = Boolean(preventClose);
preventAbort = Boolean(preventAbort);
preventCancel = Boolean(preventCancel);
+
if (IsReadableStreamLocked(this) === true) {
return Promise.reject(new TypeError('ReadableStream.prototype.pipeTo cannot be used on a locked ReadableStream'));
}
+
if (IsWritableStreamLocked(dest) === true) {
return Promise.reject(new TypeError('ReadableStream.prototype.pipeTo cannot be used on a locked WritableStream'));
}
+
var reader = AcquireReadableStreamDefaultReader(this);
var writer = AcquireWritableStreamDefaultWriter(dest);
var shuttingDown = false;
@@ -6022,20 +7173,25 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return new Promise(function (resolve, reject) {
function pipeLoop() {
currentWrite = Promise.resolve();
+
if (shuttingDown === true) {
return Promise.resolve();
}
+
return writer._readyPromise.then(function () {
return ReadableStreamDefaultReaderRead(reader).then(function (_ref5) {
var value = _ref5.value,
done = _ref5.done;
+
if (done === true) {
return;
}
+
currentWrite = WritableStreamDefaultWriterWrite(writer, value).catch(function () {});
});
}).then(pipeLoop);
}
+
isOrBecomesErrored(_this, reader._closedPromise, function (storedError) {
if (preventAbort === false) {
shutdownWithAction(function () {
@@ -6063,8 +7219,10 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
shutdown();
}
});
+
if (WritableStreamCloseQueuedOrInFlight(dest) === true || dest._state === 'closed') {
var destClosed = new TypeError('the destination writable stream closed before all data could be piped to it');
+
if (preventCancel === false) {
shutdownWithAction(function () {
return ReadableStreamCancel(_this, destClosed);
@@ -6073,16 +7231,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
shutdown(true, destClosed);
}
}
+
pipeLoop().catch(function (err) {
currentWrite = Promise.resolve();
rethrowAssertionErrorRejection(err);
});
+
function waitForWritesToFinish() {
var oldCurrentWrite = currentWrite;
return currentWrite.then(function () {
return oldCurrentWrite !== currentWrite ? waitForWritesToFinish() : undefined;
});
}
+
function isOrBecomesErrored(stream, promise, action) {
if (stream._state === 'errored') {
action(stream._storedError);
@@ -6090,6 +7251,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
promise.catch(action).catch(rethrowAssertionErrorRejection);
}
}
+
function isOrBecomesClosed(stream, promise, action) {
if (stream._state === 'closed') {
action();
@@ -6097,16 +7259,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
promise.then(action).catch(rethrowAssertionErrorRejection);
}
}
+
function shutdownWithAction(action, originalIsError, originalError) {
if (shuttingDown === true) {
return;
}
+
shuttingDown = true;
+
if (dest._state === 'writable' && WritableStreamCloseQueuedOrInFlight(dest) === false) {
waitForWritesToFinish().then(doTheRest);
} else {
doTheRest();
}
+
function doTheRest() {
action().then(function () {
return finalize(originalIsError, originalError);
@@ -6115,11 +7281,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}).catch(rethrowAssertionErrorRejection);
}
}
+
function shutdown(isError, error) {
if (shuttingDown === true) {
return;
}
+
shuttingDown = true;
+
if (dest._state === 'writable' && WritableStreamCloseQueuedOrInFlight(dest) === false) {
waitForWritesToFinish().then(function () {
return finalize(isError, error);
@@ -6128,9 +7297,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
finalize(isError, error);
}
}
+
function finalize(isError, error) {
WritableStreamDefaultWriterRelease(writer);
ReadableStreamReaderGenericRelease(reader);
+
if (isError) {
reject(error);
} else {
@@ -6145,6 +7316,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStream(this) === false) {
throw streamBrandCheckException('tee');
}
+
var branches = ReadableStreamTee(this, false);
return createArrayFromList(branches);
}
@@ -6154,11 +7326,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStream(this) === false) {
throw streamBrandCheckException('locked');
}
+
return IsReadableStreamLocked(this);
}
}]);
+
return ReadableStream;
}();
+
module.exports = {
ReadableStream: ReadableStream,
IsReadableStreamDisturbed: IsReadableStreamDisturbed,
@@ -6167,32 +7342,42 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableStreamDefaultControllerError: ReadableStreamDefaultControllerError,
ReadableStreamDefaultControllerGetDesiredSize: ReadableStreamDefaultControllerGetDesiredSize
};
+
function AcquireReadableStreamBYOBReader(stream) {
return new ReadableStreamBYOBReader(stream);
}
+
function AcquireReadableStreamDefaultReader(stream) {
return new ReadableStreamDefaultReader(stream);
}
+
function IsReadableStream(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_readableStreamController')) {
return false;
}
+
return true;
}
+
function IsReadableStreamDisturbed(stream) {
assert(IsReadableStream(stream) === true, 'IsReadableStreamDisturbed should only be used on known readable streams');
return stream._disturbed;
}
+
function IsReadableStreamLocked(stream) {
assert(IsReadableStream(stream) === true, 'IsReadableStreamLocked should only be used on known readable streams');
+
if (stream._reader === undefined) {
return false;
}
+
return true;
}
+
function ReadableStreamTee(stream, cloneForBranch2) {
assert(IsReadableStream(stream) === true);
assert(typeof cloneForBranch2 === 'boolean');
@@ -6227,16 +7412,20 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var branch2Stream = new ReadableStream(underlyingSource2);
pull._branch1 = branch1Stream._readableStreamController;
pull._branch2 = branch2Stream._readableStreamController;
+
reader._closedPromise.catch(function (r) {
if (teeState.closedOrErrored === true) {
return;
}
+
ReadableStreamDefaultControllerError(pull._branch1, r);
ReadableStreamDefaultControllerError(pull._branch2, r);
teeState.closedOrErrored = true;
});
+
return [branch1Stream, branch2Stream];
}
+
function create_ReadableStreamTeePullFunction() {
function f() {
var reader = f._reader,
@@ -6248,60 +7437,79 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var value = result.value;
var done = result.done;
assert(typeof done === 'boolean');
+
if (done === true && teeState.closedOrErrored === false) {
if (teeState.canceled1 === false) {
ReadableStreamDefaultControllerClose(branch1);
}
+
if (teeState.canceled2 === false) {
ReadableStreamDefaultControllerClose(branch2);
}
+
teeState.closedOrErrored = true;
}
+
if (teeState.closedOrErrored === true) {
return;
}
+
var value1 = value;
var value2 = value;
+
if (teeState.canceled1 === false) {
ReadableStreamDefaultControllerEnqueue(branch1, value1);
}
+
if (teeState.canceled2 === false) {
ReadableStreamDefaultControllerEnqueue(branch2, value2);
}
});
}
+
return f;
}
+
function create_ReadableStreamTeeBranch1CancelFunction() {
function f(reason) {
var stream = f._stream,
teeState = f._teeState;
teeState.canceled1 = true;
teeState.reason1 = reason;
+
if (teeState.canceled2 === true) {
var compositeReason = createArrayFromList([teeState.reason1, teeState.reason2]);
var cancelResult = ReadableStreamCancel(stream, compositeReason);
+
teeState._resolve(cancelResult);
}
+
return teeState.promise;
}
+
return f;
}
+
function create_ReadableStreamTeeBranch2CancelFunction() {
function f(reason) {
var stream = f._stream,
teeState = f._teeState;
teeState.canceled2 = true;
teeState.reason2 = reason;
+
if (teeState.canceled1 === true) {
var compositeReason = createArrayFromList([teeState.reason1, teeState.reason2]);
var cancelResult = ReadableStreamCancel(stream, compositeReason);
+
teeState._resolve(cancelResult);
}
+
return teeState.promise;
}
+
return f;
}
+
function ReadableStreamAddReadIntoRequest(stream) {
assert(IsReadableStreamBYOBReader(stream._reader) === true);
assert(stream._state === 'readable' || stream._state === 'closed');
@@ -6310,10 +7518,12 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_resolve: resolve,
_reject: reject
};
+
stream._reader._readIntoRequests.push(readIntoRequest);
});
return promise;
}
+
function ReadableStreamAddReadRequest(stream) {
assert(IsReadableStreamDefaultReader(stream._reader) === true);
assert(stream._state === 'readable');
@@ -6322,126 +7532,172 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
_resolve: resolve,
_reject: reject
};
+
stream._reader._readRequests.push(readRequest);
});
return promise;
}
+
function ReadableStreamCancel(stream, reason) {
stream._disturbed = true;
+
if (stream._state === 'closed') {
return Promise.resolve(undefined);
}
+
if (stream._state === 'errored') {
return Promise.reject(stream._storedError);
}
+
ReadableStreamClose(stream);
+
var sourceCancelPromise = stream._readableStreamController.__cancelSteps(reason);
+
return sourceCancelPromise.then(function () {
return undefined;
});
}
+
function ReadableStreamClose(stream) {
assert(stream._state === 'readable');
stream._state = 'closed';
var reader = stream._reader;
+
if (reader === undefined) {
return undefined;
}
+
if (IsReadableStreamDefaultReader(reader) === true) {
for (var i = 0; i < reader._readRequests.length; i++) {
var _resolve = reader._readRequests[i]._resolve;
+
_resolve(CreateIterResultObject(undefined, true));
}
+
reader._readRequests = [];
}
+
defaultReaderClosedPromiseResolve(reader);
return undefined;
}
+
function ReadableStreamError(stream, e) {
assert(IsReadableStream(stream) === true, 'stream must be ReadableStream');
assert(stream._state === 'readable', 'state must be readable');
stream._state = 'errored';
stream._storedError = e;
var reader = stream._reader;
+
if (reader === undefined) {
return undefined;
}
+
if (IsReadableStreamDefaultReader(reader) === true) {
for (var i = 0; i < reader._readRequests.length; i++) {
var readRequest = reader._readRequests[i];
+
readRequest._reject(e);
}
+
reader._readRequests = [];
} else {
assert(IsReadableStreamBYOBReader(reader), 'reader must be ReadableStreamBYOBReader');
+
for (var _i = 0; _i < reader._readIntoRequests.length; _i++) {
var readIntoRequest = reader._readIntoRequests[_i];
+
readIntoRequest._reject(e);
}
+
reader._readIntoRequests = [];
}
+
defaultReaderClosedPromiseReject(reader, e);
+
reader._closedPromise.catch(function () {});
}
+
function ReadableStreamFulfillReadIntoRequest(stream, chunk, done) {
var reader = stream._reader;
assert(reader._readIntoRequests.length > 0);
+
var readIntoRequest = reader._readIntoRequests.shift();
+
readIntoRequest._resolve(CreateIterResultObject(chunk, done));
}
+
function ReadableStreamFulfillReadRequest(stream, chunk, done) {
var reader = stream._reader;
assert(reader._readRequests.length > 0);
+
var readRequest = reader._readRequests.shift();
+
readRequest._resolve(CreateIterResultObject(chunk, done));
}
+
function ReadableStreamGetNumReadIntoRequests(stream) {
return stream._reader._readIntoRequests.length;
}
+
function ReadableStreamGetNumReadRequests(stream) {
return stream._reader._readRequests.length;
}
+
function ReadableStreamHasBYOBReader(stream) {
var reader = stream._reader;
+
if (reader === undefined) {
return false;
}
+
if (IsReadableStreamBYOBReader(reader) === false) {
return false;
}
+
return true;
}
+
function ReadableStreamHasDefaultReader(stream) {
var reader = stream._reader;
+
if (reader === undefined) {
return false;
}
+
if (IsReadableStreamDefaultReader(reader) === false) {
return false;
}
+
return true;
}
+
var ReadableStreamDefaultReader = function () {
function ReadableStreamDefaultReader(stream) {
_classCallCheck(this, ReadableStreamDefaultReader);
+
if (IsReadableStream(stream) === false) {
throw new TypeError('ReadableStreamDefaultReader can only be constructed with a ReadableStream instance');
}
+
if (IsReadableStreamLocked(stream) === true) {
throw new TypeError('This stream has already been locked for exclusive reading by another reader');
}
+
ReadableStreamReaderGenericInitialize(this, stream);
this._readRequests = [];
}
+
_createClass(ReadableStreamDefaultReader, [{
key: 'cancel',
value: function cancel(reason) {
if (IsReadableStreamDefaultReader(this) === false) {
return Promise.reject(defaultReaderBrandCheckException('cancel'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('cancel'));
}
+
return ReadableStreamReaderGenericCancel(this, reason);
}
}, {
@@ -6450,9 +7706,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultReader(this) === false) {
return Promise.reject(defaultReaderBrandCheckException('read'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('read from'));
}
+
return ReadableStreamDefaultReaderRead(this);
}
}, {
@@ -6461,12 +7719,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultReader(this) === false) {
throw defaultReaderBrandCheckException('releaseLock');
}
+
if (this._ownerReadableStream === undefined) {
return;
}
+
if (this._readRequests.length > 0) {
throw new TypeError('Tried to release a reader lock when that reader has pending read() calls un-settled');
}
+
ReadableStreamReaderGenericRelease(this);
}
}, {
@@ -6475,35 +7736,45 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultReader(this) === false) {
return Promise.reject(defaultReaderBrandCheckException('closed'));
}
+
return this._closedPromise;
}
}]);
+
return ReadableStreamDefaultReader;
}();
+
var ReadableStreamBYOBReader = function () {
function ReadableStreamBYOBReader(stream) {
_classCallCheck(this, ReadableStreamBYOBReader);
+
if (!IsReadableStream(stream)) {
throw new TypeError('ReadableStreamBYOBReader can only be constructed with a ReadableStream instance given a ' + 'byte source');
}
+
if (IsReadableByteStreamController(stream._readableStreamController) === false) {
throw new TypeError('Cannot construct a ReadableStreamBYOBReader for a stream not constructed with a byte ' + 'source');
}
+
if (IsReadableStreamLocked(stream)) {
throw new TypeError('This stream has already been locked for exclusive reading by another reader');
}
+
ReadableStreamReaderGenericInitialize(this, stream);
this._readIntoRequests = [];
}
+
_createClass(ReadableStreamBYOBReader, [{
key: 'cancel',
value: function cancel(reason) {
if (!IsReadableStreamBYOBReader(this)) {
return Promise.reject(byobReaderBrandCheckException('cancel'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('cancel'));
}
+
return ReadableStreamReaderGenericCancel(this, reason);
}
}, {
@@ -6512,15 +7783,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (!IsReadableStreamBYOBReader(this)) {
return Promise.reject(byobReaderBrandCheckException('read'));
}
+
if (this._ownerReadableStream === undefined) {
return Promise.reject(readerLockException('read from'));
}
+
if (!ArrayBuffer.isView(view)) {
return Promise.reject(new TypeError('view must be an array buffer view'));
}
+
if (view.byteLength === 0) {
return Promise.reject(new TypeError('view must have non-zero byteLength'));
}
+
return ReadableStreamBYOBReaderRead(this, view);
}
}, {
@@ -6529,12 +7804,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (!IsReadableStreamBYOBReader(this)) {
throw byobReaderBrandCheckException('releaseLock');
}
+
if (this._ownerReadableStream === undefined) {
return;
}
+
if (this._readIntoRequests.length > 0) {
throw new TypeError('Tried to release a reader lock when that reader has pending read() calls un-settled');
}
+
ReadableStreamReaderGenericRelease(this);
}
}, {
@@ -6543,32 +7821,42 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (!IsReadableStreamBYOBReader(this)) {
return Promise.reject(byobReaderBrandCheckException('closed'));
}
+
return this._closedPromise;
}
}]);
+
return ReadableStreamBYOBReader;
}();
+
function IsReadableStreamBYOBReader(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_readIntoRequests')) {
return false;
}
+
return true;
}
+
function IsReadableStreamDefaultReader(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_readRequests')) {
return false;
}
+
return true;
}
+
function ReadableStreamReaderGenericInitialize(reader, stream) {
reader._ownerReadableStream = stream;
stream._reader = reader;
+
if (stream._state === 'readable') {
defaultReaderClosedPromiseInitialize(reader);
} else if (stream._state === 'closed') {
@@ -6576,57 +7864,74 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
} else {
assert(stream._state === 'errored', 'state must be errored');
defaultReaderClosedPromiseInitializeAsRejected(reader, stream._storedError);
+
reader._closedPromise.catch(function () {});
}
}
+
function ReadableStreamReaderGenericCancel(reader, reason) {
var stream = reader._ownerReadableStream;
assert(stream !== undefined);
return ReadableStreamCancel(stream, reason);
}
+
function ReadableStreamReaderGenericRelease(reader) {
assert(reader._ownerReadableStream !== undefined);
assert(reader._ownerReadableStream._reader === reader);
+
if (reader._ownerReadableStream._state === 'readable') {
defaultReaderClosedPromiseReject(reader, new TypeError('Reader was released and can no longer be used to monitor the stream\'s closedness'));
} else {
defaultReaderClosedPromiseResetToRejected(reader, new TypeError('Reader was released and can no longer be used to monitor the stream\'s closedness'));
}
+
reader._closedPromise.catch(function () {});
+
reader._ownerReadableStream._reader = undefined;
reader._ownerReadableStream = undefined;
}
+
function ReadableStreamBYOBReaderRead(reader, view) {
var stream = reader._ownerReadableStream;
assert(stream !== undefined);
stream._disturbed = true;
+
if (stream._state === 'errored') {
return Promise.reject(stream._storedError);
}
+
return ReadableByteStreamControllerPullInto(stream._readableStreamController, view);
}
+
function ReadableStreamDefaultReaderRead(reader) {
var stream = reader._ownerReadableStream;
assert(stream !== undefined);
stream._disturbed = true;
+
if (stream._state === 'closed') {
return Promise.resolve(CreateIterResultObject(undefined, true));
}
+
if (stream._state === 'errored') {
return Promise.reject(stream._storedError);
}
+
assert(stream._state === 'readable');
return stream._readableStreamController.__pullSteps();
}
+
var ReadableStreamDefaultController = function () {
function ReadableStreamDefaultController(stream, underlyingSource, size, highWaterMark) {
_classCallCheck(this, ReadableStreamDefaultController);
+
if (IsReadableStream(stream) === false) {
throw new TypeError('ReadableStreamDefaultController can only be constructed with a ReadableStream instance');
}
+
if (stream._readableStreamController !== undefined) {
throw new TypeError('ReadableStreamDefaultController instances can only be created by the ReadableStream constructor');
}
+
this._controlledReadableStream = stream;
this._underlyingSource = underlyingSource;
this._queue = undefined;
@@ -6650,19 +7955,24 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableStreamDefaultControllerErrorIfNeeded(controller, r);
}).catch(rethrowAssertionErrorRejection);
}
+
_createClass(ReadableStreamDefaultController, [{
key: 'close',
value: function close() {
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('close');
}
+
if (this._closeRequested === true) {
throw new TypeError('The stream has already been closed; do not close it again!');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be closed');
}
+
ReadableStreamDefaultControllerClose(this);
}
}, {
@@ -6671,13 +7981,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('enqueue');
}
+
if (this._closeRequested === true) {
throw new TypeError('stream is closed or draining');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be enqueued to');
}
+
return ReadableStreamDefaultControllerEnqueue(this, chunk);
}
}, {
@@ -6686,10 +8000,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('error');
}
+
var stream = this._controlledReadableStream;
+
if (stream._state !== 'readable') {
throw new TypeError('The stream is ' + stream._state + ' and so cannot be errored');
}
+
ReadableStreamDefaultControllerError(this, e);
}
}, {
@@ -6702,15 +8019,19 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
key: '__pullSteps',
value: function __pullSteps() {
var stream = this._controlledReadableStream;
+
if (this._queue.length > 0) {
var chunk = DequeueValue(this);
+
if (this._closeRequested === true && this._queue.length === 0) {
ReadableStreamClose(stream);
} else {
ReadableStreamDefaultControllerCallPullIfNeeded(this);
}
+
return Promise.resolve(CreateIterResultObject(chunk, false));
}
+
var pendingPromise = ReadableStreamAddReadRequest(stream);
ReadableStreamDefaultControllerCallPullIfNeeded(this);
return pendingPromise;
@@ -6721,83 +8042,108 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('desiredSize');
}
+
return ReadableStreamDefaultControllerGetDesiredSize(this);
}
}]);
+
return ReadableStreamDefaultController;
}();
+
function IsReadableStreamDefaultController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_underlyingSource')) {
return false;
}
+
return true;
}
+
function ReadableStreamDefaultControllerCallPullIfNeeded(controller) {
var shouldPull = ReadableStreamDefaultControllerShouldCallPull(controller);
+
if (shouldPull === false) {
return undefined;
}
+
if (controller._pulling === true) {
controller._pullAgain = true;
return undefined;
}
+
assert(controller._pullAgain === false);
controller._pulling = true;
var pullPromise = PromiseInvokeOrNoop(controller._underlyingSource, 'pull', [controller]);
pullPromise.then(function () {
controller._pulling = false;
+
if (controller._pullAgain === true) {
controller._pullAgain = false;
return ReadableStreamDefaultControllerCallPullIfNeeded(controller);
}
+
return undefined;
}, function (e) {
ReadableStreamDefaultControllerErrorIfNeeded(controller, e);
}).catch(rethrowAssertionErrorRejection);
return undefined;
}
+
function ReadableStreamDefaultControllerShouldCallPull(controller) {
var stream = controller._controlledReadableStream;
+
if (stream._state === 'closed' || stream._state === 'errored') {
return false;
}
+
if (controller._closeRequested === true) {
return false;
}
+
if (controller._started === false) {
return false;
}
+
if (IsReadableStreamLocked(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) {
return true;
}
+
var desiredSize = ReadableStreamDefaultControllerGetDesiredSize(controller);
+
if (desiredSize > 0) {
return true;
}
+
return false;
}
+
function ReadableStreamDefaultControllerClose(controller) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
assert(stream._state === 'readable');
controller._closeRequested = true;
+
if (controller._queue.length === 0) {
ReadableStreamClose(stream);
}
}
+
function ReadableStreamDefaultControllerEnqueue(controller, chunk) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
assert(stream._state === 'readable');
+
if (IsReadableStreamLocked(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) {
ReadableStreamFulfillReadRequest(stream, chunk, false);
} else {
var chunkSize = 1;
+
if (controller._strategySize !== undefined) {
var strategySize = controller._strategySize;
+
try {
chunkSize = strategySize(chunk);
} catch (chunkSizeE) {
@@ -6805,6 +8151,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
throw chunkSizeE;
}
}
+
try {
EnqueueValueWithSize(controller, chunk, chunkSize);
} catch (enqueueE) {
@@ -6812,46 +8159,58 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
throw enqueueE;
}
}
+
ReadableStreamDefaultControllerCallPullIfNeeded(controller);
return undefined;
}
+
function ReadableStreamDefaultControllerError(controller, e) {
var stream = controller._controlledReadableStream;
assert(stream._state === 'readable');
ResetQueue(controller);
ReadableStreamError(stream, e);
}
+
function ReadableStreamDefaultControllerErrorIfNeeded(controller, e) {
if (controller._controlledReadableStream._state === 'readable') {
ReadableStreamDefaultControllerError(controller, e);
}
}
+
function ReadableStreamDefaultControllerGetDesiredSize(controller) {
var stream = controller._controlledReadableStream;
var state = stream._state;
+
if (state === 'errored') {
return null;
}
+
if (state === 'closed') {
return 0;
}
+
return controller._strategyHWM - controller._queueTotalSize;
}
+
var ReadableStreamBYOBRequest = function () {
function ReadableStreamBYOBRequest(controller, view) {
_classCallCheck(this, ReadableStreamBYOBRequest);
+
this._associatedReadableByteStreamController = controller;
this._view = view;
}
+
_createClass(ReadableStreamBYOBRequest, [{
key: 'respond',
value: function respond(bytesWritten) {
if (IsReadableStreamBYOBRequest(this) === false) {
throw byobRequestBrandCheckException('respond');
}
+
if (this._associatedReadableByteStreamController === undefined) {
throw new TypeError('This BYOB request has been invalidated');
}
+
ReadableByteStreamControllerRespond(this._associatedReadableByteStreamController, bytesWritten);
}
}, {
@@ -6860,12 +8219,15 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableStreamBYOBRequest(this) === false) {
throw byobRequestBrandCheckException('respond');
}
+
if (this._associatedReadableByteStreamController === undefined) {
throw new TypeError('This BYOB request has been invalidated');
}
+
if (!ArrayBuffer.isView(view)) {
throw new TypeError('You can only respond with array buffer views');
}
+
ReadableByteStreamControllerRespondWithNewView(this._associatedReadableByteStreamController, view);
}
}, {
@@ -6874,17 +8236,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return this._view;
}
}]);
+
return ReadableStreamBYOBRequest;
}();
+
var ReadableByteStreamController = function () {
function ReadableByteStreamController(stream, underlyingByteSource, highWaterMark) {
_classCallCheck(this, ReadableByteStreamController);
+
if (IsReadableStream(stream) === false) {
throw new TypeError('ReadableByteStreamController can only be constructed with a ReadableStream instance given ' + 'a byte source');
}
+
if (stream._readableStreamController !== undefined) {
throw new TypeError('ReadableByteStreamController instances can only be created by the ReadableStream constructor given a byte ' + 'source');
}
+
this._controlledReadableStream = stream;
this._underlyingByteSource = underlyingByteSource;
this._pullAgain = false;
@@ -6896,11 +8263,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
this._started = false;
this._strategyHWM = ValidateAndNormalizeHighWaterMark(highWaterMark);
var autoAllocateChunkSize = underlyingByteSource.autoAllocateChunkSize;
+
if (autoAllocateChunkSize !== undefined) {
if (Number.isInteger(autoAllocateChunkSize) === false || autoAllocateChunkSize <= 0) {
throw new RangeError('autoAllocateChunkSize must be a positive integer');
}
}
+
this._autoAllocateChunkSize = autoAllocateChunkSize;
this._pendingPullIntos = [];
var controller = this;
@@ -6916,19 +8285,24 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
}).catch(rethrowAssertionErrorRejection);
}
+
_createClass(ReadableByteStreamController, [{
key: 'close',
value: function close() {
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('close');
}
+
if (this._closeRequested === true) {
throw new TypeError('The stream has already been closed; do not close it again!');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be closed');
}
+
ReadableByteStreamControllerClose(this);
}
}, {
@@ -6937,16 +8311,21 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('enqueue');
}
+
if (this._closeRequested === true) {
throw new TypeError('stream is closed or draining');
}
+
var state = this._controlledReadableStream._state;
+
if (state !== 'readable') {
throw new TypeError('The stream (in ' + state + ' state) is not in the readable state and cannot be enqueued to');
}
+
if (!ArrayBuffer.isView(chunk)) {
throw new TypeError('You can only enqueue array buffer views when using a ReadableByteStreamController');
}
+
ReadableByteStreamControllerEnqueue(this, chunk);
}
}, {
@@ -6955,10 +8334,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('error');
}
+
var stream = this._controlledReadableStream;
+
if (stream._state !== 'readable') {
throw new TypeError('The stream is ' + stream._state + ' and so cannot be errored');
}
+
ReadableByteStreamControllerError(this, e);
}
}, {
@@ -6968,6 +8350,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var firstDescriptor = this._pendingPullIntos[0];
firstDescriptor.bytesFilled = 0;
}
+
ResetQueue(this);
return PromiseInvokeOrNoop(this._underlyingByteSource, 'cancel', [reason]);
}
@@ -6976,27 +8359,36 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
value: function __pullSteps() {
var stream = this._controlledReadableStream;
assert(ReadableStreamHasDefaultReader(stream) === true);
+
if (this._queueTotalSize > 0) {
assert(ReadableStreamGetNumReadRequests(stream) === 0);
+
var entry = this._queue.shift();
+
this._queueTotalSize -= entry.byteLength;
ReadableByteStreamControllerHandleQueueDrain(this);
var view = void 0;
+
try {
view = new Uint8Array(entry.buffer, entry.byteOffset, entry.byteLength);
} catch (viewE) {
return Promise.reject(viewE);
}
+
return Promise.resolve(CreateIterResultObject(view, false));
}
+
var autoAllocateChunkSize = this._autoAllocateChunkSize;
+
if (autoAllocateChunkSize !== undefined) {
var buffer = void 0;
+
try {
buffer = new ArrayBuffer(autoAllocateChunkSize);
} catch (bufferE) {
return Promise.reject(bufferE);
}
+
var pullIntoDescriptor = {
buffer: buffer,
byteOffset: 0,
@@ -7006,8 +8398,10 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ctor: Uint8Array,
readerType: 'default'
};
+
this._pendingPullIntos.push(pullIntoDescriptor);
}
+
var promise = ReadableStreamAddReadRequest(stream);
ReadableByteStreamControllerCallPullIfNeeded(this);
return promise;
@@ -7018,11 +8412,13 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('byobRequest');
}
+
if (this._byobRequest === undefined && this._pendingPullIntos.length > 0) {
var firstDescriptor = this._pendingPullIntos[0];
var view = new Uint8Array(firstDescriptor.buffer, firstDescriptor.byteOffset + firstDescriptor.bytesFilled, firstDescriptor.byteLength - firstDescriptor.bytesFilled);
this._byobRequest = new ReadableStreamBYOBRequest(this, view);
}
+
return this._byobRequest;
}
}, {
@@ -7031,43 +8427,56 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsReadableByteStreamController(this) === false) {
throw byteStreamControllerBrandCheckException('desiredSize');
}
+
return ReadableByteStreamControllerGetDesiredSize(this);
}
}]);
+
return ReadableByteStreamController;
}();
+
function IsReadableByteStreamController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_underlyingByteSource')) {
return false;
}
+
return true;
}
+
function IsReadableStreamBYOBRequest(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_associatedReadableByteStreamController')) {
return false;
}
+
return true;
}
+
function ReadableByteStreamControllerCallPullIfNeeded(controller) {
var shouldPull = ReadableByteStreamControllerShouldCallPull(controller);
+
if (shouldPull === false) {
return undefined;
}
+
if (controller._pulling === true) {
controller._pullAgain = true;
return undefined;
}
+
assert(controller._pullAgain === false);
controller._pulling = true;
var pullPromise = PromiseInvokeOrNoop(controller._underlyingByteSource, 'pull', [controller]);
pullPromise.then(function () {
controller._pulling = false;
+
if (controller._pullAgain === true) {
controller._pullAgain = false;
ReadableByteStreamControllerCallPullIfNeeded(controller);
@@ -7079,18 +8488,23 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}).catch(rethrowAssertionErrorRejection);
return undefined;
}
+
function ReadableByteStreamControllerClearPendingPullIntos(controller) {
ReadableByteStreamControllerInvalidateBYOBRequest(controller);
controller._pendingPullIntos = [];
}
+
function ReadableByteStreamControllerCommitPullIntoDescriptor(stream, pullIntoDescriptor) {
assert(stream._state !== 'errored', 'state must not be errored');
var done = false;
+
if (stream._state === 'closed') {
assert(pullIntoDescriptor.bytesFilled === 0);
done = true;
}
+
var filledView = ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
+
if (pullIntoDescriptor.readerType === 'default') {
ReadableStreamFulfillReadRequest(stream, filledView, done);
} else {
@@ -7098,6 +8512,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableStreamFulfillReadIntoRequest(stream, filledView, done);
}
}
+
function ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor) {
var bytesFilled = pullIntoDescriptor.bytesFilled;
var elementSize = pullIntoDescriptor.elementSize;
@@ -7105,14 +8520,17 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
assert(bytesFilled % elementSize === 0);
return new pullIntoDescriptor.ctor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, bytesFilled / elementSize);
}
+
function ReadableByteStreamControllerEnqueueChunkToQueue(controller, buffer, byteOffset, byteLength) {
controller._queue.push({
buffer: buffer,
byteOffset: byteOffset,
byteLength: byteLength
});
+
controller._queueTotalSize += byteLength;
}
+
function ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) {
var elementSize = pullIntoDescriptor.elementSize;
var currentAlignedBytes = pullIntoDescriptor.bytesFilled - pullIntoDescriptor.bytesFilled % elementSize;
@@ -7121,73 +8539,92 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var maxAlignedBytes = maxBytesFilled - maxBytesFilled % elementSize;
var totalBytesToCopyRemaining = maxBytesToCopy;
var ready = false;
+
if (maxAlignedBytes > currentAlignedBytes) {
totalBytesToCopyRemaining = maxAlignedBytes - pullIntoDescriptor.bytesFilled;
ready = true;
}
+
var queue = controller._queue;
+
while (totalBytesToCopyRemaining > 0) {
var headOfQueue = queue[0];
var bytesToCopy = Math.min(totalBytesToCopyRemaining, headOfQueue.byteLength);
var destStart = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
ArrayBufferCopy(pullIntoDescriptor.buffer, destStart, headOfQueue.buffer, headOfQueue.byteOffset, bytesToCopy);
+
if (headOfQueue.byteLength === bytesToCopy) {
queue.shift();
} else {
headOfQueue.byteOffset += bytesToCopy;
headOfQueue.byteLength -= bytesToCopy;
}
+
controller._queueTotalSize -= bytesToCopy;
ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, bytesToCopy, pullIntoDescriptor);
totalBytesToCopyRemaining -= bytesToCopy;
}
+
if (ready === false) {
assert(controller._queueTotalSize === 0, 'queue must be empty');
assert(pullIntoDescriptor.bytesFilled > 0);
assert(pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize);
}
+
return ready;
}
+
function ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, size, pullIntoDescriptor) {
assert(controller._pendingPullIntos.length === 0 || controller._pendingPullIntos[0] === pullIntoDescriptor);
ReadableByteStreamControllerInvalidateBYOBRequest(controller);
pullIntoDescriptor.bytesFilled += size;
}
+
function ReadableByteStreamControllerHandleQueueDrain(controller) {
assert(controller._controlledReadableStream._state === 'readable');
+
if (controller._queueTotalSize === 0 && controller._closeRequested === true) {
ReadableStreamClose(controller._controlledReadableStream);
} else {
ReadableByteStreamControllerCallPullIfNeeded(controller);
}
}
+
function ReadableByteStreamControllerInvalidateBYOBRequest(controller) {
if (controller._byobRequest === undefined) {
return;
}
+
controller._byobRequest._associatedReadableByteStreamController = undefined;
controller._byobRequest._view = undefined;
controller._byobRequest = undefined;
}
+
function ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller) {
assert(controller._closeRequested === false);
+
while (controller._pendingPullIntos.length > 0) {
if (controller._queueTotalSize === 0) {
return;
}
+
var pullIntoDescriptor = controller._pendingPullIntos[0];
+
if (ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) === true) {
ReadableByteStreamControllerShiftPendingPullInto(controller);
ReadableByteStreamControllerCommitPullIntoDescriptor(controller._controlledReadableStream, pullIntoDescriptor);
}
}
}
+
function ReadableByteStreamControllerPullInto(controller, view) {
var stream = controller._controlledReadableStream;
var elementSize = 1;
+
if (view.constructor !== DataView) {
elementSize = view.constructor.BYTES_PER_ELEMENT;
}
+
var ctor = view.constructor;
var pullIntoDescriptor = {
buffer: view.buffer,
@@ -7198,37 +8635,48 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ctor: ctor,
readerType: 'byob'
};
+
if (controller._pendingPullIntos.length > 0) {
pullIntoDescriptor.buffer = TransferArrayBuffer(pullIntoDescriptor.buffer);
+
controller._pendingPullIntos.push(pullIntoDescriptor);
+
return ReadableStreamAddReadIntoRequest(stream);
}
+
if (stream._state === 'closed') {
var emptyView = new view.constructor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, 0);
return Promise.resolve(CreateIterResultObject(emptyView, true));
}
+
if (controller._queueTotalSize > 0) {
if (ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) === true) {
var filledView = ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
ReadableByteStreamControllerHandleQueueDrain(controller);
return Promise.resolve(CreateIterResultObject(filledView, false));
}
+
if (controller._closeRequested === true) {
var e = new TypeError('Insufficient bytes to fill elements in the given buffer');
ReadableByteStreamControllerError(controller, e);
return Promise.reject(e);
}
}
+
pullIntoDescriptor.buffer = TransferArrayBuffer(pullIntoDescriptor.buffer);
+
controller._pendingPullIntos.push(pullIntoDescriptor);
+
var promise = ReadableStreamAddReadIntoRequest(stream);
ReadableByteStreamControllerCallPullIfNeeded(controller);
return promise;
}
+
function ReadableByteStreamControllerRespondInClosedState(controller, firstDescriptor) {
firstDescriptor.buffer = TransferArrayBuffer(firstDescriptor.buffer);
assert(firstDescriptor.bytesFilled === 0, 'bytesFilled must be 0');
var stream = controller._controlledReadableStream;
+
if (ReadableStreamHasBYOBReader(stream) === true) {
while (ReadableStreamGetNumReadIntoRequests(stream) > 0) {
var pullIntoDescriptor = ReadableByteStreamControllerShiftPendingPullInto(controller);
@@ -7236,84 +8684,109 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
}
}
+
function ReadableByteStreamControllerRespondInReadableState(controller, bytesWritten, pullIntoDescriptor) {
if (pullIntoDescriptor.bytesFilled + bytesWritten > pullIntoDescriptor.byteLength) {
throw new RangeError('bytesWritten out of range');
}
+
ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, bytesWritten, pullIntoDescriptor);
+
if (pullIntoDescriptor.bytesFilled < pullIntoDescriptor.elementSize) {
return;
}
+
ReadableByteStreamControllerShiftPendingPullInto(controller);
var remainderSize = pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize;
+
if (remainderSize > 0) {
var end = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
var remainder = pullIntoDescriptor.buffer.slice(end - remainderSize, end);
ReadableByteStreamControllerEnqueueChunkToQueue(controller, remainder, 0, remainder.byteLength);
}
+
pullIntoDescriptor.buffer = TransferArrayBuffer(pullIntoDescriptor.buffer);
pullIntoDescriptor.bytesFilled -= remainderSize;
ReadableByteStreamControllerCommitPullIntoDescriptor(controller._controlledReadableStream, pullIntoDescriptor);
ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller);
}
+
function ReadableByteStreamControllerRespondInternal(controller, bytesWritten) {
var firstDescriptor = controller._pendingPullIntos[0];
var stream = controller._controlledReadableStream;
+
if (stream._state === 'closed') {
if (bytesWritten !== 0) {
throw new TypeError('bytesWritten must be 0 when calling respond() on a closed stream');
}
+
ReadableByteStreamControllerRespondInClosedState(controller, firstDescriptor);
} else {
assert(stream._state === 'readable');
ReadableByteStreamControllerRespondInReadableState(controller, bytesWritten, firstDescriptor);
}
}
+
function ReadableByteStreamControllerShiftPendingPullInto(controller) {
var descriptor = controller._pendingPullIntos.shift();
+
ReadableByteStreamControllerInvalidateBYOBRequest(controller);
return descriptor;
}
+
function ReadableByteStreamControllerShouldCallPull(controller) {
var stream = controller._controlledReadableStream;
+
if (stream._state !== 'readable') {
return false;
}
+
if (controller._closeRequested === true) {
return false;
}
+
if (controller._started === false) {
return false;
}
+
if (ReadableStreamHasDefaultReader(stream) === true && ReadableStreamGetNumReadRequests(stream) > 0) {
return true;
}
+
if (ReadableStreamHasBYOBReader(stream) === true && ReadableStreamGetNumReadIntoRequests(stream) > 0) {
return true;
}
+
if (ReadableByteStreamControllerGetDesiredSize(controller) > 0) {
return true;
}
+
return false;
}
+
function ReadableByteStreamControllerClose(controller) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
assert(stream._state === 'readable');
+
if (controller._queueTotalSize > 0) {
controller._closeRequested = true;
return;
}
+
if (controller._pendingPullIntos.length > 0) {
var firstPendingPullInto = controller._pendingPullIntos[0];
+
if (firstPendingPullInto.bytesFilled > 0) {
var e = new TypeError('Insufficient bytes to fill elements in the given buffer');
ReadableByteStreamControllerError(controller, e);
throw e;
}
}
+
ReadableStreamClose(stream);
}
+
function ReadableByteStreamControllerEnqueue(controller, chunk) {
var stream = controller._controlledReadableStream;
assert(controller._closeRequested === false);
@@ -7322,6 +8795,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
var byteOffset = chunk.byteOffset;
var byteLength = chunk.byteLength;
var transferredBuffer = TransferArrayBuffer(buffer);
+
if (ReadableStreamHasDefaultReader(stream) === true) {
if (ReadableStreamGetNumReadRequests(stream) === 0) {
ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
@@ -7338,6 +8812,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
}
}
+
function ReadableByteStreamControllerError(controller, e) {
var stream = controller._controlledReadableStream;
assert(stream._state === 'readable');
@@ -7345,93 +8820,122 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
ResetQueue(controller);
ReadableStreamError(stream, e);
}
+
function ReadableByteStreamControllerGetDesiredSize(controller) {
var stream = controller._controlledReadableStream;
var state = stream._state;
+
if (state === 'errored') {
return null;
}
+
if (state === 'closed') {
return 0;
}
+
return controller._strategyHWM - controller._queueTotalSize;
}
+
function ReadableByteStreamControllerRespond(controller, bytesWritten) {
bytesWritten = Number(bytesWritten);
+
if (IsFiniteNonNegativeNumber(bytesWritten) === false) {
throw new RangeError('bytesWritten must be a finite');
}
+
assert(controller._pendingPullIntos.length > 0);
ReadableByteStreamControllerRespondInternal(controller, bytesWritten);
}
+
function ReadableByteStreamControllerRespondWithNewView(controller, view) {
assert(controller._pendingPullIntos.length > 0);
var firstDescriptor = controller._pendingPullIntos[0];
+
if (firstDescriptor.byteOffset + firstDescriptor.bytesFilled !== view.byteOffset) {
throw new RangeError('The region specified by view does not match byobRequest');
}
+
if (firstDescriptor.byteLength !== view.byteLength) {
throw new RangeError('The buffer of view has different capacity than byobRequest');
}
+
firstDescriptor.buffer = view.buffer;
ReadableByteStreamControllerRespondInternal(controller, view.byteLength);
}
+
function streamBrandCheckException(name) {
return new TypeError('ReadableStream.prototype.' + name + ' can only be used on a ReadableStream');
}
+
function readerLockException(name) {
return new TypeError('Cannot ' + name + ' a stream using a released reader');
}
+
function defaultReaderBrandCheckException(name) {
return new TypeError('ReadableStreamDefaultReader.prototype.' + name + ' can only be used on a ReadableStreamDefaultReader');
}
+
function defaultReaderClosedPromiseInitialize(reader) {
reader._closedPromise = new Promise(function (resolve, reject) {
reader._closedPromise_resolve = resolve;
reader._closedPromise_reject = reject;
});
}
+
function defaultReaderClosedPromiseInitializeAsRejected(reader, reason) {
reader._closedPromise = Promise.reject(reason);
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function defaultReaderClosedPromiseInitializeAsResolved(reader) {
reader._closedPromise = Promise.resolve(undefined);
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function defaultReaderClosedPromiseReject(reader, reason) {
assert(reader._closedPromise_resolve !== undefined);
assert(reader._closedPromise_reject !== undefined);
+
reader._closedPromise_reject(reason);
+
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function defaultReaderClosedPromiseResetToRejected(reader, reason) {
assert(reader._closedPromise_resolve === undefined);
assert(reader._closedPromise_reject === undefined);
reader._closedPromise = Promise.reject(reason);
}
+
function defaultReaderClosedPromiseResolve(reader) {
assert(reader._closedPromise_resolve !== undefined);
assert(reader._closedPromise_reject !== undefined);
+
reader._closedPromise_resolve(undefined);
+
reader._closedPromise_resolve = undefined;
reader._closedPromise_reject = undefined;
}
+
function byobReaderBrandCheckException(name) {
return new TypeError('ReadableStreamBYOBReader.prototype.' + name + ' can only be used on a ReadableStreamBYOBReader');
}
+
function defaultControllerBrandCheckException(name) {
return new TypeError('ReadableStreamDefaultController.prototype.' + name + ' can only be used on a ReadableStreamDefaultController');
}
+
function byobRequestBrandCheckException(name) {
return new TypeError('ReadableStreamBYOBRequest.prototype.' + name + ' can only be used on a ReadableStreamBYOBRequest');
}
+
function byteStreamControllerBrandCheckException(name) {
return new TypeError('ReadableByteStreamController.prototype.' + name + ' can only be used on a ReadableByteStreamController');
}
+
function ifIsObjectAndHasAPromiseIsHandledInternalSlotSetPromiseIsHandledToTrue(promise) {
try {
Promise.prototype.then.call(promise, undefined, function () {});
@@ -7441,8 +8945,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
"use strict";
var transformStream = __w_pdfjs_require__(6);
+
var readableStream = __w_pdfjs_require__(4);
+
var writableStream = __w_pdfjs_require__(2);
+
exports.TransformStream = transformStream.TransformStream;
exports.ReadableStream = readableStream.ReadableStream;
exports.IsReadableStreamDisturbed = readableStream.IsReadableStreamDisturbed;
@@ -7472,50 +8979,63 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
Object.defineProperty(target, descriptor.key, descriptor);
}
}
+
return function (Constructor, protoProps, staticProps) {
if (protoProps) defineProperties(Constructor.prototype, protoProps);
if (staticProps) defineProperties(Constructor, staticProps);
return Constructor;
};
}();
+
function _classCallCheck(instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
}
}
+
var _require = __w_pdfjs_require__(1),
assert = _require.assert;
+
var _require2 = __w_pdfjs_require__(0),
InvokeOrNoop = _require2.InvokeOrNoop,
PromiseInvokeOrPerformFallback = _require2.PromiseInvokeOrPerformFallback,
PromiseInvokeOrNoop = _require2.PromiseInvokeOrNoop,
typeIsObject = _require2.typeIsObject;
+
var _require3 = __w_pdfjs_require__(4),
ReadableStream = _require3.ReadableStream,
ReadableStreamDefaultControllerClose = _require3.ReadableStreamDefaultControllerClose,
ReadableStreamDefaultControllerEnqueue = _require3.ReadableStreamDefaultControllerEnqueue,
ReadableStreamDefaultControllerError = _require3.ReadableStreamDefaultControllerError,
ReadableStreamDefaultControllerGetDesiredSize = _require3.ReadableStreamDefaultControllerGetDesiredSize;
+
var _require4 = __w_pdfjs_require__(2),
WritableStream = _require4.WritableStream,
WritableStreamDefaultControllerError = _require4.WritableStreamDefaultControllerError;
+
function TransformStreamCloseReadable(transformStream) {
if (transformStream._errored === true) {
throw new TypeError('TransformStream is already errored');
}
+
if (transformStream._readableClosed === true) {
throw new TypeError('Readable side is already closed');
}
+
TransformStreamCloseReadableInternal(transformStream);
}
+
function TransformStreamEnqueueToReadable(transformStream, chunk) {
if (transformStream._errored === true) {
throw new TypeError('TransformStream is already errored');
}
+
if (transformStream._readableClosed === true) {
throw new TypeError('Readable side is already closed');
}
+
var controller = transformStream._readableController;
+
try {
ReadableStreamDefaultControllerEnqueue(controller, chunk);
} catch (e) {
@@ -7523,70 +9043,91 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
TransformStreamErrorIfNeeded(transformStream, e);
throw transformStream._storedError;
}
+
var desiredSize = ReadableStreamDefaultControllerGetDesiredSize(controller);
var maybeBackpressure = desiredSize <= 0;
+
if (maybeBackpressure === true && transformStream._backpressure === false) {
TransformStreamSetBackpressure(transformStream, true);
}
}
+
function TransformStreamError(transformStream, e) {
if (transformStream._errored === true) {
throw new TypeError('TransformStream is already errored');
}
+
TransformStreamErrorInternal(transformStream, e);
}
+
function TransformStreamCloseReadableInternal(transformStream) {
assert(transformStream._errored === false);
assert(transformStream._readableClosed === false);
+
try {
ReadableStreamDefaultControllerClose(transformStream._readableController);
} catch (e) {
assert(false);
}
+
transformStream._readableClosed = true;
}
+
function TransformStreamErrorIfNeeded(transformStream, e) {
if (transformStream._errored === false) {
TransformStreamErrorInternal(transformStream, e);
}
}
+
function TransformStreamErrorInternal(transformStream, e) {
assert(transformStream._errored === false);
transformStream._errored = true;
transformStream._storedError = e;
+
if (transformStream._writableDone === false) {
WritableStreamDefaultControllerError(transformStream._writableController, e);
}
+
if (transformStream._readableClosed === false) {
ReadableStreamDefaultControllerError(transformStream._readableController, e);
}
}
+
function TransformStreamReadableReadyPromise(transformStream) {
assert(transformStream._backpressureChangePromise !== undefined, '_backpressureChangePromise should have been initialized');
+
if (transformStream._backpressure === false) {
return Promise.resolve();
}
+
assert(transformStream._backpressure === true, '_backpressure should have been initialized');
return transformStream._backpressureChangePromise;
}
+
function TransformStreamSetBackpressure(transformStream, backpressure) {
assert(transformStream._backpressure !== backpressure, 'TransformStreamSetBackpressure() should be called only when backpressure is changed');
+
if (transformStream._backpressureChangePromise !== undefined) {
transformStream._backpressureChangePromise_resolve(backpressure);
}
+
transformStream._backpressureChangePromise = new Promise(function (resolve) {
transformStream._backpressureChangePromise_resolve = resolve;
});
+
transformStream._backpressureChangePromise.then(function (resolution) {
assert(resolution !== backpressure, '_backpressureChangePromise should be fulfilled only when backpressure is changed');
});
+
transformStream._backpressure = backpressure;
}
+
function TransformStreamDefaultTransform(chunk, transformStreamController) {
var transformStream = transformStreamController._controlledTransformStream;
TransformStreamEnqueueToReadable(transformStream, chunk);
return Promise.resolve();
}
+
function TransformStreamTransform(transformStream, chunk) {
assert(transformStream._errored === false);
assert(transformStream._transforming === false);
@@ -7603,30 +9144,39 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
return Promise.reject(e);
});
}
+
function IsTransformStreamDefaultController(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_controlledTransformStream')) {
return false;
}
+
return true;
}
+
function IsTransformStream(x) {
if (!typeIsObject(x)) {
return false;
}
+
if (!Object.prototype.hasOwnProperty.call(x, '_transformStreamController')) {
return false;
}
+
return true;
}
+
var TransformStreamSink = function () {
function TransformStreamSink(transformStream, startPromise) {
_classCallCheck(this, TransformStreamSink);
+
this._transformStream = transformStream;
this._startPromise = startPromise;
}
+
_createClass(TransformStreamSink, [{
key: 'start',
value: function start(c) {
@@ -7660,9 +9210,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (transformStream._errored === true) {
return Promise.reject(transformStream._storedError);
}
+
if (transformStream._readableClosed === false) {
TransformStreamCloseReadableInternal(transformStream);
}
+
return Promise.resolve();
}).catch(function (r) {
TransformStreamErrorIfNeeded(transformStream, r);
@@ -7670,14 +9222,18 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
});
}
}]);
+
return TransformStreamSink;
}();
+
var TransformStreamSource = function () {
function TransformStreamSource(transformStream, startPromise) {
_classCallCheck(this, TransformStreamSource);
+
this._transformStream = transformStream;
this._startPromise = startPromise;
}
+
_createClass(TransformStreamSource, [{
key: 'start',
value: function start(c) {
@@ -7685,9 +9241,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
transformStream._readableController = c;
return this._startPromise.then(function () {
assert(transformStream._backpressureChangePromise !== undefined, '_backpressureChangePromise should have been initialized');
+
if (transformStream._backpressure === true) {
return Promise.resolve();
}
+
assert(transformStream._backpressure === false, '_backpressure should have been initialized');
return transformStream._backpressureChangePromise;
});
@@ -7709,25 +9267,32 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
TransformStreamErrorInternal(transformStream, new TypeError('Readable side canceled'));
}
}]);
+
return TransformStreamSource;
}();
+
var TransformStreamDefaultController = function () {
function TransformStreamDefaultController(transformStream) {
_classCallCheck(this, TransformStreamDefaultController);
+
if (IsTransformStream(transformStream) === false) {
throw new TypeError('TransformStreamDefaultController can only be ' + 'constructed with a TransformStream instance');
}
+
if (transformStream._transformStreamController !== undefined) {
throw new TypeError('TransformStreamDefaultController instances can ' + 'only be created by the TransformStream constructor');
}
+
this._controlledTransformStream = transformStream;
}
+
_createClass(TransformStreamDefaultController, [{
key: 'enqueue',
value: function enqueue(chunk) {
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('enqueue');
}
+
TransformStreamEnqueueToReadable(this._controlledTransformStream, chunk);
}
}, {
@@ -7736,6 +9301,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('close');
}
+
TransformStreamCloseReadable(this._controlledTransformStream);
}
}, {
@@ -7744,6 +9310,7 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('error');
}
+
TransformStreamError(this._controlledTransformStream, reason);
}
}, {
@@ -7752,17 +9319,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStreamDefaultController(this) === false) {
throw defaultControllerBrandCheckException('desiredSize');
}
+
var transformStream = this._controlledTransformStream;
var readableController = transformStream._readableController;
return ReadableStreamDefaultControllerGetDesiredSize(readableController);
}
}]);
+
return TransformStreamDefaultController;
}();
+
var TransformStream = function () {
function TransformStream() {
var transformer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
_classCallCheck(this, TransformStream);
+
this._transformer = transformer;
var readableStrategy = transformer.readableStrategy,
writableStrategy = transformer.writableStrategy;
@@ -7800,12 +9372,14 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
}
});
}
+
_createClass(TransformStream, [{
key: 'readable',
get: function get() {
if (IsTransformStream(this) === false) {
throw streamBrandCheckException('readable');
}
+
return this._readable;
}
}, {
@@ -7814,15 +9388,22 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
if (IsTransformStream(this) === false) {
throw streamBrandCheckException('writable');
}
+
return this._writable;
}
}]);
+
return TransformStream;
}();
- module.exports = { TransformStream: TransformStream };
+
+ module.exports = {
+ TransformStream: TransformStream
+ };
+
function defaultControllerBrandCheckException(name) {
return new TypeError('TransformStreamDefaultController.prototype.' + name + ' can only be used on a TransformStreamDefaultController');
}
+
function streamBrandCheckException(name) {
return new TypeError('TransformStream.prototype.' + name + ' can only be used on a TransformStream');
}
@@ -7837,10 +9418,11 @@ var _typeof2 = typeof Symbol === "function" && typeof Symbol.iterator === "symbo
"use strict";
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
{
var isURLSupported = false;
+
try {
if (typeof URL === 'function' && _typeof(URL.prototype) === 'object' && 'origin' in URL.prototype) {
var u = new URL('b', 'http://a');
@@ -7848,19 +9430,24 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
isURLSupported = u.href === 'http://a/c%20d';
}
} catch (ex) {}
+
if (isURLSupported) {
exports.URL = URL;
} else {
var PolyfillURL = __w_pdfjs_require__(133).URL;
+
var OriginalURL = __w_pdfjs_require__(4).URL;
+
if (OriginalURL) {
PolyfillURL.createObjectURL = function (blob) {
return OriginalURL.createObjectURL.apply(OriginalURL, arguments);
};
+
PolyfillURL.revokeObjectURL = function (url) {
OriginalURL.revokeObjectURL(url);
};
}
+
exports.URL = PolyfillURL;
}
}
@@ -7888,48 +9475,63 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
relativePathDotMapping['.%2e'] = '..';
relativePathDotMapping['%2e.'] = '..';
relativePathDotMapping['%2e%2e'] = '..';
+
function isRelativeScheme(scheme) {
return relative[scheme] !== undefined;
}
+
function invalid() {
clear.call(this);
this._isInvalid = true;
}
+
function IDNAToASCII(h) {
if (h === '') {
invalid.call(this);
}
+
return h.toLowerCase();
}
+
function percentEscape(c) {
var unicode = c.charCodeAt(0);
+
if (unicode > 0x20 && unicode < 0x7F && [0x22, 0x23, 0x3C, 0x3E, 0x3F, 0x60].indexOf(unicode) === -1) {
return c;
}
+
return encodeURIComponent(c);
}
+
function percentEscapeQuery(c) {
var unicode = c.charCodeAt(0);
+
if (unicode > 0x20 && unicode < 0x7F && [0x22, 0x23, 0x3C, 0x3E, 0x60].indexOf(unicode) === -1) {
return c;
}
+
return encodeURIComponent(c);
}
+
var EOF,
ALPHA = /[a-zA-Z]/,
ALPHANUMERIC = /[a-zA-Z0-9\+\-\.]/;
+
function parse(input, stateOverride, base) {
function err(message) {
errors.push(message);
}
+
var state = stateOverride || 'scheme start',
cursor = 0,
buffer = '',
seenAt = false,
seenBracket = false,
errors = [];
+
loop: while ((input[cursor - 1] !== EOF || cursor === 0) && !this._isInvalid) {
var c = input[cursor];
+
switch (state) {
case 'scheme start':
if (c && ALPHA.test(c)) {
@@ -7943,19 +9545,24 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
err('Invalid scheme.');
break loop;
}
+
break;
+
case 'scheme':
if (c && ALPHANUMERIC.test(c)) {
buffer += c.toLowerCase();
} else if (c === ':') {
this._scheme = buffer;
buffer = '';
+
if (stateOverride) {
break loop;
}
+
if (isRelativeScheme(this._scheme)) {
this._isRelative = true;
}
+
if (this._scheme === 'file') {
state = 'relative';
} else if (this._isRelative && base && base._scheme === this._scheme) {
@@ -7976,7 +9583,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
err('Code point not allowed in scheme: ' + c);
break loop;
}
+
break;
+
case 'scheme data':
if (c === '?') {
this._query = '?';
@@ -7989,7 +9598,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._schemeData += percentEscape(c);
}
}
+
break;
+
case 'no scheme':
if (!base || !isRelativeScheme(base._scheme)) {
err('Missing scheme.');
@@ -7998,7 +9609,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = 'relative';
continue;
}
+
break;
+
case 'relative or authority':
if (c === '/' && input[cursor + 1] === '/') {
state = 'authority ignore slashes';
@@ -8007,12 +9620,16 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = 'relative';
continue;
}
+
break;
+
case 'relative':
this._isRelative = true;
+
if (this._scheme !== 'file') {
this._scheme = base._scheme;
}
+
if (c === EOF) {
this._host = base._host;
this._port = base._port;
@@ -8025,6 +9642,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (c === '\\') {
err('\\ is an invalid code point.');
}
+
state = 'relative slash';
} else if (c === '?') {
this._host = base._host;
@@ -8046,23 +9664,29 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
var nextC = input[cursor + 1];
var nextNextC = input[cursor + 2];
+
if (this._scheme !== 'file' || !ALPHA.test(c) || nextC !== ':' && nextC !== '|' || nextNextC !== EOF && nextNextC !== '/' && nextNextC !== '\\' && nextNextC !== '?' && nextNextC !== '#') {
this._host = base._host;
this._port = base._port;
this._username = base._username;
this._password = base._password;
this._path = base._path.slice();
+
this._path.pop();
}
+
state = 'relative path';
continue;
}
+
break;
+
case 'relative slash':
if (c === '/' || c === '\\') {
if (c === '\\') {
err('\\ is an invalid code point.');
}
+
if (this._scheme === 'file') {
state = 'file host';
} else {
@@ -8075,10 +9699,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._username = base._username;
this._password = base._password;
}
+
state = 'relative path';
continue;
}
+
break;
+
case 'authority first slash':
if (c === '/') {
state = 'authority second slash';
@@ -8087,14 +9714,19 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = 'authority ignore slashes';
continue;
}
+
break;
+
case 'authority second slash':
state = 'authority ignore slashes';
+
if (c !== '/') {
err('Expected \'/\', got: ' + c);
continue;
}
+
break;
+
case 'authority ignore slashes':
if (c !== '/' && c !== '\\') {
state = 'authority';
@@ -8102,31 +9734,40 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
err('Expected authority, got: ' + c);
}
+
break;
+
case 'authority':
if (c === '@') {
if (seenAt) {
err('@ already seen.');
buffer += '%40';
}
+
seenAt = true;
+
for (var i = 0; i < buffer.length; i++) {
var cp = buffer[i];
+
if (cp === '\t' || cp === '\n' || cp === '\r') {
err('Invalid whitespace in authority.');
continue;
}
+
if (cp === ':' && this._password === null) {
this._password = '';
continue;
}
+
var tempC = percentEscape(cp);
+
if (this._password !== null) {
this._password += tempC;
} else {
this._username += tempC;
}
}
+
buffer = '';
} else if (c === EOF || c === '/' || c === '\\' || c === '?' || c === '#') {
cursor -= buffer.length;
@@ -8136,7 +9777,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
buffer += c;
}
+
break;
+
case 'file host':
if (c === EOF || c === '/' || c === '\\' || c === '?' || c === '#') {
if (buffer.length === 2 && ALPHA.test(buffer[0]) && (buffer[1] === ':' || buffer[1] === '|')) {
@@ -8148,19 +9791,23 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
buffer = '';
state = 'relative path start';
}
+
continue;
} else if (c === '\t' || c === '\n' || c === '\r') {
err('Invalid whitespace in file host.');
} else {
buffer += c;
}
+
break;
+
case 'host':
case 'hostname':
if (c === ':' && !seenBracket) {
this._host = IDNAToASCII.call(this, buffer);
buffer = '';
state = 'port';
+
if (stateOverride === 'hostname') {
break loop;
}
@@ -8168,9 +9815,11 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._host = IDNAToASCII.call(this, buffer);
buffer = '';
state = 'relative path start';
+
if (stateOverride) {
break loop;
}
+
continue;
} else if (c !== '\t' && c !== '\n' && c !== '\r') {
if (c === '[') {
@@ -8178,25 +9827,32 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (c === ']') {
seenBracket = false;
}
+
buffer += c;
} else {
err('Invalid code point in host/hostname: ' + c);
}
+
break;
+
case 'port':
if (/[0-9]/.test(c)) {
buffer += c;
} else if (c === EOF || c === '/' || c === '\\' || c === '?' || c === '#' || stateOverride) {
if (buffer !== '') {
var temp = parseInt(buffer, 10);
+
if (temp !== relative[this._scheme]) {
this._port = temp + '';
}
+
buffer = '';
}
+
if (stateOverride) {
break loop;
}
+
state = 'relative path start';
continue;
} else if (c === '\t' || c === '\n' || c === '\r') {
@@ -8204,27 +9860,37 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
invalid.call(this);
}
+
break;
+
case 'relative path start':
if (c === '\\') {
err('\'\\\' not allowed in path.');
}
+
state = 'relative path';
+
if (c !== '/' && c !== '\\') {
continue;
}
+
break;
+
case 'relative path':
if (c === EOF || c === '/' || c === '\\' || !stateOverride && (c === '?' || c === '#')) {
if (c === '\\') {
err('\\ not allowed in relative path.');
}
+
var tmp;
+
if (tmp = relativePathDotMapping[buffer.toLowerCase()]) {
buffer = tmp;
}
+
if (buffer === '..') {
this._path.pop();
+
if (c !== '/' && c !== '\\') {
this._path.push('');
}
@@ -8234,9 +9900,12 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (this._scheme === 'file' && this._path.length === 0 && buffer.length === 2 && ALPHA.test(buffer[0]) && buffer[1] === '|') {
buffer = buffer[0] + ':';
}
+
this._path.push(buffer);
}
+
buffer = '';
+
if (c === '?') {
this._query = '?';
state = 'query';
@@ -8247,7 +9916,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (c !== '\t' && c !== '\n' && c !== '\r') {
buffer += percentEscape(c);
}
+
break;
+
case 'query':
if (!stateOverride && c === '#') {
this._fragment = '#';
@@ -8255,16 +9926,21 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (c !== EOF && c !== '\t' && c !== '\n' && c !== '\r') {
this._query += percentEscapeQuery(c);
}
+
break;
+
case 'fragment':
if (c !== EOF && c !== '\t' && c !== '\n' && c !== '\r') {
this._fragment += c;
}
+
break;
}
+
cursor++;
}
}
+
function clear() {
this._scheme = '';
this._schemeData = '';
@@ -8278,15 +9954,18 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this._isInvalid = false;
this._isRelative = false;
}
+
function JURL(url, base) {
if (base !== undefined && !(base instanceof JURL)) {
base = new JURL(String(base));
}
+
this._url = url;
clear.call(this);
var input = url.replace(/^[ \t\r\n\f]+|[ \t\r\n\f]+$/g, '');
parse.call(this, input, null, base);
}
+
JURL.prototype = {
toString: function toString() {
return this.href;
@@ -8296,111 +9975,149 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
if (this._isInvalid) {
return this._url;
}
+
var authority = '';
+
if (this._username !== '' || this._password !== null) {
authority = this._username + (this._password !== null ? ':' + this._password : '') + '@';
}
+
return this.protocol + (this._isRelative ? '//' + authority + this.host : '') + this.pathname + this._query + this._fragment;
},
+
set href(value) {
clear.call(this);
parse.call(this, value);
},
+
get protocol() {
return this._scheme + ':';
},
+
set protocol(value) {
if (this._isInvalid) {
return;
}
+
parse.call(this, value + ':', 'scheme start');
},
+
get host() {
return this._isInvalid ? '' : this._port ? this._host + ':' + this._port : this._host;
},
+
set host(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
parse.call(this, value, 'host');
},
+
get hostname() {
return this._host;
},
+
set hostname(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
parse.call(this, value, 'hostname');
},
+
get port() {
return this._port;
},
+
set port(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
parse.call(this, value, 'port');
},
+
get pathname() {
return this._isInvalid ? '' : this._isRelative ? '/' + this._path.join('/') : this._schemeData;
},
+
set pathname(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
this._path = [];
parse.call(this, value, 'relative path start');
},
+
get search() {
return this._isInvalid || !this._query || this._query === '?' ? '' : this._query;
},
+
set search(value) {
if (this._isInvalid || !this._isRelative) {
return;
}
+
this._query = '?';
+
if (value[0] === '?') {
value = value.slice(1);
}
+
parse.call(this, value, 'query');
},
+
get hash() {
return this._isInvalid || !this._fragment || this._fragment === '#' ? '' : this._fragment;
},
+
set hash(value) {
if (this._isInvalid) {
return;
}
+
this._fragment = '#';
+
if (value[0] === '#') {
value = value.slice(1);
}
+
parse.call(this, value, 'fragment');
},
+
get origin() {
var host;
+
if (this._isInvalid || !this._scheme) {
return '';
}
+
switch (this._scheme) {
case 'data':
case 'file':
case 'javascript':
case 'mailto':
return 'null';
+
case 'blob':
try {
return new JURL(this._schemeData).origin || 'null';
} catch (_) {}
+
return 'null';
}
+
host = this.host;
+
if (!host) {
return '';
}
+
return this._scheme + '://' + host;
}
+
};
exports.URL = JURL;
})();
@@ -8415,13 +10132,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.NetworkPdfManager = exports.LocalPdfManager = undefined;
+exports.NetworkPdfManager = exports.LocalPdfManager = void 0;
-var _regenerator = __w_pdfjs_require__(135);
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(135));
var _util = __w_pdfjs_require__(2);
@@ -8433,15 +10146,31 @@ var _stream = __w_pdfjs_require__(144);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var BasePdfManager = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var BasePdfManager =
+/*#__PURE__*/
+function () {
function BasePdfManager() {
_classCallCheck(this, BasePdfManager);
@@ -8451,47 +10180,49 @@ var BasePdfManager = function () {
}
_createClass(BasePdfManager, [{
- key: 'onLoadedStream',
+ key: "onLoadedStream",
value: function onLoadedStream() {
(0, _util.unreachable)('Abstract method `onLoadedStream` called');
}
}, {
- key: 'ensureDoc',
+ key: "ensureDoc",
value: function ensureDoc(prop, args) {
return this.ensure(this.pdfDocument, prop, args);
}
}, {
- key: 'ensureXRef',
+ key: "ensureXRef",
value: function ensureXRef(prop, args) {
return this.ensure(this.pdfDocument.xref, prop, args);
}
}, {
- key: 'ensureCatalog',
+ key: "ensureCatalog",
value: function ensureCatalog(prop, args) {
return this.ensure(this.pdfDocument.catalog, prop, args);
}
}, {
- key: 'getPage',
+ key: "getPage",
value: function getPage(pageIndex) {
return this.pdfDocument.getPage(pageIndex);
}
}, {
- key: 'cleanup',
+ key: "cleanup",
value: function cleanup() {
return this.pdfDocument.cleanup();
}
}, {
- key: 'ensure',
+ key: "ensure",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(obj, prop, args) {
- return _regenerator2.default.wrap(function _callee$(_context) {
+ var _ensure = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(obj, prop, args) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
(0, _util.unreachable)('Abstract method `ensure` called');
case 1:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -8499,58 +10230,61 @@ var BasePdfManager = function () {
}));
function ensure(_x, _x2, _x3) {
- return _ref.apply(this, arguments);
+ return _ensure.apply(this, arguments);
}
return ensure;
}()
}, {
- key: 'requestRange',
+ key: "requestRange",
value: function requestRange(begin, end) {
(0, _util.unreachable)('Abstract method `requestRange` called');
}
}, {
- key: 'requestLoadedStream',
+ key: "requestLoadedStream",
value: function requestLoadedStream() {
(0, _util.unreachable)('Abstract method `requestLoadedStream` called');
}
}, {
- key: 'sendProgressiveData',
+ key: "sendProgressiveData",
value: function sendProgressiveData(chunk) {
(0, _util.unreachable)('Abstract method `sendProgressiveData` called');
}
}, {
- key: 'updatePassword',
+ key: "updatePassword",
value: function updatePassword(password) {
this._password = password;
}
}, {
- key: 'terminate',
+ key: "terminate",
value: function terminate() {
(0, _util.unreachable)('Abstract method `terminate` called');
}
}, {
- key: 'docId',
+ key: "docId",
get: function get() {
return this._docId;
}
}, {
- key: 'password',
+ key: "password",
get: function get() {
return this._password;
}
}, {
- key: 'docBaseUrl',
+ key: "docBaseUrl",
get: function get() {
var docBaseUrl = null;
+
if (this._docBaseUrl) {
var absoluteUrl = (0, _util.createValidAbsoluteUrl)(this._docBaseUrl);
+
if (absoluteUrl) {
docBaseUrl = absoluteUrl.href;
} else {
- (0, _util.warn)('Invalid absolute docBaseUrl: "' + this._docBaseUrl + '".');
+ (0, _util.warn)("Invalid absolute docBaseUrl: \"".concat(this._docBaseUrl, "\"."));
}
}
+
return (0, _util.shadow)(this, 'docBaseUrl', docBaseUrl);
}
}]);
@@ -8558,30 +10292,35 @@ var BasePdfManager = function () {
return BasePdfManager;
}();
-var LocalPdfManager = function (_BasePdfManager) {
+var LocalPdfManager =
+/*#__PURE__*/
+function (_BasePdfManager) {
_inherits(LocalPdfManager, _BasePdfManager);
function LocalPdfManager(docId, data, password, evaluatorOptions, docBaseUrl) {
- _classCallCheck(this, LocalPdfManager);
+ var _this;
- var _this = _possibleConstructorReturn(this, (LocalPdfManager.__proto__ || Object.getPrototypeOf(LocalPdfManager)).call(this));
+ _classCallCheck(this, LocalPdfManager);
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(LocalPdfManager).call(this));
_this._docId = docId;
_this._password = password;
_this._docBaseUrl = docBaseUrl;
_this.evaluatorOptions = evaluatorOptions;
var stream = new _stream.Stream(data);
- _this.pdfDocument = new _document.PDFDocument(_this, stream);
+ _this.pdfDocument = new _document.PDFDocument(_assertThisInitialized(_assertThisInitialized(_this)), stream);
_this._loadedStreamPromise = Promise.resolve(stream);
return _this;
}
_createClass(LocalPdfManager, [{
- key: 'ensure',
+ key: "ensure",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2(obj, prop, args) {
+ var _ensure2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2(obj, prop, args) {
var value;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -8592,13 +10331,13 @@ var LocalPdfManager = function (_BasePdfManager) {
break;
}
- return _context2.abrupt('return', value.apply(obj, args));
+ return _context2.abrupt("return", value.apply(obj, args));
case 3:
- return _context2.abrupt('return', value);
+ return _context2.abrupt("return", value);
case 4:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -8606,40 +10345,45 @@ var LocalPdfManager = function (_BasePdfManager) {
}));
function ensure(_x4, _x5, _x6) {
- return _ref2.apply(this, arguments);
+ return _ensure2.apply(this, arguments);
}
return ensure;
}()
}, {
- key: 'requestRange',
+ key: "requestRange",
value: function requestRange(begin, end) {
return Promise.resolve();
}
}, {
- key: 'requestLoadedStream',
+ key: "requestLoadedStream",
value: function requestLoadedStream() {}
}, {
- key: 'onLoadedStream',
+ key: "onLoadedStream",
value: function onLoadedStream() {
return this._loadedStreamPromise;
}
}, {
- key: 'terminate',
+ key: "terminate",
value: function terminate() {}
}]);
return LocalPdfManager;
}(BasePdfManager);
-var NetworkPdfManager = function (_BasePdfManager2) {
+exports.LocalPdfManager = LocalPdfManager;
+
+var NetworkPdfManager =
+/*#__PURE__*/
+function (_BasePdfManager2) {
_inherits(NetworkPdfManager, _BasePdfManager2);
function NetworkPdfManager(docId, pdfNetworkStream, args, evaluatorOptions, docBaseUrl) {
- _classCallCheck(this, NetworkPdfManager);
+ var _this2;
- var _this2 = _possibleConstructorReturn(this, (NetworkPdfManager.__proto__ || Object.getPrototypeOf(NetworkPdfManager)).call(this));
+ _classCallCheck(this, NetworkPdfManager);
+ _this2 = _possibleConstructorReturn(this, _getPrototypeOf(NetworkPdfManager).call(this));
_this2._docId = docId;
_this2._password = args.password;
_this2._docBaseUrl = docBaseUrl;
@@ -8652,16 +10396,18 @@ var NetworkPdfManager = function (_BasePdfManager2) {
disableAutoFetch: args.disableAutoFetch,
rangeChunkSize: args.rangeChunkSize
});
- _this2.pdfDocument = new _document.PDFDocument(_this2, _this2.streamManager.getStream());
+ _this2.pdfDocument = new _document.PDFDocument(_assertThisInitialized(_assertThisInitialized(_this2)), _this2.streamManager.getStream());
return _this2;
}
_createClass(NetworkPdfManager, [{
- key: 'ensure',
+ key: "ensure",
value: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3(obj, prop, args) {
+ var _ensure3 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3(obj, prop, args) {
var value;
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
@@ -8673,14 +10419,14 @@ var NetworkPdfManager = function (_BasePdfManager2) {
break;
}
- return _context3.abrupt('return', value.apply(obj, args));
+ return _context3.abrupt("return", value.apply(obj, args));
case 4:
- return _context3.abrupt('return', value);
+ return _context3.abrupt("return", value);
case 7:
_context3.prev = 7;
- _context3.t0 = _context3['catch'](0);
+ _context3.t0 = _context3["catch"](0);
if (_context3.t0 instanceof _util.MissingDataException) {
_context3.next = 11;
@@ -8694,10 +10440,10 @@ var NetworkPdfManager = function (_BasePdfManager2) {
return this.requestRange(_context3.t0.begin, _context3.t0.end);
case 13:
- return _context3.abrupt('return', this.ensure(obj, prop, args));
+ return _context3.abrupt("return", this.ensure(obj, prop, args));
case 14:
- case 'end':
+ case "end":
return _context3.stop();
}
}
@@ -8705,33 +10451,35 @@ var NetworkPdfManager = function (_BasePdfManager2) {
}));
function ensure(_x7, _x8, _x9) {
- return _ref3.apply(this, arguments);
+ return _ensure3.apply(this, arguments);
}
return ensure;
}()
}, {
- key: 'requestRange',
+ key: "requestRange",
value: function requestRange(begin, end) {
return this.streamManager.requestRange(begin, end);
}
}, {
- key: 'requestLoadedStream',
+ key: "requestLoadedStream",
value: function requestLoadedStream() {
this.streamManager.requestAllChunks();
}
}, {
- key: 'sendProgressiveData',
+ key: "sendProgressiveData",
value: function sendProgressiveData(chunk) {
- this.streamManager.onReceiveData({ chunk: chunk });
+ this.streamManager.onReceiveData({
+ chunk: chunk
+ });
}
}, {
- key: 'onLoadedStream',
+ key: "onLoadedStream",
value: function onLoadedStream() {
return this.streamManager.onLoadedStream();
}
}, {
- key: 'terminate',
+ key: "terminate",
value: function terminate() {
this.streamManager.abort();
}
@@ -8740,7 +10488,6 @@ var NetworkPdfManager = function (_BasePdfManager2) {
return NetworkPdfManager;
}(BasePdfManager);
-exports.LocalPdfManager = LocalPdfManager;
exports.NetworkPdfManager = NetworkPdfManager;
/***/ }),
@@ -8759,13 +10506,17 @@ module.exports = __w_pdfjs_require__(136);
"use strict";
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
var g = function () {
- return this;
+ return this || (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" && self;
}() || Function("return this")();
+
var hadRuntime = g.regeneratorRuntime && Object.getOwnPropertyNames(g).indexOf("regeneratorRuntime") >= 0;
var oldRuntime = hadRuntime && g.regeneratorRuntime;
g.regeneratorRuntime = undefined;
module.exports = __w_pdfjs_require__(137);
+
if (hadRuntime) {
g.regeneratorRuntime = oldRuntime;
} else {
@@ -8783,7 +10534,7 @@ if (hadRuntime) {
"use strict";
/* WEBPACK VAR INJECTION */(function(module) {
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
!function (global) {
"use strict";
@@ -8797,13 +10548,17 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
var inModule = ( false ? undefined : _typeof(module)) === "object";
var runtime = global.regeneratorRuntime;
+
if (runtime) {
if (inModule) {
module.exports = runtime;
}
+
return;
}
+
runtime = global.regeneratorRuntime = inModule ? module.exports : {};
+
function wrap(innerFn, outerFn, self, tryLocsList) {
var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
var generator = Object.create(protoGenerator.prototype);
@@ -8811,7 +10566,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
generator._invoke = makeInvokeMethod(innerFn, self, context);
return generator;
}
+
runtime.wrap = wrap;
+
function tryCatch(fn, obj, arg) {
try {
return {
@@ -8825,27 +10582,37 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
};
}
}
+
var GenStateSuspendedStart = "suspendedStart";
var GenStateSuspendedYield = "suspendedYield";
var GenStateExecuting = "executing";
var GenStateCompleted = "completed";
var ContinueSentinel = {};
+
function Generator() {}
+
function GeneratorFunction() {}
+
function GeneratorFunctionPrototype() {}
+
var IteratorPrototype = {};
+
IteratorPrototype[iteratorSymbol] = function () {
return this;
};
+
var getProto = Object.getPrototypeOf;
var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+
if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
IteratorPrototype = NativeIteratorPrototype;
}
+
var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
GeneratorFunctionPrototype.constructor = GeneratorFunction;
GeneratorFunctionPrototype[toStringTagSymbol] = GeneratorFunction.displayName = "GeneratorFunction";
+
function defineIteratorMethods(prototype) {
["next", "throw", "return"].forEach(function (method) {
prototype[method] = function (arg) {
@@ -8853,91 +10620,120 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
};
});
}
+
runtime.isGeneratorFunction = function (genFun) {
var ctor = typeof genFun === "function" && genFun.constructor;
return ctor ? ctor === GeneratorFunction || (ctor.displayName || ctor.name) === "GeneratorFunction" : false;
};
+
runtime.mark = function (genFun) {
if (Object.setPrototypeOf) {
Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
} else {
genFun.__proto__ = GeneratorFunctionPrototype;
+
if (!(toStringTagSymbol in genFun)) {
genFun[toStringTagSymbol] = "GeneratorFunction";
}
}
+
genFun.prototype = Object.create(Gp);
return genFun;
};
+
runtime.awrap = function (arg) {
- return { __await: arg };
+ return {
+ __await: arg
+ };
};
+
function AsyncIterator(generator) {
function invoke(method, arg, resolve, reject) {
var record = tryCatch(generator[method], generator, arg);
+
if (record.type === "throw") {
reject(record.arg);
} else {
var result = record.arg;
var value = result.value;
- if (value && (typeof value === "undefined" ? "undefined" : _typeof(value)) === "object" && hasOwn.call(value, "__await")) {
+
+ if (value && _typeof(value) === "object" && hasOwn.call(value, "__await")) {
return Promise.resolve(value.__await).then(function (value) {
invoke("next", value, resolve, reject);
}, function (err) {
invoke("throw", err, resolve, reject);
});
}
+
return Promise.resolve(value).then(function (unwrapped) {
result.value = unwrapped;
resolve(result);
- }, reject);
+ }, function (error) {
+ return invoke("throw", error, resolve, reject);
+ });
}
}
+
var previousPromise;
+
function enqueue(method, arg) {
function callInvokeWithMethodAndArg() {
return new Promise(function (resolve, reject) {
invoke(method, arg, resolve, reject);
});
}
+
return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
}
+
this._invoke = enqueue;
}
+
defineIteratorMethods(AsyncIterator.prototype);
+
AsyncIterator.prototype[asyncIteratorSymbol] = function () {
return this;
};
+
runtime.AsyncIterator = AsyncIterator;
+
runtime.async = function (innerFn, outerFn, self, tryLocsList) {
var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList));
return runtime.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
return result.done ? result.value : iter.next();
});
};
+
function makeInvokeMethod(innerFn, self, context) {
var state = GenStateSuspendedStart;
return function invoke(method, arg) {
if (state === GenStateExecuting) {
throw new Error("Generator is already running");
}
+
if (state === GenStateCompleted) {
if (method === "throw") {
throw arg;
}
+
return doneResult();
}
+
context.method = method;
context.arg = arg;
+
while (true) {
var delegate = context.delegate;
+
if (delegate) {
var delegateResult = maybeInvokeDelegate(delegate, context);
+
if (delegateResult) {
if (delegateResult === ContinueSentinel) continue;
return delegateResult;
}
}
+
if (context.method === "next") {
context.sent = context._sent = context.arg;
} else if (context.method === "throw") {
@@ -8945,17 +10741,22 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = GenStateCompleted;
throw context.arg;
}
+
context.dispatchException(context.arg);
} else if (context.method === "return") {
context.abrupt("return", context.arg);
}
+
state = GenStateExecuting;
var record = tryCatch(innerFn, self, context);
+
if (record.type === "normal") {
state = context.done ? GenStateCompleted : GenStateSuspendedYield;
+
if (record.arg === ContinueSentinel) {
continue;
}
+
return {
value: record.arg,
done: context.done
@@ -8968,41 +10769,53 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
}
};
}
+
function maybeInvokeDelegate(delegate, context) {
var method = delegate.iterator[context.method];
+
if (method === undefined) {
context.delegate = null;
+
if (context.method === "throw") {
if (delegate.iterator.return) {
context.method = "return";
context.arg = undefined;
maybeInvokeDelegate(delegate, context);
+
if (context.method === "throw") {
return ContinueSentinel;
}
}
+
context.method = "throw";
context.arg = new TypeError("The iterator does not provide a 'throw' method");
}
+
return ContinueSentinel;
}
+
var record = tryCatch(method, delegate.iterator, context.arg);
+
if (record.type === "throw") {
context.method = "throw";
context.arg = record.arg;
context.delegate = null;
return ContinueSentinel;
}
+
var info = record.arg;
+
if (!info) {
context.method = "throw";
context.arg = new TypeError("iterator result is not an object");
context.delegate = null;
return ContinueSentinel;
}
+
if (info.done) {
context[delegate.resultName] = info.value;
context.next = delegate.nextLoc;
+
if (context.method !== "return") {
context.method = "next";
context.arg = undefined;
@@ -9010,67 +10823,90 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
return info;
}
+
context.delegate = null;
return ContinueSentinel;
}
+
defineIteratorMethods(Gp);
Gp[toStringTagSymbol] = "Generator";
+
Gp[iteratorSymbol] = function () {
return this;
};
+
Gp.toString = function () {
return "[object Generator]";
};
+
function pushTryEntry(locs) {
- var entry = { tryLoc: locs[0] };
+ var entry = {
+ tryLoc: locs[0]
+ };
+
if (1 in locs) {
entry.catchLoc = locs[1];
}
+
if (2 in locs) {
entry.finallyLoc = locs[2];
entry.afterLoc = locs[3];
}
+
this.tryEntries.push(entry);
}
+
function resetTryEntry(entry) {
var record = entry.completion || {};
record.type = "normal";
delete record.arg;
entry.completion = record;
}
+
function Context(tryLocsList) {
- this.tryEntries = [{ tryLoc: "root" }];
+ this.tryEntries = [{
+ tryLoc: "root"
+ }];
tryLocsList.forEach(pushTryEntry, this);
this.reset(true);
}
+
runtime.keys = function (object) {
var keys = [];
+
for (var key in object) {
keys.push(key);
}
+
keys.reverse();
return function next() {
while (keys.length) {
var key = keys.pop();
+
if (key in object) {
next.value = key;
next.done = false;
return next;
}
}
+
next.done = true;
return next;
};
};
+
function values(iterable) {
if (iterable) {
var iteratorMethod = iterable[iteratorSymbol];
+
if (iteratorMethod) {
return iteratorMethod.call(iterable);
}
+
if (typeof iterable.next === "function") {
return iterable;
}
+
if (!isNaN(iterable.length)) {
var i = -1,
next = function next() {
@@ -9081,22 +10917,30 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
return next;
}
}
+
next.value = undefined;
next.done = true;
return next;
};
+
return next.next = next;
}
}
- return { next: doneResult };
+
+ return {
+ next: doneResult
+ };
}
+
runtime.values = values;
+
function doneResult() {
return {
value: undefined,
done: true
};
}
+
Context.prototype = {
constructor: Context,
reset: function reset(skipTempReset) {
@@ -9108,6 +10952,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.method = "next";
this.arg = undefined;
this.tryEntries.forEach(resetTryEntry);
+
if (!skipTempReset) {
for (var name in this) {
if (name.charAt(0) === "t" && hasOwn.call(this, name) && !isNaN(+name.slice(1))) {
@@ -9120,35 +10965,45 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.done = true;
var rootEntry = this.tryEntries[0];
var rootRecord = rootEntry.completion;
+
if (rootRecord.type === "throw") {
throw rootRecord.arg;
}
+
return this.rval;
},
dispatchException: function dispatchException(exception) {
if (this.done) {
throw exception;
}
+
var context = this;
+
function handle(loc, caught) {
record.type = "throw";
record.arg = exception;
context.next = loc;
+
if (caught) {
context.method = "next";
context.arg = undefined;
}
+
return !!caught;
}
+
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
var record = entry.completion;
+
if (entry.tryLoc === "root") {
return handle("end");
}
+
if (entry.tryLoc <= this.prev) {
var hasCatch = hasOwn.call(entry, "catchLoc");
var hasFinally = hasOwn.call(entry, "finallyLoc");
+
if (hasCatch && hasFinally) {
if (this.prev < entry.catchLoc) {
return handle(entry.catchLoc, true);
@@ -9172,28 +11027,34 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
abrupt: function abrupt(type, arg) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
+
if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
var finallyEntry = entry;
break;
}
}
+
if (finallyEntry && (type === "break" || type === "continue") && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc) {
finallyEntry = null;
}
+
var record = finallyEntry ? finallyEntry.completion : {};
record.type = type;
record.arg = arg;
+
if (finallyEntry) {
this.method = "next";
this.next = finallyEntry.finallyLoc;
return ContinueSentinel;
}
+
return this.complete(record);
},
complete: function complete(record, afterLoc) {
if (record.type === "throw") {
throw record.arg;
}
+
if (record.type === "break" || record.type === "continue") {
this.next = record.arg;
} else if (record.type === "return") {
@@ -9203,11 +11064,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (record.type === "normal" && afterLoc) {
this.next = afterLoc;
}
+
return ContinueSentinel;
},
finish: function finish(finallyLoc) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
+
if (entry.finallyLoc === finallyLoc) {
this.complete(entry.completion, entry.afterLoc);
resetTryEntry(entry);
@@ -9218,15 +11081,19 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
"catch": function _catch(tryLoc) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
+
if (entry.tryLoc === tryLoc) {
var record = entry.completion;
+
if (record.type === "throw") {
var thrown = record.arg;
resetTryEntry(entry);
}
+
return thrown;
}
}
+
throw new Error("illegal catch attempt");
},
delegateYield: function delegateYield(iterable, resultName, nextLoc) {
@@ -9235,14 +11102,16 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
resultName: resultName,
nextLoc: nextLoc
};
+
if (this.method === "next") {
this.arg = undefined;
}
+
return ContinueSentinel;
}
};
}(function () {
- return this;
+ return this || (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" && self;
}() || Function("return this")());
/* WEBPACK VAR INJECTION */}.call(this, __w_pdfjs_require__(138)(module)))
@@ -9256,6 +11125,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
module.exports = function (module) {
if (!module.webpackPolyfill) {
module.deprecate = function () {};
+
module.paths = [];
if (!module.children) module.children = [];
Object.defineProperty(module, "loaded", {
@@ -9272,6 +11142,7 @@ module.exports = function (module) {
});
module.webpackPolyfill = 1;
}
+
return module;
};
@@ -9285,7 +11156,7 @@ module.exports = function (module) {
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.ChunkedStreamManager = exports.ChunkedStream = undefined;
+exports.ChunkedStreamManager = exports.ChunkedStream = void 0;
var _util = __w_pdfjs_require__(2);
@@ -9303,14 +11174,17 @@ var ChunkedStream = function ChunkedStreamClosure() {
this.progressiveDataLength = 0;
this.lastSuccessfulEnsureByteChunk = -1;
}
+
ChunkedStream.prototype = {
getMissingChunks: function ChunkedStream_getMissingChunks() {
var chunks = [];
+
for (var chunk = 0, n = this.numChunks; chunk < n; ++chunk) {
if (!this.loadedChunks[chunk]) {
chunks.push(chunk);
}
}
+
return chunks;
},
getBaseStreams: function ChunkedStream_getBaseStreams() {
@@ -9321,18 +11195,23 @@ var ChunkedStream = function ChunkedStreamClosure() {
},
onReceiveData: function ChunkedStream_onReceiveData(begin, chunk) {
var end = begin + chunk.byteLength;
+
if (begin % this.chunkSize !== 0) {
- throw new Error('Bad begin offset: ' + begin);
+ throw new Error("Bad begin offset: ".concat(begin));
}
+
var length = this.bytes.length;
+
if (end % this.chunkSize !== 0 && end !== length) {
- throw new Error('Bad end offset: ' + end);
+ throw new Error("Bad end offset: ".concat(end));
}
+
this.bytes.set(new Uint8Array(chunk), begin);
var chunkSize = this.chunkSize;
var beginChunk = Math.floor(begin / chunkSize);
var endChunk = Math.floor((end - 1) / chunkSize) + 1;
var curChunk;
+
for (curChunk = beginChunk; curChunk < endChunk; ++curChunk) {
if (!this.loadedChunks[curChunk]) {
this.loadedChunks[curChunk] = true;
@@ -9348,6 +11227,7 @@ var ChunkedStream = function ChunkedStreamClosure() {
this.progressiveDataLength = position;
var endChunk = position >= this.end ? this.numChunks : Math.floor(position / this.chunkSize);
var curChunk;
+
for (curChunk = beginChunk; curChunk < endChunk; ++curChunk) {
if (!this.loadedChunks[curChunk]) {
this.loadedChunks[curChunk] = true;
@@ -9357,24 +11237,30 @@ var ChunkedStream = function ChunkedStreamClosure() {
},
ensureByte: function ChunkedStream_ensureByte(pos) {
var chunk = Math.floor(pos / this.chunkSize);
+
if (chunk === this.lastSuccessfulEnsureByteChunk) {
return;
}
+
if (!this.loadedChunks[chunk]) {
throw new _util.MissingDataException(pos, pos + 1);
}
+
this.lastSuccessfulEnsureByteChunk = chunk;
},
ensureRange: function ChunkedStream_ensureRange(begin, end) {
if (begin >= end) {
return;
}
+
if (end <= this.progressiveDataLength) {
return;
}
+
var chunkSize = this.chunkSize;
var beginChunk = Math.floor(begin / chunkSize);
var endChunk = Math.floor((end - 1) / chunkSize) + 1;
+
for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
if (!this.loadedChunks[chunk]) {
throw new _util.MissingDataException(begin, end);
@@ -9384,37 +11270,47 @@ var ChunkedStream = function ChunkedStreamClosure() {
nextEmptyChunk: function ChunkedStream_nextEmptyChunk(beginChunk) {
var chunk,
numChunks = this.numChunks;
+
for (var i = 0; i < numChunks; ++i) {
chunk = (beginChunk + i) % numChunks;
+
if (!this.loadedChunks[chunk]) {
return chunk;
}
}
+
return null;
},
hasChunk: function ChunkedStream_hasChunk(chunk) {
return !!this.loadedChunks[chunk];
},
+
get length() {
return this.end - this.start;
},
+
get isEmpty() {
return this.length === 0;
},
+
getByte: function ChunkedStream_getByte() {
var pos = this.pos;
+
if (pos >= this.end) {
return -1;
}
+
this.ensureByte(pos);
return this.bytes[this.pos++];
},
getUint16: function ChunkedStream_getUint16() {
var b0 = this.getByte();
var b1 = this.getByte();
+
if (b0 === -1 || b1 === -1) {
return -1;
}
+
return (b0 << 8) + b1;
},
getInt32: function ChunkedStream_getInt32() {
@@ -9426,25 +11322,29 @@ var ChunkedStream = function ChunkedStreamClosure() {
},
getBytes: function getBytes(length) {
var forceClamped = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var bytes = this.bytes;
var pos = this.pos;
var strEnd = this.end;
+
if (!length) {
this.ensureRange(pos, strEnd);
+
var _subarray = bytes.subarray(pos, strEnd);
+
return forceClamped ? new Uint8ClampedArray(_subarray) : _subarray;
}
+
var end = pos + length;
+
if (end > strEnd) {
end = strEnd;
}
+
this.ensureRange(pos, end);
this.pos = end;
var subarray = bytes.subarray(pos, end);
return forceClamped ? new Uint8ClampedArray(subarray) : subarray;
},
-
peekByte: function ChunkedStream_peekByte() {
var peekedByte = this.getByte();
this.pos--;
@@ -9452,12 +11352,10 @@ var ChunkedStream = function ChunkedStreamClosure() {
},
peekBytes: function peekBytes(length) {
var forceClamped = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var bytes = this.getBytes(length, forceClamped);
this.pos -= bytes.length;
return bytes;
},
-
getByteRange: function ChunkedStream_getBytes(begin, end) {
this.ensureRange(begin, end);
return this.bytes.subarray(begin, end);
@@ -9466,6 +11364,7 @@ var ChunkedStream = function ChunkedStreamClosure() {
if (!n) {
n = 1;
}
+
this.pos += n;
},
reset: function ChunkedStream_reset() {
@@ -9476,20 +11375,26 @@ var ChunkedStream = function ChunkedStreamClosure() {
},
makeSubStream: function ChunkedStream_makeSubStream(start, length, dict) {
this.ensureRange(start, start + length);
+
function ChunkedStreamSubstream() {}
+
ChunkedStreamSubstream.prototype = Object.create(this);
+
ChunkedStreamSubstream.prototype.getMissingChunks = function () {
var chunkSize = this.chunkSize;
var beginChunk = Math.floor(this.start / chunkSize);
var endChunk = Math.floor((this.end - 1) / chunkSize) + 1;
var missingChunks = [];
+
for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
if (!this.loadedChunks[chunk]) {
missingChunks.push(chunk);
}
}
+
return missingChunks;
};
+
var subStream = new ChunkedStreamSubstream();
subStream.pos = subStream.start = start;
subStream.end = start + length || this.end;
@@ -9499,6 +11404,9 @@ var ChunkedStream = function ChunkedStreamClosure() {
};
return ChunkedStream;
}();
+
+exports.ChunkedStream = ChunkedStream;
+
var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
function ChunkedStreamManager(pdfNetworkStream, args) {
var chunkSize = args.rangeChunkSize;
@@ -9518,6 +11426,7 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
this.aborted = false;
this._loadedStreamCapability = (0, _util.createPromiseCapability)();
}
+
ChunkedStreamManager.prototype = {
onLoadedStream: function ChunkedStreamManager_getLoadedStream() {
return this._loadedStreamCapability.promise;
@@ -9526,9 +11435,11 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
var _this = this;
var rangeReader = this.pdfNetworkStream.getRangeReader(begin, end);
+
if (!rangeReader.isStreamingSupported) {
rangeReader.onProgress = this.onProgress.bind(this);
}
+
var chunks = [],
loaded = 0;
var manager = this;
@@ -9539,12 +11450,17 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
var data = chunk.value;
chunks.push(data);
loaded += (0, _util.arrayByteLength)(data);
+
if (rangeReader.isStreamingSupported) {
- manager.onProgress({ loaded: loaded });
+ manager.onProgress({
+ loaded: loaded
+ });
}
+
rangeReader.read().then(readChunk, reject);
return;
}
+
var chunkData = (0, _util.arraysToBytes)(chunks);
chunks = null;
resolve(chunkData);
@@ -9552,12 +11468,14 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
reject(e);
}
};
+
rangeReader.read().then(readChunk, reject);
});
promise.then(function (data) {
if (_this.aborted) {
return;
}
+
_this.onReceiveData({
chunk: data,
begin: begin
@@ -9566,7 +11484,9 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
},
requestAllChunks: function ChunkedStreamManager_requestAllChunks() {
var missingChunks = this.stream.getMissingChunks();
+
this._requestChunks(missingChunks);
+
return this._loadedStreamCapability.promise;
},
_requestChunks: function ChunkedStreamManager_requestChunks(chunks) {
@@ -9574,35 +11494,45 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
var i, ii;
var chunksNeeded = Object.create(null);
this.chunksNeededByRequest[requestId] = chunksNeeded;
+
for (i = 0, ii = chunks.length; i < ii; i++) {
if (!this.stream.hasChunk(chunks[i])) {
chunksNeeded[chunks[i]] = true;
}
}
+
if ((0, _util.isEmptyObj)(chunksNeeded)) {
return Promise.resolve();
}
+
var capability = (0, _util.createPromiseCapability)();
this.promisesByRequest[requestId] = capability;
var chunksToRequest = [];
+
for (var chunk in chunksNeeded) {
chunk = chunk | 0;
+
if (!(chunk in this.requestsByChunk)) {
this.requestsByChunk[chunk] = [];
chunksToRequest.push(chunk);
}
+
this.requestsByChunk[chunk].push(requestId);
}
+
if (!chunksToRequest.length) {
return capability.promise;
}
+
var groupedChunksToRequest = this.groupChunks(chunksToRequest);
+
for (i = 0; i < groupedChunksToRequest.length; ++i) {
var groupedChunk = groupedChunksToRequest[i];
var begin = groupedChunk.beginChunk * this.chunkSize;
var end = Math.min(groupedChunk.endChunk * this.chunkSize, this.length);
this.sendRequest(begin, end);
}
+
return capability.promise;
},
getStream: function ChunkedStreamManager_getStream() {
@@ -9613,23 +11543,28 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
var beginChunk = this.getBeginChunk(begin);
var endChunk = this.getEndChunk(end);
var chunks = [];
+
for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
chunks.push(chunk);
}
+
return this._requestChunks(chunks);
},
requestRanges: function ChunkedStreamManager_requestRanges(ranges) {
ranges = ranges || [];
var chunksToRequest = [];
+
for (var i = 0; i < ranges.length; i++) {
var beginChunk = this.getBeginChunk(ranges[i].begin);
var endChunk = this.getEndChunk(ranges[i].end);
+
for (var chunk = beginChunk; chunk < endChunk; ++chunk) {
if (!chunksToRequest.includes(chunk)) {
chunksToRequest.push(chunk);
}
}
}
+
chunksToRequest.sort(function (a, b) {
return a - b;
});
@@ -9639,11 +11574,14 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
var groupedChunks = [];
var beginChunk = -1;
var prevChunk = -1;
+
for (var i = 0; i < chunks.length; ++i) {
var chunk = chunks[i];
+
if (beginChunk < 0) {
beginChunk = chunk;
}
+
if (prevChunk >= 0 && prevChunk + 1 !== chunk) {
groupedChunks.push({
beginChunk: beginChunk,
@@ -9651,14 +11589,17 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
});
beginChunk = chunk;
}
+
if (i + 1 === chunks.length) {
groupedChunks.push({
beginChunk: beginChunk,
endChunk: chunk + 1
});
}
+
prevChunk = chunk;
}
+
return groupedChunks;
},
onProgress: function ChunkedStreamManager_onProgress(args) {
@@ -9675,52 +11616,66 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
var end = begin + chunk.byteLength;
var beginChunk = Math.floor(begin / this.chunkSize);
var endChunk = end < this.length ? Math.floor(end / this.chunkSize) : Math.ceil(end / this.chunkSize);
+
if (isProgressive) {
this.stream.onReceiveProgressiveData(chunk);
this.progressiveDataLength = end;
} else {
this.stream.onReceiveData(begin, chunk);
}
+
if (this.stream.allChunksLoaded()) {
this._loadedStreamCapability.resolve(this.stream);
}
+
var loadedRequests = [];
var i, requestId;
+
for (chunk = beginChunk; chunk < endChunk; ++chunk) {
var requestIds = this.requestsByChunk[chunk] || [];
delete this.requestsByChunk[chunk];
+
for (i = 0; i < requestIds.length; ++i) {
requestId = requestIds[i];
var chunksNeeded = this.chunksNeededByRequest[requestId];
+
if (chunk in chunksNeeded) {
delete chunksNeeded[chunk];
}
+
if (!(0, _util.isEmptyObj)(chunksNeeded)) {
continue;
}
+
loadedRequests.push(requestId);
}
}
+
if (!this.disableAutoFetch && (0, _util.isEmptyObj)(this.requestsByChunk)) {
var nextEmptyChunk;
+
if (this.stream.numChunksLoaded === 1) {
var lastChunk = this.stream.numChunks - 1;
+
if (!this.stream.hasChunk(lastChunk)) {
nextEmptyChunk = lastChunk;
}
} else {
nextEmptyChunk = this.stream.nextEmptyChunk(endChunk);
}
+
if (Number.isInteger(nextEmptyChunk)) {
this._requestChunks([nextEmptyChunk]);
}
}
+
for (i = 0; i < loadedRequests.length; ++i) {
requestId = loadedRequests[i];
var capability = this.promisesByRequest[requestId];
delete this.promisesByRequest[requestId];
capability.resolve();
}
+
this.msgHandler.send('DocProgress', {
loaded: this.stream.numChunksLoaded * this.chunkSize,
total: this.length
@@ -9739,9 +11694,11 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
},
abort: function ChunkedStreamManager_abort() {
this.aborted = true;
+
if (this.pdfNetworkStream) {
this.pdfNetworkStream.cancelAllRequests('abort');
}
+
for (var requestId in this.promisesByRequest) {
var capability = this.promisesByRequest[requestId];
capability.reject(new Error('Request was aborted'));
@@ -9750,7 +11707,7 @@ var ChunkedStreamManager = function ChunkedStreamManagerClosure() {
};
return ChunkedStreamManager;
}();
-exports.ChunkedStream = ChunkedStream;
+
exports.ChunkedStreamManager = ChunkedStreamManager;
/***/ }),
@@ -9763,9 +11720,7 @@ exports.ChunkedStreamManager = ChunkedStreamManager;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFDocument = exports.Page = undefined;
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+exports.PDFDocument = exports.Page = void 0;
var _util = __w_pdfjs_require__(2);
@@ -9787,12 +11742,22 @@ var _evaluator = __w_pdfjs_require__(158);
var _function = __w_pdfjs_require__(172);
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
var Page = function PageClosure() {
var DEFAULT_USER_UNIT = 1.0;
var LETTER_SIZE_MEDIABOX = [0, 0, 612, 792];
+
function isAnnotationRenderable(annotation, intent) {
return intent === 'display' && annotation.viewable || intent === 'print' && annotation.printable;
}
+
function Page(_ref) {
var pdfManager = _ref.pdfManager,
xref = _ref.xref,
@@ -9802,7 +11767,6 @@ var Page = function PageClosure() {
fontCache = _ref.fontCache,
builtInCMapCache = _ref.builtInCMapCache,
pdfFunctionFactory = _ref.pdfFunctionFactory;
-
this.pdfManager = pdfManager;
this.pageIndex = pageIndex;
this.pageDict = pageDict;
@@ -9814,70 +11778,91 @@ var Page = function PageClosure() {
this.evaluatorOptions = pdfManager.evaluatorOptions;
this.resourcesPromise = null;
var uniquePrefix = 'p' + this.pageIndex + '_';
- var idCounters = { obj: 0 };
+ var idCounters = {
+ obj: 0
+ };
this.idFactory = {
createObjId: function createObjId() {
return uniquePrefix + ++idCounters.obj;
}
};
}
+
Page.prototype = {
_getInheritableProperty: function _getInheritableProperty(key) {
var getArray = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var value = (0, _util.getInheritableProperty)({
dict: this.pageDict,
key: key,
getArray: getArray,
stopWhenFound: false
});
+
if (!Array.isArray(value)) {
return value;
}
+
if (value.length === 1 || !(0, _primitives.isDict)(value[0])) {
return value[0];
}
+
return _primitives.Dict.merge(this.xref, value);
},
get content() {
return this.pageDict.get('Contents');
},
+
get resources() {
return (0, _util.shadow)(this, 'resources', this._getInheritableProperty('Resources') || _primitives.Dict.empty);
},
+
get mediaBox() {
var mediaBox = this._getInheritableProperty('MediaBox', true);
+
if (!Array.isArray(mediaBox) || mediaBox.length !== 4) {
return (0, _util.shadow)(this, 'mediaBox', LETTER_SIZE_MEDIABOX);
}
+
return (0, _util.shadow)(this, 'mediaBox', mediaBox);
},
+
get cropBox() {
var cropBox = this._getInheritableProperty('CropBox', true);
+
if (!Array.isArray(cropBox) || cropBox.length !== 4) {
return (0, _util.shadow)(this, 'cropBox', this.mediaBox);
}
+
return (0, _util.shadow)(this, 'cropBox', cropBox);
},
+
get userUnit() {
var obj = this.pageDict.get('UserUnit');
+
if (!(0, _util.isNum)(obj) || obj <= 0) {
obj = DEFAULT_USER_UNIT;
}
+
return (0, _util.shadow)(this, 'userUnit', obj);
},
+
get view() {
var mediaBox = this.mediaBox,
cropBox = this.cropBox;
+
if (mediaBox === cropBox) {
return (0, _util.shadow)(this, 'view', mediaBox);
}
+
var intersection = _util.Util.intersect(cropBox, mediaBox);
+
return (0, _util.shadow)(this, 'view', intersection || mediaBox);
},
+
get rotate() {
var rotate = this._getInheritableProperty('Rotate') || 0;
+
if (rotate % 90 !== 0) {
rotate = 0;
} else if (rotate >= 360) {
@@ -9885,25 +11870,31 @@ var Page = function PageClosure() {
} else if (rotate < 0) {
rotate = (rotate % 360 + 360) % 360;
}
+
return (0, _util.shadow)(this, 'rotate', rotate);
},
+
getContentStream: function Page_getContentStream() {
var content = this.content;
var stream;
+
if (Array.isArray(content)) {
var xref = this.xref;
var i,
n = content.length;
var streams = [];
+
for (i = 0; i < n; ++i) {
streams.push(xref.fetchIfRef(content[i]));
}
+
stream = new _stream.StreamsSequenceStream(streams);
} else if ((0, _primitives.isStream)(content)) {
stream = content;
} else {
stream = new _stream.NullStream();
}
+
return stream;
},
loadResources: function Page_loadResources(keys) {
@@ -9912,6 +11903,7 @@ var Page = function PageClosure() {
if (!this.resourcesPromise) {
this.resourcesPromise = this.pdfManager.ensure(this, 'resources');
}
+
return this.resourcesPromise.then(function () {
var objectLoader = new _obj.ObjectLoader(_this.resources, keys, _this.xref);
return objectLoader.load();
@@ -9924,7 +11916,6 @@ var Page = function PageClosure() {
task = _ref2.task,
intent = _ref2.intent,
renderInteractiveForms = _ref2.renderInteractiveForms;
-
var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
var resourcesPromise = this.loadResources(['ExtGState', 'ColorSpace', 'Pattern', 'Shading', 'XObject', 'Font']);
var partialEvaluator = new _evaluator.PartialEvaluator({
@@ -9967,19 +11958,24 @@ var Page = function PageClosure() {
pageOpList.flush(true);
return pageOpList;
}
+
var i,
ii,
opListPromises = [];
+
for (i = 0, ii = annotations.length; i < ii; i++) {
if (isAnnotationRenderable(annotations[i], intent)) {
opListPromises.push(annotations[i].getOperatorList(partialEvaluator, task, renderInteractiveForms));
}
}
+
return Promise.all(opListPromises).then(function (opLists) {
pageOpList.addOp(_util.OPS.beginAnnotations, []);
+
for (i = 0, ii = opLists.length; i < ii; i++) {
pageOpList.addOpList(opLists[i]);
}
+
pageOpList.addOp(_util.OPS.endAnnotations, []);
pageOpList.flush(true);
return pageOpList;
@@ -9994,7 +11990,6 @@ var Page = function PageClosure() {
normalizeWhitespace = _ref7.normalizeWhitespace,
sink = _ref7.sink,
combineTextItems = _ref7.combineTextItems;
-
var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
var resourcesPromise = this.loadResources(['ExtGState', 'XObject', 'Font']);
var dataPromises = Promise.all([contentStreamPromise, resourcesPromise]);
@@ -10026,11 +12021,13 @@ var Page = function PageClosure() {
getAnnotationsData: function getAnnotationsData(intent) {
return this._parsedAnnotations.then(function (annotations) {
var annotationsData = [];
+
for (var i = 0, ii = annotations.length; i < ii; i++) {
if (!intent || isAnnotationRenderable(annotations[i], intent)) {
annotationsData.push(annotations[i].data);
}
}
+
return annotationsData;
});
},
@@ -10038,34 +12035,43 @@ var Page = function PageClosure() {
get annotations() {
return (0, _util.shadow)(this, 'annotations', this._getInheritableProperty('Annots') || []);
},
+
get _parsedAnnotations() {
var _this4 = this;
var parsedAnnotations = this.pdfManager.ensure(this, 'annotations').then(function () {
var annotationRefs = _this4.annotations;
var annotationPromises = [];
+
for (var i = 0, ii = annotationRefs.length; i < ii; i++) {
annotationPromises.push(_annotation.AnnotationFactory.create(_this4.xref, annotationRefs[i], _this4.pdfManager, _this4.idFactory));
}
+
return Promise.all(annotationPromises).then(function (annotations) {
return annotations.filter(function isDefined(annotation) {
return !!annotation;
});
}, function (reason) {
- (0, _util.warn)('_parsedAnnotations: "' + reason + '".');
+ (0, _util.warn)("_parsedAnnotations: \"".concat(reason, "\"."));
return [];
});
});
return (0, _util.shadow)(this, '_parsedAnnotations', parsedAnnotations);
}
+
};
return Page;
}();
+
+exports.Page = Page;
+
var PDFDocument = function PDFDocumentClosure() {
var FINGERPRINT_FIRST_BYTES = 1024;
var EMPTY_FINGERPRINT = '\x00\x00\x00\x00\x00\x00\x00' + '\x00\x00\x00\x00\x00\x00\x00\x00\x00';
+
function PDFDocument(pdfManager, arg) {
var stream;
+
if ((0, _primitives.isStream)(arg)) {
stream = arg;
} else if ((0, _util.isArrayBuffer)(arg)) {
@@ -10073,9 +12079,11 @@ var PDFDocument = function PDFDocumentClosure() {
} else {
throw new Error('PDFDocument: Unknown argument type');
}
+
if (stream.length <= 0) {
throw new Error('PDFDocument: stream must have data');
}
+
this.pdfManager = pdfManager;
this.stream = stream;
this.xref = new _obj.XRef(stream, pdfManager);
@@ -10086,25 +12094,32 @@ var PDFDocument = function PDFDocumentClosure() {
});
this._pagePromises = [];
}
+
function find(stream, needle, limit, backwards) {
var pos = stream.pos;
var end = stream.end;
var strBuf = [];
+
if (pos + limit > end) {
limit = end - pos;
}
+
for (var n = 0; n < limit; ++n) {
strBuf.push(String.fromCharCode(stream.getByte()));
}
+
var str = strBuf.join('');
stream.pos = pos;
var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
+
if (index === -1) {
return false;
}
+
stream.pos += index;
return true;
}
+
var DocumentInfoValidators = {
Title: _util.isString,
Author: _util.isString,
@@ -10120,14 +12135,18 @@ var PDFDocument = function PDFDocumentClosure() {
parse: function PDFDocument_parse(recoveryMode) {
this.setup(recoveryMode);
var version = this.catalog.catDict.get('Version');
+
if ((0, _primitives.isName)(version)) {
this.pdfFormatVersion = version.name;
}
+
try {
this.acroForm = this.catalog.catDict.get('AcroForm');
+
if (this.acroForm) {
this.xfa = this.acroForm.get('XFA');
var fields = this.acroForm.get('Fields');
+
if ((!fields || !Array.isArray(fields) || fields.length === 0) && !this.xfa) {
this.acroForm = null;
}
@@ -10136,28 +12155,36 @@ var PDFDocument = function PDFDocumentClosure() {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
(0, _util.info)('Something wrong with AcroForm entry');
this.acroForm = null;
}
},
+
get linearization() {
var linearization = null;
+
try {
linearization = _parser.Linearization.create(this.stream);
} catch (err) {
if (err instanceof _util.MissingDataException) {
throw err;
}
+
(0, _util.info)(err);
}
+
return (0, _util.shadow)(this, 'linearization', linearization);
},
+
get startXRef() {
var stream = this.stream;
var startXRef = 0;
var linearization = this.linearization;
+
if (linearization) {
stream.reset();
+
if (find(stream, 'endobj', 1024)) {
startXRef = stream.pos + 6;
}
@@ -10165,50 +12192,66 @@ var PDFDocument = function PDFDocumentClosure() {
var step = 1024;
var found = false,
pos = stream.end;
+
while (!found && pos > 0) {
pos -= step - 'startxref'.length;
+
if (pos < 0) {
pos = 0;
}
+
stream.pos = pos;
found = find(stream, 'startxref', step, true);
}
+
if (found) {
stream.skip(9);
var ch;
+
do {
ch = stream.getByte();
} while ((0, _util.isSpace)(ch));
+
var str = '';
+
while (ch >= 0x20 && ch <= 0x39) {
str += String.fromCharCode(ch);
ch = stream.getByte();
}
+
startXRef = parseInt(str, 10);
+
if (isNaN(startXRef)) {
startXRef = 0;
}
}
}
+
return (0, _util.shadow)(this, 'startXRef', startXRef);
},
+
checkHeader: function PDFDocument_checkHeader() {
var stream = this.stream;
stream.reset();
+
if (find(stream, '%PDF-', 1024)) {
stream.moveStart();
var MAX_VERSION_LENGTH = 12;
var version = '',
ch;
+
while ((ch = stream.getByte()) > 0x20) {
if (version.length >= MAX_VERSION_LENGTH) {
break;
}
+
version += String.fromCharCode(ch);
}
+
if (!this.pdfFormatVersion) {
this.pdfFormatVersion = version.substring(5);
}
+
return;
}
},
@@ -10220,11 +12263,13 @@ var PDFDocument = function PDFDocumentClosure() {
this.xref.parse(recoveryMode);
this.catalog = new _obj.Catalog(this.pdfManager, this.xref);
},
+
get numPages() {
var linearization = this.linearization;
var num = linearization ? linearization.numPages : this.catalog.numPages;
return (0, _util.shadow)(this, 'numPages', num);
},
+
get documentInfo() {
var docInfo = {
PDFFormatVersion: this.pdfFormatVersion,
@@ -10232,52 +12277,99 @@ var PDFDocument = function PDFDocumentClosure() {
IsAcroFormPresent: !!this.acroForm,
IsXFAPresent: !!this.xfa
};
- var infoDict = void 0;
+ var infoDict;
+
try {
infoDict = this.xref.trailer.get('Info');
} catch (err) {
if (err instanceof _util.MissingDataException) {
throw err;
}
+
(0, _util.info)('The document information dictionary is invalid.');
}
+
if ((0, _primitives.isDict)(infoDict)) {
- for (var key in DocumentInfoValidators) {
- if (infoDict.has(key)) {
+ var _iteratorNormalCompletion = true;
+ var _didIteratorError = false;
+ var _iteratorError = undefined;
+
+ try {
+ for (var _iterator = infoDict.getKeys()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+ var key = _step.value;
var value = infoDict.get(key);
- if (DocumentInfoValidators[key](value)) {
- docInfo[key] = typeof value !== 'string' ? value : (0, _util.stringToPDFString)(value);
- } else {
- (0, _util.info)('Bad value in document info for "' + key + '"');
+
+ if (DocumentInfoValidators[key]) {
+ if (DocumentInfoValidators[key](value)) {
+ docInfo[key] = typeof value !== 'string' ? value : (0, _util.stringToPDFString)(value);
+ } else {
+ (0, _util.info)("Bad value in document info for \"".concat(key, "\"."));
+ }
+ } else if (typeof key === 'string') {
+ var customValue = void 0;
+
+ if ((0, _util.isString)(value)) {
+ customValue = (0, _util.stringToPDFString)(value);
+ } else if ((0, _primitives.isName)(value) || (0, _util.isNum)(value) || (0, _util.isBool)(value)) {
+ customValue = value;
+ } else {
+ (0, _util.info)("Unsupported value in document info for (custom) \"".concat(key, "\"."));
+ continue;
+ }
+
+ if (!docInfo['Custom']) {
+ docInfo['Custom'] = Object.create(null);
+ }
+
+ docInfo['Custom'][key] = customValue;
+ }
+ }
+ } catch (err) {
+ _didIteratorError = true;
+ _iteratorError = err;
+ } finally {
+ try {
+ if (!_iteratorNormalCompletion && _iterator.return != null) {
+ _iterator.return();
+ }
+ } finally {
+ if (_didIteratorError) {
+ throw _iteratorError;
}
}
}
}
+
return (0, _util.shadow)(this, 'documentInfo', docInfo);
},
+
get fingerprint() {
var xref = this.xref,
hash,
fileID = '';
var idArray = xref.trailer.get('ID');
+
if (Array.isArray(idArray) && idArray[0] && (0, _util.isString)(idArray[0]) && idArray[0] !== EMPTY_FINGERPRINT) {
hash = (0, _util.stringToBytes)(idArray[0]);
} else {
if (this.stream.ensureRange) {
this.stream.ensureRange(0, Math.min(FINGERPRINT_FIRST_BYTES, this.stream.end));
}
+
hash = (0, _crypto.calculateMD5)(this.stream.bytes.subarray(0, FINGERPRINT_FIRST_BYTES), 0, FINGERPRINT_FIRST_BYTES);
}
+
for (var i = 0, n = hash.length; i < n; i++) {
var hex = hash[i].toString(16);
fileID += hex.length === 1 ? '0' + hex : hex;
}
+
return (0, _util.shadow)(this, 'fingerprint', fileID);
},
+
_getLinearizationPage: function _getLinearizationPage(pageIndex) {
var catalog = this.catalog,
linearization = this.linearization;
-
(0, _util.assert)(linearization && linearization.pageFirst === pageIndex);
var ref = new _primitives.Ref(linearization.objectNumberFirst, 0);
return this.xref.fetchAsync(ref).then(function (obj) {
@@ -10285,8 +12377,10 @@ var PDFDocument = function PDFDocumentClosure() {
if (ref && !catalog.pageKidsCountCache.has(ref)) {
catalog.pageKidsCountCache.put(ref, 1);
}
+
return [obj, ref];
}
+
throw new _util.FormatError('The Linearization dictionary doesn\'t point ' + 'to a valid Page dictionary.');
}).catch(function (reason) {
(0, _util.info)(reason);
@@ -10299,9 +12393,9 @@ var PDFDocument = function PDFDocumentClosure() {
if (this._pagePromises[pageIndex] !== undefined) {
return this._pagePromises[pageIndex];
}
+
var catalog = this.catalog,
linearization = this.linearization;
-
var promise = linearization && linearization.pageFirst === pageIndex ? this._getLinearizationPage(pageIndex) : catalog.getPageDict(pageIndex);
return this._pagePromises[pageIndex] = promise.then(function (_ref10) {
var _ref11 = _slicedToArray(_ref10, 2),
@@ -10320,14 +12414,13 @@ var PDFDocument = function PDFDocumentClosure() {
});
});
},
-
cleanup: function PDFDocument_cleanup() {
return this.catalog.cleanup();
}
};
return PDFDocument;
}();
-exports.Page = Page;
+
exports.PDFDocument = PDFDocument;
/***/ }),
@@ -10340,17 +12433,9 @@ exports.PDFDocument = PDFDocument;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.FileSpec = exports.XRef = exports.ObjectLoader = exports.Catalog = undefined;
-
-var _regenerator = __w_pdfjs_require__(135);
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
+exports.FileSpec = exports.XRef = exports.ObjectLoader = exports.Catalog = void 0;
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(135));
var _util = __w_pdfjs_require__(2);
@@ -10366,45 +12451,77 @@ var _colorspace = __w_pdfjs_require__(155);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
function fetchDestination(dest) {
return (0, _primitives.isDict)(dest) ? dest.get('D') : dest;
}
-var Catalog = function () {
+var Catalog =
+/*#__PURE__*/
+function () {
function Catalog(pdfManager, xref) {
_classCallCheck(this, Catalog);
this.pdfManager = pdfManager;
this.xref = xref;
this.catDict = xref.getCatalogObj();
+
if (!(0, _primitives.isDict)(this.catDict)) {
throw new _util.FormatError('Catalog object is not a dictionary.');
}
+
this.fontCache = new _primitives.RefSetCache();
this.builtInCMapCache = new Map();
this.pageKidsCountCache = new _primitives.RefSetCache();
}
_createClass(Catalog, [{
- key: '_readDocumentOutline',
+ key: "_readDocumentOutline",
value: function _readDocumentOutline() {
var obj = this.catDict.get('Outlines');
+
if (!(0, _primitives.isDict)(obj)) {
return null;
}
+
obj = obj.getRaw('First');
+
if (!(0, _primitives.isRef)(obj)) {
return null;
}
- var root = { items: [] };
+
+ var root = {
+ items: []
+ };
var queue = [{
obj: obj,
parent: root
@@ -10413,15 +12530,19 @@ var Catalog = function () {
processed.put(obj);
var xref = this.xref,
blackColor = new Uint8ClampedArray(3);
+
while (queue.length > 0) {
var i = queue.shift();
var outlineDict = xref.fetchIfRef(i.obj);
+
if (outlineDict === null) {
continue;
}
+
if (!outlineDict.has('Title')) {
throw new _util.FormatError('Invalid outline item encountered.');
}
+
var data = {
url: null,
dest: null
@@ -10435,9 +12556,11 @@ var Catalog = function () {
var flags = outlineDict.get('F') || 0;
var color = outlineDict.getArray('C');
var rgbColor = blackColor;
+
if (Array.isArray(color) && color.length === 3 && (color[0] !== 0 || color[1] !== 0 || color[2] !== 0)) {
rgbColor = _colorspace.ColorSpace.singletons.rgb.getRgb(color, 0);
}
+
var outlineItem = {
dest: data.dest,
url: data.url,
@@ -10452,6 +12575,7 @@ var Catalog = function () {
};
i.parent.items.push(outlineItem);
obj = outlineDict.getRaw('First');
+
if ((0, _primitives.isRef)(obj) && !processed.has(obj)) {
queue.push({
obj: obj,
@@ -10459,7 +12583,9 @@ var Catalog = function () {
});
processed.put(obj);
}
+
obj = outlineDict.getRaw('Next');
+
if ((0, _primitives.isRef)(obj) && !processed.has(obj)) {
queue.push({
obj: obj,
@@ -10468,42 +12594,53 @@ var Catalog = function () {
processed.put(obj);
}
}
+
return root.items.length > 0 ? root.items : null;
}
}, {
- key: '_readPermissions',
+ key: "_readPermissions",
value: function _readPermissions() {
var encrypt = this.xref.trailer.get('Encrypt');
+
if (!(0, _primitives.isDict)(encrypt)) {
return null;
}
+
var flags = encrypt.get('P');
+
if (!(0, _util.isNum)(flags)) {
return null;
}
+
flags += Math.pow(2, 32);
var permissions = [];
+
for (var key in _util.PermissionFlag) {
var value = _util.PermissionFlag[key];
+
if (flags & value) {
permissions.push(value);
}
}
+
return permissions;
}
}, {
- key: 'getDestination',
+ key: "getDestination",
value: function getDestination(destinationId) {
var obj = this._readDests();
+
if (obj instanceof NameTree || obj instanceof _primitives.Dict) {
return fetchDestination(obj.get(destinationId) || null);
}
+
return null;
}
}, {
- key: '_readDests',
+ key: "_readDests",
value: function _readDests() {
var obj = this.catDict.get('Names');
+
if (obj && obj.has('Dests')) {
return new NameTree(obj.getRaw('Dests'), this.xref);
} else if (this.catDict.has('Dests')) {
@@ -10511,12 +12648,14 @@ var Catalog = function () {
}
}
}, {
- key: '_readPageLabels',
+ key: "_readPageLabels",
value: function _readPageLabels() {
var obj = this.catDict.getRaw('PageLabels');
+
if (!obj) {
return null;
}
+
var pageLabels = new Array(this.numPages);
var style = null,
prefix = '';
@@ -10524,51 +12663,66 @@ var Catalog = function () {
var nums = numberTree.getAll();
var currentLabel = '',
currentIndex = 1;
+
for (var i = 0, ii = this.numPages; i < ii; i++) {
if (i in nums) {
var labelDict = nums[i];
+
if (!(0, _primitives.isDict)(labelDict)) {
throw new _util.FormatError('PageLabel is not a dictionary.');
}
+
if (labelDict.has('Type') && !(0, _primitives.isName)(labelDict.get('Type'), 'PageLabel')) {
throw new _util.FormatError('Invalid type in PageLabel dictionary.');
}
+
if (labelDict.has('S')) {
var s = labelDict.get('S');
+
if (!(0, _primitives.isName)(s)) {
throw new _util.FormatError('Invalid style in PageLabel dictionary.');
}
+
style = s.name;
} else {
style = null;
}
+
if (labelDict.has('P')) {
var p = labelDict.get('P');
+
if (!(0, _util.isString)(p)) {
throw new _util.FormatError('Invalid prefix in PageLabel dictionary.');
}
+
prefix = (0, _util.stringToPDFString)(p);
} else {
prefix = '';
}
+
if (labelDict.has('St')) {
var st = labelDict.get('St');
+
if (!(Number.isInteger(st) && st >= 1)) {
throw new _util.FormatError('Invalid start in PageLabel dictionary.');
}
+
currentIndex = st;
} else {
currentIndex = 1;
}
}
+
switch (style) {
case 'D':
currentLabel = currentIndex;
break;
+
case 'R':
case 'r':
currentLabel = (0, _util.toRomanNumerals)(currentIndex, style === 'r');
break;
+
case 'A':
case 'a':
var LIMIT = 26;
@@ -10578,24 +12732,30 @@ var Catalog = function () {
var letterIndex = currentIndex - 1;
var character = String.fromCharCode(baseCharCode + letterIndex % LIMIT);
var charBuf = [];
+
for (var j = 0, jj = letterIndex / LIMIT | 0; j <= jj; j++) {
charBuf.push(character);
}
+
currentLabel = charBuf.join('');
break;
+
default:
if (style) {
- throw new _util.FormatError('Invalid style "' + style + '" in PageLabel dictionary.');
+ throw new _util.FormatError("Invalid style \"".concat(style, "\" in PageLabel dictionary."));
}
+
currentLabel = '';
}
+
pageLabels[i] = prefix + currentLabel;
currentIndex++;
}
+
return pageLabels;
}
}, {
- key: 'cleanup',
+ key: "cleanup",
value: function cleanup() {
var _this = this;
@@ -10609,41 +12769,50 @@ var Catalog = function () {
var font = translatedFonts[i].dict;
delete font.translated;
}
+
_this.fontCache.clear();
+
_this.builtInCMapCache.clear();
});
}
}, {
- key: 'getPageDict',
+ key: "getPageDict",
value: function getPageDict(pageIndex) {
var capability = (0, _util.createPromiseCapability)();
var nodesToVisit = [this.catDict.getRaw('Pages')];
var xref = this.xref,
pageKidsCountCache = this.pageKidsCountCache;
- var count = void 0,
+ var count,
currentPageIndex = 0;
+
function next() {
var _loop = function _loop() {
var currentNode = nodesToVisit.pop();
+
if ((0, _primitives.isRef)(currentNode)) {
count = pageKidsCountCache.get(currentNode);
+
if (count > 0 && currentPageIndex + count < pageIndex) {
currentPageIndex += count;
- return 'continue';
+ return "continue";
}
+
xref.fetchAsync(currentNode).then(function (obj) {
if ((0, _primitives.isDict)(obj, 'Page') || (0, _primitives.isDict)(obj) && !obj.has('Kids')) {
if (pageIndex === currentPageIndex) {
if (currentNode && !pageKidsCountCache.has(currentNode)) {
pageKidsCountCache.put(currentNode, 1);
}
+
capability.resolve([obj, currentNode]);
} else {
currentPageIndex++;
next();
}
+
return;
}
+
nodesToVisit.push(obj);
next();
}, capability.reject);
@@ -10651,24 +12820,31 @@ var Catalog = function () {
v: void 0
};
}
+
if (!(0, _primitives.isDict)(currentNode)) {
capability.reject(new _util.FormatError('Page dictionary kid reference points to wrong type of object.'));
return {
v: void 0
};
}
+
count = currentNode.get('Count');
+
if (Number.isInteger(count) && count >= 0) {
var objId = currentNode.objId;
+
if (objId && !pageKidsCountCache.has(objId)) {
pageKidsCountCache.put(objId, count);
}
+
if (currentPageIndex + count <= pageIndex) {
currentPageIndex += count;
- return 'continue';
+ return "continue";
}
}
+
var kids = currentNode.get('Kids');
+
if (!Array.isArray(kids)) {
if ((0, _primitives.isName)(currentNode.get('Type'), 'Page') || !currentNode.has('Type') && currentNode.has('Contents')) {
if (currentPageIndex === pageIndex) {
@@ -10677,14 +12853,17 @@ var Catalog = function () {
v: void 0
};
}
+
currentPageIndex++;
- return 'continue';
+ return "continue";
}
+
capability.reject(new _util.FormatError('Page dictionary kids object is not an array.'));
return {
v: void 0
};
}
+
for (var last = kids.length - 1; last >= 0; last--) {
nodesToVisit.push(kids[last]);
}
@@ -10694,64 +12873,78 @@ var Catalog = function () {
var _ret = _loop();
switch (_ret) {
- case 'continue':
+ case "continue":
continue;
default:
- if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v;
+ if (_typeof(_ret) === "object") return _ret.v;
}
}
- capability.reject(new Error('Page index ' + pageIndex + ' not found.'));
+
+ capability.reject(new Error("Page index ".concat(pageIndex, " not found.")));
}
+
next();
return capability.promise;
}
}, {
- key: 'getPageIndex',
+ key: "getPageIndex",
value: function getPageIndex(pageRef) {
var xref = this.xref;
+
function pagesBeforeRef(kidRef) {
var total = 0,
- parentRef = void 0;
+ parentRef;
return xref.fetchAsync(kidRef).then(function (node) {
if ((0, _primitives.isRefsEqual)(kidRef, pageRef) && !(0, _primitives.isDict)(node, 'Page') && !((0, _primitives.isDict)(node) && !node.has('Type') && node.has('Contents'))) {
throw new _util.FormatError('The reference does not point to a /Page dictionary.');
}
+
if (!node) {
return null;
}
+
if (!(0, _primitives.isDict)(node)) {
throw new _util.FormatError('Node must be a dictionary.');
}
+
parentRef = node.getRaw('Parent');
return node.getAsync('Parent');
}).then(function (parent) {
if (!parent) {
return null;
}
+
if (!(0, _primitives.isDict)(parent)) {
throw new _util.FormatError('Parent must be a dictionary.');
}
+
return parent.getAsync('Kids');
}).then(function (kids) {
if (!kids) {
return null;
}
+
var kidPromises = [];
var found = false;
+
for (var i = 0, ii = kids.length; i < ii; i++) {
var kid = kids[i];
+
if (!(0, _primitives.isRef)(kid)) {
throw new _util.FormatError('Kid must be a reference.');
}
+
if ((0, _primitives.isRefsEqual)(kid, kidRef)) {
found = true;
break;
}
+
kidPromises.push(xref.fetchAsync(kid).then(function (kid) {
if (!(0, _primitives.isDict)(kid)) {
throw new _util.FormatError('Kid node must be a dictionary.');
}
+
if (kid.has('Count')) {
total += kid.get('Count');
} else {
@@ -10759,15 +12952,19 @@ var Catalog = function () {
}
}));
}
+
if (!found) {
throw new _util.FormatError('Kid reference not found in parent\'s kids.');
}
+
return Promise.all(kidPromises).then(function () {
return [total, parentRef];
});
});
}
+
var total = 0;
+
function next(ref) {
return pagesBeforeRef(ref).then(function (args) {
if (!args) {
@@ -10782,21 +12979,26 @@ var Catalog = function () {
return next(parentRef);
});
}
+
return next(pageRef);
}
}, {
- key: 'metadata',
+ key: "metadata",
get: function get() {
var streamRef = this.catDict.getRaw('Metadata');
+
if (!(0, _primitives.isRef)(streamRef)) {
return (0, _util.shadow)(this, 'metadata', null);
}
+
var suppressEncryption = !(this.xref.encrypt && this.xref.encrypt.encryptMetadata);
var stream = this.xref.fetch(streamRef, suppressEncryption);
- var metadata = void 0;
+ var metadata;
+
if (stream && (0, _primitives.isDict)(stream.dict)) {
var type = stream.dict.get('Type');
var subtype = stream.dict.get('Subtype');
+
if ((0, _primitives.isName)(type, 'Metadata') && (0, _primitives.isName)(subtype, 'XML')) {
try {
metadata = (0, _util.stringToUTF8String)((0, _util.bytesToString)(stream.getBytes()));
@@ -10804,65 +13006,79 @@ var Catalog = function () {
if (e instanceof _util.MissingDataException) {
throw e;
}
+
(0, _util.info)('Skipping invalid metadata.');
}
}
}
+
return (0, _util.shadow)(this, 'metadata', metadata);
}
}, {
- key: 'toplevelPagesDict',
+ key: "toplevelPagesDict",
get: function get() {
var pagesObj = this.catDict.get('Pages');
+
if (!(0, _primitives.isDict)(pagesObj)) {
throw new _util.FormatError('Invalid top-level pages dictionary.');
}
+
return (0, _util.shadow)(this, 'toplevelPagesDict', pagesObj);
}
}, {
- key: 'documentOutline',
+ key: "documentOutline",
get: function get() {
var obj = null;
+
try {
obj = this._readDocumentOutline();
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
(0, _util.warn)('Unable to read document outline.');
}
+
return (0, _util.shadow)(this, 'documentOutline', obj);
}
}, {
- key: 'permissions',
+ key: "permissions",
get: function get() {
var permissions = null;
+
try {
permissions = this._readPermissions();
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
(0, _util.warn)('Unable to read permissions.');
}
+
return (0, _util.shadow)(this, 'permissions', permissions);
}
}, {
- key: 'numPages',
+ key: "numPages",
get: function get() {
var obj = this.toplevelPagesDict.get('Count');
+
if (!Number.isInteger(obj)) {
throw new _util.FormatError('Page count in top-level pages dictionary is not an integer.');
}
+
return (0, _util.shadow)(this, 'numPages', obj);
}
}, {
- key: 'destinations',
+ key: "destinations",
get: function get() {
var obj = this._readDests(),
dests = Object.create(null);
+
if (obj instanceof NameTree) {
var names = obj.getAll();
+
for (var name in names) {
dests[name] = fetchDestination(names[name]);
}
@@ -10873,27 +13089,32 @@ var Catalog = function () {
}
});
}
+
return (0, _util.shadow)(this, 'destinations', dests);
}
}, {
- key: 'pageLabels',
+ key: "pageLabels",
get: function get() {
var obj = null;
+
try {
obj = this._readPageLabels();
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
(0, _util.warn)('Unable to read page labels.');
}
+
return (0, _util.shadow)(this, 'pageLabels', obj);
}
}, {
- key: 'pageMode',
+ key: "pageMode",
get: function get() {
var obj = this.catDict.get('PageMode');
var pageMode = 'UseNone';
+
if ((0, _primitives.isName)(obj)) {
switch (obj.name) {
case 'UseNone':
@@ -10905,83 +13126,106 @@ var Catalog = function () {
pageMode = obj.name;
}
}
+
return (0, _util.shadow)(this, 'pageMode', pageMode);
}
}, {
- key: 'attachments',
+ key: "attachments",
get: function get() {
var obj = this.catDict.get('Names');
var attachments = null;
+
if (obj && obj.has('EmbeddedFiles')) {
var nameTree = new NameTree(obj.getRaw('EmbeddedFiles'), this.xref);
var names = nameTree.getAll();
+
for (var name in names) {
var fs = new FileSpec(names[name], this.xref);
+
if (!attachments) {
attachments = Object.create(null);
}
+
attachments[(0, _util.stringToPDFString)(name)] = fs.serializable;
}
}
+
return (0, _util.shadow)(this, 'attachments', attachments);
}
}, {
- key: 'javaScript',
+ key: "javaScript",
get: function get() {
var obj = this.catDict.get('Names');
var javaScript = null;
+
function appendIfJavaScriptDict(jsDict) {
var type = jsDict.get('S');
+
if (!(0, _primitives.isName)(type, 'JavaScript')) {
return;
}
+
var js = jsDict.get('JS');
+
if ((0, _primitives.isStream)(js)) {
js = (0, _util.bytesToString)(js.getBytes());
} else if (!(0, _util.isString)(js)) {
return;
}
+
if (!javaScript) {
javaScript = [];
}
+
javaScript.push((0, _util.stringToPDFString)(js));
}
+
if (obj && obj.has('JavaScript')) {
var nameTree = new NameTree(obj.getRaw('JavaScript'), this.xref);
var names = nameTree.getAll();
+
for (var name in names) {
var jsDict = names[name];
+
if ((0, _primitives.isDict)(jsDict)) {
appendIfJavaScriptDict(jsDict);
}
}
}
+
var openActionDict = this.catDict.get('OpenAction');
+
if ((0, _primitives.isDict)(openActionDict, 'Action')) {
var actionType = openActionDict.get('S');
+
if ((0, _primitives.isName)(actionType, 'Named')) {
var action = openActionDict.get('N');
+
if ((0, _primitives.isName)(action, 'Print')) {
if (!javaScript) {
javaScript = [];
}
+
javaScript.push('print({});');
}
} else {
appendIfJavaScriptDict(openActionDict);
}
}
+
return (0, _util.shadow)(this, 'javaScript', javaScript);
}
}], [{
- key: 'parseDestDictionary',
+ key: "parseDestDictionary",
value: function parseDestDictionary(params) {
function addDefaultProtocolToUrl(url) {
if (url.indexOf('www.') === 0) {
- return 'http://' + url;
+ return "http://".concat(url);
}
+
return url;
}
+
function tryConvertUrlEncoding(url) {
try {
return (0, _util.stringToUTF8String)(url);
@@ -10989,57 +13233,76 @@ var Catalog = function () {
return url;
}
}
+
var destDict = params.destDict;
+
if (!(0, _primitives.isDict)(destDict)) {
(0, _util.warn)('parseDestDictionary: `destDict` must be a dictionary.');
return;
}
+
var resultObj = params.resultObj;
- if ((typeof resultObj === 'undefined' ? 'undefined' : _typeof(resultObj)) !== 'object') {
+
+ if (_typeof(resultObj) !== 'object') {
(0, _util.warn)('parseDestDictionary: `resultObj` must be an object.');
return;
}
+
var docBaseUrl = params.docBaseUrl || null;
var action = destDict.get('A'),
- url = void 0,
- dest = void 0;
+ url,
+ dest;
+
if (!(0, _primitives.isDict)(action) && destDict.has('Dest')) {
action = destDict.get('Dest');
}
+
if ((0, _primitives.isDict)(action)) {
var actionType = action.get('S');
+
if (!(0, _primitives.isName)(actionType)) {
(0, _util.warn)('parseDestDictionary: Invalid type in Action dictionary.');
return;
}
+
var actionName = actionType.name;
+
switch (actionName) {
case 'URI':
url = action.get('URI');
+
if ((0, _primitives.isName)(url)) {
url = '/' + url.name;
} else if ((0, _util.isString)(url)) {
url = addDefaultProtocolToUrl(url);
}
+
break;
+
case 'GoTo':
dest = action.get('D');
break;
+
case 'Launch':
case 'GoToR':
var urlDict = action.get('F');
+
if ((0, _primitives.isDict)(urlDict)) {
url = urlDict.get('F') || null;
} else if ((0, _util.isString)(urlDict)) {
url = urlDict;
}
+
var remoteDest = action.get('D');
+
if (remoteDest) {
if ((0, _primitives.isName)(remoteDest)) {
remoteDest = remoteDest.name;
}
+
if ((0, _util.isString)(url)) {
var baseUrl = url.split('#')[0];
+
if ((0, _util.isString)(remoteDest)) {
url = baseUrl + '#' + remoteDest;
} else if (Array.isArray(remoteDest)) {
@@ -11047,56 +13310,74 @@ var Catalog = function () {
}
}
}
+
var newWindow = action.get('NewWindow');
+
if ((0, _util.isBool)(newWindow)) {
resultObj.newWindow = newWindow;
}
+
break;
+
case 'Named':
var namedAction = action.get('N');
+
if ((0, _primitives.isName)(namedAction)) {
resultObj.action = namedAction.name;
}
+
break;
+
case 'JavaScript':
var jsAction = action.get('JS');
- var js = void 0;
+ var js;
+
if ((0, _primitives.isStream)(jsAction)) {
js = (0, _util.bytesToString)(jsAction.getBytes());
} else if ((0, _util.isString)(jsAction)) {
js = jsAction;
}
+
if (js) {
var URL_OPEN_METHODS = ['app.launchURL', 'window.open'];
var regex = new RegExp('^\\s*(' + URL_OPEN_METHODS.join('|').split('.').join('\\.') + ')\\((?:\'|\")([^\'\"]*)(?:\'|\")(?:,\\s*(\\w+)\\)|\\))', 'i');
var jsUrl = regex.exec((0, _util.stringToPDFString)(js));
+
if (jsUrl && jsUrl[2]) {
url = jsUrl[2];
+
if (jsUrl[3] === 'true' && jsUrl[1] === 'app.launchURL') {
resultObj.newWindow = true;
}
+
break;
}
}
+
default:
- (0, _util.warn)('parseDestDictionary: unsupported action type "' + actionName + '".');
+ (0, _util.warn)("parseDestDictionary: unsupported action type \"".concat(actionName, "\"."));
break;
}
} else if (destDict.has('Dest')) {
dest = destDict.get('Dest');
}
+
if ((0, _util.isString)(url)) {
url = tryConvertUrlEncoding(url);
var absoluteUrl = (0, _util.createValidAbsoluteUrl)(url, docBaseUrl);
+
if (absoluteUrl) {
resultObj.url = absoluteUrl.href;
}
+
resultObj.unsafeUrl = url;
}
+
if (dest) {
if ((0, _primitives.isName)(dest)) {
dest = dest.name;
}
+
if ((0, _util.isString)(dest) || Array.isArray(dest)) {
resultObj.dest = dest;
}
@@ -11107,6 +13388,8 @@ var Catalog = function () {
return Catalog;
}();
+exports.Catalog = Catalog;
+
var XRef = function XRefClosure() {
function XRef(stream, pdfManager) {
this.stream = stream;
@@ -11119,50 +13402,61 @@ var XRef = function XRefClosure() {
fontTypes: []
};
}
+
XRef.prototype = {
setStartXRef: function XRef_setStartXRef(startXRef) {
this.startXRefQueue = [startXRef];
},
parse: function XRef_parse(recoveryMode) {
var trailerDict;
+
if (!recoveryMode) {
trailerDict = this.readXRef();
} else {
(0, _util.warn)('Indexing all PDF objects');
trailerDict = this.indexObjects();
}
+
trailerDict.assignXref(this);
this.trailer = trailerDict;
- var encrypt = void 0;
+ var encrypt;
+
try {
encrypt = trailerDict.get('Encrypt');
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
- (0, _util.warn)('XRef.parse - Invalid "Encrypt" reference: "' + ex + '".');
+
+ (0, _util.warn)("XRef.parse - Invalid \"Encrypt\" reference: \"".concat(ex, "\"."));
}
+
if ((0, _primitives.isDict)(encrypt)) {
var ids = trailerDict.get('ID');
var fileId = ids && ids.length ? ids[0] : '';
encrypt.suppressEncryption = true;
this.encrypt = new _crypto.CipherTransformFactory(encrypt, fileId, this.pdfManager.password);
}
- var root = void 0;
+
+ var root;
+
try {
root = trailerDict.get('Root');
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
- (0, _util.warn)('XRef.parse - Invalid "Root" reference: "' + ex + '".');
+
+ (0, _util.warn)("XRef.parse - Invalid \"Root\" reference: \"".concat(ex, "\"."));
}
+
if ((0, _primitives.isDict)(root) && root.has('Pages')) {
this.root = root;
} else {
if (!recoveryMode) {
throw new _util.XRefParseException();
}
+
throw new _util.FormatError('Invalid root reference');
}
},
@@ -11175,17 +13469,23 @@ var XRef = function XRefClosure() {
parserBuf2: parser.buf2
};
}
+
var obj = this.readXRefTable(parser);
+
if (!(0, _primitives.isCmd)(obj, 'trailer')) {
throw new _util.FormatError('Invalid XRef table: could not find trailer dictionary');
}
+
var dict = parser.getObj();
+
if (!(0, _primitives.isDict)(dict) && dict.dict) {
dict = dict.dict;
}
+
if (!(0, _primitives.isDict)(dict)) {
throw new _util.FormatError('Invalid XRef table: could not parse trailer dictionary');
}
+
delete this.tableState;
return dict;
},
@@ -11196,19 +13496,24 @@ var XRef = function XRefClosure() {
parser.buf1 = tableState.parserBuf1;
parser.buf2 = tableState.parserBuf2;
var obj;
+
while (true) {
if (!('firstEntryNum' in tableState) || !('entryCount' in tableState)) {
if ((0, _primitives.isCmd)(obj = parser.getObj(), 'trailer')) {
break;
}
+
tableState.firstEntryNum = obj;
tableState.entryCount = parser.getObj();
}
+
var first = tableState.firstEntryNum;
var count = tableState.entryCount;
+
if (!Number.isInteger(first) || !Number.isInteger(count)) {
throw new _util.FormatError('Invalid XRef table: wrong types in subsection header');
}
+
for (var i = tableState.entryNum; i < count; i++) {
tableState.streamPos = stream.pos;
tableState.entryNum = i;
@@ -11218,21 +13523,26 @@ var XRef = function XRefClosure() {
entry.offset = parser.getObj();
entry.gen = parser.getObj();
var type = parser.getObj();
+
if ((0, _primitives.isCmd)(type, 'f')) {
entry.free = true;
} else if ((0, _primitives.isCmd)(type, 'n')) {
entry.uncompressed = true;
}
+
if (!Number.isInteger(entry.offset) || !Number.isInteger(entry.gen) || !(entry.free || entry.uncompressed)) {
- throw new _util.FormatError('Invalid entry in XRef subsection: ' + first + ', ' + count);
+ throw new _util.FormatError("Invalid entry in XRef subsection: ".concat(first, ", ").concat(count));
}
+
if (i === 0 && entry.free && first === 1) {
first = 0;
}
+
if (!this.entries[i + first]) {
this.entries[i + first] = entry;
}
}
+
tableState.entryNum = 0;
tableState.streamPos = stream.pos;
tableState.parserBuf1 = parser.buf1;
@@ -11240,9 +13550,11 @@ var XRef = function XRefClosure() {
delete tableState.firstEntryNum;
delete tableState.entryCount;
}
+
if (this.entries[0] && !this.entries[0].free) {
throw new _util.FormatError('Invalid XRef table: unexpected first object');
}
+
return obj;
},
processXRefStream: function XRef_processXRefStream(stream) {
@@ -11250,9 +13562,11 @@ var XRef = function XRefClosure() {
var streamParameters = stream.dict;
var byteWidths = streamParameters.get('W');
var range = streamParameters.get('Index');
+
if (!range) {
range = [0, streamParameters.get('Size')];
}
+
this.streamState = {
entryRanges: range,
byteWidths: byteWidths,
@@ -11260,6 +13574,7 @@ var XRef = function XRefClosure() {
streamPos: stream.pos
};
}
+
this.readXRefStream(stream);
delete this.streamState;
return stream.dict;
@@ -11273,52 +13588,67 @@ var XRef = function XRefClosure() {
var offsetFieldWidth = byteWidths[1];
var generationFieldWidth = byteWidths[2];
var entryRanges = streamState.entryRanges;
+
while (entryRanges.length > 0) {
var first = entryRanges[0];
var n = entryRanges[1];
+
if (!Number.isInteger(first) || !Number.isInteger(n)) {
- throw new _util.FormatError('Invalid XRef range fields: ' + first + ', ' + n);
+ throw new _util.FormatError("Invalid XRef range fields: ".concat(first, ", ").concat(n));
}
+
if (!Number.isInteger(typeFieldWidth) || !Number.isInteger(offsetFieldWidth) || !Number.isInteger(generationFieldWidth)) {
- throw new _util.FormatError('Invalid XRef entry fields length: ' + first + ', ' + n);
+ throw new _util.FormatError("Invalid XRef entry fields length: ".concat(first, ", ").concat(n));
}
+
for (i = streamState.entryNum; i < n; ++i) {
streamState.entryNum = i;
streamState.streamPos = stream.pos;
var type = 0,
offset = 0,
generation = 0;
+
for (j = 0; j < typeFieldWidth; ++j) {
type = type << 8 | stream.getByte();
}
+
if (typeFieldWidth === 0) {
type = 1;
}
+
for (j = 0; j < offsetFieldWidth; ++j) {
offset = offset << 8 | stream.getByte();
}
+
for (j = 0; j < generationFieldWidth; ++j) {
generation = generation << 8 | stream.getByte();
}
+
var entry = {};
entry.offset = offset;
entry.gen = generation;
+
switch (type) {
case 0:
entry.free = true;
break;
+
case 1:
entry.uncompressed = true;
break;
+
case 2:
break;
+
default:
- throw new _util.FormatError('Invalid XRef entry type: ' + type);
+ throw new _util.FormatError("Invalid XRef entry type: ".concat(type));
}
+
if (!this.entries[first + i]) {
this.entries[first + i] = entry;
}
}
+
streamState.entryNum = 0;
streamState.streamPos = stream.pos;
entryRanges.splice(0, 2);
@@ -11331,35 +13661,46 @@ var XRef = function XRefClosure() {
SPACE = 0x20;
var PERCENT = 0x25,
LT = 0x3C;
+
function readToken(data, offset) {
var token = '',
ch = data[offset];
+
while (ch !== LF && ch !== CR && ch !== LT) {
if (++offset >= data.length) {
break;
}
+
token += String.fromCharCode(ch);
ch = data[offset];
}
+
return token;
}
+
function skipUntil(data, offset, what) {
var length = what.length,
dataLength = data.length;
var skipped = 0;
+
while (offset < dataLength) {
var i = 0;
+
while (i < length && data[offset + i] === what[i]) {
++i;
}
+
if (i >= length) {
break;
}
+
offset++;
skipped++;
}
+
return skipped;
}
+
var objRegExp = /^(\d+)\s+(\d+)\s+obj\b/;
var endobjRegExp = /\bendobj[\b\s]$/;
var nestedObjRegExp = /\s+(\d+\s+\d+\s+obj[\b\s])$/;
@@ -11376,24 +13717,32 @@ var XRef = function XRefClosure() {
length = buffer.length;
var trailers = [],
xrefStms = [];
+
while (position < length) {
var ch = buffer[position];
+
if (ch === TAB || ch === LF || ch === CR || ch === SPACE) {
++position;
continue;
}
+
if (ch === PERCENT) {
do {
++position;
+
if (position >= length) {
break;
}
+
ch = buffer[position];
} while (ch !== LF && ch !== CR);
+
continue;
}
+
var token = readToken(buffer, position);
var m;
+
if (token.indexOf('xref') === 0 && (token.length === 4 || /\s/.test(token[4]))) {
position += skipUntil(buffer, position, trailerBytes);
trailers.push(position);
@@ -11406,31 +13755,39 @@ var XRef = function XRefClosure() {
uncompressed: true
};
}
+
var contentLength = void 0,
startPos = position + token.length;
+
while (startPos < buffer.length) {
var endPos = startPos + skipUntil(buffer, startPos, objBytes) + 4;
contentLength = endPos - position;
var checkPos = Math.max(endPos - CHECK_CONTENT_LENGTH, startPos);
var tokenStr = (0, _util.bytesToString)(buffer.subarray(checkPos, endPos));
+
if (endobjRegExp.test(tokenStr)) {
break;
} else {
var objToken = nestedObjRegExp.exec(tokenStr);
+
if (objToken && objToken[1]) {
(0, _util.warn)('indexObjects: Found new "obj" inside of another "obj", ' + 'caused by missing "endobj" -- trying to recover.');
contentLength -= objToken[1].length;
break;
}
}
+
startPos = endPos;
}
+
var content = buffer.subarray(position, position + contentLength);
var xrefTagOffset = skipUntil(content, 0, xrefBytes);
+
if (xrefTagOffset < contentLength && content[xrefTagOffset + 5] < 64) {
xrefStms.push(position - stream.start);
this.xrefstms[position - stream.start] = 1;
}
+
position += contentLength;
} else if (token.indexOf('trailer') === 0 && (token.length === 7 || /\s/.test(token[7]))) {
trailers.push(position);
@@ -11439,69 +13796,92 @@ var XRef = function XRefClosure() {
position += token.length + 1;
}
}
+
var i, ii;
+
for (i = 0, ii = xrefStms.length; i < ii; ++i) {
this.startXRefQueue.push(xrefStms[i]);
this.readXRef(true);
}
- var trailerDict = void 0;
+
+ var trailerDict;
+
for (i = 0, ii = trailers.length; i < ii; ++i) {
stream.pos = trailers[i];
var parser = new _parser.Parser(new _parser.Lexer(stream), true, this, true);
var obj = parser.getObj();
+
if (!(0, _primitives.isCmd)(obj, 'trailer')) {
continue;
}
+
var dict = parser.getObj();
+
if (!(0, _primitives.isDict)(dict)) {
continue;
}
+
var rootDict = void 0;
+
try {
rootDict = dict.get('Root');
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
continue;
}
+
if (!(0, _primitives.isDict)(rootDict) || !rootDict.has('Pages')) {
continue;
}
+
if (dict.has('ID')) {
return dict;
}
+
trailerDict = dict;
}
+
if (trailerDict) {
return trailerDict;
}
+
throw new _util.InvalidPDFException('Invalid PDF structure');
},
readXRef: function XRef_readXRef(recoveryMode) {
var stream = this.stream;
var startXRefParsedCache = Object.create(null);
+
try {
while (this.startXRefQueue.length) {
var startXRef = this.startXRefQueue[0];
+
if (startXRefParsedCache[startXRef]) {
(0, _util.warn)('readXRef - skipping XRef table since it was already parsed.');
this.startXRefQueue.shift();
continue;
}
+
startXRefParsedCache[startXRef] = true;
stream.pos = startXRef + stream.start;
var parser = new _parser.Parser(new _parser.Lexer(stream), true, this);
var obj = parser.getObj();
var dict;
+
if ((0, _primitives.isCmd)(obj, 'xref')) {
dict = this.processXRefTable(parser);
+
if (!this.topDict) {
this.topDict = dict;
}
+
obj = dict.get('XRefStm');
+
if (Number.isInteger(obj)) {
var pos = obj;
+
if (!(pos in this.xrefstms)) {
this.xrefstms[pos] = 1;
this.startXRefQueue.push(pos);
@@ -11511,164 +13891,214 @@ var XRef = function XRefClosure() {
if (!Number.isInteger(parser.getObj()) || !(0, _primitives.isCmd)(parser.getObj(), 'obj') || !(0, _primitives.isStream)(obj = parser.getObj())) {
throw new _util.FormatError('Invalid XRef stream');
}
+
dict = this.processXRefStream(obj);
+
if (!this.topDict) {
this.topDict = dict;
}
+
if (!dict) {
throw new _util.FormatError('Failed to read XRef stream');
}
} else {
throw new _util.FormatError('Invalid XRef stream header');
}
+
obj = dict.get('Prev');
+
if (Number.isInteger(obj)) {
this.startXRefQueue.push(obj);
} else if ((0, _primitives.isRef)(obj)) {
this.startXRefQueue.push(obj.num);
}
+
this.startXRefQueue.shift();
}
+
return this.topDict;
} catch (e) {
if (e instanceof _util.MissingDataException) {
throw e;
}
+
(0, _util.info)('(while reading XRef): ' + e);
}
+
if (recoveryMode) {
return;
}
+
throw new _util.XRefParseException();
},
getEntry: function XRef_getEntry(i) {
var xrefEntry = this.entries[i];
+
if (xrefEntry && !xrefEntry.free && xrefEntry.offset) {
return xrefEntry;
}
+
return null;
},
fetchIfRef: function XRef_fetchIfRef(obj, suppressEncryption) {
if (!(0, _primitives.isRef)(obj)) {
return obj;
}
+
return this.fetch(obj, suppressEncryption);
},
fetch: function XRef_fetch(ref, suppressEncryption) {
if (!(0, _primitives.isRef)(ref)) {
throw new Error('ref object is not a reference');
}
+
var num = ref.num;
+
if (num in this.cache) {
var cacheEntry = this.cache[num];
+
if (cacheEntry instanceof _primitives.Dict && !cacheEntry.objId) {
cacheEntry.objId = ref.toString();
}
+
return cacheEntry;
}
+
var xrefEntry = this.getEntry(num);
+
if (xrefEntry === null) {
return this.cache[num] = null;
}
+
if (xrefEntry.uncompressed) {
xrefEntry = this.fetchUncompressed(ref, xrefEntry, suppressEncryption);
} else {
xrefEntry = this.fetchCompressed(xrefEntry, suppressEncryption);
}
+
if ((0, _primitives.isDict)(xrefEntry)) {
xrefEntry.objId = ref.toString();
} else if ((0, _primitives.isStream)(xrefEntry)) {
xrefEntry.dict.objId = ref.toString();
}
+
return xrefEntry;
},
fetchUncompressed: function XRef_fetchUncompressed(ref, xrefEntry, suppressEncryption) {
var gen = ref.gen;
var num = ref.num;
+
if (xrefEntry.gen !== gen) {
throw new _util.FormatError('inconsistent generation in XRef');
}
+
var stream = this.stream.makeSubStream(xrefEntry.offset + this.stream.start);
var parser = new _parser.Parser(new _parser.Lexer(stream), true, this);
var obj1 = parser.getObj();
var obj2 = parser.getObj();
var obj3 = parser.getObj();
+
if (!Number.isInteger(obj1)) {
obj1 = parseInt(obj1, 10);
}
+
if (!Number.isInteger(obj2)) {
obj2 = parseInt(obj2, 10);
}
+
if (obj1 !== num || obj2 !== gen || !(0, _primitives.isCmd)(obj3)) {
throw new _util.FormatError('bad XRef entry');
}
+
if (obj3.cmd !== 'obj') {
if (obj3.cmd.indexOf('obj') === 0) {
num = parseInt(obj3.cmd.substring(3), 10);
+
if (!Number.isNaN(num)) {
return num;
}
}
+
throw new _util.FormatError('bad XRef entry');
}
+
if (this.encrypt && !suppressEncryption) {
xrefEntry = parser.getObj(this.encrypt.createCipherTransform(num, gen));
} else {
xrefEntry = parser.getObj();
}
+
if (!(0, _primitives.isStream)(xrefEntry)) {
this.cache[num] = xrefEntry;
}
+
return xrefEntry;
},
fetchCompressed: function XRef_fetchCompressed(xrefEntry, suppressEncryption) {
var tableOffset = xrefEntry.offset;
var stream = this.fetch(new _primitives.Ref(tableOffset, 0));
+
if (!(0, _primitives.isStream)(stream)) {
throw new _util.FormatError('bad ObjStm stream');
}
+
var first = stream.dict.get('First');
var n = stream.dict.get('N');
+
if (!Number.isInteger(first) || !Number.isInteger(n)) {
throw new _util.FormatError('invalid first and n parameters for ObjStm stream');
}
+
var parser = new _parser.Parser(new _parser.Lexer(stream), false, this);
parser.allowStreams = true;
var i,
entries = [],
num,
nums = [];
+
for (i = 0; i < n; ++i) {
num = parser.getObj();
+
if (!Number.isInteger(num)) {
- throw new _util.FormatError('invalid object number in the ObjStm stream: ' + num);
+ throw new _util.FormatError("invalid object number in the ObjStm stream: ".concat(num));
}
+
nums.push(num);
var offset = parser.getObj();
+
if (!Number.isInteger(offset)) {
- throw new _util.FormatError('invalid object offset in the ObjStm stream: ' + offset);
+ throw new _util.FormatError("invalid object offset in the ObjStm stream: ".concat(offset));
}
}
+
for (i = 0; i < n; ++i) {
entries.push(parser.getObj());
+
if ((0, _primitives.isCmd)(parser.buf1, 'endobj')) {
parser.shift();
}
+
num = nums[i];
var entry = this.entries[num];
+
if (entry && entry.offset === tableOffset && entry.gen === i) {
this.cache[num] = entries[i];
}
}
+
xrefEntry = entries[xrefEntry.gen];
+
if (xrefEntry === undefined) {
throw new _util.FormatError('bad XRef entry for compressed object');
}
+
return xrefEntry;
},
fetchIfRefAsync: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(obj, suppressEncryption) {
- return _regenerator2.default.wrap(function _callee$(_context) {
+ var _fetchIfRefAsync = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(obj, suppressEncryption) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -11677,13 +14107,13 @@ var XRef = function XRefClosure() {
break;
}
- return _context.abrupt('return', obj);
+ return _context.abrupt("return", obj);
case 2:
- return _context.abrupt('return', this.fetchAsync(obj, suppressEncryption));
+ return _context.abrupt("return", this.fetchAsync(obj, suppressEncryption));
case 3:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -11691,23 +14121,25 @@ var XRef = function XRefClosure() {
}));
function fetchIfRefAsync(_x, _x2) {
- return _ref.apply(this, arguments);
+ return _fetchIfRefAsync.apply(this, arguments);
}
return fetchIfRefAsync;
}(),
fetchAsync: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ref, suppressEncryption) {
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _fetchAsync = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2(ref, suppressEncryption) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
_context2.prev = 0;
- return _context2.abrupt('return', this.fetch(ref, suppressEncryption));
+ return _context2.abrupt("return", this.fetch(ref, suppressEncryption));
case 4:
_context2.prev = 4;
- _context2.t0 = _context2['catch'](0);
+ _context2.t0 = _context2["catch"](0);
if (_context2.t0 instanceof _util.MissingDataException) {
_context2.next = 8;
@@ -11721,10 +14153,10 @@ var XRef = function XRefClosure() {
return this.pdfManager.requestRange(_context2.t0.begin, _context2.t0.end);
case 10:
- return _context2.abrupt('return', this.fetchAsync(ref, suppressEncryption));
+ return _context2.abrupt("return", this.fetchAsync(ref, suppressEncryption));
case 11:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -11732,12 +14164,11 @@ var XRef = function XRefClosure() {
}));
function fetchAsync(_x3, _x4) {
- return _ref2.apply(this, arguments);
+ return _fetchAsync.apply(this, arguments);
}
return fetchAsync;
}(),
-
getCatalogObj: function XRef_getCatalogObj() {
return this.root;
}
@@ -11745,100 +14176,131 @@ var XRef = function XRefClosure() {
return XRef;
}();
-var NameOrNumberTree = function () {
+exports.XRef = XRef;
+
+var NameOrNumberTree =
+/*#__PURE__*/
+function () {
function NameOrNumberTree(root, xref, type) {
_classCallCheck(this, NameOrNumberTree);
if (this.constructor === NameOrNumberTree) {
(0, _util.unreachable)('Cannot initialize NameOrNumberTree.');
}
+
this.root = root;
this.xref = xref;
this._type = type;
}
_createClass(NameOrNumberTree, [{
- key: 'getAll',
+ key: "getAll",
value: function getAll() {
var dict = Object.create(null);
+
if (!this.root) {
return dict;
}
+
var xref = this.xref;
var processed = new _primitives.RefSet();
processed.put(this.root);
var queue = [this.root];
+
while (queue.length > 0) {
var obj = xref.fetchIfRef(queue.shift());
+
if (!(0, _primitives.isDict)(obj)) {
continue;
}
+
if (obj.has('Kids')) {
- var _kids = obj.get('Kids');
- for (var i = 0, ii = _kids.length; i < ii; i++) {
- var kid = _kids[i];
+ var kids = obj.get('Kids');
+
+ for (var i = 0, ii = kids.length; i < ii; i++) {
+ var kid = kids[i];
+
if (processed.has(kid)) {
- throw new _util.FormatError('Duplicate entry in "' + this._type + '" tree.');
+ throw new _util.FormatError("Duplicate entry in \"".concat(this._type, "\" tree."));
}
+
queue.push(kid);
processed.put(kid);
}
+
continue;
}
+
var entries = obj.get(this._type);
+
if (Array.isArray(entries)) {
for (var _i2 = 0, _ii = entries.length; _i2 < _ii; _i2 += 2) {
dict[xref.fetchIfRef(entries[_i2])] = xref.fetchIfRef(entries[_i2 + 1]);
}
}
}
+
return dict;
}
}, {
- key: 'get',
+ key: "get",
value: function get(key) {
if (!this.root) {
return null;
}
+
var xref = this.xref;
var kidsOrEntries = xref.fetchIfRef(this.root);
var loopCount = 0;
var MAX_LEVELS = 10;
+
while (kidsOrEntries.has('Kids')) {
if (++loopCount > MAX_LEVELS) {
- (0, _util.warn)('Search depth limit reached for "' + this._type + '" tree.');
+ (0, _util.warn)("Search depth limit reached for \"".concat(this._type, "\" tree."));
return null;
}
- var _kids2 = kidsOrEntries.get('Kids');
- if (!Array.isArray(_kids2)) {
+
+ var kids = kidsOrEntries.get('Kids');
+
+ if (!Array.isArray(kids)) {
return null;
}
+
var l = 0,
- r = _kids2.length - 1;
+ r = kids.length - 1;
+
while (l <= r) {
var m = l + r >> 1;
- var kid = xref.fetchIfRef(_kids2[m]);
+ var kid = xref.fetchIfRef(kids[m]);
var limits = kid.get('Limits');
+
if (key < xref.fetchIfRef(limits[0])) {
r = m - 1;
} else if (key > xref.fetchIfRef(limits[1])) {
l = m + 1;
} else {
- kidsOrEntries = xref.fetchIfRef(_kids2[m]);
+ kidsOrEntries = xref.fetchIfRef(kids[m]);
break;
}
}
+
if (l > r) {
return null;
}
}
+
var entries = kidsOrEntries.get(this._type);
+
if (Array.isArray(entries)) {
var _l = 0,
_r = entries.length - 2;
+
while (_l <= _r) {
- var _m = _l + _r & ~1;
+ var tmp = _l + _r >> 1,
+ _m = tmp + (tmp & 1);
+
var currentKey = xref.fetchIfRef(entries[_m]);
+
if (key < currentKey) {
_r = _m - 2;
} else if (key > currentKey) {
@@ -11847,7 +14309,19 @@ var NameOrNumberTree = function () {
return xref.fetchIfRef(entries[_m + 1]);
}
}
+
+ (0, _util.info)("Falling back to an exhaustive search, for key \"".concat(key, "\", ") + "in \"".concat(this._type, "\" tree."));
+
+ for (var _m2 = 0, mm = entries.length; _m2 < mm; _m2 += 2) {
+ var _currentKey = xref.fetchIfRef(entries[_m2]);
+
+ if (_currentKey === key) {
+ (0, _util.warn)("The \"".concat(key, "\" key was found at an incorrect, ") + "i.e. out-of-order, position in \"".concat(this._type, "\" tree."));
+ return xref.fetchIfRef(entries[_m2 + 1]);
+ }
+ }
}
+
return null;
}
}]);
@@ -11855,25 +14329,29 @@ var NameOrNumberTree = function () {
return NameOrNumberTree;
}();
-var NameTree = function (_NameOrNumberTree) {
+var NameTree =
+/*#__PURE__*/
+function (_NameOrNumberTree) {
_inherits(NameTree, _NameOrNumberTree);
function NameTree(root, xref) {
_classCallCheck(this, NameTree);
- return _possibleConstructorReturn(this, (NameTree.__proto__ || Object.getPrototypeOf(NameTree)).call(this, root, xref, 'Names'));
+ return _possibleConstructorReturn(this, _getPrototypeOf(NameTree).call(this, root, xref, 'Names'));
}
return NameTree;
}(NameOrNumberTree);
-var NumberTree = function (_NameOrNumberTree2) {
+var NumberTree =
+/*#__PURE__*/
+function (_NameOrNumberTree2) {
_inherits(NumberTree, _NameOrNumberTree2);
function NumberTree(root, xref) {
_classCallCheck(this, NumberTree);
- return _possibleConstructorReturn(this, (NumberTree.__proto__ || Object.getPrototypeOf(NumberTree)).call(this, root, xref, 'Nums'));
+ return _possibleConstructorReturn(this, _getPrototypeOf(NumberTree).call(this, root, xref, 'Nums'));
}
return NumberTree;
@@ -11884,21 +14362,28 @@ var FileSpec = function FileSpecClosure() {
if (!root || !(0, _primitives.isDict)(root)) {
return;
}
+
this.xref = xref;
this.root = root;
+
if (root.has('FS')) {
this.fs = root.get('FS');
}
+
this.description = root.has('Desc') ? (0, _util.stringToPDFString)(root.get('Desc')) : '';
+
if (root.has('RF')) {
(0, _util.warn)('Related file specifications are not supported');
}
+
this.contentAvailable = true;
+
if (!root.has('EF')) {
this.contentAvailable = false;
(0, _util.warn)('Non-embedded file specifications are not supported');
}
}
+
function pickPlatformItem(dict) {
if (dict.has('UF')) {
return dict.get('UF');
@@ -11911,27 +14396,35 @@ var FileSpec = function FileSpecClosure() {
} else if (dict.has('DOS')) {
return dict.get('DOS');
}
+
return null;
}
+
FileSpec.prototype = {
get filename() {
if (!this._filename && this.root) {
var filename = pickPlatformItem(this.root) || 'unnamed';
this._filename = (0, _util.stringToPDFString)(filename).replace(/\\\\/g, '\\').replace(/\\\//g, '/').replace(/\\/g, '/');
}
+
return this._filename;
},
+
get content() {
if (!this.contentAvailable) {
return null;
}
+
if (!this.contentRef && this.root) {
this.contentRef = pickPlatformItem(this.root.get('EF'));
}
+
var content = null;
+
if (this.contentRef) {
var xref = this.xref;
var fileObj = xref.fetchIfRef(this.contentRef);
+
if (fileObj && (0, _primitives.isStream)(fileObj)) {
content = fileObj.getBytes();
} else {
@@ -11940,27 +14433,36 @@ var FileSpec = function FileSpecClosure() {
} else {
(0, _util.warn)('Embedded file specification does not have a content');
}
+
return content;
},
+
get serializable() {
return {
filename: this.filename,
content: this.content
};
}
+
};
return FileSpec;
}();
+
+exports.FileSpec = FileSpec;
+
var ObjectLoader = function () {
function mayHaveChildren(value) {
return (0, _primitives.isRef)(value) || (0, _primitives.isDict)(value) || Array.isArray(value) || (0, _primitives.isStream)(value);
}
+
function addChildren(node, nodesToVisit) {
if ((0, _primitives.isDict)(node) || (0, _primitives.isStream)(node)) {
var dict = (0, _primitives.isDict)(node) ? node : node.dict;
var dictKeys = dict.getKeys();
+
for (var i = 0, ii = dictKeys.length; i < ii; i++) {
var rawValue = dict.getRaw(dictKeys[i]);
+
if (mayHaveChildren(rawValue)) {
nodesToVisit.push(rawValue);
}
@@ -11968,12 +14470,14 @@ var ObjectLoader = function () {
} else if (Array.isArray(node)) {
for (var _i3 = 0, _ii2 = node.length; _i3 < _ii2; _i3++) {
var value = node[_i3];
+
if (mayHaveChildren(value)) {
nodesToVisit.push(value);
}
}
}
}
+
function ObjectLoader(dict, keys, xref) {
this.dict = dict;
this.keys = keys;
@@ -11981,57 +14485,70 @@ var ObjectLoader = function () {
this.refSet = null;
this.capability = null;
}
+
ObjectLoader.prototype = {
load: function load() {
this.capability = (0, _util.createPromiseCapability)();
+
if (!(this.xref.stream instanceof _chunked_stream.ChunkedStream) || this.xref.stream.getMissingChunks().length === 0) {
this.capability.resolve();
return this.capability.promise;
}
+
var keys = this.keys,
dict = this.dict;
-
this.refSet = new _primitives.RefSet();
var nodesToVisit = [];
+
for (var i = 0, ii = keys.length; i < ii; i++) {
var rawValue = dict.getRaw(keys[i]);
+
if (rawValue !== undefined) {
nodesToVisit.push(rawValue);
}
}
+
this._walk(nodesToVisit);
+
return this.capability.promise;
},
_walk: function _walk(nodesToVisit) {
- var _this4 = this;
+ var _this2 = this;
var nodesToRevisit = [];
var pendingRequests = [];
+
while (nodesToVisit.length) {
- var _currentNode = nodesToVisit.pop();
- if ((0, _primitives.isRef)(_currentNode)) {
- if (this.refSet.has(_currentNode)) {
+ var currentNode = nodesToVisit.pop();
+
+ if ((0, _primitives.isRef)(currentNode)) {
+ if (this.refSet.has(currentNode)) {
continue;
}
+
try {
- this.refSet.put(_currentNode);
- _currentNode = this.xref.fetch(_currentNode);
+ this.refSet.put(currentNode);
+ currentNode = this.xref.fetch(currentNode);
} catch (ex) {
if (!(ex instanceof _util.MissingDataException)) {
throw ex;
}
- nodesToRevisit.push(_currentNode);
+
+ nodesToRevisit.push(currentNode);
pendingRequests.push({
begin: ex.begin,
end: ex.end
});
}
}
- if (_currentNode && _currentNode.getBaseStreams) {
- var baseStreams = _currentNode.getBaseStreams();
+
+ if (currentNode && currentNode.getBaseStreams) {
+ var baseStreams = currentNode.getBaseStreams();
var foundMissingData = false;
+
for (var i = 0, ii = baseStreams.length; i < ii; i++) {
var stream = baseStreams[i];
+
if (stream.getMissingChunks && stream.getMissingChunks().length) {
foundMissingData = true;
pendingRequests.push({
@@ -12040,34 +14557,38 @@ var ObjectLoader = function () {
});
}
}
+
if (foundMissingData) {
- nodesToRevisit.push(_currentNode);
+ nodesToRevisit.push(currentNode);
}
}
- addChildren(_currentNode, nodesToVisit);
+
+ addChildren(currentNode, nodesToVisit);
}
+
if (pendingRequests.length) {
this.xref.stream.manager.requestRanges(pendingRequests).then(function () {
for (var _i4 = 0, _ii3 = nodesToRevisit.length; _i4 < _ii3; _i4++) {
var node = nodesToRevisit[_i4];
+
if ((0, _primitives.isRef)(node)) {
- _this4.refSet.remove(node);
+ _this2.refSet.remove(node);
}
}
- _this4._walk(nodesToRevisit);
+
+ _this2._walk(nodesToRevisit);
}, this.capability.reject);
return;
}
+
this.refSet = null;
this.capability.resolve();
}
};
return ObjectLoader;
}();
-exports.Catalog = Catalog;
+
exports.ObjectLoader = ObjectLoader;
-exports.XRef = XRef;
-exports.FileSpec = FileSpec;
/***/ }),
/* 142 */
@@ -12079,38 +14600,61 @@ exports.FileSpec = FileSpec;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.isEOF = isEOF;
+exports.isCmd = isCmd;
+exports.isDict = isDict;
+exports.isName = isName;
+exports.isRef = isRef;
+exports.isRefsEqual = isRefsEqual;
+exports.isStream = isStream;
+exports.RefSetCache = exports.RefSet = exports.Ref = exports.Name = exports.Dict = exports.Cmd = exports.EOF = void 0;
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
var EOF = {};
+exports.EOF = EOF;
+
var Name = function NameClosure() {
function Name(name) {
this.name = name;
}
+
Name.prototype = {};
var nameCache = Object.create(null);
+
Name.get = function Name_get(name) {
var nameValue = nameCache[name];
return nameValue ? nameValue : nameCache[name] = new Name(name);
};
+
return Name;
}();
+
+exports.Name = Name;
+
var Cmd = function CmdClosure() {
function Cmd(cmd) {
this.cmd = cmd;
}
+
Cmd.prototype = {};
var cmdCache = Object.create(null);
+
Cmd.get = function Cmd_get(cmd) {
var cmdValue = cmdCache[cmd];
return cmdValue ? cmdValue : cmdCache[cmd] = new Cmd(cmd);
};
+
return Cmd;
}();
+
+exports.Cmd = Cmd;
+
var Dict = function DictClosure() {
var nonSerializable = function nonSerializableClosure() {
return nonSerializable;
};
+
function Dict(xref) {
this._map = Object.create(null);
this.xref = xref;
@@ -12118,6 +14662,7 @@ var Dict = function DictClosure() {
this.suppressEncryption = false;
this.__nonSerializable__ = nonSerializable;
}
+
Dict.prototype = {
assignXref: function Dict_assignXref(newXref) {
this.xref = newXref;
@@ -12126,12 +14671,15 @@ var Dict = function DictClosure() {
var value;
var xref = this.xref,
suppressEncryption = this.suppressEncryption;
+
if (typeof (value = this._map[key1]) !== 'undefined' || key1 in this._map || typeof key2 === 'undefined') {
return xref ? xref.fetchIfRef(value, suppressEncryption) : value;
}
+
if (typeof (value = this._map[key2]) !== 'undefined' || key2 in this._map || typeof key3 === 'undefined') {
return xref ? xref.fetchIfRef(value, suppressEncryption) : value;
}
+
value = this._map[key3] || null;
return xref ? xref.fetchIfRef(value, suppressEncryption) : value;
},
@@ -12139,38 +14687,50 @@ var Dict = function DictClosure() {
var value;
var xref = this.xref,
suppressEncryption = this.suppressEncryption;
+
if (typeof (value = this._map[key1]) !== 'undefined' || key1 in this._map || typeof key2 === 'undefined') {
if (xref) {
return xref.fetchIfRefAsync(value, suppressEncryption);
}
+
return Promise.resolve(value);
}
+
if (typeof (value = this._map[key2]) !== 'undefined' || key2 in this._map || typeof key3 === 'undefined') {
if (xref) {
return xref.fetchIfRefAsync(value, suppressEncryption);
}
+
return Promise.resolve(value);
}
+
value = this._map[key3] || null;
+
if (xref) {
return xref.fetchIfRefAsync(value, suppressEncryption);
}
+
return Promise.resolve(value);
},
getArray: function Dict_getArray(key1, key2, key3) {
var value = this.get(key1, key2, key3);
var xref = this.xref,
suppressEncryption = this.suppressEncryption;
+
if (!Array.isArray(value) || !xref) {
return value;
}
+
value = value.slice();
+
for (var i = 0, ii = value.length; i < ii; i++) {
if (!isRef(value[i])) {
continue;
}
+
value[i] = xref.fetch(value[i], suppressEncryption);
}
+
return value;
},
getRaw: function Dict_getRaw(key) {
@@ -12192,44 +14752,61 @@ var Dict = function DictClosure() {
}
};
Dict.empty = new Dict(null);
+
Dict.merge = function (xref, dictArray) {
var mergedDict = new Dict(xref);
+
for (var i = 0, ii = dictArray.length; i < ii; i++) {
var dict = dictArray[i];
+
if (!isDict(dict)) {
continue;
}
+
for (var keyName in dict._map) {
if (mergedDict._map[keyName] !== undefined) {
continue;
}
+
mergedDict._map[keyName] = dict._map[keyName];
}
}
+
return mergedDict;
};
+
return Dict;
}();
+
+exports.Dict = Dict;
+
var Ref = function RefClosure() {
function Ref(num, gen) {
this.num = num;
this.gen = gen;
}
+
Ref.prototype = {
toString: function Ref_toString() {
var str = this.num + 'R';
+
if (this.gen !== 0) {
str += this.gen;
}
+
return str;
}
};
return Ref;
}();
+
+exports.Ref = Ref;
+
var RefSet = function RefSetClosure() {
function RefSet() {
this.dict = Object.create(null);
}
+
RefSet.prototype = {
has: function RefSet_has(ref) {
return ref.toString() in this.dict;
@@ -12243,10 +14820,14 @@ var RefSet = function RefSetClosure() {
};
return RefSet;
}();
+
+exports.RefSet = RefSet;
+
var RefSetCache = function RefSetCacheClosure() {
function RefSetCache() {
this.dict = Object.create(null);
}
+
RefSetCache.prototype = {
get: function RefSetCache_get(ref) {
return this.dict[ref.toString()];
@@ -12271,41 +14852,36 @@ var RefSetCache = function RefSetCacheClosure() {
};
return RefSetCache;
}();
+
+exports.RefSetCache = RefSetCache;
+
function isEOF(v) {
return v === EOF;
}
+
function isName(v, name) {
return v instanceof Name && (name === undefined || v.name === name);
}
+
function isCmd(v, cmd) {
return v instanceof Cmd && (cmd === undefined || v.cmd === cmd);
}
+
function isDict(v, type) {
return v instanceof Dict && (type === undefined || isName(v.get('Type'), type));
}
+
function isRef(v) {
return v instanceof Ref;
}
+
function isRefsEqual(v1, v2) {
return v1.num === v2.num && v1.gen === v2.gen;
}
+
function isStream(v) {
- return (typeof v === 'undefined' ? 'undefined' : _typeof(v)) === 'object' && v !== null && v.getBytes !== undefined;
+ return _typeof(v) === 'object' && v !== null && v.getBytes !== undefined;
}
-exports.EOF = EOF;
-exports.Cmd = Cmd;
-exports.Dict = Dict;
-exports.Name = Name;
-exports.Ref = Ref;
-exports.RefSet = RefSet;
-exports.RefSetCache = RefSetCache;
-exports.isEOF = isEOF;
-exports.isCmd = isCmd;
-exports.isDict = isDict;
-exports.isName = isName;
-exports.isRef = isRef;
-exports.isRefsEqual = isRefsEqual;
-exports.isStream = isStream;
/***/ }),
/* 143 */
@@ -12317,7 +14893,7 @@ exports.isStream = isStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.Parser = exports.Linearization = exports.Lexer = undefined;
+exports.Parser = exports.Linearization = exports.Lexer = void 0;
var _stream = __w_pdfjs_require__(144);
@@ -12335,16 +14911,20 @@ var _jpx_stream = __w_pdfjs_require__(152);
var MAX_LENGTH_TO_CACHE = 1000;
var MAX_ADLER32_LENGTH = 5552;
+
function computeAdler32(bytes) {
var bytesLength = bytes.length;
var a = 1,
b = 0;
+
for (var i = 0; i < bytesLength; ++i) {
a += bytes[i] & 0xFF;
b += a;
}
+
return b % 65521 << 16 | a % 65521;
}
+
var Parser = function ParserClosure() {
function Parser(lexer, allowStreams, xref, recoveryMode) {
this.lexer = lexer;
@@ -12354,6 +14934,7 @@ var Parser = function ParserClosure() {
this.imageCache = Object.create(null);
this.refill();
}
+
Parser.prototype = {
refill: function Parser_refill() {
this.buf1 = this.lexer.getObj();
@@ -12376,76 +14957,100 @@ var Parser = function ParserClosure() {
if (e instanceof _util.MissingDataException) {
throw e;
}
+
return false;
}
},
getObj: function Parser_getObj(cipherTransform) {
var buf1 = this.buf1;
this.shift();
+
if (buf1 instanceof _primitives.Cmd) {
switch (buf1.cmd) {
case 'BI':
return this.makeInlineImage(cipherTransform);
+
case '[':
var array = [];
+
while (!(0, _primitives.isCmd)(this.buf1, ']') && !(0, _primitives.isEOF)(this.buf1)) {
array.push(this.getObj(cipherTransform));
}
+
if ((0, _primitives.isEOF)(this.buf1)) {
if (!this.recoveryMode) {
throw new _util.FormatError('End of file inside array');
}
+
return array;
}
+
this.shift();
return array;
+
case '<<':
var dict = new _primitives.Dict(this.xref);
+
while (!(0, _primitives.isCmd)(this.buf1, '>>') && !(0, _primitives.isEOF)(this.buf1)) {
if (!(0, _primitives.isName)(this.buf1)) {
(0, _util.info)('Malformed dictionary: key must be a name object');
this.shift();
continue;
}
+
var key = this.buf1.name;
this.shift();
+
if ((0, _primitives.isEOF)(this.buf1)) {
break;
}
+
dict.set(key, this.getObj(cipherTransform));
}
+
if ((0, _primitives.isEOF)(this.buf1)) {
if (!this.recoveryMode) {
throw new _util.FormatError('End of file inside dictionary');
}
+
return dict;
}
+
if ((0, _primitives.isCmd)(this.buf2, 'stream')) {
return this.allowStreams ? this.makeStream(dict, cipherTransform) : dict;
}
+
this.shift();
return dict;
+
default:
return buf1;
}
}
+
if (Number.isInteger(buf1)) {
var num = buf1;
+
if (Number.isInteger(this.buf1) && (0, _primitives.isCmd)(this.buf2, 'R')) {
var ref = new _primitives.Ref(num, this.buf1);
this.shift();
this.shift();
return ref;
}
+
return num;
}
+
if ((0, _util.isString)(buf1)) {
var str = buf1;
+
if (cipherTransform) {
str = cipherTransform.decryptString(str);
}
+
return str;
}
+
return buf1;
},
findDefaultInlineStreamEnd: function findDefaultInlineStreamEnd(stream) {
@@ -12458,8 +15063,9 @@ var Parser = function ParserClosure() {
NUL = 0x0;
var startPos = stream.pos,
state = 0,
- ch = void 0,
- maybeEIPos = void 0;
+ ch,
+ maybeEIPos;
+
while ((ch = stream.getByte()) !== -1) {
if (state === 0) {
state = ch === E ? 1 : 0;
@@ -12467,19 +15073,24 @@ var Parser = function ParserClosure() {
state = ch === I ? 2 : 0;
} else {
(0, _util.assert)(state === 2);
+
if (ch === SPACE || ch === LF || ch === CR) {
maybeEIPos = stream.pos;
var followingBytes = stream.peekBytes(n);
+
for (var i = 0, ii = followingBytes.length; i < ii; i++) {
ch = followingBytes[i];
+
if (ch === NUL && followingBytes[i + 1] !== NUL) {
continue;
}
+
if (ch !== LF && ch !== CR && (ch < SPACE || ch > 0x7F)) {
state = 0;
break;
}
}
+
if (state === 2) {
break;
}
@@ -12488,35 +15099,42 @@ var Parser = function ParserClosure() {
}
}
}
+
if (ch === -1) {
(0, _util.warn)('findDefaultInlineStreamEnd: ' + 'Reached the end of the stream without finding a valid EI marker');
+
if (maybeEIPos) {
(0, _util.warn)('... trying to recover by using the last "EI" occurrence.');
stream.skip(-(stream.pos - maybeEIPos));
}
}
+
return stream.pos - 4 - startPos;
},
-
findDCTDecodeInlineStreamEnd: function Parser_findDCTDecodeInlineStreamEnd(stream) {
var startPos = stream.pos,
foundEOI = false,
b,
markerLength,
length;
+
while ((b = stream.getByte()) !== -1) {
if (b !== 0xFF) {
continue;
}
+
switch (stream.getByte()) {
case 0x00:
break;
+
case 0xFF:
stream.skip(-1);
break;
+
case 0xD9:
foundEOI = true;
break;
+
case 0xC0:
case 0xC1:
case 0xC2:
@@ -12556,23 +15174,29 @@ var Parser = function ParserClosure() {
case 0xEF:
case 0xFE:
markerLength = stream.getUint16();
+
if (markerLength > 2) {
stream.skip(markerLength - 2);
} else {
stream.skip(-2);
}
+
break;
}
+
if (foundEOI) {
break;
}
}
+
length = stream.pos - startPos;
+
if (b === -1) {
(0, _util.warn)('Inline DCTDecode image stream: ' + 'EOI marker not found, searching for /EI/ instead.');
stream.skip(-length);
return this.findDefaultInlineStreamEnd(stream);
}
+
this.inlineStreamSkipEI(stream);
return length;
},
@@ -12582,18 +15206,22 @@ var Parser = function ParserClosure() {
var startPos = stream.pos,
ch,
length;
+
while ((ch = stream.getByte()) !== -1) {
if (ch === TILDE && stream.peekByte() === GT) {
stream.skip();
break;
}
}
+
length = stream.pos - startPos;
+
if (ch === -1) {
(0, _util.warn)('Inline ASCII85Decode image stream: ' + 'EOD marker not found, searching for /EI/ instead.');
stream.skip(-length);
return this.findDefaultInlineStreamEnd(stream);
}
+
this.inlineStreamSkipEI(stream);
return length;
},
@@ -12602,17 +15230,21 @@ var Parser = function ParserClosure() {
var startPos = stream.pos,
ch,
length;
+
while ((ch = stream.getByte()) !== -1) {
if (ch === GT) {
break;
}
}
+
length = stream.pos - startPos;
+
if (ch === -1) {
(0, _util.warn)('Inline ASCIIHexDecode image stream: ' + 'EOD marker not found, searching for /EI/ instead.');
stream.skip(-length);
return this.findDefaultInlineStreamEnd(stream);
}
+
this.inlineStreamSkipEI(stream);
return length;
},
@@ -12621,6 +15253,7 @@ var Parser = function ParserClosure() {
I = 0x49;
var state = 0,
ch;
+
while ((ch = stream.getByte()) !== -1) {
if (state === 0) {
state = ch === E ? 1 : 0;
@@ -12635,33 +15268,43 @@ var Parser = function ParserClosure() {
var lexer = this.lexer;
var stream = lexer.stream;
var dict = new _primitives.Dict(this.xref),
- dictLength = void 0;
+ dictLength;
+
while (!(0, _primitives.isCmd)(this.buf1, 'ID') && !(0, _primitives.isEOF)(this.buf1)) {
if (!(0, _primitives.isName)(this.buf1)) {
throw new _util.FormatError('Dictionary key must be a name object');
}
+
var key = this.buf1.name;
this.shift();
+
if ((0, _primitives.isEOF)(this.buf1)) {
break;
}
+
dict.set(key, this.getObj(cipherTransform));
}
+
if (lexer.beginInlineImagePos !== -1) {
dictLength = stream.pos - lexer.beginInlineImagePos;
}
+
var filter = dict.get('Filter', 'F'),
filterName;
+
if ((0, _primitives.isName)(filter)) {
filterName = filter.name;
} else if (Array.isArray(filter)) {
var filterZero = this.xref.fetchIfRef(filter[0]);
+
if ((0, _primitives.isName)(filterZero)) {
filterName = filterZero.name;
}
}
+
var startPos = stream.pos,
- length = void 0;
+ length;
+
if (filterName === 'DCTDecode' || filterName === 'DCT') {
length = this.findDCTDecodeInlineStreamEnd(stream);
} else if (filterName === 'ASCII85Decode' || filterName === 'A85') {
@@ -12671,8 +15314,10 @@ var Parser = function ParserClosure() {
} else {
length = this.findDefaultInlineStreamEnd(stream);
}
+
var imageStream = stream.makeSubStream(startPos, length, dict);
- var cacheKey = void 0;
+ var cacheKey;
+
if (length < MAX_LENGTH_TO_CACHE && dictLength < MAX_ADLER32_LENGTH) {
var imageBytes = imageStream.getBytes();
imageStream.reset();
@@ -12682,6 +15327,7 @@ var Parser = function ParserClosure() {
stream.pos = initialStreamPos;
cacheKey = computeAdler32(imageBytes) + '_' + computeAdler32(dictBytes);
var cacheEntry = this.imageCache[cacheKey];
+
if (cacheEntry !== undefined) {
this.buf2 = _primitives.Cmd.get('EI');
this.shift();
@@ -12689,95 +15335,121 @@ var Parser = function ParserClosure() {
return cacheEntry;
}
}
+
if (cipherTransform) {
imageStream = cipherTransform.createStream(imageStream, length);
}
+
imageStream = this.filter(imageStream, dict, length);
imageStream.dict = dict;
+
if (cacheKey !== undefined) {
imageStream.cacheKey = 'inline_' + length + '_' + cacheKey;
this.imageCache[cacheKey] = imageStream;
}
+
this.buf2 = _primitives.Cmd.get('EI');
this.shift();
return imageStream;
},
_findStreamLength: function _findStreamLength(startPos, signature) {
var stream = this.lexer.stream;
-
stream.pos = startPos;
var SCAN_BLOCK_LENGTH = 2048;
var signatureLength = signature.length;
+
while (stream.pos < stream.end) {
var scanBytes = stream.peekBytes(SCAN_BLOCK_LENGTH);
var scanLength = scanBytes.length - signatureLength;
+
if (scanLength <= 0) {
break;
}
+
var pos = 0;
+
while (pos < scanLength) {
var j = 0;
+
while (j < signatureLength && scanBytes[pos + j] === signature[j]) {
j++;
}
+
if (j >= signatureLength) {
stream.pos += pos;
return stream.pos - startPos;
}
+
pos++;
}
+
stream.pos += scanLength;
}
+
return -1;
},
-
makeStream: function Parser_makeStream(dict, cipherTransform) {
var lexer = this.lexer;
var stream = lexer.stream;
lexer.skipToNextLine();
var startPos = stream.pos - 1;
var length = dict.get('Length');
+
if (!Number.isInteger(length)) {
(0, _util.info)('Bad ' + length + ' attribute in stream');
length = 0;
}
+
stream.pos = startPos + length;
lexer.nextChar();
+
if (this.tryShift() && (0, _primitives.isCmd)(this.buf2, 'endstream')) {
this.shift();
} else {
var ENDSTREAM_SIGNATURE = new Uint8Array([0x65, 0x6E, 0x64, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6D]);
+
var actualLength = this._findStreamLength(startPos, ENDSTREAM_SIGNATURE);
+
if (actualLength < 0) {
var MAX_TRUNCATION = 1;
+
for (var i = 1; i <= MAX_TRUNCATION; i++) {
var end = ENDSTREAM_SIGNATURE.length - i;
var TRUNCATED_SIGNATURE = ENDSTREAM_SIGNATURE.slice(0, end);
+
var maybeLength = this._findStreamLength(startPos, TRUNCATED_SIGNATURE);
+
if (maybeLength >= 0) {
var lastByte = stream.peekBytes(end + 1)[end];
+
if (!(0, _util.isSpace)(lastByte)) {
break;
}
- (0, _util.info)('Found "' + (0, _util.bytesToString)(TRUNCATED_SIGNATURE) + '" when ' + 'searching for endstream command.');
+
+ (0, _util.info)("Found \"".concat((0, _util.bytesToString)(TRUNCATED_SIGNATURE), "\" when ") + 'searching for endstream command.');
actualLength = maybeLength;
break;
}
}
+
if (actualLength < 0) {
throw new _util.FormatError('Missing endstream command.');
}
}
+
length = actualLength;
lexer.nextChar();
this.shift();
this.shift();
}
+
this.shift();
stream = stream.makeSubStream(startPos, length, dict);
+
if (cipherTransform) {
stream = cipherTransform.createStream(stream, length);
}
+
stream = this.filter(stream, dict, length);
stream.dict = dict;
return stream;
@@ -12785,29 +15457,39 @@ var Parser = function ParserClosure() {
filter: function Parser_filter(stream, dict, length) {
var filter = dict.get('Filter', 'F');
var params = dict.get('DecodeParms', 'DP');
+
if ((0, _primitives.isName)(filter)) {
if (Array.isArray(params)) {
(0, _util.warn)('/DecodeParms should not contain an Array, ' + 'when /Filter contains a Name.');
}
+
return this.makeFilter(stream, filter.name, length, params);
}
+
var maybeLength = length;
+
if (Array.isArray(filter)) {
var filterArray = filter;
var paramsArray = params;
+
for (var i = 0, ii = filterArray.length; i < ii; ++i) {
filter = this.xref.fetchIfRef(filterArray[i]);
+
if (!(0, _primitives.isName)(filter)) {
throw new _util.FormatError('Bad filter name: ' + filter);
}
+
params = null;
+
if (Array.isArray(paramsArray) && i in paramsArray) {
params = this.xref.fetchIfRef(paramsArray[i]);
}
+
stream = this.makeFilter(stream, filter.name, maybeLength, params);
maybeLength = null;
}
}
+
return stream;
},
makeFilter: function Parser_makeFilter(stream, name, maybeLength, params) {
@@ -12815,60 +15497,77 @@ var Parser = function ParserClosure() {
(0, _util.warn)('Empty "' + name + '" stream.');
return new _stream.NullStream();
}
+
try {
var xrefStreamStats = this.xref.stats.streamTypes;
+
if (name === 'FlateDecode' || name === 'Fl') {
xrefStreamStats[_util.StreamType.FLATE] = true;
+
if (params) {
return new _stream.PredictorStream(new _stream.FlateStream(stream, maybeLength), maybeLength, params);
}
+
return new _stream.FlateStream(stream, maybeLength);
}
+
if (name === 'LZWDecode' || name === 'LZW') {
xrefStreamStats[_util.StreamType.LZW] = true;
var earlyChange = 1;
+
if (params) {
if (params.has('EarlyChange')) {
earlyChange = params.get('EarlyChange');
}
+
return new _stream.PredictorStream(new _stream.LZWStream(stream, maybeLength, earlyChange), maybeLength, params);
}
+
return new _stream.LZWStream(stream, maybeLength, earlyChange);
}
+
if (name === 'DCTDecode' || name === 'DCT') {
xrefStreamStats[_util.StreamType.DCT] = true;
return new _jpeg_stream.JpegStream(stream, maybeLength, stream.dict, params);
}
+
if (name === 'JPXDecode' || name === 'JPX') {
xrefStreamStats[_util.StreamType.JPX] = true;
return new _jpx_stream.JpxStream(stream, maybeLength, stream.dict, params);
}
+
if (name === 'ASCII85Decode' || name === 'A85') {
xrefStreamStats[_util.StreamType.A85] = true;
return new _stream.Ascii85Stream(stream, maybeLength);
}
+
if (name === 'ASCIIHexDecode' || name === 'AHx') {
xrefStreamStats[_util.StreamType.AHX] = true;
return new _stream.AsciiHexStream(stream, maybeLength);
}
+
if (name === 'CCITTFaxDecode' || name === 'CCF') {
xrefStreamStats[_util.StreamType.CCF] = true;
return new _ccitt_stream.CCITTFaxStream(stream, maybeLength, params);
}
+
if (name === 'RunLengthDecode' || name === 'RL') {
xrefStreamStats[_util.StreamType.RL] = true;
return new _stream.RunLengthStream(stream, maybeLength);
}
+
if (name === 'JBIG2Decode') {
xrefStreamStats[_util.StreamType.JBIG] = true;
return new _jbig2_stream.Jbig2Stream(stream, maybeLength, stream.dict, params);
}
+
(0, _util.warn)('filter "' + name + '" not supported yet');
return stream;
} catch (ex) {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
(0, _util.warn)('Invalid stream: \"' + ex + '\"');
return new _stream.NullStream();
}
@@ -12876,6 +15575,9 @@ var Parser = function ParserClosure() {
};
return Parser;
}();
+
+exports.Parser = Parser;
+
var Lexer = function LexerClosure() {
function Lexer(stream, knownCommands) {
this.stream = stream;
@@ -12884,16 +15586,21 @@ var Lexer = function LexerClosure() {
this.knownCommands = knownCommands;
this.beginInlineImagePos = -1;
}
+
var specialChars = [1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
function toHexDigit(ch) {
if (ch >= 0x30 && ch <= 0x39) {
return ch & 0x0F;
}
+
if (ch >= 0x41 && ch <= 0x46 || ch >= 0x61 && ch <= 0x66) {
return (ch & 0x0F) + 9;
}
+
return -1;
}
+
Lexer.prototype = {
nextChar: function Lexer_nextChar() {
return this.currentChar = this.stream.getByte();
@@ -12906,9 +15613,11 @@ var Lexer = function LexerClosure() {
var eNotation = false;
var divideBy = 0;
var sign = 0;
+
if (ch === 0x2D) {
sign = -1;
ch = this.nextChar();
+
if (ch === 0x2D) {
ch = this.nextChar();
}
@@ -12916,35 +15625,43 @@ var Lexer = function LexerClosure() {
sign = 1;
ch = this.nextChar();
}
+
if (ch === 0x0A || ch === 0x0D) {
do {
ch = this.nextChar();
} while (ch === 0x0A || ch === 0x0D);
}
+
if (ch === 0x2E) {
divideBy = 10;
ch = this.nextChar();
}
+
if (ch < 0x30 || ch > 0x39) {
if (divideBy === 10 && sign === 0 && ((0, _util.isSpace)(ch) || ch === -1)) {
(0, _util.warn)('Lexer.getNumber - treating a single decimal point as zero.');
return 0;
}
- throw new _util.FormatError('Invalid number: ' + String.fromCharCode(ch) + ' (charCode ' + ch + ')');
+
+ throw new _util.FormatError("Invalid number: ".concat(String.fromCharCode(ch), " (charCode ").concat(ch, ")"));
}
+
sign = sign || 1;
var baseValue = ch - 0x30;
var powerValue = 0;
var powerValueSign = 1;
+
while ((ch = this.nextChar()) >= 0) {
if (0x30 <= ch && ch <= 0x39) {
var currentDigit = ch - 0x30;
+
if (eNotation) {
powerValue = powerValue * 10 + currentDigit;
} else {
if (divideBy !== 0) {
divideBy *= 10;
}
+
baseValue = baseValue * 10 + currentDigit;
}
} else if (ch === 0x2E) {
@@ -12957,23 +15674,28 @@ var Lexer = function LexerClosure() {
(0, _util.warn)('Badly formatted number');
} else if (ch === 0x45 || ch === 0x65) {
ch = this.peekChar();
+
if (ch === 0x2B || ch === 0x2D) {
powerValueSign = ch === 0x2D ? -1 : 1;
this.nextChar();
} else if (ch < 0x30 || ch > 0x39) {
break;
}
+
eNotation = true;
} else {
break;
}
}
+
if (divideBy !== 0) {
baseValue /= divideBy;
}
+
if (eNotation) {
baseValue *= Math.pow(10, powerValueSign * powerValue);
}
+
return sign * baseValue;
},
getString: function Lexer_getString() {
@@ -12982,17 +15704,21 @@ var Lexer = function LexerClosure() {
var strBuf = this.strBuf;
strBuf.length = 0;
var ch = this.nextChar();
+
while (true) {
var charBuffered = false;
+
switch (ch | 0) {
case -1:
(0, _util.warn)('Unterminated string');
done = true;
break;
+
case 0x28:
++numParen;
strBuf.push('(');
break;
+
case 0x29:
if (--numParen === 0) {
this.nextChar();
@@ -13000,34 +15726,44 @@ var Lexer = function LexerClosure() {
} else {
strBuf.push(')');
}
+
break;
+
case 0x5C:
ch = this.nextChar();
+
switch (ch) {
case -1:
(0, _util.warn)('Unterminated string');
done = true;
break;
+
case 0x6E:
strBuf.push('\n');
break;
+
case 0x72:
strBuf.push('\r');
break;
+
case 0x74:
strBuf.push('\t');
break;
+
case 0x62:
strBuf.push('\b');
break;
+
case 0x66:
strBuf.push('\f');
break;
+
case 0x5C:
case 0x28:
case 0x29:
strBuf.push(String.fromCharCode(ch));
break;
+
case 0x30:
case 0x31:
case 0x32:
@@ -13039,67 +15775,87 @@ var Lexer = function LexerClosure() {
var x = ch & 0x0F;
ch = this.nextChar();
charBuffered = true;
+
if (ch >= 0x30 && ch <= 0x37) {
x = (x << 3) + (ch & 0x0F);
ch = this.nextChar();
+
if (ch >= 0x30 && ch <= 0x37) {
charBuffered = false;
x = (x << 3) + (ch & 0x0F);
}
}
+
strBuf.push(String.fromCharCode(x));
break;
+
case 0x0D:
if (this.peekChar() === 0x0A) {
this.nextChar();
}
+
break;
+
case 0x0A:
break;
+
default:
strBuf.push(String.fromCharCode(ch));
break;
}
+
break;
+
default:
strBuf.push(String.fromCharCode(ch));
break;
}
+
if (done) {
break;
}
+
if (!charBuffered) {
ch = this.nextChar();
}
}
+
return strBuf.join('');
},
getName: function Lexer_getName() {
var ch, previousCh;
var strBuf = this.strBuf;
strBuf.length = 0;
+
while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
if (ch === 0x23) {
ch = this.nextChar();
+
if (specialChars[ch]) {
(0, _util.warn)('Lexer_getName: ' + 'NUMBER SIGN (#) should be followed by a hexadecimal number.');
strBuf.push('#');
break;
}
+
var x = toHexDigit(ch);
+
if (x !== -1) {
previousCh = ch;
ch = this.nextChar();
var x2 = toHexDigit(ch);
+
if (x2 === -1) {
(0, _util.warn)('Lexer_getName: Illegal digit (' + String.fromCharCode(ch) + ') in hexadecimal number.');
strBuf.push('#', String.fromCharCode(previousCh));
+
if (specialChars[ch]) {
break;
}
+
strBuf.push(String.fromCharCode(ch));
continue;
}
+
strBuf.push(String.fromCharCode(x << 4 | x2));
} else {
strBuf.push('#', String.fromCharCode(ch));
@@ -13108,9 +15864,11 @@ var Lexer = function LexerClosure() {
strBuf.push(String.fromCharCode(ch));
}
}
+
if (strBuf.length > 127) {
(0, _util.warn)('name token is longer than allowed by the spec: ' + strBuf.length);
}
+
return _primitives.Name.get(strBuf.join(''));
},
getHexString: function Lexer_getHexString() {
@@ -13120,6 +15878,7 @@ var Lexer = function LexerClosure() {
var isFirstHex = true;
var firstDigit;
var secondDigit;
+
while (true) {
if (ch < 0) {
(0, _util.warn)('Unterminated hex string');
@@ -13133,6 +15892,7 @@ var Lexer = function LexerClosure() {
} else {
if (isFirstHex) {
firstDigit = toHexDigit(ch);
+
if (firstDigit === -1) {
(0, _util.warn)('Ignoring invalid character "' + ch + '" in hex string');
ch = this.nextChar();
@@ -13140,26 +15900,32 @@ var Lexer = function LexerClosure() {
}
} else {
secondDigit = toHexDigit(ch);
+
if (secondDigit === -1) {
(0, _util.warn)('Ignoring invalid character "' + ch + '" in hex string');
ch = this.nextChar();
continue;
}
+
strBuf.push(String.fromCharCode(firstDigit << 4 | secondDigit));
}
+
isFirstHex = !isFirstHex;
ch = this.nextChar();
}
}
+
return strBuf.join('');
},
getObj: function Lexer_getObj() {
var comment = false;
var ch = this.currentChar;
+
while (true) {
if (ch < 0) {
return _primitives.EOF;
}
+
if (comment) {
if (ch === 0x0A || ch === 0x0D) {
comment = false;
@@ -13169,8 +15935,10 @@ var Lexer = function LexerClosure() {
} else if (specialChars[ch] !== 1) {
break;
}
+
ch = this.nextChar();
}
+
switch (ch | 0) {
case 0x30:
case 0x31:
@@ -13186,121 +15954,159 @@ var Lexer = function LexerClosure() {
case 0x2D:
case 0x2E:
return this.getNumber();
+
case 0x28:
return this.getString();
+
case 0x2F:
return this.getName();
+
case 0x5B:
this.nextChar();
return _primitives.Cmd.get('[');
+
case 0x5D:
this.nextChar();
return _primitives.Cmd.get(']');
+
case 0x3C:
ch = this.nextChar();
+
if (ch === 0x3C) {
this.nextChar();
return _primitives.Cmd.get('<<');
}
+
return this.getHexString();
+
case 0x3E:
ch = this.nextChar();
+
if (ch === 0x3E) {
this.nextChar();
return _primitives.Cmd.get('>>');
}
+
return _primitives.Cmd.get('>');
+
case 0x7B:
this.nextChar();
return _primitives.Cmd.get('{');
+
case 0x7D:
this.nextChar();
return _primitives.Cmd.get('}');
+
case 0x29:
this.nextChar();
- throw new _util.FormatError('Illegal character: ' + ch);
+ throw new _util.FormatError("Illegal character: ".concat(ch));
}
+
var str = String.fromCharCode(ch);
var knownCommands = this.knownCommands;
var knownCommandFound = knownCommands && knownCommands[str] !== undefined;
+
while ((ch = this.nextChar()) >= 0 && !specialChars[ch]) {
var possibleCommand = str + String.fromCharCode(ch);
+
if (knownCommandFound && knownCommands[possibleCommand] === undefined) {
break;
}
+
if (str.length === 128) {
- throw new _util.FormatError('Command token too long: ' + str.length);
+ throw new _util.FormatError("Command token too long: ".concat(str.length));
}
+
str = possibleCommand;
knownCommandFound = knownCommands && knownCommands[str] !== undefined;
}
+
if (str === 'true') {
return true;
}
+
if (str === 'false') {
return false;
}
+
if (str === 'null') {
return null;
}
+
if (str === 'BI') {
this.beginInlineImagePos = this.stream.pos;
}
+
return _primitives.Cmd.get(str);
},
skipToNextLine: function Lexer_skipToNextLine() {
var ch = this.currentChar;
+
while (ch >= 0) {
if (ch === 0x0D) {
ch = this.nextChar();
+
if (ch === 0x0A) {
this.nextChar();
}
+
break;
} else if (ch === 0x0A) {
this.nextChar();
break;
}
+
ch = this.nextChar();
}
}
};
return Lexer;
}();
+
+exports.Lexer = Lexer;
var Linearization = {
create: function LinearizationCreate(stream) {
function getInt(name, allowZeroValue) {
var obj = linDict.get(name);
+
if (Number.isInteger(obj) && (allowZeroValue ? obj >= 0 : obj > 0)) {
return obj;
}
+
throw new Error('The "' + name + '" parameter in the linearization ' + 'dictionary is invalid.');
}
+
function getHints() {
var hints = linDict.get('H'),
hintsLength,
item;
+
if (Array.isArray(hints) && ((hintsLength = hints.length) === 2 || hintsLength === 4)) {
for (var index = 0; index < hintsLength; index++) {
if (!(Number.isInteger(item = hints[index]) && item > 0)) {
throw new Error('Hint (' + index + ') in the linearization dictionary is invalid.');
}
}
+
return hints;
}
+
throw new Error('Hint array in the linearization dictionary is invalid.');
}
+
var parser = new Parser(new Lexer(stream), false, null);
var obj1 = parser.getObj();
var obj2 = parser.getObj();
var obj3 = parser.getObj();
var linDict = parser.getObj();
var obj, length;
+
if (!(Number.isInteger(obj1) && Number.isInteger(obj2) && (0, _primitives.isCmd)(obj3, 'obj') && (0, _primitives.isDict)(linDict) && (0, _util.isNum)(obj = linDict.get('Linearized')) && obj > 0)) {
return null;
} else if ((length = getInt('L')) !== stream.length) {
throw new Error('The "L" parameter in the linearization dictionary ' + 'does not equal the stream length.');
}
+
return {
length: length,
hints: getHints(),
@@ -13312,9 +16118,7 @@ var Linearization = {
};
}
};
-exports.Lexer = Lexer;
exports.Linearization = Linearization;
-exports.Parser = Parser;
/***/ }),
/* 144 */
@@ -13326,13 +16130,19 @@ exports.Parser = Parser;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.LZWStream = exports.StringStream = exports.StreamsSequenceStream = exports.Stream = exports.RunLengthStream = exports.PredictorStream = exports.NullStream = exports.FlateStream = exports.DecodeStream = exports.DecryptStream = exports.AsciiHexStream = exports.Ascii85Stream = undefined;
+exports.LZWStream = exports.StringStream = exports.StreamsSequenceStream = exports.Stream = exports.RunLengthStream = exports.PredictorStream = exports.NullStream = exports.FlateStream = exports.DecodeStream = exports.DecryptStream = exports.AsciiHexStream = exports.Ascii85Stream = void 0;
var _util = __w_pdfjs_require__(2);
var _primitives = __w_pdfjs_require__(142);
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+
+function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
var Stream = function StreamClosure() {
function Stream(arrayBuffer, start, length, dict) {
@@ -13342,25 +16152,31 @@ var Stream = function StreamClosure() {
this.end = start + length || this.bytes.length;
this.dict = dict;
}
+
Stream.prototype = {
get length() {
return this.end - this.start;
},
+
get isEmpty() {
return this.length === 0;
},
+
getByte: function Stream_getByte() {
if (this.pos >= this.end) {
return -1;
}
+
return this.bytes[this.pos++];
},
getUint16: function Stream_getUint16() {
var b0 = this.getByte();
var b1 = this.getByte();
+
if (b0 === -1 || b1 === -1) {
return -1;
}
+
return (b0 << 8) + b1;
},
getInt32: function Stream_getInt32() {
@@ -13372,23 +16188,26 @@ var Stream = function StreamClosure() {
},
getBytes: function getBytes(length) {
var forceClamped = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var bytes = this.bytes;
var pos = this.pos;
var strEnd = this.end;
+
if (!length) {
var _subarray = bytes.subarray(pos, strEnd);
+
return forceClamped ? new Uint8ClampedArray(_subarray) : _subarray;
}
+
var end = pos + length;
+
if (end > strEnd) {
end = strEnd;
}
+
this.pos = end;
var subarray = bytes.subarray(pos, end);
return forceClamped ? new Uint8ClampedArray(subarray) : subarray;
},
-
peekByte: function Stream_peekByte() {
var peekedByte = this.getByte();
this.pos--;
@@ -13396,16 +16215,15 @@ var Stream = function StreamClosure() {
},
peekBytes: function peekBytes(length) {
var forceClamped = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var bytes = this.getBytes(length, forceClamped);
this.pos -= bytes.length;
return bytes;
},
-
skip: function Stream_skip(n) {
if (!n) {
n = 1;
}
+
this.pos += n;
},
reset: function Stream_reset() {
@@ -13420,16 +16238,24 @@ var Stream = function StreamClosure() {
};
return Stream;
}();
+
+exports.Stream = Stream;
+
var StringStream = function StringStreamClosure() {
function StringStream(str) {
var bytes = (0, _util.stringToBytes)(str);
Stream.call(this, bytes);
}
+
StringStream.prototype = Stream.prototype;
return StringStream;
}();
+
+exports.StringStream = StringStream;
+
var DecodeStream = function DecodeStreamClosure() {
var emptyBuffer = new Uint8Array(0);
+
function DecodeStream(maybeMinBufferLength) {
this._rawMinBufferLength = maybeMinBufferLength || 0;
this.pos = 0;
@@ -13437,48 +16263,61 @@ var DecodeStream = function DecodeStreamClosure() {
this.eof = false;
this.buffer = emptyBuffer;
this.minBufferLength = 512;
+
if (maybeMinBufferLength) {
while (this.minBufferLength < maybeMinBufferLength) {
this.minBufferLength *= 2;
}
}
}
+
DecodeStream.prototype = {
get isEmpty() {
while (!this.eof && this.bufferLength === 0) {
this.readBlock();
}
+
return this.bufferLength === 0;
},
+
ensureBuffer: function DecodeStream_ensureBuffer(requested) {
var buffer = this.buffer;
+
if (requested <= buffer.byteLength) {
return buffer;
}
+
var size = this.minBufferLength;
+
while (size < requested) {
size *= 2;
}
+
var buffer2 = new Uint8Array(size);
buffer2.set(buffer);
return this.buffer = buffer2;
},
getByte: function DecodeStream_getByte() {
var pos = this.pos;
+
while (this.bufferLength <= pos) {
if (this.eof) {
return -1;
}
+
this.readBlock();
}
+
return this.buffer[this.pos++];
},
getUint16: function DecodeStream_getUint16() {
var b0 = this.getByte();
var b1 = this.getByte();
+
if (b0 === -1 || b1 === -1) {
return -1;
}
+
return (b0 << 8) + b1;
},
getInt32: function DecodeStream_getInt32() {
@@ -13490,16 +16329,19 @@ var DecodeStream = function DecodeStreamClosure() {
},
getBytes: function getBytes(length) {
var forceClamped = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var end,
pos = this.pos;
+
if (length) {
this.ensureBuffer(pos + length);
end = pos + length;
+
while (!this.eof && this.bufferLength < end) {
this.readBlock();
}
+
var bufEnd = this.bufferLength;
+
if (end > bufEnd) {
end = bufEnd;
}
@@ -13507,13 +16349,14 @@ var DecodeStream = function DecodeStreamClosure() {
while (!this.eof) {
this.readBlock();
}
+
end = this.bufferLength;
}
+
this.pos = end;
var subarray = this.buffer.subarray(pos, end);
return forceClamped && !(subarray instanceof Uint8ClampedArray) ? new Uint8ClampedArray(subarray) : subarray;
},
-
peekByte: function DecodeStream_peekByte() {
var peekedByte = this.getByte();
this.pos--;
@@ -13521,23 +16364,24 @@ var DecodeStream = function DecodeStreamClosure() {
},
peekBytes: function peekBytes(length) {
var forceClamped = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var bytes = this.getBytes(length, forceClamped);
this.pos -= bytes.length;
return bytes;
},
-
makeSubStream: function DecodeStream_makeSubStream(start, length, dict) {
var end = start + length;
+
while (this.bufferLength <= end && !this.eof) {
this.readBlock();
}
+
return new Stream(this.buffer, start, length, dict);
},
skip: function DecodeStream_skip(n) {
if (!n) {
n = 1;
}
+
this.pos += n;
},
reset: function DecodeStream_reset() {
@@ -13547,32 +16391,43 @@ var DecodeStream = function DecodeStreamClosure() {
if (this.str && this.str.getBaseStreams) {
return this.str.getBaseStreams();
}
+
return [];
}
};
return DecodeStream;
}();
+
+exports.DecodeStream = DecodeStream;
+
var StreamsSequenceStream = function StreamsSequenceStreamClosure() {
function StreamsSequenceStream(streams) {
this.streams = streams;
var maybeLength = 0;
+
for (var i = 0, ii = streams.length; i < ii; i++) {
var stream = streams[i];
+
if (stream instanceof DecodeStream) {
maybeLength += stream._rawMinBufferLength;
} else {
maybeLength += stream.length;
}
}
+
DecodeStream.call(this, maybeLength);
}
+
StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
+
StreamsSequenceStream.prototype.readBlock = function streamSequenceStreamReadBlock() {
var streams = this.streams;
+
if (streams.length === 0) {
this.eof = true;
return;
}
+
var stream = streams.shift();
var chunk = stream.getBytes();
var bufferLength = this.bufferLength;
@@ -13581,63 +16436,83 @@ var StreamsSequenceStream = function StreamsSequenceStreamClosure() {
buffer.set(chunk, bufferLength);
this.bufferLength = newLength;
};
+
StreamsSequenceStream.prototype.getBaseStreams = function StreamsSequenceStream_getBaseStreams() {
var baseStreams = [];
+
for (var i = 0, ii = this.streams.length; i < ii; i++) {
var stream = this.streams[i];
+
if (stream.getBaseStreams) {
baseStreams.push.apply(baseStreams, _toConsumableArray(stream.getBaseStreams()));
}
}
+
return baseStreams;
};
+
return StreamsSequenceStream;
}();
+
+exports.StreamsSequenceStream = StreamsSequenceStream;
+
var FlateStream = function FlateStreamClosure() {
var codeLenCodeMap = new Int32Array([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]);
var lengthDecode = new Int32Array([0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a, 0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f, 0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073, 0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102]);
var distDecode = new Int32Array([0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d, 0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1, 0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01, 0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001]);
var fixedLitCodeTab = [new Int32Array([0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0, 0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0, 0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0, 0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8, 0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8, 0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8, 0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4, 0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4, 0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4, 0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc, 0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec, 0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc, 0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2, 0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2, 0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2, 0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca, 0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea, 0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da, 0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6, 0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6, 0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6, 0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce, 0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee, 0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de, 0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe, 0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1, 0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1, 0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1, 0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1, 0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9, 0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9, 0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9, 0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9, 0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5, 0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5, 0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5, 0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5, 0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd, 0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed, 0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd, 0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd, 0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3, 0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3, 0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3, 0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3, 0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb, 0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb, 0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db, 0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb, 0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7, 0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7, 0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7, 0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7, 0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf, 0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef, 0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df, 0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff]), 9];
var fixedDistCodeTab = [new Int32Array([0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c, 0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000, 0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d, 0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000]), 5];
+
function FlateStream(str, maybeLength) {
this.str = str;
this.dict = str.dict;
var cmf = str.getByte();
var flg = str.getByte();
+
if (cmf === -1 || flg === -1) {
- throw new _util.FormatError('Invalid header in flate stream: ' + cmf + ', ' + flg);
+ throw new _util.FormatError("Invalid header in flate stream: ".concat(cmf, ", ").concat(flg));
}
+
if ((cmf & 0x0f) !== 0x08) {
- throw new _util.FormatError('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
+ throw new _util.FormatError("Unknown compression method in flate stream: ".concat(cmf, ", ").concat(flg));
}
+
if (((cmf << 8) + flg) % 31 !== 0) {
- throw new _util.FormatError('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
+ throw new _util.FormatError("Bad FCHECK in flate stream: ".concat(cmf, ", ").concat(flg));
}
+
if (flg & 0x20) {
- throw new _util.FormatError('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
+ throw new _util.FormatError("FDICT bit set in flate stream: ".concat(cmf, ", ").concat(flg));
}
+
this.codeSize = 0;
this.codeBuf = 0;
DecodeStream.call(this, maybeLength);
}
+
FlateStream.prototype = Object.create(DecodeStream.prototype);
+
FlateStream.prototype.getBits = function FlateStream_getBits(bits) {
var str = this.str;
var codeSize = this.codeSize;
var codeBuf = this.codeBuf;
var b;
+
while (codeSize < bits) {
if ((b = str.getByte()) === -1) {
throw new _util.FormatError('Bad encoding in flate stream');
}
+
codeBuf |= b << codeSize;
codeSize += 8;
}
+
b = codeBuf & (1 << bits) - 1;
this.codeBuf = codeBuf >> bits;
this.codeSize = codeSize -= bits;
return b;
};
+
FlateStream.prototype.getCode = function FlateStream_getCode(table) {
var str = this.str;
var codes = table[0];
@@ -13645,87 +16520,115 @@ var FlateStream = function FlateStreamClosure() {
var codeSize = this.codeSize;
var codeBuf = this.codeBuf;
var b;
+
while (codeSize < maxLen) {
if ((b = str.getByte()) === -1) {
break;
}
+
codeBuf |= b << codeSize;
codeSize += 8;
}
+
var code = codes[codeBuf & (1 << maxLen) - 1];
var codeLen = code >> 16;
var codeVal = code & 0xffff;
+
if (codeLen < 1 || codeSize < codeLen) {
throw new _util.FormatError('Bad encoding in flate stream');
}
+
this.codeBuf = codeBuf >> codeLen;
this.codeSize = codeSize - codeLen;
return codeVal;
};
+
FlateStream.prototype.generateHuffmanTable = function flateStreamGenerateHuffmanTable(lengths) {
var n = lengths.length;
var maxLen = 0;
var i;
+
for (i = 0; i < n; ++i) {
if (lengths[i] > maxLen) {
maxLen = lengths[i];
}
}
+
var size = 1 << maxLen;
var codes = new Int32Array(size);
+
for (var len = 1, code = 0, skip = 2; len <= maxLen; ++len, code <<= 1, skip <<= 1) {
for (var val = 0; val < n; ++val) {
if (lengths[val] === len) {
var code2 = 0;
var t = code;
+
for (i = 0; i < len; ++i) {
code2 = code2 << 1 | t & 1;
t >>= 1;
}
+
for (i = code2; i < size; i += skip) {
codes[i] = len << 16 | val;
}
+
++code;
}
}
}
+
return [codes, maxLen];
};
+
FlateStream.prototype.readBlock = function FlateStream_readBlock() {
var buffer, len;
var str = this.str;
var hdr = this.getBits(3);
+
if (hdr & 1) {
this.eof = true;
}
+
hdr >>= 1;
+
if (hdr === 0) {
var b;
+
if ((b = str.getByte()) === -1) {
throw new _util.FormatError('Bad block header in flate stream');
}
+
var blockLen = b;
+
if ((b = str.getByte()) === -1) {
throw new _util.FormatError('Bad block header in flate stream');
}
+
blockLen |= b << 8;
+
if ((b = str.getByte()) === -1) {
throw new _util.FormatError('Bad block header in flate stream');
}
+
var check = b;
+
if ((b = str.getByte()) === -1) {
throw new _util.FormatError('Bad block header in flate stream');
}
+
check |= b << 8;
+
if (check !== (~blockLen & 0xffff) && (blockLen !== 0 || check !== 0)) {
throw new _util.FormatError('Bad uncompressed block length in flate stream');
}
+
this.codeBuf = 0;
this.codeSize = 0;
var bufferLength = this.bufferLength;
buffer = this.ensureBuffer(bufferLength + blockLen);
var end = bufferLength + blockLen;
this.bufferLength = end;
+
if (blockLen === 0) {
if (str.peekByte() === -1) {
this.eof = true;
@@ -13736,13 +16639,17 @@ var FlateStream = function FlateStreamClosure() {
this.eof = true;
break;
}
+
buffer[n] = b;
}
}
+
return;
}
+
var litCodeTable;
var distCodeTable;
+
if (hdr === 1) {
litCodeTable = fixedLitCodeTab;
distCodeTable = fixedDistCodeTab;
@@ -13752,17 +16659,21 @@ var FlateStream = function FlateStreamClosure() {
var numCodeLenCodes = this.getBits(4) + 4;
var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
var i;
+
for (i = 0; i < numCodeLenCodes; ++i) {
codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
}
+
var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
len = 0;
i = 0;
var codes = numLitCodes + numDistCodes;
var codeLengths = new Uint8Array(codes);
var bitsLength, bitsOffset, what;
+
while (i < codes) {
var code = this.getCode(codeLenCodeTab);
+
if (code === 16) {
bitsLength = 2;
bitsOffset = 3;
@@ -13779,75 +16690,99 @@ var FlateStream = function FlateStreamClosure() {
codeLengths[i++] = len = code;
continue;
}
+
var repeatLength = this.getBits(bitsLength) + bitsOffset;
+
while (repeatLength-- > 0) {
codeLengths[i++] = what;
}
}
+
litCodeTable = this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
distCodeTable = this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
} else {
throw new _util.FormatError('Unknown block type in flate stream');
}
+
buffer = this.buffer;
var limit = buffer ? buffer.length : 0;
var pos = this.bufferLength;
+
while (true) {
var code1 = this.getCode(litCodeTable);
+
if (code1 < 256) {
if (pos + 1 >= limit) {
buffer = this.ensureBuffer(pos + 1);
limit = buffer.length;
}
+
buffer[pos++] = code1;
continue;
}
+
if (code1 === 256) {
this.bufferLength = pos;
return;
}
+
code1 -= 257;
code1 = lengthDecode[code1];
var code2 = code1 >> 16;
+
if (code2 > 0) {
code2 = this.getBits(code2);
}
+
len = (code1 & 0xffff) + code2;
code1 = this.getCode(distCodeTable);
code1 = distDecode[code1];
code2 = code1 >> 16;
+
if (code2 > 0) {
code2 = this.getBits(code2);
}
+
var dist = (code1 & 0xffff) + code2;
+
if (pos + len >= limit) {
buffer = this.ensureBuffer(pos + len);
limit = buffer.length;
}
+
for (var k = 0; k < len; ++k, ++pos) {
buffer[pos] = buffer[pos - dist];
}
}
};
+
return FlateStream;
}();
+
+exports.FlateStream = FlateStream;
+
var PredictorStream = function PredictorStreamClosure() {
function PredictorStream(str, maybeLength, params) {
if (!(0, _primitives.isDict)(params)) {
return str;
}
+
var predictor = this.predictor = params.get('Predictor') || 1;
+
if (predictor <= 1) {
return str;
}
+
if (predictor !== 2 && (predictor < 10 || predictor > 15)) {
- throw new _util.FormatError('Unsupported predictor: ' + predictor);
+ throw new _util.FormatError("Unsupported predictor: ".concat(predictor));
}
+
if (predictor === 2) {
this.readBlock = this.readBlockTiff;
} else {
this.readBlock = this.readBlockPng;
}
+
this.str = str;
this.dict = str.dict;
var colors = this.colors = params.get('Colors') || 1;
@@ -13858,7 +16793,9 @@ var PredictorStream = function PredictorStreamClosure() {
DecodeStream.call(this, maybeLength);
return this;
}
+
PredictorStream.prototype = Object.create(DecodeStream.prototype);
+
PredictorStream.prototype.readBlockTiff = function predictorStreamReadBlockTiff() {
var rowBytes = this.rowBytes;
var bufferLength = this.bufferLength;
@@ -13867,15 +16804,18 @@ var PredictorStream = function PredictorStreamClosure() {
var colors = this.colors;
var rawBytes = this.str.getBytes(rowBytes);
this.eof = !rawBytes.length;
+
if (this.eof) {
return;
}
+
var inbuf = 0,
outbuf = 0;
var inbits = 0,
outbits = 0;
var pos = bufferLength;
var i;
+
if (bits === 1 && colors === 1) {
for (i = 0; i < rowBytes; ++i) {
var c = rawBytes[i] ^ inbuf;
@@ -13889,15 +16829,18 @@ var PredictorStream = function PredictorStreamClosure() {
for (i = 0; i < colors; ++i) {
buffer[pos++] = rawBytes[i];
}
+
for (; i < rowBytes; ++i) {
buffer[pos] = buffer[pos - colors] + rawBytes[i];
pos++;
}
} else if (bits === 16) {
var bytesPerPixel = colors * 2;
+
for (i = 0; i < bytesPerPixel; ++i) {
buffer[pos++] = rawBytes[i];
}
+
for (; i < rowBytes; i += 2) {
var sum = ((rawBytes[i] & 0xFF) << 8) + (rawBytes[i + 1] & 0xFF) + ((buffer[pos - bytesPerPixel] & 0xFF) << 8) + (buffer[pos - bytesPerPixel + 1] & 0xFF);
buffer[pos++] = sum >> 8 & 0xFF;
@@ -13909,100 +16852,129 @@ var PredictorStream = function PredictorStreamClosure() {
var j = 0,
k = bufferLength;
var columns = this.columns;
+
for (i = 0; i < columns; ++i) {
for (var kk = 0; kk < colors; ++kk) {
if (inbits < bits) {
inbuf = inbuf << 8 | rawBytes[j++] & 0xFF;
inbits += 8;
}
+
compArray[kk] = compArray[kk] + (inbuf >> inbits - bits) & bitMask;
inbits -= bits;
outbuf = outbuf << bits | compArray[kk];
outbits += bits;
+
if (outbits >= 8) {
buffer[k++] = outbuf >> outbits - 8 & 0xFF;
outbits -= 8;
}
}
}
+
if (outbits > 0) {
buffer[k++] = (outbuf << 8 - outbits) + (inbuf & (1 << 8 - outbits) - 1);
}
}
+
this.bufferLength += rowBytes;
};
+
PredictorStream.prototype.readBlockPng = function predictorStreamReadBlockPng() {
var rowBytes = this.rowBytes;
var pixBytes = this.pixBytes;
var predictor = this.str.getByte();
var rawBytes = this.str.getBytes(rowBytes);
this.eof = !rawBytes.length;
+
if (this.eof) {
return;
}
+
var bufferLength = this.bufferLength;
var buffer = this.ensureBuffer(bufferLength + rowBytes);
var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
+
if (prevRow.length === 0) {
prevRow = new Uint8Array(rowBytes);
}
+
var i,
j = bufferLength,
up,
c;
+
switch (predictor) {
case 0:
for (i = 0; i < rowBytes; ++i) {
buffer[j++] = rawBytes[i];
}
+
break;
+
case 1:
for (i = 0; i < pixBytes; ++i) {
buffer[j++] = rawBytes[i];
}
+
for (; i < rowBytes; ++i) {
buffer[j] = buffer[j - pixBytes] + rawBytes[i] & 0xFF;
j++;
}
+
break;
+
case 2:
for (i = 0; i < rowBytes; ++i) {
buffer[j++] = prevRow[i] + rawBytes[i] & 0xFF;
}
+
break;
+
case 3:
for (i = 0; i < pixBytes; ++i) {
buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
}
+
for (; i < rowBytes; ++i) {
buffer[j] = (prevRow[i] + buffer[j - pixBytes] >> 1) + rawBytes[i] & 0xFF;
j++;
}
+
break;
+
case 4:
for (i = 0; i < pixBytes; ++i) {
up = prevRow[i];
c = rawBytes[i];
buffer[j++] = up + c;
}
+
for (; i < rowBytes; ++i) {
up = prevRow[i];
var upLeft = prevRow[i - pixBytes];
var left = buffer[j - pixBytes];
var p = left + up - upLeft;
var pa = p - left;
+
if (pa < 0) {
pa = -pa;
}
+
var pb = p - up;
+
if (pb < 0) {
pb = -pb;
}
+
var pc = p - upLeft;
+
if (pc < 0) {
pc = -pc;
}
+
c = rawBytes[i];
+
if (pa <= pb && pa <= pc) {
buffer[j++] = left + c;
} else if (pb <= pc) {
@@ -14011,14 +16983,21 @@ var PredictorStream = function PredictorStreamClosure() {
buffer[j++] = upLeft + c;
}
}
+
break;
+
default:
- throw new _util.FormatError('Unsupported predictor: ' + predictor);
+ throw new _util.FormatError("Unsupported predictor: ".concat(predictor));
}
+
this.bufferLength += rowBytes;
};
+
return PredictorStream;
}();
+
+exports.PredictorStream = PredictorStream;
+
var DecryptStream = function DecryptStreamClosure() {
function DecryptStream(str, maybeLength, decrypt) {
this.str = str;
@@ -14028,20 +17007,25 @@ var DecryptStream = function DecryptStreamClosure() {
this.initialized = false;
DecodeStream.call(this, maybeLength);
}
+
var chunkSize = 512;
DecryptStream.prototype = Object.create(DecodeStream.prototype);
+
DecryptStream.prototype.readBlock = function DecryptStream_readBlock() {
var chunk;
+
if (this.initialized) {
chunk = this.nextChunk;
} else {
chunk = this.str.getBytes(chunkSize);
this.initialized = true;
}
+
if (!chunk || chunk.length === 0) {
this.eof = true;
return;
}
+
this.nextChunk = this.str.getBytes(chunkSize);
var hasMoreData = this.nextChunk && this.nextChunk.length > 0;
var decrypt = this.decrypt;
@@ -14050,104 +17034,142 @@ var DecryptStream = function DecryptStreamClosure() {
var i,
n = chunk.length;
var buffer = this.ensureBuffer(bufferLength + n);
+
for (i = 0; i < n; i++) {
buffer[bufferLength++] = chunk[i];
}
+
this.bufferLength = bufferLength;
};
+
return DecryptStream;
}();
+
+exports.DecryptStream = DecryptStream;
+
var Ascii85Stream = function Ascii85StreamClosure() {
function Ascii85Stream(str, maybeLength) {
this.str = str;
this.dict = str.dict;
this.input = new Uint8Array(5);
+
if (maybeLength) {
maybeLength = 0.8 * maybeLength;
}
+
DecodeStream.call(this, maybeLength);
}
+
Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
+
Ascii85Stream.prototype.readBlock = function Ascii85Stream_readBlock() {
var TILDA_CHAR = 0x7E;
var Z_LOWER_CHAR = 0x7A;
var EOF = -1;
var str = this.str;
var c = str.getByte();
+
while ((0, _util.isSpace)(c)) {
c = str.getByte();
}
+
if (c === EOF || c === TILDA_CHAR) {
this.eof = true;
return;
}
+
var bufferLength = this.bufferLength,
buffer;
var i;
+
if (c === Z_LOWER_CHAR) {
buffer = this.ensureBuffer(bufferLength + 4);
+
for (i = 0; i < 4; ++i) {
buffer[bufferLength + i] = 0;
}
+
this.bufferLength += 4;
} else {
var input = this.input;
input[0] = c;
+
for (i = 1; i < 5; ++i) {
c = str.getByte();
+
while ((0, _util.isSpace)(c)) {
c = str.getByte();
}
+
input[i] = c;
+
if (c === EOF || c === TILDA_CHAR) {
break;
}
}
+
buffer = this.ensureBuffer(bufferLength + i - 1);
this.bufferLength += i - 1;
+
if (i < 5) {
for (; i < 5; ++i) {
input[i] = 0x21 + 84;
}
+
this.eof = true;
}
+
var t = 0;
+
for (i = 0; i < 5; ++i) {
t = t * 85 + (input[i] - 0x21);
}
+
for (i = 3; i >= 0; --i) {
buffer[bufferLength + i] = t & 0xFF;
t >>= 8;
}
}
};
+
return Ascii85Stream;
}();
+
+exports.Ascii85Stream = Ascii85Stream;
+
var AsciiHexStream = function AsciiHexStreamClosure() {
function AsciiHexStream(str, maybeLength) {
this.str = str;
this.dict = str.dict;
this.firstDigit = -1;
+
if (maybeLength) {
maybeLength = 0.5 * maybeLength;
}
+
DecodeStream.call(this, maybeLength);
}
+
AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
+
AsciiHexStream.prototype.readBlock = function AsciiHexStream_readBlock() {
var UPSTREAM_BLOCK_SIZE = 8000;
var bytes = this.str.getBytes(UPSTREAM_BLOCK_SIZE);
+
if (!bytes.length) {
this.eof = true;
return;
}
+
var maxDecodeLength = bytes.length + 1 >> 1;
var buffer = this.ensureBuffer(this.bufferLength + maxDecodeLength);
var bufferLength = this.bufferLength;
var firstDigit = this.firstDigit;
+
for (var i = 0, ii = bytes.length; i < ii; i++) {
var ch = bytes[i],
digit;
+
if (ch >= 0x30 && ch <= 0x39) {
digit = ch & 0x0F;
} else if (ch >= 0x41 && ch <= 0x46 || ch >= 0x61 && ch <= 0x66) {
@@ -14158,6 +17180,7 @@ var AsciiHexStream = function AsciiHexStreamClosure() {
} else {
continue;
}
+
if (firstDigit < 0) {
firstDigit = digit;
} else {
@@ -14165,34 +17188,46 @@ var AsciiHexStream = function AsciiHexStreamClosure() {
firstDigit = -1;
}
}
+
if (firstDigit >= 0 && this.eof) {
buffer[bufferLength++] = firstDigit << 4;
firstDigit = -1;
}
+
this.firstDigit = firstDigit;
this.bufferLength = bufferLength;
};
+
return AsciiHexStream;
}();
+
+exports.AsciiHexStream = AsciiHexStream;
+
var RunLengthStream = function RunLengthStreamClosure() {
function RunLengthStream(str, maybeLength) {
this.str = str;
this.dict = str.dict;
DecodeStream.call(this, maybeLength);
}
+
RunLengthStream.prototype = Object.create(DecodeStream.prototype);
+
RunLengthStream.prototype.readBlock = function RunLengthStream_readBlock() {
var repeatHeader = this.str.getBytes(2);
+
if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] === 128) {
this.eof = true;
return;
}
+
var buffer;
var bufferLength = this.bufferLength;
var n = repeatHeader[0];
+
if (n < 128) {
buffer = this.ensureBuffer(bufferLength + n + 1);
buffer[bufferLength++] = repeatHeader[1];
+
if (n > 0) {
var source = this.str.getBytes(n);
buffer.set(source, bufferLength);
@@ -14202,14 +17237,20 @@ var RunLengthStream = function RunLengthStreamClosure() {
n = 257 - n;
var b = repeatHeader[1];
buffer = this.ensureBuffer(bufferLength + n + 1);
+
for (var i = 0; i < n; i++) {
buffer[bufferLength++] = b;
}
}
+
this.bufferLength = bufferLength;
};
+
return RunLengthStream;
}();
+
+exports.RunLengthStream = RunLengthStream;
+
var LZWStream = function LZWStreamClosure() {
function LZWStream(str, maybeLength, earlyChange) {
this.str = str;
@@ -14227,40 +17268,51 @@ var LZWStream = function LZWStreamClosure() {
currentSequence: new Uint8Array(maxLzwDictionarySize),
currentSequenceLength: 0
};
+
for (var i = 0; i < 256; ++i) {
lzwState.dictionaryValues[i] = i;
lzwState.dictionaryLengths[i] = 1;
}
+
this.lzwState = lzwState;
DecodeStream.call(this, maybeLength);
}
+
LZWStream.prototype = Object.create(DecodeStream.prototype);
+
LZWStream.prototype.readBits = function LZWStream_readBits(n) {
var bitsCached = this.bitsCached;
var cachedData = this.cachedData;
+
while (bitsCached < n) {
var c = this.str.getByte();
+
if (c === -1) {
this.eof = true;
return null;
}
+
cachedData = cachedData << 8 | c;
bitsCached += 8;
}
+
this.bitsCached = bitsCached -= n;
this.cachedData = cachedData;
this.lastCode = null;
return cachedData >>> bitsCached & (1 << n) - 1;
};
+
LZWStream.prototype.readBlock = function LZWStream_readBlock() {
var blockSize = 512;
var estimatedDecodedSize = blockSize * 2,
decodedSizeDelta = blockSize;
var i, j, q;
var lzwState = this.lzwState;
+
if (!lzwState) {
return;
}
+
var earlyChange = lzwState.earlyChange;
var nextCode = lzwState.nextCode;
var dictionaryValues = lzwState.dictionaryValues;
@@ -14273,15 +17325,18 @@ var LZWStream = function LZWStreamClosure() {
var decodedLength = 0;
var currentBufferLength = this.bufferLength;
var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
+
for (i = 0; i < blockSize; i++) {
var code = this.readBits(codeLength);
var hasPrev = currentSequenceLength > 0;
+
if (code < 256) {
currentSequence[0] = code;
currentSequenceLength = 1;
} else if (code >= 258) {
if (code < nextCode) {
currentSequenceLength = dictionaryLengths[code];
+
for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
currentSequence[j] = dictionaryValues[q];
q = dictionaryPrevCodes[q];
@@ -14299,6 +17354,7 @@ var LZWStream = function LZWStreamClosure() {
delete this.lzwState;
break;
}
+
if (hasPrev) {
dictionaryPrevCodes[nextCode] = prevCode;
dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
@@ -14306,45 +17362,45 @@ var LZWStream = function LZWStreamClosure() {
nextCode++;
codeLength = nextCode + earlyChange & nextCode + earlyChange - 1 ? codeLength : Math.min(Math.log(nextCode + earlyChange) / 0.6931471805599453 + 1, 12) | 0;
}
+
prevCode = code;
decodedLength += currentSequenceLength;
+
if (estimatedDecodedSize < decodedLength) {
do {
estimatedDecodedSize += decodedSizeDelta;
} while (estimatedDecodedSize < decodedLength);
+
buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
}
+
for (j = 0; j < currentSequenceLength; j++) {
buffer[currentBufferLength++] = currentSequence[j];
}
}
+
lzwState.nextCode = nextCode;
lzwState.codeLength = codeLength;
lzwState.prevCode = prevCode;
lzwState.currentSequenceLength = currentSequenceLength;
this.bufferLength = currentBufferLength;
};
+
return LZWStream;
}();
+
+exports.LZWStream = LZWStream;
+
var NullStream = function NullStreamClosure() {
function NullStream() {
Stream.call(this, new Uint8Array(0));
}
+
NullStream.prototype = Stream.prototype;
return NullStream;
}();
-exports.Ascii85Stream = Ascii85Stream;
-exports.AsciiHexStream = AsciiHexStream;
-exports.DecryptStream = DecryptStream;
-exports.DecodeStream = DecodeStream;
-exports.FlateStream = FlateStream;
+
exports.NullStream = NullStream;
-exports.PredictorStream = PredictorStream;
-exports.RunLengthStream = RunLengthStream;
-exports.Stream = Stream;
-exports.StreamsSequenceStream = StreamsSequenceStream;
-exports.StringStream = StringStream;
-exports.LZWStream = LZWStream;
/***/ }),
/* 145 */
@@ -14356,7 +17412,7 @@ exports.LZWStream = LZWStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.CCITTFaxStream = undefined;
+exports.CCITTFaxStream = void 0;
var _primitives = __w_pdfjs_require__(142);
@@ -14368,9 +17424,11 @@ var CCITTFaxStream = function CCITTFaxStreamClosure() {
function CCITTFaxStream(str, maybeLength, params) {
this.str = str;
this.dict = str.dict;
+
if (!(0, _primitives.isDict)(params)) {
params = _primitives.Dict.empty;
}
+
var source = {
next: function next() {
return str.getByte();
@@ -14385,22 +17443,29 @@ var CCITTFaxStream = function CCITTFaxStreamClosure() {
EndOfBlock: params.get('EndOfBlock'),
BlackIs1: params.get('BlackIs1')
});
+
_stream.DecodeStream.call(this, maybeLength);
}
+
CCITTFaxStream.prototype = Object.create(_stream.DecodeStream.prototype);
+
CCITTFaxStream.prototype.readBlock = function () {
while (!this.eof) {
var c = this.ccittFaxDecoder.readNextChar();
+
if (c === -1) {
this.eof = true;
return;
}
+
this.ensureBuffer(this.bufferLength + 1);
this.buffer[this.bufferLength++] = c;
}
};
+
return CCITTFaxStream;
}();
+
exports.CCITTFaxStream = CCITTFaxStream;
/***/ }),
@@ -14413,7 +17478,7 @@ exports.CCITTFaxStream = CCITTFaxStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.CCITTFaxDecoder = undefined;
+exports.CCITTFaxDecoder = void 0;
var _util = __w_pdfjs_require__(2);
@@ -14435,12 +17500,14 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
var blackTable1 = [[-1, -1], [-1, -1], [12, ccittEOL], [12, ccittEOL], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [-1, -1], [11, 1792], [11, 1792], [11, 1792], [11, 1792], [12, 1984], [12, 1984], [12, 2048], [12, 2048], [12, 2112], [12, 2112], [12, 2176], [12, 2176], [12, 2240], [12, 2240], [12, 2304], [12, 2304], [11, 1856], [11, 1856], [11, 1856], [11, 1856], [11, 1920], [11, 1920], [11, 1920], [11, 1920], [12, 2368], [12, 2368], [12, 2432], [12, 2432], [12, 2496], [12, 2496], [12, 2560], [12, 2560], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [10, 18], [12, 52], [12, 52], [13, 640], [13, 704], [13, 768], [13, 832], [12, 55], [12, 55], [12, 56], [12, 56], [13, 1280], [13, 1344], [13, 1408], [13, 1472], [12, 59], [12, 59], [12, 60], [12, 60], [13, 1536], [13, 1600], [11, 24], [11, 24], [11, 24], [11, 24], [11, 25], [11, 25], [11, 25], [11, 25], [13, 1664], [13, 1728], [12, 320], [12, 320], [12, 384], [12, 384], [12, 448], [12, 448], [13, 512], [13, 576], [12, 53], [12, 53], [12, 54], [12, 54], [13, 896], [13, 960], [13, 1024], [13, 1088], [13, 1152], [13, 1216], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64], [10, 64]];
var blackTable2 = [[8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [8, 13], [11, 23], [11, 23], [12, 50], [12, 51], [12, 44], [12, 45], [12, 46], [12, 47], [12, 57], [12, 58], [12, 61], [12, 256], [10, 16], [10, 16], [10, 16], [10, 16], [10, 17], [10, 17], [10, 17], [10, 17], [12, 48], [12, 49], [12, 62], [12, 63], [12, 30], [12, 31], [12, 32], [12, 33], [12, 40], [12, 41], [11, 22], [11, 22], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [8, 14], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 10], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [7, 11], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [9, 15], [12, 128], [12, 192], [12, 26], [12, 27], [12, 28], [12, 29], [11, 19], [11, 19], [11, 20], [11, 20], [12, 34], [12, 35], [12, 36], [12, 37], [12, 38], [12, 39], [11, 21], [11, 21], [12, 42], [12, 43], [10, 0], [10, 0], [10, 0], [10, 0], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12], [7, 12]];
var blackTable3 = [[-1, -1], [-1, -1], [-1, -1], [-1, -1], [6, 9], [6, 8], [5, 7], [5, 7], [4, 6], [4, 6], [4, 6], [4, 6], [4, 5], [4, 5], [4, 5], [4, 5], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 1], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [3, 4], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 3], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2], [2, 2]];
+
function CCITTFaxDecoder(source) {
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
if (!source || typeof source.next !== 'function') {
throw new Error('CCITTFaxDecoder - invalid "source" parameter.');
}
+
this.source = source;
this.eof = false;
this.encoding = options['K'] || 0;
@@ -14449,9 +17516,11 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
this.columns = options['Columns'] || 1728;
this.rows = options['Rows'] || 0;
var eoblock = options['EndOfBlock'];
+
if (eoblock === null || eoblock === undefined) {
eoblock = true;
}
+
this.eoblock = eoblock;
this.black = options['BlackIs1'] || false;
this.codingLine = new Uint32Array(this.columns + 1);
@@ -14464,66 +17533,79 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
this.inputBuf = 0;
this.outputBits = 0;
this.rowsDone = false;
- var code1 = void 0;
+ var code1;
+
while ((code1 = this._lookBits(12)) === 0) {
this._eatBits(1);
}
+
if (code1 === 1) {
this._eatBits(12);
}
+
if (this.encoding > 0) {
this.nextLine2D = !this._lookBits(1);
+
this._eatBits(1);
}
}
+
CCITTFaxDecoder.prototype = {
readNextChar: function readNextChar() {
if (this.eof) {
return -1;
}
+
var refLine = this.refLine;
var codingLine = this.codingLine;
var columns = this.columns;
- var refPos = void 0,
- blackPixels = void 0,
- bits = void 0,
- i = void 0;
+ var refPos, blackPixels, bits, i;
+
if (this.outputBits === 0) {
if (this.rowsDone) {
this.eof = true;
}
+
if (this.eof) {
return -1;
}
+
this.err = false;
- var code1 = void 0,
- code2 = void 0,
- code3 = void 0;
+ var code1, code2, code3;
+
if (this.nextLine2D) {
for (i = 0; codingLine[i] < columns; ++i) {
refLine[i] = codingLine[i];
}
+
refLine[i++] = columns;
refLine[i] = columns;
codingLine[0] = 0;
this.codingPos = 0;
refPos = 0;
blackPixels = 0;
+
while (codingLine[this.codingPos] < columns) {
code1 = this._getTwoDimCode();
+
switch (code1) {
case twoDimPass:
this._addPixels(refLine[refPos + 1], blackPixels);
+
if (refLine[refPos + 1] < columns) {
refPos += 2;
}
+
break;
+
case twoDimHoriz:
code1 = code2 = 0;
+
if (blackPixels) {
do {
code1 += code3 = this._getBlackCode();
} while (code3 >= 64);
+
do {
code2 += code3 = this._getWhiteCode();
} while (code3 >= 64);
@@ -14531,107 +17613,152 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
do {
code1 += code3 = this._getWhiteCode();
} while (code3 >= 64);
+
do {
code2 += code3 = this._getBlackCode();
} while (code3 >= 64);
}
+
this._addPixels(codingLine[this.codingPos] + code1, blackPixels);
+
if (codingLine[this.codingPos] < columns) {
this._addPixels(codingLine[this.codingPos] + code2, blackPixels ^ 1);
}
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
+
break;
+
case twoDimVertR3:
this._addPixels(refLine[refPos] + 3, blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
++refPos;
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case twoDimVertR2:
this._addPixels(refLine[refPos] + 2, blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
++refPos;
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case twoDimVertR1:
this._addPixels(refLine[refPos] + 1, blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
++refPos;
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case twoDimVert0:
this._addPixels(refLine[refPos], blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
++refPos;
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case twoDimVertL3:
this._addPixelsNeg(refLine[refPos] - 3, blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
if (refPos > 0) {
--refPos;
} else {
++refPos;
}
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case twoDimVertL2:
this._addPixelsNeg(refLine[refPos] - 2, blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
if (refPos > 0) {
--refPos;
} else {
++refPos;
}
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case twoDimVertL1:
this._addPixelsNeg(refLine[refPos] - 1, blackPixels);
+
blackPixels ^= 1;
+
if (codingLine[this.codingPos] < columns) {
if (refPos > 0) {
--refPos;
} else {
++refPos;
}
+
while (refLine[refPos] <= codingLine[this.codingPos] && refLine[refPos] < columns) {
refPos += 2;
}
}
+
break;
+
case ccittEOF:
this._addPixels(columns, 0);
+
this.eof = true;
break;
+
default:
(0, _util.info)('bad 2d code');
+
this._addPixels(columns, 0);
+
this.err = true;
}
}
@@ -14639,8 +17766,10 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
codingLine[0] = 0;
this.codingPos = 0;
blackPixels = 0;
+
while (codingLine[this.codingPos] < columns) {
code1 = 0;
+
if (blackPixels) {
do {
code1 += code3 = this._getBlackCode();
@@ -14650,92 +17779,125 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
code1 += code3 = this._getWhiteCode();
} while (code3 >= 64);
}
+
this._addPixels(codingLine[this.codingPos] + code1, blackPixels);
+
blackPixels ^= 1;
}
}
+
var gotEOL = false;
+
if (this.byteAlign) {
this.inputBits &= ~7;
}
+
if (!this.eoblock && this.row === this.rows - 1) {
this.rowsDone = true;
} else {
code1 = this._lookBits(12);
+
if (this.eoline) {
while (code1 !== ccittEOF && code1 !== 1) {
this._eatBits(1);
+
code1 = this._lookBits(12);
}
} else {
while (code1 === 0) {
this._eatBits(1);
+
code1 = this._lookBits(12);
}
}
+
if (code1 === 1) {
this._eatBits(12);
+
gotEOL = true;
} else if (code1 === ccittEOF) {
this.eof = true;
}
}
+
if (!this.eof && this.encoding > 0 && !this.rowsDone) {
this.nextLine2D = !this._lookBits(1);
+
this._eatBits(1);
}
+
if (this.eoblock && gotEOL && this.byteAlign) {
code1 = this._lookBits(12);
+
if (code1 === 1) {
this._eatBits(12);
+
if (this.encoding > 0) {
this._lookBits(1);
+
this._eatBits(1);
}
+
if (this.encoding >= 0) {
for (i = 0; i < 4; ++i) {
code1 = this._lookBits(12);
+
if (code1 !== 1) {
(0, _util.info)('bad rtc code: ' + code1);
}
+
this._eatBits(12);
+
if (this.encoding > 0) {
this._lookBits(1);
+
this._eatBits(1);
}
}
}
+
this.eof = true;
}
} else if (this.err && this.eoline) {
while (true) {
code1 = this._lookBits(13);
+
if (code1 === ccittEOF) {
this.eof = true;
return -1;
}
+
if (code1 >> 1 === 1) {
break;
}
+
this._eatBits(1);
}
+
this._eatBits(12);
+
if (this.encoding > 0) {
this._eatBits(1);
+
this.nextLine2D = !(code1 & 1);
}
}
+
if (codingLine[0] > 0) {
this.outputBits = codingLine[this.codingPos = 0];
} else {
this.outputBits = codingLine[this.codingPos = 1];
}
+
this.row++;
}
- var c = void 0;
+
+ var c;
+
if (this.outputBits >= 8) {
c = this.codingPos & 1 ? 0 : 0xFF;
this.outputBits -= 8;
+
if (this.outputBits === 0 && codingLine[this.codingPos] < columns) {
this.codingPos++;
this.outputBits = codingLine[this.codingPos] - codingLine[this.codingPos - 1];
@@ -14743,21 +17905,27 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
} else {
bits = 8;
c = 0;
+
do {
if (this.outputBits > bits) {
c <<= bits;
+
if (!(this.codingPos & 1)) {
c |= 0xFF >> 8 - bits;
}
+
this.outputBits -= bits;
bits = 0;
} else {
c <<= this.outputBits;
+
if (!(this.codingPos & 1)) {
c |= 0xFF >> 8 - this.outputBits;
}
+
bits -= this.outputBits;
this.outputBits = 0;
+
if (codingLine[this.codingPos] < columns) {
this.codingPos++;
this.outputBits = codingLine[this.codingPos] - codingLine[this.codingPos - 1];
@@ -14768,39 +17936,48 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
}
} while (bits);
}
+
if (this.black) {
c ^= 0xFF;
}
+
return c;
},
_addPixels: function _addPixels(a1, blackPixels) {
var codingLine = this.codingLine;
var codingPos = this.codingPos;
+
if (a1 > codingLine[codingPos]) {
if (a1 > this.columns) {
(0, _util.info)('row is wrong length');
this.err = true;
a1 = this.columns;
}
+
if (codingPos & 1 ^ blackPixels) {
++codingPos;
}
+
codingLine[codingPos] = a1;
}
+
this.codingPos = codingPos;
},
_addPixelsNeg: function _addPixelsNeg(a1, blackPixels) {
var codingLine = this.codingLine;
var codingPos = this.codingPos;
+
if (a1 > codingLine[codingPos]) {
if (a1 > this.columns) {
(0, _util.info)('row is wrong length');
this.err = true;
a1 = this.columns;
}
+
if (codingPos & 1 ^ blackPixels) {
++codingPos;
}
+
codingLine[codingPos] = a1;
} else if (a1 < codingLine[codingPos]) {
if (a1 < 0) {
@@ -14808,91 +17985,119 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
this.err = true;
a1 = 0;
}
+
while (codingPos > 0 && a1 < codingLine[codingPos - 1]) {
--codingPos;
}
+
codingLine[codingPos] = a1;
}
+
this.codingPos = codingPos;
},
_findTableCode: function _findTableCode(start, end, table, limit) {
var limitValue = limit || 0;
+
for (var i = start; i <= end; ++i) {
var code = this._lookBits(i);
+
if (code === ccittEOF) {
return [true, 1, false];
}
+
if (i < end) {
code <<= end - i;
}
+
if (!limitValue || code >= limitValue) {
var p = table[code - limitValue];
+
if (p[0] === i) {
this._eatBits(i);
+
return [true, p[1], true];
}
}
}
+
return [false, 0, false];
},
_getTwoDimCode: function _getTwoDimCode() {
var code = 0;
- var p = void 0;
+ var p;
+
if (this.eoblock) {
code = this._lookBits(7);
p = twoDimTable[code];
+
if (p && p[0] > 0) {
this._eatBits(p[0]);
+
return p[1];
}
} else {
var result = this._findTableCode(1, 7, twoDimTable);
+
if (result[0] && result[2]) {
return result[1];
}
}
+
(0, _util.info)('Bad two dim code');
return ccittEOF;
},
_getWhiteCode: function _getWhiteCode() {
var code = 0;
- var p = void 0;
+ var p;
+
if (this.eoblock) {
code = this._lookBits(12);
+
if (code === ccittEOF) {
return 1;
}
+
if (code >> 5 === 0) {
p = whiteTable1[code];
} else {
p = whiteTable2[code >> 3];
}
+
if (p[0] > 0) {
this._eatBits(p[0]);
+
return p[1];
}
} else {
var result = this._findTableCode(1, 9, whiteTable2);
+
if (result[0]) {
return result[1];
}
+
result = this._findTableCode(11, 12, whiteTable1);
+
if (result[0]) {
return result[1];
}
}
+
(0, _util.info)('bad white code');
+
this._eatBits(1);
+
return 1;
},
_getBlackCode: function _getBlackCode() {
- var code = void 0,
- p = void 0;
+ var code, p;
+
if (this.eoblock) {
code = this._lookBits(13);
+
if (code === ccittEOF) {
return 1;
}
+
if (code >> 7 === 0) {
p = blackTable1[code];
} else if (code >> 9 === 0 && code >> 7 !== 0) {
@@ -14900,40 +18105,54 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
} else {
p = blackTable3[code >> 7];
}
+
if (p[0] > 0) {
this._eatBits(p[0]);
+
return p[1];
}
} else {
var result = this._findTableCode(2, 6, blackTable3);
+
if (result[0]) {
return result[1];
}
+
result = this._findTableCode(7, 12, blackTable2, 64);
+
if (result[0]) {
return result[1];
}
+
result = this._findTableCode(10, 13, blackTable1);
+
if (result[0]) {
return result[1];
}
}
+
(0, _util.info)('bad black code');
+
this._eatBits(1);
+
return 1;
},
_lookBits: function _lookBits(n) {
- var c = void 0;
+ var c;
+
while (this.inputBits < n) {
if ((c = this.source.next()) === -1) {
if (this.inputBits === 0) {
return ccittEOF;
}
+
return this.inputBuf << n - this.inputBits & 0xFFFF >> 16 - n;
}
+
this.inputBuf = this.inputBuf << 8 | c;
this.inputBits += 8;
}
+
return this.inputBuf >> this.inputBits - n & 0xFFFF >> 16 - n;
},
_eatBits: function _eatBits(n) {
@@ -14944,6 +18163,7 @@ var CCITTFaxDecoder = function CCITTFaxDecoder() {
};
return CCITTFaxDecoder;
}();
+
exports.CCITTFaxDecoder = CCITTFaxDecoder;
/***/ }),
@@ -14956,7 +18176,7 @@ exports.CCITTFaxDecoder = CCITTFaxDecoder;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.Jbig2Stream = undefined;
+exports.Jbig2Stream = void 0;
var _primitives = __w_pdfjs_require__(142);
@@ -14972,25 +18192,31 @@ var Jbig2Stream = function Jbig2StreamClosure() {
this.maybeLength = maybeLength;
this.dict = dict;
this.params = params;
+
_stream.DecodeStream.call(this, maybeLength);
}
+
Jbig2Stream.prototype = Object.create(_stream.DecodeStream.prototype);
Object.defineProperty(Jbig2Stream.prototype, 'bytes', {
get: function get() {
return (0, _util.shadow)(this, 'bytes', this.stream.getBytes(this.maybeLength));
},
-
configurable: true
});
+
Jbig2Stream.prototype.ensureBuffer = function (requested) {};
+
Jbig2Stream.prototype.readBlock = function () {
if (this.eof) {
return;
}
+
var jbig2Image = new _jbig.Jbig2Image();
var chunks = [];
+
if ((0, _primitives.isDict)(this.params)) {
var globalsStream = this.params.get('JBIG2Globals');
+
if ((0, _primitives.isStream)(globalsStream)) {
var globals = globalsStream.getBytes();
chunks.push({
@@ -15000,6 +18226,7 @@ var Jbig2Stream = function Jbig2StreamClosure() {
});
}
}
+
chunks.push({
data: this.bytes,
start: 0,
@@ -15007,15 +18234,19 @@ var Jbig2Stream = function Jbig2StreamClosure() {
});
var data = jbig2Image.parseChunks(chunks);
var dataLength = data.length;
+
for (var i = 0; i < dataLength; i++) {
data[i] ^= 0xFF;
}
+
this.buffer = data;
this.bufferLength = dataLength;
this.eof = true;
};
+
return Jbig2Stream;
}();
+
exports.Jbig2Stream = Jbig2Stream;
/***/ }),
@@ -15028,7 +18259,7 @@ exports.Jbig2Stream = Jbig2Stream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.Jbig2Image = undefined;
+exports.Jbig2Image = void 0;
var _util = __w_pdfjs_require__(2);
@@ -15040,64 +18271,82 @@ var Jbig2Error = function Jbig2ErrorClosure() {
function Jbig2Error(msg) {
this.message = 'JBIG2 error: ' + msg;
}
+
Jbig2Error.prototype = new Error();
Jbig2Error.prototype.name = 'Jbig2Error';
Jbig2Error.constructor = Jbig2Error;
return Jbig2Error;
}();
+
var Jbig2Image = function Jbig2ImageClosure() {
function ContextCache() {}
+
ContextCache.prototype = {
getContexts: function getContexts(id) {
if (id in this) {
return this[id];
}
+
return this[id] = new Int8Array(1 << 16);
}
};
+
function DecodingContext(data, start, end) {
this.data = data;
this.start = start;
this.end = end;
}
+
DecodingContext.prototype = {
get decoder() {
var decoder = new _arithmetic_decoder.ArithmeticDecoder(this.data, this.start, this.end);
return (0, _util.shadow)(this, 'decoder', decoder);
},
+
get contextCache() {
var cache = new ContextCache();
return (0, _util.shadow)(this, 'contextCache', cache);
}
+
};
+
function decodeInteger(contextCache, procedure, decoder) {
var contexts = contextCache.getContexts(procedure);
var prev = 1;
+
function readBits(length) {
var v = 0;
+
for (var i = 0; i < length; i++) {
var bit = decoder.readBit(contexts, prev);
prev = prev < 256 ? prev << 1 | bit : (prev << 1 | bit) & 511 | 256;
v = v << 1 | bit;
}
+
return v >>> 0;
}
+
var sign = readBits(1);
var value = readBits(1) ? readBits(1) ? readBits(1) ? readBits(1) ? readBits(1) ? readBits(32) + 4436 : readBits(12) + 340 : readBits(8) + 84 : readBits(6) + 20 : readBits(4) + 4 : readBits(2);
return sign === 0 ? value : value > 0 ? -value : null;
}
+
function decodeIAID(contextCache, decoder, codeLength) {
var contexts = contextCache.getContexts('IAID');
var prev = 1;
+
for (var i = 0; i < codeLength; i++) {
var bit = decoder.readBit(contexts, prev);
prev = prev << 1 | bit;
}
+
if (codeLength < 31) {
return prev & (1 << codeLength) - 1;
}
+
return prev & 0x7FFFFFFF;
}
+
var SegmentTypes = ['SymbolDictionary', null, null, null, 'IntermediateTextRegion', null, 'ImmediateTextRegion', 'ImmediateLosslessTextRegion', null, null, null, null, null, null, null, null, 'PatternDictionary', null, null, null, 'IntermediateHalftoneRegion', null, 'ImmediateHalftoneRegion', 'ImmediateLosslessHalftoneRegion', null, null, null, null, null, null, null, null, null, null, null, null, 'IntermediateGenericRegion', null, 'ImmediateGenericRegion', 'ImmediateLosslessGenericRegion', 'IntermediateGenericRefinementRegion', null, 'ImmediateGenericRefinementRegion', 'ImmediateLosslessGenericRefinementRegion', null, null, null, null, 'PageInformation', 'EndOfPage', 'EndOfStripe', 'EndOfFile', 'Profiles', 'Tables', null, null, null, null, null, null, null, null, 'Extension'];
var CodingTemplates = [[{
x: -1,
@@ -15298,6 +18547,7 @@ var Jbig2Image = function Jbig2ImageClosure() {
}];
var ReusedContexts = [0x9B25, 0x0795, 0x00E5, 0x0195];
var RefinementReusedContexts = [0x0020, 0x0008];
+
function decodeBitmapTemplate0(width, height, decodingContext) {
var decoder = decodingContext.decoder;
var contexts = decodingContext.contextCache.getContexts('GB');
@@ -15310,26 +18560,32 @@ var Jbig2Image = function Jbig2ImageClosure() {
row2,
bitmap = [];
var OLD_PIXEL_MASK = 0x7BF7;
+
for (i = 0; i < height; i++) {
row = bitmap[i] = new Uint8Array(width);
row1 = i < 1 ? row : bitmap[i - 1];
row2 = i < 2 ? row : bitmap[i - 2];
contextLabel = row2[0] << 13 | row2[1] << 12 | row2[2] << 11 | row1[0] << 7 | row1[1] << 6 | row1[2] << 5 | row1[3] << 4;
+
for (j = 0; j < width; j++) {
row[j] = pixel = decoder.readBit(contexts, contextLabel);
contextLabel = (contextLabel & OLD_PIXEL_MASK) << 1 | (j + 3 < width ? row2[j + 3] << 11 : 0) | (j + 4 < width ? row1[j + 4] << 4 : 0) | pixel;
}
}
+
return bitmap;
}
+
function decodeBitmap(mmr, width, height, templateIndex, prediction, skip, at, decodingContext) {
if (mmr) {
var input = new Reader(decodingContext.data, decodingContext.start, decodingContext.end);
return decodeMMRBitmap(input, width, height, false);
}
+
if (templateIndex === 0 && !skip && !prediction && at.length === 4 && at[0].x === 3 && at[0].y === -1 && at[1].x === -3 && at[1].y === -1 && at[2].x === 2 && at[2].y === -2 && at[3].x === -2 && at[3].y === -2) {
return decodeBitmapTemplate0(width, height, decodingContext);
}
+
var useskip = !!skip;
var template = CodingTemplates[templateIndex].concat(at);
template.sort(function (a, b) {
@@ -15344,28 +18600,33 @@ var Jbig2Image = function Jbig2ImageClosure() {
maxX = 0,
minY = 0;
var c, k;
+
for (k = 0; k < templateLength; k++) {
templateX[k] = template[k].x;
templateY[k] = template[k].y;
minX = Math.min(minX, template[k].x);
maxX = Math.max(maxX, template[k].x);
minY = Math.min(minY, template[k].y);
+
if (k < templateLength - 1 && template[k].y === template[k + 1].y && template[k].x === template[k + 1].x - 1) {
reuseMask |= 1 << templateLength - 1 - k;
} else {
changingTemplateEntries.push(k);
}
}
+
var changingEntriesLength = changingTemplateEntries.length;
var changingTemplateX = new Int8Array(changingEntriesLength);
var changingTemplateY = new Int8Array(changingEntriesLength);
var changingTemplateBit = new Uint16Array(changingEntriesLength);
+
for (c = 0; c < changingEntriesLength; c++) {
k = changingTemplateEntries[c];
changingTemplateX[c] = template[k].x;
changingTemplateY[c] = template[k].y;
changingTemplateBit[c] = 1 << templateLength - 1 - k;
}
+
var sbb_left = -minX;
var sbb_top = -minY;
var sbb_right = width - maxX;
@@ -15381,28 +18642,35 @@ var Jbig2Image = function Jbig2ImageClosure() {
contextLabel = 0,
bit,
shift;
+
for (var i = 0; i < height; i++) {
if (prediction) {
var sltp = decoder.readBit(contexts, pseudoPixelContext);
ltp ^= sltp;
+
if (ltp) {
bitmap.push(row);
continue;
}
}
+
row = new Uint8Array(row);
bitmap.push(row);
+
for (j = 0; j < width; j++) {
if (useskip && skip[i][j]) {
row[j] = 0;
continue;
}
+
if (j >= sbb_left && j < sbb_right && i >= sbb_top) {
contextLabel = contextLabel << 1 & reuseMask;
+
for (k = 0; k < changingEntriesLength; k++) {
i0 = i + changingTemplateY[k];
j0 = j + changingTemplateX[k];
bit = bitmap[i0][j0];
+
if (bit) {
bit = changingTemplateBit[k];
contextLabel |= bit;
@@ -15411,12 +18679,16 @@ var Jbig2Image = function Jbig2ImageClosure() {
} else {
contextLabel = 0;
shift = templateLength - 1;
+
for (k = 0; k < templateLength; k++, shift--) {
j0 = j + templateX[k];
+
if (j0 >= 0 && j0 < width) {
i0 = i + templateY[k];
+
if (i0 >= 0) {
bit = bitmap[i0][j0];
+
if (bit) {
contextLabel |= bit << shift;
}
@@ -15424,36 +18696,47 @@ var Jbig2Image = function Jbig2ImageClosure() {
}
}
}
+
var pixel = decoder.readBit(contexts, contextLabel);
row[j] = pixel;
}
}
+
return bitmap;
}
+
function decodeRefinement(width, height, templateIndex, referenceBitmap, offsetX, offsetY, prediction, at, decodingContext) {
var codingTemplate = RefinementTemplates[templateIndex].coding;
+
if (templateIndex === 0) {
codingTemplate = codingTemplate.concat([at[0]]);
}
+
var codingTemplateLength = codingTemplate.length;
var codingTemplateX = new Int32Array(codingTemplateLength);
var codingTemplateY = new Int32Array(codingTemplateLength);
var k;
+
for (k = 0; k < codingTemplateLength; k++) {
codingTemplateX[k] = codingTemplate[k].x;
codingTemplateY[k] = codingTemplate[k].y;
}
+
var referenceTemplate = RefinementTemplates[templateIndex].reference;
+
if (templateIndex === 0) {
referenceTemplate = referenceTemplate.concat([at[1]]);
}
+
var referenceTemplateLength = referenceTemplate.length;
var referenceTemplateX = new Int32Array(referenceTemplateLength);
var referenceTemplateY = new Int32Array(referenceTemplateLength);
+
for (k = 0; k < referenceTemplateLength; k++) {
referenceTemplateX[k] = referenceTemplate[k].x;
referenceTemplateY[k] = referenceTemplate[k].y;
}
+
var referenceWidth = referenceBitmap[0].length;
var referenceHeight = referenceBitmap.length;
var pseudoPixelContext = RefinementReusedContexts[templateIndex];
@@ -15461,75 +18744,93 @@ var Jbig2Image = function Jbig2ImageClosure() {
var decoder = decodingContext.decoder;
var contexts = decodingContext.contextCache.getContexts('GR');
var ltp = 0;
+
for (var i = 0; i < height; i++) {
if (prediction) {
var sltp = decoder.readBit(contexts, pseudoPixelContext);
ltp ^= sltp;
+
if (ltp) {
throw new Jbig2Error('prediction is not supported');
}
}
+
var row = new Uint8Array(width);
bitmap.push(row);
+
for (var j = 0; j < width; j++) {
var i0, j0;
var contextLabel = 0;
+
for (k = 0; k < codingTemplateLength; k++) {
i0 = i + codingTemplateY[k];
j0 = j + codingTemplateX[k];
+
if (i0 < 0 || j0 < 0 || j0 >= width) {
contextLabel <<= 1;
} else {
contextLabel = contextLabel << 1 | bitmap[i0][j0];
}
}
+
for (k = 0; k < referenceTemplateLength; k++) {
i0 = i + referenceTemplateY[k] - offsetY;
j0 = j + referenceTemplateX[k] - offsetX;
+
if (i0 < 0 || i0 >= referenceHeight || j0 < 0 || j0 >= referenceWidth) {
contextLabel <<= 1;
} else {
contextLabel = contextLabel << 1 | referenceBitmap[i0][j0];
}
}
+
var pixel = decoder.readBit(contexts, contextLabel);
row[j] = pixel;
}
}
+
return bitmap;
}
+
function decodeSymbolDictionary(huffman, refinement, symbols, numberOfNewSymbols, numberOfExportedSymbols, huffmanTables, templateIndex, at, refinementTemplateIndex, refinementAt, decodingContext, huffmanInput) {
if (huffman && refinement) {
throw new Jbig2Error('symbol refinement with Huffman is not supported');
}
+
var newSymbols = [];
var currentHeight = 0;
var symbolCodeLength = (0, _util.log2)(symbols.length + numberOfNewSymbols);
var decoder = decodingContext.decoder;
var contextCache = decodingContext.contextCache;
- var tableB1 = void 0,
- symbolWidths = void 0;
+ var tableB1, symbolWidths;
+
if (huffman) {
tableB1 = getStandardTable(1);
symbolWidths = [];
symbolCodeLength = Math.max(symbolCodeLength, 1);
}
+
while (newSymbols.length < numberOfNewSymbols) {
var deltaHeight = huffman ? huffmanTables.tableDeltaHeight.decode(huffmanInput) : decodeInteger(contextCache, 'IADH', decoder);
currentHeight += deltaHeight;
var currentWidth = 0,
totalWidth = 0;
var firstSymbol = huffman ? symbolWidths.length : 0;
+
while (true) {
var deltaWidth = huffman ? huffmanTables.tableDeltaWidth.decode(huffmanInput) : decodeInteger(contextCache, 'IADW', decoder);
+
if (deltaWidth === null) {
break;
}
+
currentWidth += deltaWidth;
totalWidth += currentWidth;
var bitmap;
+
if (refinement) {
var numberOfInstances = decodeInteger(contextCache, 'IAAI', decoder);
+
if (numberOfInstances > 1) {
bitmap = decodeTextRegion(huffman, refinement, currentWidth, currentHeight, 0, numberOfInstances, 1, symbols.concat(newSymbols), symbolCodeLength, 0, 0, 1, 0, huffmanTables, refinementTemplateIndex, refinementAt, decodingContext, 0, huffmanInput);
} else {
@@ -15539,6 +18840,7 @@ var Jbig2Image = function Jbig2ImageClosure() {
var symbol = symbolId < symbols.length ? symbols[symbolId] : newSymbols[symbolId - symbols.length];
bitmap = decodeRefinement(currentWidth, currentHeight, refinementTemplateIndex, symbol, rdx, rdy, false, refinementAt, decodingContext);
}
+
newSymbols.push(bitmap);
} else if (huffman) {
symbolWidths.push(currentWidth);
@@ -15547,10 +18849,12 @@ var Jbig2Image = function Jbig2ImageClosure() {
newSymbols.push(bitmap);
}
}
+
if (huffman && !refinement) {
var bitmapSize = huffmanTables.tableBitmapSize.decode(huffmanInput);
huffmanInput.byteAlign();
var collectiveBitmap = void 0;
+
if (bitmapSize === 0) {
collectiveBitmap = readUncompressedBitmap(huffmanInput, totalWidth, currentHeight);
} else {
@@ -15561,7 +18865,9 @@ var Jbig2Image = function Jbig2ImageClosure() {
huffmanInput.end = originalEnd;
huffmanInput.position = bitmapEnd;
}
+
var numberOfSymbolsDecoded = symbolWidths.length;
+
if (firstSymbol === numberOfSymbolsDecoded - 1) {
newSymbols.push(collectiveBitmap);
} else {
@@ -15571,79 +18877,100 @@ var Jbig2Image = function Jbig2ImageClosure() {
xMax = void 0,
bitmapWidth = void 0,
symbolBitmap = void 0;
+
for (_i = firstSymbol; _i < numberOfSymbolsDecoded; _i++) {
bitmapWidth = symbolWidths[_i];
xMax = xMin + bitmapWidth;
symbolBitmap = [];
+
for (y = 0; y < currentHeight; y++) {
symbolBitmap.push(collectiveBitmap[y].subarray(xMin, xMax));
}
+
newSymbols.push(symbolBitmap);
xMin = xMax;
}
}
}
}
+
var exportedSymbols = [];
var flags = [],
currentFlag = false;
var totalSymbolsLength = symbols.length + numberOfNewSymbols;
+
while (flags.length < totalSymbolsLength) {
var runLength = huffman ? tableB1.decode(huffmanInput) : decodeInteger(contextCache, 'IAEX', decoder);
+
while (runLength--) {
flags.push(currentFlag);
}
+
currentFlag = !currentFlag;
}
+
for (var i = 0, ii = symbols.length; i < ii; i++) {
if (flags[i]) {
exportedSymbols.push(symbols[i]);
}
}
+
for (var j = 0; j < numberOfNewSymbols; i++, j++) {
if (flags[i]) {
exportedSymbols.push(newSymbols[j]);
}
}
+
return exportedSymbols;
}
+
function decodeTextRegion(huffman, refinement, width, height, defaultPixelValue, numberOfSymbolInstances, stripSize, inputSymbols, symbolCodeLength, transposed, dsOffset, referenceCorner, combinationOperator, huffmanTables, refinementTemplateIndex, refinementAt, decodingContext, logStripSize, huffmanInput) {
if (huffman && refinement) {
throw new Jbig2Error('refinement with Huffman is not supported');
}
+
var bitmap = [];
var i, row;
+
for (i = 0; i < height; i++) {
row = new Uint8Array(width);
+
if (defaultPixelValue) {
for (var j = 0; j < width; j++) {
row[j] = defaultPixelValue;
}
}
+
bitmap.push(row);
}
+
var decoder = decodingContext.decoder;
var contextCache = decodingContext.contextCache;
var stripT = huffman ? -huffmanTables.tableDeltaT.decode(huffmanInput) : -decodeInteger(contextCache, 'IADT', decoder);
var firstS = 0;
i = 0;
+
while (i < numberOfSymbolInstances) {
var deltaT = huffman ? huffmanTables.tableDeltaT.decode(huffmanInput) : decodeInteger(contextCache, 'IADT', decoder);
stripT += deltaT;
var deltaFirstS = huffman ? huffmanTables.tableFirstS.decode(huffmanInput) : decodeInteger(contextCache, 'IAFS', decoder);
firstS += deltaFirstS;
var currentS = firstS;
+
do {
var currentT = 0;
+
if (stripSize > 1) {
currentT = huffman ? huffmanInput.readBits(logStripSize) : decodeInteger(contextCache, 'IAIT', decoder);
}
+
var t = stripSize * stripT + currentT;
var symbolId = huffman ? huffmanTables.symbolIDTable.decode(huffmanInput) : decodeIAID(contextCache, decoder, symbolCodeLength);
var applyRefinement = refinement && (huffman ? huffmanInput.readBit() : decodeInteger(contextCache, 'IARI', decoder));
var symbolBitmap = inputSymbols[symbolId];
var symbolWidth = symbolBitmap[0].length;
var symbolHeight = symbolBitmap.length;
+
if (applyRefinement) {
var rdw = decodeInteger(contextCache, 'IARDW', decoder);
var rdh = decodeInteger(contextCache, 'IARDH', decoder);
@@ -15653,74 +18980,99 @@ var Jbig2Image = function Jbig2ImageClosure() {
symbolHeight += rdh;
symbolBitmap = decodeRefinement(symbolWidth, symbolHeight, refinementTemplateIndex, symbolBitmap, (rdw >> 1) + rdx, (rdh >> 1) + rdy, false, refinementAt, decodingContext);
}
+
var offsetT = t - (referenceCorner & 1 ? 0 : symbolHeight - 1);
var offsetS = currentS - (referenceCorner & 2 ? symbolWidth - 1 : 0);
var s2, t2, symbolRow;
+
if (transposed) {
for (s2 = 0; s2 < symbolHeight; s2++) {
row = bitmap[offsetS + s2];
+
if (!row) {
continue;
}
+
symbolRow = symbolBitmap[s2];
var maxWidth = Math.min(width - offsetT, symbolWidth);
+
switch (combinationOperator) {
case 0:
for (t2 = 0; t2 < maxWidth; t2++) {
row[offsetT + t2] |= symbolRow[t2];
}
+
break;
+
case 2:
for (t2 = 0; t2 < maxWidth; t2++) {
row[offsetT + t2] ^= symbolRow[t2];
}
+
break;
+
default:
- throw new Jbig2Error('operator ' + combinationOperator + ' is not supported');
+ throw new Jbig2Error("operator ".concat(combinationOperator, " is not supported"));
}
}
+
currentS += symbolHeight - 1;
} else {
for (t2 = 0; t2 < symbolHeight; t2++) {
row = bitmap[offsetT + t2];
+
if (!row) {
continue;
}
+
symbolRow = symbolBitmap[t2];
+
switch (combinationOperator) {
case 0:
for (s2 = 0; s2 < symbolWidth; s2++) {
row[offsetS + s2] |= symbolRow[s2];
}
+
break;
+
case 2:
for (s2 = 0; s2 < symbolWidth; s2++) {
row[offsetS + s2] ^= symbolRow[s2];
}
+
break;
+
default:
- throw new Jbig2Error('operator ' + combinationOperator + ' is not supported');
+ throw new Jbig2Error("operator ".concat(combinationOperator, " is not supported"));
}
}
+
currentS += symbolWidth - 1;
}
+
i++;
var deltaS = huffman ? huffmanTables.tableDeltaS.decode(huffmanInput) : decodeInteger(contextCache, 'IADS', decoder);
+
if (deltaS === null) {
break;
}
+
currentS += deltaS + dsOffset;
} while (true);
}
+
return bitmap;
}
+
function decodePatternDictionary(mmr, patternWidth, patternHeight, maxPatternIndex, template, decodingContext) {
var at = [];
+
if (!mmr) {
at.push({
x: -patternWidth,
y: 0
});
+
if (template === 0) {
at.push({
x: -3,
@@ -15736,58 +19088,71 @@ var Jbig2Image = function Jbig2ImageClosure() {
});
}
}
+
var collectiveWidth = (maxPatternIndex + 1) * patternWidth;
var collectiveBitmap = decodeBitmap(mmr, collectiveWidth, patternHeight, template, false, null, at, decodingContext);
var patterns = [],
i = 0,
- patternBitmap = void 0,
- xMin = void 0,
- xMax = void 0,
- y = void 0;
+ patternBitmap,
+ xMin,
+ xMax,
+ y;
+
while (i <= maxPatternIndex) {
patternBitmap = [];
xMin = patternWidth * i;
xMax = xMin + patternWidth;
+
for (y = 0; y < patternHeight; y++) {
patternBitmap.push(collectiveBitmap[y].subarray(xMin, xMax));
}
+
patterns.push(patternBitmap);
i++;
}
+
return patterns;
}
+
function decodeHalftoneRegion(mmr, patterns, template, regionWidth, regionHeight, defaultPixelValue, enableSkip, combinationOperator, gridWidth, gridHeight, gridOffsetX, gridOffsetY, gridVectorX, gridVectorY, decodingContext) {
var skip = null;
+
if (enableSkip) {
throw new Jbig2Error('skip is not supported');
}
+
if (combinationOperator !== 0) {
throw new Jbig2Error('operator ' + combinationOperator + ' is not supported in halftone region');
}
+
var regionBitmap = [];
- var i = void 0,
- j = void 0,
- row = void 0;
+ var i, j, row;
+
for (i = 0; i < regionHeight; i++) {
row = new Uint8Array(regionWidth);
+
if (defaultPixelValue) {
for (j = 0; j < regionWidth; j++) {
row[j] = defaultPixelValue;
}
}
+
regionBitmap.push(row);
}
+
var numberOfPatterns = patterns.length;
var pattern0 = patterns[0];
var patternWidth = pattern0[0].length,
patternHeight = pattern0.length;
var bitsPerValue = (0, _util.log2)(numberOfPatterns);
var at = [];
+
if (!mmr) {
at.push({
x: template <= 1 ? 3 : 2,
y: -1
});
+
if (template === 0) {
at.push({
x: -3,
@@ -15803,44 +19168,46 @@ var Jbig2Image = function Jbig2ImageClosure() {
});
}
}
+
var grayScaleBitPlanes = [],
- mmrInput = void 0,
- bitmap = void 0;
+ mmrInput,
+ bitmap;
+
if (mmr) {
mmrInput = new Reader(decodingContext.data, decodingContext.start, decodingContext.end);
}
+
for (i = bitsPerValue - 1; i >= 0; i--) {
if (mmr) {
bitmap = decodeMMRBitmap(mmrInput, gridWidth, gridHeight, true);
} else {
bitmap = decodeBitmap(false, gridWidth, gridHeight, template, false, skip, at, decodingContext);
}
+
grayScaleBitPlanes[i] = bitmap;
}
- var mg = void 0,
- ng = void 0,
- bit = void 0,
- patternIndex = void 0,
- patternBitmap = void 0,
- x = void 0,
- y = void 0,
- patternRow = void 0,
- regionRow = void 0;
+
+ var mg, ng, bit, patternIndex, patternBitmap, x, y, patternRow, regionRow;
+
for (mg = 0; mg < gridHeight; mg++) {
for (ng = 0; ng < gridWidth; ng++) {
bit = 0;
patternIndex = 0;
+
for (j = bitsPerValue - 1; j >= 0; j--) {
bit = grayScaleBitPlanes[j][mg][ng] ^ bit;
patternIndex |= bit << j;
}
+
patternBitmap = patterns[patternIndex];
x = gridOffsetX + mg * gridVectorY + ng * gridVectorX >> 8;
y = gridOffsetY + mg * gridVectorX - ng * gridVectorY >> 8;
+
if (x >= 0 && x + patternWidth <= regionWidth && y >= 0 && y + patternHeight <= regionHeight) {
for (i = 0; i < patternHeight; i++) {
regionRow = regionBitmap[y + i];
patternRow = patternBitmap[i];
+
for (j = 0; j < patternWidth; j++) {
regionRow[x + j] |= patternRow[j];
}
@@ -15848,15 +19215,20 @@ var Jbig2Image = function Jbig2ImageClosure() {
} else {
var regionX = void 0,
regionY = void 0;
+
for (i = 0; i < patternHeight; i++) {
regionY = y + i;
+
if (regionY < 0 || regionY >= regionHeight) {
continue;
}
+
regionRow = regionBitmap[regionY];
patternRow = patternBitmap[i];
+
for (j = 0; j < patternWidth; j++) {
regionX = x + j;
+
if (regionX >= 0 && regionX < regionWidth) {
regionRow[regionX] |= patternRow[j];
}
@@ -15865,16 +19237,20 @@ var Jbig2Image = function Jbig2ImageClosure() {
}
}
}
+
return regionBitmap;
}
+
function readSegmentHeader(data, start) {
var segmentHeader = {};
segmentHeader.number = (0, _util.readUint32)(data, start);
var flags = data[start + 4];
var segmentType = flags & 0x3F;
+
if (!SegmentTypes[segmentType]) {
throw new Jbig2Error('invalid segment type: ' + segmentType);
}
+
segmentHeader.type = segmentType;
segmentHeader.typeName = SegmentTypes[segmentType];
segmentHeader.deferredNonRetain = !!(flags & 0x80);
@@ -15883,35 +19259,43 @@ var Jbig2Image = function Jbig2ImageClosure() {
var referredToCount = referredFlags >> 5 & 7;
var retainBits = [referredFlags & 31];
var position = start + 6;
+
if (referredFlags === 7) {
referredToCount = (0, _util.readUint32)(data, position - 1) & 0x1FFFFFFF;
position += 3;
var bytes = referredToCount + 7 >> 3;
retainBits[0] = data[position++];
+
while (--bytes > 0) {
retainBits.push(data[position++]);
}
} else if (referredFlags === 5 || referredFlags === 6) {
throw new Jbig2Error('invalid referred-to flags');
}
+
segmentHeader.retainBits = retainBits;
var referredToSegmentNumberSize = segmentHeader.number <= 256 ? 1 : segmentHeader.number <= 65536 ? 2 : 4;
var referredTo = [];
var i, ii;
+
for (i = 0; i < referredToCount; i++) {
var number = referredToSegmentNumberSize === 1 ? data[position] : referredToSegmentNumberSize === 2 ? (0, _util.readUint16)(data, position) : (0, _util.readUint32)(data, position);
referredTo.push(number);
position += referredToSegmentNumberSize;
}
+
segmentHeader.referredTo = referredTo;
+
if (!pageAssociationFieldSize) {
segmentHeader.pageAssociation = data[position++];
} else {
segmentHeader.pageAssociation = (0, _util.readUint32)(data, position);
position += 4;
}
+
segmentHeader.length = (0, _util.readUint32)(data, position);
position += 4;
+
if (segmentHeader.length === 0xFFFFFFFF) {
if (segmentType === 38) {
var genericRegionInfo = readRegionSegmentInformation(data, position);
@@ -15919,24 +19303,30 @@ var Jbig2Image = function Jbig2ImageClosure() {
var genericRegionMmr = !!(genericRegionSegmentFlags & 1);
var searchPatternLength = 6;
var searchPattern = new Uint8Array(searchPatternLength);
+
if (!genericRegionMmr) {
searchPattern[0] = 0xFF;
searchPattern[1] = 0xAC;
}
+
searchPattern[2] = genericRegionInfo.height >>> 24 & 0xFF;
searchPattern[3] = genericRegionInfo.height >> 16 & 0xFF;
searchPattern[4] = genericRegionInfo.height >> 8 & 0xFF;
searchPattern[5] = genericRegionInfo.height & 0xFF;
+
for (i = position, ii = data.length; i < ii; i++) {
var j = 0;
+
while (j < searchPatternLength && searchPattern[j] === data[i + j]) {
j++;
}
+
if (j === searchPatternLength) {
segmentHeader.length = i + searchPatternLength;
break;
}
}
+
if (segmentHeader.length === 0xFFFFFFFF) {
throw new Jbig2Error('segment end was not found');
}
@@ -15944,12 +19334,15 @@ var Jbig2Image = function Jbig2ImageClosure() {
throw new Jbig2Error('invalid unknown segment length');
}
}
+
segmentHeader.headerEnd = position;
return segmentHeader;
}
+
function readSegments(header, data, start, end) {
var segments = [];
var position = start;
+
while (position < end) {
var segmentHeader = readSegmentHeader(data, position);
position = segmentHeader.headerEnd;
@@ -15957,16 +19350,20 @@ var Jbig2Image = function Jbig2ImageClosure() {
header: segmentHeader,
data: data
};
+
if (!header.randomAccess) {
segment.start = position;
position += segmentHeader.length;
segment.end = position;
}
+
segments.push(segment);
+
if (segmentHeader.type === 51) {
break;
}
}
+
if (header.randomAccess) {
for (var i = 0, ii = segments.length; i < ii; i++) {
segments[i].start = position;
@@ -15974,8 +19371,10 @@ var Jbig2Image = function Jbig2ImageClosure() {
segments[i].end = position;
}
}
+
return segments;
}
+
function readRegionSegmentInformation(data, start) {
return {
width: (0, _util.readUint32)(data, start),
@@ -15985,13 +19384,16 @@ var Jbig2Image = function Jbig2ImageClosure() {
combinationOperator: data[start + 16] & 7
};
}
+
var RegionSegmentInformationFieldLength = 17;
+
function processSegment(segment, visitor) {
var header = segment.header;
var data = segment.data,
position = segment.start,
end = segment.end;
var args, at, i, atLength;
+
switch (header.type) {
case 0:
var dictionary = {};
@@ -16007,9 +19409,11 @@ var Jbig2Image = function Jbig2ImageClosure() {
dictionary.template = dictionaryFlags >> 10 & 3;
dictionary.refinementTemplate = dictionaryFlags >> 12 & 1;
position += 2;
+
if (!dictionary.huffman) {
atLength = dictionary.template === 0 ? 4 : 1;
at = [];
+
for (i = 0; i < atLength; i++) {
at.push({
x: (0, _util.readInt8)(data, position),
@@ -16017,10 +19421,13 @@ var Jbig2Image = function Jbig2ImageClosure() {
});
position += 2;
}
+
dictionary.at = at;
}
+
if (dictionary.refinement && !dictionary.refinementTemplate) {
at = [];
+
for (i = 0; i < 2; i++) {
at.push({
x: (0, _util.readInt8)(data, position),
@@ -16028,14 +19435,17 @@ var Jbig2Image = function Jbig2ImageClosure() {
});
position += 2;
}
+
dictionary.refinementAt = at;
}
+
dictionary.numberOfExportedSymbols = (0, _util.readUint32)(data, position);
position += 4;
dictionary.numberOfNewSymbols = (0, _util.readUint32)(data, position);
position += 4;
args = [dictionary, header.number, header.referredTo, data, position, end];
break;
+
case 6:
case 7:
var textRegion = {};
@@ -16053,6 +19463,7 @@ var Jbig2Image = function Jbig2ImageClosure() {
textRegion.defaultPixelValue = textRegionSegmentFlags >> 9 & 1;
textRegion.dsOffset = textRegionSegmentFlags << 17 >> 27;
textRegion.refinementTemplate = textRegionSegmentFlags >> 15 & 1;
+
if (textRegion.huffman) {
var textRegionHuffmanFlags = (0, _util.readUint16)(data, position);
position += 2;
@@ -16065,8 +19476,10 @@ var Jbig2Image = function Jbig2ImageClosure() {
textRegion.huffmanRefinementDY = textRegionHuffmanFlags >> 12 & 3;
textRegion.huffmanRefinementSizeSelector = !!(textRegionHuffmanFlags & 0x4000);
}
+
if (textRegion.refinement && !textRegion.refinementTemplate) {
at = [];
+
for (i = 0; i < 2; i++) {
at.push({
x: (0, _util.readInt8)(data, position),
@@ -16074,12 +19487,15 @@ var Jbig2Image = function Jbig2ImageClosure() {
});
position += 2;
}
+
textRegion.refinementAt = at;
}
+
textRegion.numberOfSymbolInstances = (0, _util.readUint32)(data, position);
position += 4;
args = [textRegion, header.referredTo, data, position, end];
break;
+
case 16:
var patternDictionary = {};
var patternDictionaryFlags = data[position++];
@@ -16091,6 +19507,7 @@ var Jbig2Image = function Jbig2ImageClosure() {
position += 4;
args = [patternDictionary, header.number, data, position, end];
break;
+
case 22:
case 23:
var halftoneRegion = {};
@@ -16116,6 +19533,7 @@ var Jbig2Image = function Jbig2ImageClosure() {
position += 2;
args = [halftoneRegion, header.referredTo, data, position, end];
break;
+
case 38:
case 39:
var genericRegion = {};
@@ -16125,9 +19543,11 @@ var Jbig2Image = function Jbig2ImageClosure() {
genericRegion.mmr = !!(genericRegionSegmentFlags & 1);
genericRegion.template = genericRegionSegmentFlags >> 1 & 3;
genericRegion.prediction = !!(genericRegionSegmentFlags & 8);
+
if (!genericRegion.mmr) {
atLength = genericRegion.template === 0 ? 4 : 1;
at = [];
+
for (i = 0; i < atLength; i++) {
at.push({
x: (0, _util.readInt8)(data, position),
@@ -16135,10 +19555,13 @@ var Jbig2Image = function Jbig2ImageClosure() {
});
position += 2;
}
+
genericRegion.at = at;
}
+
args = [genericRegion, data, position, end];
break;
+
case 48:
var pageInfo = {
width: (0, _util.readUint32)(data, position),
@@ -16146,9 +19569,11 @@ var Jbig2Image = function Jbig2ImageClosure() {
resolutionX: (0, _util.readUint32)(data, position + 8),
resolutionY: (0, _util.readUint32)(data, position + 12)
};
+
if (pageInfo.height === 0xFFFFFFFF) {
delete pageInfo.height;
}
+
var pageSegmentFlags = data[position + 16];
(0, _util.readUint16)(data, position + 17);
pageInfo.lossless = !!(pageSegmentFlags & 1);
@@ -16159,93 +19584,117 @@ var Jbig2Image = function Jbig2ImageClosure() {
pageInfo.combinationOperatorOverride = !!(pageSegmentFlags & 64);
args = [pageInfo];
break;
+
case 49:
break;
+
case 50:
break;
+
case 51:
break;
+
case 53:
args = [header.number, data, position, end];
break;
+
case 62:
break;
+
default:
- throw new Jbig2Error('segment type ' + header.typeName + '(' + header.type + ')' + ' is not implemented');
+ throw new Jbig2Error("segment type ".concat(header.typeName, "(").concat(header.type, ")") + ' is not implemented');
}
+
var callbackName = 'on' + header.typeName;
+
if (callbackName in visitor) {
visitor[callbackName].apply(visitor, args);
}
}
+
function processSegments(segments, visitor) {
for (var i = 0, ii = segments.length; i < ii; i++) {
processSegment(segments[i], visitor);
}
}
+
function parseJbig2Chunks(chunks) {
var visitor = new SimpleSegmentVisitor();
+
for (var i = 0, ii = chunks.length; i < ii; i++) {
var chunk = chunks[i];
var segments = readSegments({}, chunk.data, chunk.start, chunk.end);
processSegments(segments, visitor);
}
+
return visitor.buffer;
}
+
function parseJbig2(data) {
var position = 0,
end = data.length;
+
if (data[position] !== 0x97 || data[position + 1] !== 0x4A || data[position + 2] !== 0x42 || data[position + 3] !== 0x32 || data[position + 4] !== 0x0D || data[position + 5] !== 0x0A || data[position + 6] !== 0x1A || data[position + 7] !== 0x0A) {
throw new Jbig2Error('parseJbig2 - invalid header.');
}
+
var header = Object.create(null);
position += 8;
var flags = data[position++];
header.randomAccess = !(flags & 1);
+
if (!(flags & 2)) {
header.numberOfPages = (0, _util.readUint32)(data, position);
position += 4;
}
+
var segments = readSegments(header, data, position, end);
var visitor = new SimpleSegmentVisitor();
processSegments(segments, visitor);
var _visitor$currentPageI = visitor.currentPageInfo,
width = _visitor$currentPageI.width,
height = _visitor$currentPageI.height;
-
var bitPacked = visitor.buffer;
var imgData = new Uint8ClampedArray(width * height);
var q = 0,
k = 0;
+
for (var i = 0; i < height; i++) {
var mask = 0,
buffer = void 0;
+
for (var j = 0; j < width; j++) {
if (!mask) {
mask = 128;
buffer = bitPacked[k++];
}
+
imgData[q++] = buffer & mask ? 0 : 255;
mask >>= 1;
}
}
+
return {
imgData: imgData,
width: width,
height: height
};
}
+
function SimpleSegmentVisitor() {}
+
SimpleSegmentVisitor.prototype = {
onPageInformation: function SimpleSegmentVisitor_onPageInformation(info) {
this.currentPageInfo = info;
var rowSize = info.width + 7 >> 3;
var buffer = new Uint8ClampedArray(rowSize * info.height);
+
if (info.defaultPixelValue) {
for (var i = 0, ii = buffer.length; i < ii; i++) {
buffer[i] = 0xFF;
}
}
+
this.buffer = buffer;
},
drawBitmap: function SimpleSegmentVisitor_drawBitmap(regionInfo, bitmap) {
@@ -16258,43 +19707,56 @@ var Jbig2Image = function Jbig2ImageClosure() {
var mask0 = 128 >> (regionInfo.x & 7);
var offset0 = regionInfo.y * rowSize + (regionInfo.x >> 3);
var i, j, mask, offset;
+
switch (combinationOperator) {
case 0:
for (i = 0; i < height; i++) {
mask = mask0;
offset = offset0;
+
for (j = 0; j < width; j++) {
if (bitmap[i][j]) {
buffer[offset] |= mask;
}
+
mask >>= 1;
+
if (!mask) {
mask = 128;
offset++;
}
}
+
offset0 += rowSize;
}
+
break;
+
case 2:
for (i = 0; i < height; i++) {
mask = mask0;
offset = offset0;
+
for (j = 0; j < width; j++) {
if (bitmap[i][j]) {
buffer[offset] ^= mask;
}
+
mask >>= 1;
+
if (!mask) {
mask = 128;
offset++;
}
}
+
offset0 += rowSize;
}
+
break;
+
default:
- throw new Jbig2Error('operator ' + combinationOperator + ' is not supported');
+ throw new Jbig2Error("operator ".concat(combinationOperator, " is not supported"));
}
},
onImmediateGenericRegion: function SimpleSegmentVisitor_onImmediateGenericRegion(region, data, start, end) {
@@ -16307,43 +19769,53 @@ var Jbig2Image = function Jbig2ImageClosure() {
this.onImmediateGenericRegion.apply(this, arguments);
},
onSymbolDictionary: function SimpleSegmentVisitor_onSymbolDictionary(dictionary, currentSegment, referredSegments, data, start, end) {
- var huffmanTables = void 0,
- huffmanInput = void 0;
+ var huffmanTables, huffmanInput;
+
if (dictionary.huffman) {
huffmanTables = getSymbolDictionaryHuffmanTables(dictionary, referredSegments, this.customTables);
huffmanInput = new Reader(data, start, end);
}
+
var symbols = this.symbols;
+
if (!symbols) {
this.symbols = symbols = {};
}
+
var inputSymbols = [];
+
for (var i = 0, ii = referredSegments.length; i < ii; i++) {
var referredSymbols = symbols[referredSegments[i]];
+
if (referredSymbols) {
inputSymbols = inputSymbols.concat(referredSymbols);
}
}
+
var decodingContext = new DecodingContext(data, start, end);
symbols[currentSegment] = decodeSymbolDictionary(dictionary.huffman, dictionary.refinement, inputSymbols, dictionary.numberOfNewSymbols, dictionary.numberOfExportedSymbols, huffmanTables, dictionary.template, dictionary.at, dictionary.refinementTemplate, dictionary.refinementAt, decodingContext, huffmanInput);
},
onImmediateTextRegion: function SimpleSegmentVisitor_onImmediateTextRegion(region, referredSegments, data, start, end) {
var regionInfo = region.info;
- var huffmanTables = void 0,
- huffmanInput = void 0;
+ var huffmanTables, huffmanInput;
var symbols = this.symbols;
var inputSymbols = [];
+
for (var i = 0, ii = referredSegments.length; i < ii; i++) {
var referredSymbols = symbols[referredSegments[i]];
+
if (referredSymbols) {
inputSymbols = inputSymbols.concat(referredSymbols);
}
}
+
var symbolCodeLength = (0, _util.log2)(inputSymbols.length);
+
if (region.huffman) {
huffmanInput = new Reader(data, start, end);
huffmanTables = getTextRegionHuffmanTables(region, referredSegments, this.customTables, inputSymbols.length, huffmanInput);
}
+
var decodingContext = new DecodingContext(data, start, end);
var bitmap = decodeTextRegion(region.huffman, region.refinement, regionInfo.width, regionInfo.height, region.defaultPixelValue, region.numberOfSymbolInstances, region.stripSize, inputSymbols, symbolCodeLength, region.transposed, region.dsOffset, region.referenceCorner, region.combinationOperator, huffmanTables, region.refinementTemplate, region.refinementAt, decodingContext, region.logStripSize, huffmanInput);
this.drawBitmap(regionInfo, bitmap);
@@ -16353,9 +19825,11 @@ var Jbig2Image = function Jbig2ImageClosure() {
},
onPatternDictionary: function onPatternDictionary(dictionary, currentSegment, data, start, end) {
var patterns = this.patterns;
+
if (!patterns) {
this.patterns = patterns = {};
}
+
var decodingContext = new DecodingContext(data, start, end);
patterns[currentSegment] = decodePatternDictionary(dictionary.mmr, dictionary.patternWidth, dictionary.patternHeight, dictionary.maxPatternIndex, dictionary.template, decodingContext);
},
@@ -16371,12 +19845,15 @@ var Jbig2Image = function Jbig2ImageClosure() {
},
onTables: function onTables(currentSegment, data, start, end) {
var customTables = this.customTables;
+
if (!customTables) {
this.customTables = customTables = {};
}
+
customTables[currentSegment] = decodeTablesSegment(data, start, end);
}
};
+
function HuffmanLine(lineData) {
if (lineData.length === 2) {
this.isOOB = true;
@@ -16394,8 +19871,10 @@ var Jbig2Image = function Jbig2ImageClosure() {
this.isLowerRange = lineData[4] === 'lower';
}
}
+
function HuffmanTreeNode(line) {
this.children = [];
+
if (line) {
this.isLeaf = true;
this.rangeLength = line.rangeLength;
@@ -16406,16 +19885,20 @@ var Jbig2Image = function Jbig2ImageClosure() {
this.isLeaf = false;
}
}
+
HuffmanTreeNode.prototype = {
buildTree: function buildTree(line, shift) {
var bit = line.prefixCode >> shift & 1;
+
if (shift <= 0) {
this.children[bit] = new HuffmanTreeNode(line);
} else {
var node = this.children[bit];
+
if (!node) {
this.children[bit] = node = new HuffmanTreeNode(null);
}
+
node.buildTree(line, shift - 1);
}
},
@@ -16424,31 +19907,40 @@ var Jbig2Image = function Jbig2ImageClosure() {
if (this.isOOB) {
return null;
}
+
var htOffset = reader.readBits(this.rangeLength);
return this.rangeLow + (this.isLowerRange ? -htOffset : htOffset);
}
+
var node = this.children[reader.readBit()];
+
if (!node) {
throw new Jbig2Error('invalid Huffman data');
}
+
return node.decodeNode(reader);
}
};
+
function HuffmanTable(lines, prefixCodesDone) {
if (!prefixCodesDone) {
this.assignPrefixCodes(lines);
}
+
this.rootNode = new HuffmanTreeNode(null);
- var i = void 0,
+ var i,
ii = lines.length,
- line = void 0;
+ line;
+
for (i = 0; i < ii; i++) {
line = lines[i];
+
if (line.prefixLength > 0) {
this.rootNode.buildTree(line, line.prefixLength - 1);
}
}
}
+
HuffmanTable.prototype = {
decode: function decode(reader) {
return this.rootNode.decodeNode(reader);
@@ -16456,36 +19948,46 @@ var Jbig2Image = function Jbig2ImageClosure() {
assignPrefixCodes: function assignPrefixCodes(lines) {
var linesLength = lines.length,
prefixLengthMax = 0,
- i = void 0;
+ i;
+
for (i = 0; i < linesLength; i++) {
prefixLengthMax = Math.max(prefixLengthMax, lines[i].prefixLength);
}
+
var histogram = new Uint32Array(prefixLengthMax + 1);
+
for (i = 0; i < linesLength; i++) {
histogram[lines[i].prefixLength]++;
}
+
var currentLength = 1,
firstCode = 0,
- currentCode = void 0,
- currentTemp = void 0,
- line = void 0;
+ currentCode,
+ currentTemp,
+ line;
histogram[0] = 0;
+
while (currentLength <= prefixLengthMax) {
firstCode = firstCode + histogram[currentLength - 1] << 1;
currentCode = firstCode;
currentTemp = 0;
+
while (currentTemp < linesLength) {
line = lines[currentTemp];
+
if (line.prefixLength === currentLength) {
line.prefixCode = currentCode;
currentCode++;
}
+
currentTemp++;
}
+
currentLength++;
}
}
};
+
function decodeTablesSegment(data, start, end) {
var flags = data[start];
var lowestValue = (0, _util.readUint32)(data, start + 1) & 0xFFFFFFFF;
@@ -16494,90 +19996,118 @@ var Jbig2Image = function Jbig2ImageClosure() {
var prefixSizeBits = (flags >> 1 & 7) + 1;
var rangeSizeBits = (flags >> 4 & 7) + 1;
var lines = [];
- var prefixLength = void 0,
- rangeLength = void 0,
+ var prefixLength,
+ rangeLength,
currentRangeLow = lowestValue;
+
do {
prefixLength = reader.readBits(prefixSizeBits);
rangeLength = reader.readBits(rangeSizeBits);
lines.push(new HuffmanLine([currentRangeLow, prefixLength, rangeLength, 0]));
currentRangeLow += 1 << rangeLength;
} while (currentRangeLow < highestValue);
+
prefixLength = reader.readBits(prefixSizeBits);
lines.push(new HuffmanLine([lowestValue - 1, prefixLength, 32, 0, 'lower']));
prefixLength = reader.readBits(prefixSizeBits);
lines.push(new HuffmanLine([highestValue, prefixLength, 32, 0]));
+
if (flags & 1) {
prefixLength = reader.readBits(prefixSizeBits);
lines.push(new HuffmanLine([prefixLength, 0]));
}
+
return new HuffmanTable(lines, false);
}
+
var standardTablesCache = {};
+
function getStandardTable(number) {
var table = standardTablesCache[number];
+
if (table) {
return table;
}
- var lines = void 0;
+
+ var lines;
+
switch (number) {
case 1:
lines = [[0, 1, 4, 0x0], [16, 2, 8, 0x2], [272, 3, 16, 0x6], [65808, 3, 32, 0x7]];
break;
+
case 2:
lines = [[0, 1, 0, 0x0], [1, 2, 0, 0x2], [2, 3, 0, 0x6], [3, 4, 3, 0xE], [11, 5, 6, 0x1E], [75, 6, 32, 0x3E], [6, 0x3F]];
break;
+
case 3:
lines = [[-256, 8, 8, 0xFE], [0, 1, 0, 0x0], [1, 2, 0, 0x2], [2, 3, 0, 0x6], [3, 4, 3, 0xE], [11, 5, 6, 0x1E], [-257, 8, 32, 0xFF, 'lower'], [75, 7, 32, 0x7E], [6, 0x3E]];
break;
+
case 4:
lines = [[1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 0, 0x6], [4, 4, 3, 0xE], [12, 5, 6, 0x1E], [76, 5, 32, 0x1F]];
break;
+
case 5:
lines = [[-255, 7, 8, 0x7E], [1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 0, 0x6], [4, 4, 3, 0xE], [12, 5, 6, 0x1E], [-256, 7, 32, 0x7F, 'lower'], [76, 6, 32, 0x3E]];
break;
+
case 6:
lines = [[-2048, 5, 10, 0x1C], [-1024, 4, 9, 0x8], [-512, 4, 8, 0x9], [-256, 4, 7, 0xA], [-128, 5, 6, 0x1D], [-64, 5, 5, 0x1E], [-32, 4, 5, 0xB], [0, 2, 7, 0x0], [128, 3, 7, 0x2], [256, 3, 8, 0x3], [512, 4, 9, 0xC], [1024, 4, 10, 0xD], [-2049, 6, 32, 0x3E, 'lower'], [2048, 6, 32, 0x3F]];
break;
+
case 7:
lines = [[-1024, 4, 9, 0x8], [-512, 3, 8, 0x0], [-256, 4, 7, 0x9], [-128, 5, 6, 0x1A], [-64, 5, 5, 0x1B], [-32, 4, 5, 0xA], [0, 4, 5, 0xB], [32, 5, 5, 0x1C], [64, 5, 6, 0x1D], [128, 4, 7, 0xC], [256, 3, 8, 0x1], [512, 3, 9, 0x2], [1024, 3, 10, 0x3], [-1025, 5, 32, 0x1E, 'lower'], [2048, 5, 32, 0x1F]];
break;
+
case 8:
lines = [[-15, 8, 3, 0xFC], [-7, 9, 1, 0x1FC], [-5, 8, 1, 0xFD], [-3, 9, 0, 0x1FD], [-2, 7, 0, 0x7C], [-1, 4, 0, 0xA], [0, 2, 1, 0x0], [2, 5, 0, 0x1A], [3, 6, 0, 0x3A], [4, 3, 4, 0x4], [20, 6, 1, 0x3B], [22, 4, 4, 0xB], [38, 4, 5, 0xC], [70, 5, 6, 0x1B], [134, 5, 7, 0x1C], [262, 6, 7, 0x3C], [390, 7, 8, 0x7D], [646, 6, 10, 0x3D], [-16, 9, 32, 0x1FE, 'lower'], [1670, 9, 32, 0x1FF], [2, 0x1]];
break;
+
case 9:
lines = [[-31, 8, 4, 0xFC], [-15, 9, 2, 0x1FC], [-11, 8, 2, 0xFD], [-7, 9, 1, 0x1FD], [-5, 7, 1, 0x7C], [-3, 4, 1, 0xA], [-1, 3, 1, 0x2], [1, 3, 1, 0x3], [3, 5, 1, 0x1A], [5, 6, 1, 0x3A], [7, 3, 5, 0x4], [39, 6, 2, 0x3B], [43, 4, 5, 0xB], [75, 4, 6, 0xC], [139, 5, 7, 0x1B], [267, 5, 8, 0x1C], [523, 6, 8, 0x3C], [779, 7, 9, 0x7D], [1291, 6, 11, 0x3D], [-32, 9, 32, 0x1FE, 'lower'], [3339, 9, 32, 0x1FF], [2, 0x0]];
break;
+
case 10:
lines = [[-21, 7, 4, 0x7A], [-5, 8, 0, 0xFC], [-4, 7, 0, 0x7B], [-3, 5, 0, 0x18], [-2, 2, 2, 0x0], [2, 5, 0, 0x19], [3, 6, 0, 0x36], [4, 7, 0, 0x7C], [5, 8, 0, 0xFD], [6, 2, 6, 0x1], [70, 5, 5, 0x1A], [102, 6, 5, 0x37], [134, 6, 6, 0x38], [198, 6, 7, 0x39], [326, 6, 8, 0x3A], [582, 6, 9, 0x3B], [1094, 6, 10, 0x3C], [2118, 7, 11, 0x7D], [-22, 8, 32, 0xFE, 'lower'], [4166, 8, 32, 0xFF], [2, 0x2]];
break;
+
case 11:
lines = [[1, 1, 0, 0x0], [2, 2, 1, 0x2], [4, 4, 0, 0xC], [5, 4, 1, 0xD], [7, 5, 1, 0x1C], [9, 5, 2, 0x1D], [13, 6, 2, 0x3C], [17, 7, 2, 0x7A], [21, 7, 3, 0x7B], [29, 7, 4, 0x7C], [45, 7, 5, 0x7D], [77, 7, 6, 0x7E], [141, 7, 32, 0x7F]];
break;
+
case 12:
lines = [[1, 1, 0, 0x0], [2, 2, 0, 0x2], [3, 3, 1, 0x6], [5, 5, 0, 0x1C], [6, 5, 1, 0x1D], [8, 6, 1, 0x3C], [10, 7, 0, 0x7A], [11, 7, 1, 0x7B], [13, 7, 2, 0x7C], [17, 7, 3, 0x7D], [25, 7, 4, 0x7E], [41, 8, 5, 0xFE], [73, 8, 32, 0xFF]];
break;
+
case 13:
lines = [[1, 1, 0, 0x0], [2, 3, 0, 0x4], [3, 4, 0, 0xC], [4, 5, 0, 0x1C], [5, 4, 1, 0xD], [7, 3, 3, 0x5], [15, 6, 1, 0x3A], [17, 6, 2, 0x3B], [21, 6, 3, 0x3C], [29, 6, 4, 0x3D], [45, 6, 5, 0x3E], [77, 7, 6, 0x7E], [141, 7, 32, 0x7F]];
break;
+
case 14:
lines = [[-2, 3, 0, 0x4], [-1, 3, 0, 0x5], [0, 1, 0, 0x0], [1, 3, 0, 0x6], [2, 3, 0, 0x7]];
break;
+
case 15:
lines = [[-24, 7, 4, 0x7C], [-8, 6, 2, 0x3C], [-4, 5, 1, 0x1C], [-2, 4, 0, 0xC], [-1, 3, 0, 0x4], [0, 1, 0, 0x0], [1, 3, 0, 0x5], [2, 4, 0, 0xD], [3, 5, 1, 0x1D], [5, 6, 2, 0x3D], [9, 7, 4, 0x7D], [-25, 7, 32, 0x7E, 'lower'], [25, 7, 32, 0x7F]];
break;
+
default:
- throw new Jbig2Error('standard table B.' + number + ' does not exist');
+ throw new Jbig2Error("standard table B.".concat(number, " does not exist"));
}
+
var length = lines.length,
- i = void 0;
+ i;
+
for (i = 0; i < length; i++) {
lines[i] = new HuffmanLine(lines[i]);
}
+
table = new HuffmanTable(lines, true);
standardTablesCache[number] = table;
return table;
}
+
function Reader(data, start, end) {
this.data = data;
this.start = start;
@@ -16586,25 +20116,30 @@ var Jbig2Image = function Jbig2ImageClosure() {
this.shift = -1;
this.currentByte = 0;
}
+
Reader.prototype = {
readBit: function readBit() {
if (this.shift < 0) {
if (this.position >= this.end) {
throw new Jbig2Error('end of data while reading bit');
}
+
this.currentByte = this.data[this.position++];
this.shift = 7;
}
+
var bit = this.currentByte >> this.shift & 1;
this.shift--;
return bit;
},
readBits: function readBits(numBits) {
var result = 0,
- i = void 0;
+ i;
+
for (i = numBits - 1; i >= 0; i--) {
result |= this.readBit() << i;
}
+
return result;
},
byteAlign: function byteAlign() {
@@ -16614,60 +20149,77 @@ var Jbig2Image = function Jbig2ImageClosure() {
if (this.position >= this.end) {
return -1;
}
+
return this.data[this.position++];
}
};
+
function getCustomHuffmanTable(index, referredTo, customTables) {
var currentIndex = 0,
- i = void 0,
+ i,
ii = referredTo.length,
- table = void 0;
+ table;
+
for (i = 0; i < ii; i++) {
table = customTables[referredTo[i]];
+
if (table) {
if (index === currentIndex) {
return table;
}
+
currentIndex++;
}
}
+
throw new Jbig2Error('can\'t find custom Huffman table');
}
+
function getTextRegionHuffmanTables(textRegion, referredTo, customTables, numberOfSymbols, reader) {
var codes = [],
- i = void 0,
- codeLength = void 0;
+ i,
+ codeLength;
+
for (i = 0; i <= 34; i++) {
codeLength = reader.readBits(4);
codes.push(new HuffmanLine([i, codeLength, 0, 0]));
}
+
var runCodesTable = new HuffmanTable(codes, false);
codes.length = 0;
+
for (i = 0; i < numberOfSymbols;) {
codeLength = runCodesTable.decode(reader);
+
if (codeLength >= 32) {
var repeatedLength = void 0,
numberOfRepeats = void 0,
j = void 0;
+
switch (codeLength) {
case 32:
if (i === 0) {
throw new Jbig2Error('no previous value in symbol ID table');
}
+
numberOfRepeats = reader.readBits(2) + 3;
repeatedLength = codes[i - 1].prefixLength;
break;
+
case 33:
numberOfRepeats = reader.readBits(3) + 3;
repeatedLength = 0;
break;
+
case 34:
numberOfRepeats = reader.readBits(7) + 11;
repeatedLength = 0;
break;
+
default:
throw new Jbig2Error('invalid code length in symbol ID table');
}
+
for (j = 0; j < numberOfRepeats; j++) {
codes.push(new HuffmanLine([i, repeatedLength, 0, 0]));
i++;
@@ -16677,53 +20229,65 @@ var Jbig2Image = function Jbig2ImageClosure() {
i++;
}
}
+
reader.byteAlign();
var symbolIDTable = new HuffmanTable(codes, false);
var customIndex = 0,
- tableFirstS = void 0,
- tableDeltaS = void 0,
- tableDeltaT = void 0;
+ tableFirstS,
+ tableDeltaS,
+ tableDeltaT;
+
switch (textRegion.huffmanFS) {
case 0:
case 1:
tableFirstS = getStandardTable(textRegion.huffmanFS + 6);
break;
+
case 3:
tableFirstS = getCustomHuffmanTable(customIndex, referredTo, customTables);
customIndex++;
break;
+
default:
throw new Jbig2Error('invalid Huffman FS selector');
}
+
switch (textRegion.huffmanDS) {
case 0:
case 1:
case 2:
tableDeltaS = getStandardTable(textRegion.huffmanDS + 8);
break;
+
case 3:
tableDeltaS = getCustomHuffmanTable(customIndex, referredTo, customTables);
customIndex++;
break;
+
default:
throw new Jbig2Error('invalid Huffman DS selector');
}
+
switch (textRegion.huffmanDT) {
case 0:
case 1:
case 2:
tableDeltaT = getStandardTable(textRegion.huffmanDT + 11);
break;
+
case 3:
tableDeltaT = getCustomHuffmanTable(customIndex, referredTo, customTables);
customIndex++;
break;
+
default:
throw new Jbig2Error('invalid Huffman DT selector');
}
+
if (textRegion.refinement) {
throw new Jbig2Error('refinement with Huffman is not supported');
}
+
return {
symbolIDTable: symbolIDTable,
tableFirstS: tableFirstS,
@@ -16731,47 +20295,57 @@ var Jbig2Image = function Jbig2ImageClosure() {
tableDeltaT: tableDeltaT
};
}
+
function getSymbolDictionaryHuffmanTables(dictionary, referredTo, customTables) {
var customIndex = 0,
- tableDeltaHeight = void 0,
- tableDeltaWidth = void 0;
+ tableDeltaHeight,
+ tableDeltaWidth;
+
switch (dictionary.huffmanDHSelector) {
case 0:
case 1:
tableDeltaHeight = getStandardTable(dictionary.huffmanDHSelector + 4);
break;
+
case 3:
tableDeltaHeight = getCustomHuffmanTable(customIndex, referredTo, customTables);
customIndex++;
break;
+
default:
throw new Jbig2Error('invalid Huffman DH selector');
}
+
switch (dictionary.huffmanDWSelector) {
case 0:
case 1:
tableDeltaWidth = getStandardTable(dictionary.huffmanDWSelector + 2);
break;
+
case 3:
tableDeltaWidth = getCustomHuffmanTable(customIndex, referredTo, customTables);
customIndex++;
break;
+
default:
throw new Jbig2Error('invalid Huffman DW selector');
}
- var tableBitmapSize = void 0,
- tableAggregateInstances = void 0;
+
+ var tableBitmapSize, tableAggregateInstances;
+
if (dictionary.bitmapSizeSelector) {
tableBitmapSize = getCustomHuffmanTable(customIndex, referredTo, customTables);
customIndex++;
} else {
tableBitmapSize = getStandardTable(1);
}
+
if (dictionary.aggregationInstancesSelector) {
tableAggregateInstances = getCustomHuffmanTable(customIndex, referredTo, customTables);
} else {
tableAggregateInstances = getStandardTable(1);
}
+
return {
tableDeltaHeight: tableDeltaHeight,
tableDeltaWidth: tableDeltaWidth,
@@ -16779,21 +20353,27 @@ var Jbig2Image = function Jbig2ImageClosure() {
tableAggregateInstances: tableAggregateInstances
};
}
+
function readUncompressedBitmap(reader, width, height) {
var bitmap = [],
- x = void 0,
- y = void 0,
- row = void 0;
+ x,
+ y,
+ row;
+
for (y = 0; y < height; y++) {
row = new Uint8Array(width);
bitmap.push(row);
+
for (x = 0; x < width; x++) {
row[x] = reader.readBit();
}
+
reader.byteAlign();
}
+
return bitmap;
}
+
function decodeMMRBitmap(input, width, height, endOfBlock) {
var params = {
K: -1,
@@ -16804,40 +20384,50 @@ var Jbig2Image = function Jbig2ImageClosure() {
};
var decoder = new _ccitt.CCITTFaxDecoder(input, params);
var bitmap = [],
- x = void 0,
- y = void 0,
- row = void 0,
- currentByte = void 0,
- shift = void 0,
+ x,
+ y,
+ row,
+ currentByte,
+ shift,
eof = false;
+
for (y = 0; y < height; y++) {
row = new Uint8Array(width);
bitmap.push(row);
shift = -1;
+
for (x = 0; x < width; x++) {
if (shift < 0) {
currentByte = decoder.readNextChar();
+
if (currentByte === -1) {
currentByte = 0;
eof = true;
}
+
shift = 7;
}
+
row[x] = currentByte >> shift & 1;
shift--;
}
}
+
if (endOfBlock && !eof) {
var lookForEOFLimit = 5;
+
for (var i = 0; i < lookForEOFLimit; i++) {
if (decoder.readNextChar() === -1) {
break;
}
}
}
+
return bitmap;
}
+
function Jbig2Image() {}
+
Jbig2Image.prototype = {
parseChunks: function parseChunks(chunks) {
return parseJbig2Chunks(chunks);
@@ -16855,6 +20445,7 @@ var Jbig2Image = function Jbig2ImageClosure() {
};
return Jbig2Image;
}();
+
exports.Jbig2Image = Jbig2Image;
/***/ }),
@@ -16867,6 +20458,8 @@ exports.Jbig2Image = Jbig2Image;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.ArithmeticDecoder = void 0;
+
var ArithmeticDecoder = function ArithmeticDecoderClosure() {
var QeTable = [{
qe: 0x5601,
@@ -17104,6 +20697,7 @@ var ArithmeticDecoder = function ArithmeticDecoderClosure() {
nlps: 46,
switchFlag: 0
}];
+
function ArithmeticDecoder(data, start, end) {
this.data = data;
this.bp = start;
@@ -17116,12 +20710,15 @@ var ArithmeticDecoder = function ArithmeticDecoderClosure() {
this.ct -= 7;
this.a = 0x8000;
}
+
ArithmeticDecoder.prototype = {
byteIn: function ArithmeticDecoder_byteIn() {
var data = this.data;
var bp = this.bp;
+
if (data[bp] === 0xFF) {
var b1 = data[bp + 1];
+
if (b1 > 0x8F) {
this.clow += 0xFF00;
this.ct = 8;
@@ -17137,6 +20734,7 @@ var ArithmeticDecoder = function ArithmeticDecoderClosure() {
this.ct = 8;
this.bp = bp;
}
+
if (this.clow > 0xFFFF) {
this.chigh += this.clow >> 16;
this.clow &= 0xFFFF;
@@ -17149,6 +20747,7 @@ var ArithmeticDecoder = function ArithmeticDecoderClosure() {
var qeIcx = qeTableIcx.qe;
var d;
var a = this.a - qeIcx;
+
if (this.chigh < qeIcx) {
if (a < qeIcx) {
a = qeIcx;
@@ -17157,37 +20756,46 @@ var ArithmeticDecoder = function ArithmeticDecoderClosure() {
} else {
a = qeIcx;
d = 1 ^ cx_mps;
+
if (qeTableIcx.switchFlag === 1) {
cx_mps = d;
}
+
cx_index = qeTableIcx.nlps;
}
} else {
this.chigh -= qeIcx;
+
if ((a & 0x8000) !== 0) {
this.a = a;
return cx_mps;
}
+
if (a < qeIcx) {
d = 1 ^ cx_mps;
+
if (qeTableIcx.switchFlag === 1) {
cx_mps = d;
}
+
cx_index = qeTableIcx.nlps;
} else {
d = cx_mps;
cx_index = qeTableIcx.nmps;
}
}
+
do {
if (this.ct === 0) {
this.byteIn();
}
+
a <<= 1;
this.chigh = this.chigh << 1 & 0xFFFF | this.clow >> 15 & 1;
this.clow = this.clow << 1 & 0xFFFF;
this.ct--;
} while ((a & 0x8000) === 0);
+
this.a = a;
contexts[pos] = cx_index << 1 | cx_mps;
return d;
@@ -17195,6 +20803,7 @@ var ArithmeticDecoder = function ArithmeticDecoderClosure() {
};
return ArithmeticDecoder;
}();
+
exports.ArithmeticDecoder = ArithmeticDecoder;
/***/ }),
@@ -17207,7 +20816,7 @@ exports.ArithmeticDecoder = ArithmeticDecoder;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.JpegStream = undefined;
+exports.JpegStream = void 0;
var _util = __w_pdfjs_require__(2);
@@ -17219,19 +20828,23 @@ var _jpg = __w_pdfjs_require__(151);
var JpegStream = function JpegStreamClosure() {
function JpegStream(stream, maybeLength, dict, params) {
- var ch = void 0;
+ var ch;
+
while ((ch = stream.getByte()) !== -1) {
if (ch === 0xFF) {
stream.skip(-1);
break;
}
}
+
this.stream = stream;
this.maybeLength = maybeLength;
this.dict = dict;
this.params = params;
+
_stream.DecodeStream.call(this, maybeLength);
}
+
JpegStream.prototype = Object.create(_stream.DecodeStream.prototype);
Object.defineProperty(JpegStream.prototype, 'bytes', {
get: function JpegStream_bytes() {
@@ -17239,39 +20852,49 @@ var JpegStream = function JpegStreamClosure() {
},
configurable: true
});
+
JpegStream.prototype.ensureBuffer = function (requested) {};
+
JpegStream.prototype.readBlock = function () {
if (this.eof) {
return;
}
+
var jpegOptions = {
decodeTransform: undefined,
colorTransform: undefined
};
var decodeArr = this.dict.getArray('Decode', 'D');
+
if (this.forceRGB && Array.isArray(decodeArr)) {
var bitsPerComponent = this.dict.get('BitsPerComponent') || 8;
var decodeArrLength = decodeArr.length;
var transform = new Int32Array(decodeArrLength);
var transformNeeded = false;
var maxValue = (1 << bitsPerComponent) - 1;
+
for (var i = 0; i < decodeArrLength; i += 2) {
transform[i] = (decodeArr[i + 1] - decodeArr[i]) * 256 | 0;
transform[i + 1] = decodeArr[i] * maxValue | 0;
+
if (transform[i] !== 256 || transform[i + 1] !== 0) {
transformNeeded = true;
}
}
+
if (transformNeeded) {
jpegOptions.decodeTransform = transform;
}
}
+
if ((0, _primitives.isDict)(this.params)) {
var colorTransform = this.params.get('ColorTransform');
+
if (Number.isInteger(colorTransform)) {
jpegOptions.colorTransform = colorTransform;
}
}
+
var jpegImage = new _jpg.JpegImage(jpegOptions);
jpegImage.parse(this.bytes);
var data = jpegImage.getData({
@@ -17284,13 +20907,15 @@ var JpegStream = function JpegStreamClosure() {
this.bufferLength = data.length;
this.eof = true;
};
+
JpegStream.prototype.getIR = function () {
var forceDataSchema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
return (0, _util.createObjectURL)(this.bytes, 'image/jpeg', forceDataSchema);
};
+
return JpegStream;
}();
+
exports.JpegStream = JpegStream;
/***/ }),
@@ -17303,40 +20928,46 @@ exports.JpegStream = JpegStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.JpegImage = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+exports.JpegImage = void 0;
var _util = __w_pdfjs_require__(2);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
var JpegError = function JpegErrorClosure() {
function JpegError(msg) {
this.message = 'JPEG error: ' + msg;
}
+
JpegError.prototype = new Error();
JpegError.prototype.name = 'JpegError';
JpegError.constructor = JpegError;
return JpegError;
}();
+
var DNLMarkerError = function DNLMarkerErrorClosure() {
function DNLMarkerError(message, scanLines) {
this.message = message;
this.scanLines = scanLines;
}
+
DNLMarkerError.prototype = new Error();
DNLMarkerError.prototype.name = 'DNLMarkerError';
DNLMarkerError.constructor = DNLMarkerError;
return DNLMarkerError;
}();
+
var EOIMarkerError = function EOIMarkerErrorClosure() {
function EOIMarkerError(message) {
this.message = message;
}
+
EOIMarkerError.prototype = new Error();
EOIMarkerError.prototype.name = 'EOIMarkerError';
EOIMarkerError.constructor = EOIMarkerError;
return EOIMarkerError;
}();
+
var JpegImage = function JpegImageClosure() {
var dctZigZag = new Uint8Array([0, 1, 8, 16, 9, 2, 3, 10, 17, 24, 32, 25, 18, 11, 4, 5, 12, 19, 26, 33, 40, 48, 41, 34, 27, 20, 13, 6, 7, 14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23, 30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63]);
var dctCos1 = 4017;
@@ -17347,40 +20978,48 @@ var JpegImage = function JpegImageClosure() {
var dctSin6 = 3784;
var dctSqrt2 = 5793;
var dctSqrt1d2 = 2896;
+
function JpegImage() {
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
_ref$decodeTransform = _ref.decodeTransform,
- decodeTransform = _ref$decodeTransform === undefined ? null : _ref$decodeTransform,
+ decodeTransform = _ref$decodeTransform === void 0 ? null : _ref$decodeTransform,
_ref$colorTransform = _ref.colorTransform,
- colorTransform = _ref$colorTransform === undefined ? -1 : _ref$colorTransform;
+ colorTransform = _ref$colorTransform === void 0 ? -1 : _ref$colorTransform;
this._decodeTransform = decodeTransform;
this._colorTransform = colorTransform;
}
+
function buildHuffmanTable(codeLengths, values) {
var k = 0,
code = [],
i,
j,
length = 16;
+
while (length > 0 && !codeLengths[length - 1]) {
length--;
}
+
code.push({
children: [],
index: 0
});
var p = code[0],
q;
+
for (i = 0; i < length; i++) {
for (j = 0; j < codeLengths[i]; j++) {
p = code.pop();
p.children[p.index] = values[k];
+
while (p.index > 0) {
p = code.pop();
}
+
p.index++;
code.push(p);
+
while (code.length <= i) {
code.push(q = {
children: [],
@@ -17389,8 +21028,10 @@ var JpegImage = function JpegImageClosure() {
p.children[p.index] = q.children;
p = q;
}
+
k++;
}
+
if (i + 1 < length) {
code.push(q = {
children: [],
@@ -17400,145 +21041,184 @@ var JpegImage = function JpegImageClosure() {
p = q;
}
}
+
return code[0].children;
}
+
function getBlockBufferOffset(component, row, col) {
return 64 * ((component.blocksPerLine + 1) * row + col);
}
+
function decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successivePrev, successive) {
var parseDNLMarker = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
-
var mcusPerLine = frame.mcusPerLine;
var progressive = frame.progressive;
var startOffset = offset,
bitsData = 0,
bitsCount = 0;
+
function readBit() {
if (bitsCount > 0) {
bitsCount--;
return bitsData >> bitsCount & 1;
}
+
bitsData = data[offset++];
+
if (bitsData === 0xFF) {
var nextByte = data[offset++];
+
if (nextByte) {
if (nextByte === 0xDC && parseDNLMarker) {
offset += 2;
var scanLines = data[offset++] << 8 | data[offset++];
+
if (scanLines > 0 && scanLines !== frame.scanLines) {
throw new DNLMarkerError('Found DNL marker (0xFFDC) while parsing scan data', scanLines);
}
} else if (nextByte === 0xD9) {
throw new EOIMarkerError('Found EOI marker (0xFFD9) while parsing scan data');
}
- throw new JpegError('unexpected marker ' + (bitsData << 8 | nextByte).toString(16));
+
+ throw new JpegError("unexpected marker ".concat((bitsData << 8 | nextByte).toString(16)));
}
}
+
bitsCount = 7;
return bitsData >>> 7;
}
+
function decodeHuffman(tree) {
var node = tree;
+
while (true) {
node = node[readBit()];
+
if (typeof node === 'number') {
return node;
}
- if ((typeof node === 'undefined' ? 'undefined' : _typeof(node)) !== 'object') {
+
+ if (_typeof(node) !== 'object') {
throw new JpegError('invalid huffman sequence');
}
}
}
+
function receive(length) {
var n = 0;
+
while (length > 0) {
n = n << 1 | readBit();
length--;
}
+
return n;
}
+
function receiveAndExtend(length) {
if (length === 1) {
return readBit() === 1 ? 1 : -1;
}
+
var n = receive(length);
+
if (n >= 1 << length - 1) {
return n;
}
+
return n + (-1 << length) + 1;
}
+
function decodeBaseline(component, offset) {
var t = decodeHuffman(component.huffmanTableDC);
var diff = t === 0 ? 0 : receiveAndExtend(t);
component.blockData[offset] = component.pred += diff;
var k = 1;
+
while (k < 64) {
var rs = decodeHuffman(component.huffmanTableAC);
var s = rs & 15,
r = rs >> 4;
+
if (s === 0) {
if (r < 15) {
break;
}
+
k += 16;
continue;
}
+
k += r;
var z = dctZigZag[k];
component.blockData[offset + z] = receiveAndExtend(s);
k++;
}
}
+
function decodeDCFirst(component, offset) {
var t = decodeHuffman(component.huffmanTableDC);
var diff = t === 0 ? 0 : receiveAndExtend(t) << successive;
component.blockData[offset] = component.pred += diff;
}
+
function decodeDCSuccessive(component, offset) {
component.blockData[offset] |= readBit() << successive;
}
+
var eobrun = 0;
+
function decodeACFirst(component, offset) {
if (eobrun > 0) {
eobrun--;
return;
}
+
var k = spectralStart,
e = spectralEnd;
+
while (k <= e) {
var rs = decodeHuffman(component.huffmanTableAC);
var s = rs & 15,
r = rs >> 4;
+
if (s === 0) {
if (r < 15) {
eobrun = receive(r) + (1 << r) - 1;
break;
}
+
k += 16;
continue;
}
+
k += r;
var z = dctZigZag[k];
component.blockData[offset + z] = receiveAndExtend(s) * (1 << successive);
k++;
}
}
+
var successiveACState = 0,
successiveACNextValue;
+
function decodeACSuccessive(component, offset) {
var k = spectralStart;
var e = spectralEnd;
var r = 0;
var s;
var rs;
+
while (k <= e) {
var offsetZ = offset + dctZigZag[k];
var sign = component.blockData[offsetZ] < 0 ? -1 : 1;
+
switch (successiveACState) {
case 0:
rs = decodeHuffman(component.huffmanTableAC);
s = rs & 15;
r = rs >> 4;
+
if (s === 0) {
if (r < 15) {
eobrun = receive(r) + (1 << r);
@@ -17551,21 +21231,27 @@ var JpegImage = function JpegImageClosure() {
if (s !== 1) {
throw new JpegError('invalid ACn encoding');
}
+
successiveACNextValue = receiveAndExtend(s);
successiveACState = r ? 2 : 3;
}
+
continue;
+
case 1:
case 2:
if (component.blockData[offsetZ]) {
component.blockData[offsetZ] += sign * (readBit() << successive);
} else {
r--;
+
if (r === 0) {
successiveACState = successiveACState === 2 ? 3 : 0;
}
}
+
break;
+
case 3:
if (component.blockData[offsetZ]) {
component.blockData[offsetZ] += sign * (readBit() << successive);
@@ -17573,22 +21259,29 @@ var JpegImage = function JpegImageClosure() {
component.blockData[offsetZ] = successiveACNextValue << successive;
successiveACState = 0;
}
+
break;
+
case 4:
if (component.blockData[offsetZ]) {
component.blockData[offsetZ] += sign * (readBit() << successive);
}
+
break;
}
+
k++;
}
+
if (successiveACState === 4) {
eobrun--;
+
if (eobrun === 0) {
successiveACState = 0;
}
}
}
+
function decodeMcu(component, decode, mcu, row, col) {
var mcuRow = mcu / mcusPerLine | 0;
var mcuCol = mcu % mcusPerLine;
@@ -17597,15 +21290,18 @@ var JpegImage = function JpegImageClosure() {
var offset = getBlockBufferOffset(component, blockRow, blockCol);
decode(component, offset);
}
+
function decodeBlock(component, decode, mcu) {
var blockRow = mcu / component.blocksPerLine | 0;
var blockCol = mcu % component.blocksPerLine;
var offset = getBlockBufferOffset(component, blockRow, blockCol);
decode(component, offset);
}
+
var componentsLength = components.length;
var component, i, j, k, n;
var decodeFn;
+
if (progressive) {
if (spectralStart === 0) {
decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
@@ -17615,23 +21311,31 @@ var JpegImage = function JpegImageClosure() {
} else {
decodeFn = decodeBaseline;
}
+
var mcu = 0,
fileMarker;
var mcuExpected;
+
if (componentsLength === 1) {
mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
} else {
mcuExpected = mcusPerLine * frame.mcusPerColumn;
}
+
var h, v;
+
while (mcu < mcuExpected) {
var mcuToRead = resetInterval ? Math.min(mcuExpected - mcu, resetInterval) : mcuExpected;
+
for (i = 0; i < componentsLength; i++) {
components[i].pred = 0;
}
+
eobrun = 0;
+
if (componentsLength === 1) {
component = components[0];
+
for (n = 0; n < mcuToRead; n++) {
decodeBlock(component, decodeFn, mcu);
mcu++;
@@ -17642,47 +21346,60 @@ var JpegImage = function JpegImageClosure() {
component = components[i];
h = component.h;
v = component.v;
+
for (j = 0; j < v; j++) {
for (k = 0; k < h; k++) {
decodeMcu(component, decodeFn, mcu, j, k);
}
}
}
+
mcu++;
}
}
+
bitsCount = 0;
fileMarker = findNextFileMarker(data, offset);
+
if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('decodeScan - unexpected MCU data, current marker is: ' + fileMarker.invalid);
offset = fileMarker.offset;
}
+
var marker = fileMarker && fileMarker.marker;
+
if (!marker || marker <= 0xFF00) {
throw new JpegError('marker was not found');
}
+
if (marker >= 0xFFD0 && marker <= 0xFFD7) {
offset += 2;
} else {
break;
}
}
+
fileMarker = findNextFileMarker(data, offset);
+
if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('decodeScan - unexpected Scan data, current marker is: ' + fileMarker.invalid);
offset = fileMarker.offset;
}
+
return offset - startOffset;
}
+
function quantizeAndInverse(component, blockBufferOffset, p) {
var qt = component.quantizationTable,
blockData = component.blockData;
var v0, v1, v2, v3, v4, v5, v6, v7;
var p0, p1, p2, p3, p4, p5, p6, p7;
var t;
+
if (!qt) {
throw new JpegError('missing required Quantization Table.');
}
+
for (var row = 0; row < 64; row += 8) {
p0 = blockData[blockBufferOffset + row];
p1 = blockData[blockBufferOffset + row + 1];
@@ -17693,6 +21410,7 @@ var JpegImage = function JpegImageClosure() {
p6 = blockData[blockBufferOffset + row + 6];
p7 = blockData[blockBufferOffset + row + 7];
p0 *= qt[row];
+
if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
t = dctSqrt2 * p0 + 512 >> 10;
p[row] = t;
@@ -17705,6 +21423,7 @@ var JpegImage = function JpegImageClosure() {
p[row + 7] = t;
continue;
}
+
p1 *= qt[row + 1];
p2 *= qt[row + 2];
p3 *= qt[row + 3];
@@ -17748,6 +21467,7 @@ var JpegImage = function JpegImageClosure() {
p[row + 3] = v3 + v4;
p[row + 4] = v3 - v4;
}
+
for (var col = 0; col < 8; ++col) {
p0 = p[col];
p1 = p[col + 8];
@@ -17757,6 +21477,7 @@ var JpegImage = function JpegImageClosure() {
p5 = p[col + 40];
p6 = p[col + 48];
p7 = p[col + 56];
+
if ((p1 | p2 | p3 | p4 | p5 | p6 | p7) === 0) {
t = dctSqrt2 * p0 + 8192 >> 14;
t = t < -2040 ? 0 : t >= 2024 ? 255 : t + 2056 >> 4;
@@ -17770,6 +21491,7 @@ var JpegImage = function JpegImageClosure() {
blockData[blockBufferOffset + col + 56] = t;
continue;
}
+
v0 = dctSqrt2 * p0 + 2048 >> 12;
v1 = dctSqrt2 * p4 + 2048 >> 12;
v2 = p2;
@@ -17823,30 +21545,38 @@ var JpegImage = function JpegImageClosure() {
blockData[blockBufferOffset + col + 56] = p7;
}
}
+
function buildComponentData(frame, component) {
var blocksPerLine = component.blocksPerLine;
var blocksPerColumn = component.blocksPerColumn;
var computationBuffer = new Int16Array(64);
+
for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
var offset = getBlockBufferOffset(component, blockRow, blockCol);
quantizeAndInverse(component, offset, computationBuffer);
}
}
+
return component.blockData;
}
+
function findNextFileMarker(data, currentPos) {
var startPos = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : currentPos;
function peekUint16(pos) {
return data[pos] << 8 | data[pos + 1];
}
+
var maxPos = data.length - 1;
var newPos = startPos < currentPos ? startPos : currentPos;
+
if (currentPos >= maxPos) {
return null;
}
+
var currentMarker = peekUint16(currentPos);
+
if (currentMarker >= 0xFFC0 && currentMarker <= 0xFFFE) {
return {
invalid: null,
@@ -17854,45 +21584,55 @@ var JpegImage = function JpegImageClosure() {
offset: currentPos
};
}
+
var newMarker = peekUint16(newPos);
+
while (!(newMarker >= 0xFFC0 && newMarker <= 0xFFFE)) {
if (++newPos >= maxPos) {
return null;
}
+
newMarker = peekUint16(newPos);
}
+
return {
invalid: currentMarker.toString(16),
marker: newMarker,
offset: newPos
};
}
+
JpegImage.prototype = {
parse: function parse(data) {
var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
_ref2$dnlScanLines = _ref2.dnlScanLines,
- dnlScanLines = _ref2$dnlScanLines === undefined ? null : _ref2$dnlScanLines;
+ dnlScanLines = _ref2$dnlScanLines === void 0 ? null : _ref2$dnlScanLines;
function readUint16() {
var value = data[offset] << 8 | data[offset + 1];
offset += 2;
return value;
}
+
function readDataBlock() {
var length = readUint16();
var endOffset = offset + length - 2;
var fileMarker = findNextFileMarker(data, endOffset, offset);
+
if (fileMarker && fileMarker.invalid) {
(0, _util.warn)('readDataBlock - incorrect length, current marker is: ' + fileMarker.invalid);
endOffset = fileMarker.offset;
}
+
var array = data.subarray(offset, endOffset);
offset += array.length;
return array;
}
+
function prepareComponents(frame) {
var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / frame.maxH);
var mcusPerColumn = Math.ceil(frame.scanLines / 8 / frame.maxV);
+
for (var i = 0; i < frame.components.length; i++) {
component = frame.components[i];
var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / frame.maxH);
@@ -17904,9 +21644,11 @@ var JpegImage = function JpegImageClosure() {
component.blocksPerLine = blocksPerLine;
component.blocksPerColumn = blocksPerColumn;
}
+
frame.mcusPerLine = mcusPerLine;
frame.mcusPerColumn = mcusPerColumn;
}
+
var offset = 0;
var jfif = null;
var adobe = null;
@@ -17916,12 +21658,16 @@ var JpegImage = function JpegImageClosure() {
var huffmanTablesAC = [],
huffmanTablesDC = [];
var fileMarker = readUint16();
+
if (fileMarker !== 0xFFD8) {
throw new JpegError('SOI not found');
}
+
fileMarker = readUint16();
+
markerLoop: while (fileMarker !== 0xFFD9) {
var i, j, l;
+
switch (fileMarker) {
case 0xFFE0:
case 0xFFE1:
@@ -17941,6 +21687,7 @@ var JpegImage = function JpegImageClosure() {
case 0xFFEF:
case 0xFFFE:
var appData = readDataBlock();
+
if (fileMarker === 0xFFE0) {
if (appData[0] === 0x4A && appData[1] === 0x46 && appData[2] === 0x49 && appData[3] === 0x46 && appData[4] === 0) {
jfif = {
@@ -17957,6 +21704,7 @@ var JpegImage = function JpegImageClosure() {
};
}
}
+
if (fileMarker === 0xFFEE) {
if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6F && appData[3] === 0x62 && appData[4] === 0x65) {
adobe = {
@@ -17967,14 +21715,18 @@ var JpegImage = function JpegImageClosure() {
};
}
}
+
break;
+
case 0xFFDB:
var quantizationTablesLength = readUint16();
var quantizationTablesEnd = quantizationTablesLength + offset - 2;
var z;
+
while (offset < quantizationTablesEnd) {
var quantizationTableSpec = data[offset++];
var tableData = new Uint16Array(64);
+
if (quantizationTableSpec >> 4 === 0) {
for (j = 0; j < 64; j++) {
z = dctZigZag[j];
@@ -17988,15 +21740,19 @@ var JpegImage = function JpegImageClosure() {
} else {
throw new JpegError('DQT - invalid table spec');
}
+
quantizationTables[quantizationTableSpec & 15] = tableData;
}
+
break;
+
case 0xFFC0:
case 0xFFC1:
case 0xFFC2:
if (frame) {
throw new JpegError('Only single frame JPEGs supported');
}
+
readUint16();
frame = {};
frame.extended = fileMarker === 0xFFC1;
@@ -18011,16 +21767,20 @@ var JpegImage = function JpegImageClosure() {
componentId;
var maxH = 0,
maxV = 0;
+
for (i = 0; i < componentsCount; i++) {
componentId = data[offset];
var h = data[offset + 1] >> 4;
var v = data[offset + 1] & 15;
+
if (maxH < h) {
maxH = h;
}
+
if (maxV < v) {
maxV = v;
}
+
var qId = data[offset + 2];
l = frame.components.push({
h: h,
@@ -18031,37 +21791,48 @@ var JpegImage = function JpegImageClosure() {
frame.componentIds[componentId] = l - 1;
offset += 3;
}
+
frame.maxH = maxH;
frame.maxV = maxV;
prepareComponents(frame);
break;
+
case 0xFFC4:
var huffmanLength = readUint16();
+
for (i = 2; i < huffmanLength;) {
var huffmanTableSpec = data[offset++];
var codeLengths = new Uint8Array(16);
var codeLengthSum = 0;
+
for (j = 0; j < 16; j++, offset++) {
codeLengthSum += codeLengths[j] = data[offset];
}
+
var huffmanValues = new Uint8Array(codeLengthSum);
+
for (j = 0; j < codeLengthSum; j++, offset++) {
huffmanValues[j] = data[offset];
}
+
i += 17 + codeLengthSum;
(huffmanTableSpec >> 4 === 0 ? huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] = buildHuffmanTable(codeLengths, huffmanValues);
}
+
break;
+
case 0xFFDD:
readUint16();
resetInterval = readUint16();
break;
+
case 0xFFDA:
var parseDNLMarker = ++numSOSMarkers === 1 && !dnlScanLines;
readUint16();
var selectorsCount = data[offset++];
var components = [],
component;
+
for (i = 0; i < selectorsCount; i++) {
var componentIndex = frame.componentIds[data[offset++]];
component = frame.components[componentIndex];
@@ -18070,57 +21841,75 @@ var JpegImage = function JpegImageClosure() {
component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
components.push(component);
}
+
var spectralStart = data[offset++];
var spectralEnd = data[offset++];
var successiveApproximation = data[offset++];
+
try {
var processed = decodeScan(data, offset, frame, components, resetInterval, spectralStart, spectralEnd, successiveApproximation >> 4, successiveApproximation & 15, parseDNLMarker);
offset += processed;
} catch (ex) {
if (ex instanceof DNLMarkerError) {
- (0, _util.warn)(ex.message + ' -- attempting to re-parse the JPEG image.');
- return this.parse(data, { dnlScanLines: ex.scanLines });
+ (0, _util.warn)("".concat(ex.message, " -- attempting to re-parse the JPEG image."));
+ return this.parse(data, {
+ dnlScanLines: ex.scanLines
+ });
} else if (ex instanceof EOIMarkerError) {
- (0, _util.warn)(ex.message + ' -- ignoring the rest of the image data.');
+ (0, _util.warn)("".concat(ex.message, " -- ignoring the rest of the image data."));
break markerLoop;
}
+
throw ex;
}
+
break;
+
case 0xFFDC:
offset += 4;
break;
+
case 0xFFFF:
if (data[offset] !== 0xFF) {
offset--;
}
+
break;
+
default:
if (data[offset - 3] === 0xFF && data[offset - 2] >= 0xC0 && data[offset - 2] <= 0xFE) {
offset -= 3;
break;
}
+
var nextFileMarker = findNextFileMarker(data, offset - 2);
+
if (nextFileMarker && nextFileMarker.invalid) {
(0, _util.warn)('JpegImage.parse - unexpected data, current marker is: ' + nextFileMarker.invalid);
offset = nextFileMarker.offset;
break;
}
+
throw new JpegError('unknown marker ' + fileMarker.toString(16));
}
+
fileMarker = readUint16();
}
+
this.width = frame.samplesPerLine;
this.height = frame.scanLines;
this.jfif = jfif;
this.adobe = adobe;
this.components = [];
+
for (i = 0; i < frame.components.length; i++) {
component = frame.components[i];
var quantizationTable = quantizationTables[component.quantizationId];
+
if (quantizationTable) {
component.quantizationTable = quantizationTable;
}
+
this.components.push({
output: buildComponentData(frame, component),
scaleX: component.h / frame.maxH,
@@ -18129,11 +21918,11 @@ var JpegImage = function JpegImageClosure() {
blocksPerColumn: component.blocksPerColumn
});
}
+
this.numComponents = this.components.length;
},
_getLinearizedBlockData: function _getLinearizedBlockData(width, height) {
var isSourcePDF = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
var scaleX = this.width / width,
scaleY = this.height / height;
var component, componentScaleX, componentScaleY, blocksPerScanline;
@@ -18146,6 +21935,7 @@ var JpegImage = function JpegImageClosure() {
var data = new Uint8ClampedArray(dataLength);
var xScaleBlockOffset = new Uint32Array(width);
var mask3LSB = 0xfffffff8;
+
for (i = 0; i < numComponents; i++) {
component = this.components[i];
componentScaleX = component.scaleX * scaleX;
@@ -18153,23 +21943,29 @@ var JpegImage = function JpegImageClosure() {
offset = i;
output = component.output;
blocksPerScanline = component.blocksPerLine + 1 << 3;
+
for (x = 0; x < width; x++) {
j = 0 | x * componentScaleX;
xScaleBlockOffset[x] = (j & mask3LSB) << 3 | j & 7;
}
+
for (y = 0; y < height; y++) {
j = 0 | y * componentScaleY;
index = blocksPerScanline * (j & mask3LSB) | (j & 7) << 3;
+
for (x = 0; x < width; x++) {
data[offset] = output[index + xScaleBlockOffset[x]];
offset += numComponents;
}
}
}
+
var transform = this._decodeTransform;
+
if (!isSourcePDF && numComponents === 4 && !transform) {
transform = new Int32Array([-256, 255, -256, 255, -256, 255, -256, 255]);
}
+
if (transform) {
for (i = 0; i < dataLength;) {
for (j = 0, k = 0; j < numComponents; j++, i++, k += 2) {
@@ -18177,6 +21973,7 @@ var JpegImage = function JpegImageClosure() {
}
}
}
+
return data;
},
@@ -18184,19 +21981,25 @@ var JpegImage = function JpegImageClosure() {
if (this.adobe) {
return !!this.adobe.transformCode;
}
+
if (this.numComponents === 3) {
if (this._colorTransform === 0) {
return false;
}
+
return true;
}
+
if (this._colorTransform === 1) {
return true;
}
+
return false;
},
+
_convertYccToRgb: function convertYccToRgb(data) {
var Y, Cb, Cr;
+
for (var i = 0, length = data.length; i < length; i += 3) {
Y = data[i];
Cb = data[i + 1];
@@ -18205,11 +22008,13 @@ var JpegImage = function JpegImageClosure() {
data[i + 1] = Y + 135.459 - 0.344 * Cb - 0.714 * Cr;
data[i + 2] = Y - 226.816 + 1.772 * Cb;
}
+
return data;
},
_convertYcckToRgb: function convertYcckToRgb(data) {
var Y, Cb, Cr, k;
var offset = 0;
+
for (var i = 0, length = data.length; i < length; i += 4) {
Y = data[i];
Cb = data[i + 1];
@@ -18219,10 +22024,12 @@ var JpegImage = function JpegImageClosure() {
data[offset++] = 107.268039397724 + Cb * (2.19927104525741e-5 * Cb - 0.000640992018297945 * Cr + 0.000659397001245577 * Y + 0.000426105652938837 * k - 0.176491792462875) + Cr * (-0.000778269941513683 * Cr + 0.00130872261408275 * Y + 0.000770482631801132 * k - 0.151051492775562) + Y * (0.00126935368114843 * Y - 0.00265090189010898 * k + 0.25802910206845) + k * (-0.000318913117588328 * k - 0.213742400323665);
data[offset++] = -20.810012546947 + Cb * (-0.000570115196973677 * Cb - 2.63409051004589e-5 * Cr + 0.0020741088115012 * Y - 0.00288260236853442 * k + 0.814272968359295) + Cr * (-1.53496057440975e-5 * Cr - 0.000132689043961446 * Y + 0.000560833691242812 * k - 0.195152027534049) + Y * (0.00174418132927582 * Y - 0.00255243321439347 * k + 0.116935020465145) + k * (-0.000343531996510555 * k + 0.24165260232407);
}
+
return data.subarray(0, offset);
},
_convertYcckToCmyk: function convertYcckToCmyk(data) {
var Y, Cb, Cr;
+
for (var i = 0, length = data.length; i < length; i += 4) {
Y = data[i];
Cb = data[i + 1];
@@ -18231,12 +22038,14 @@ var JpegImage = function JpegImageClosure() {
data[i + 1] = 119.541 - Y + 0.344 * Cb + 0.714 * Cr;
data[i + 2] = 481.816 - Y - 1.772 * Cb;
}
+
return data;
},
_convertCmykToRgb: function convertCmykToRgb(data) {
var c, m, y, k;
var offset = 0;
var scale = 1 / 255;
+
for (var i = 0, length = data.length; i < length; i += 4) {
c = data[i] * scale;
m = data[i + 1] * scale;
@@ -18246,30 +22055,35 @@ var JpegImage = function JpegImageClosure() {
data[offset++] = 255 + c * (8.841041422036149 * c + 60.118027045597366 * m + 6.871425592049007 * y + 31.159100130055922 * k - 79.2970844816548) + m * (-15.310361306967817 * m + 17.575251261109482 * y + 131.35250912493976 * k - 190.9453302588951) + y * (4.444339102852739 * y + 9.8632861493405 * k - 24.86741582555878) - k * (20.737325471181034 * k + 187.80453709719578);
data[offset++] = 255 + c * (0.8842522430003296 * c + 8.078677503112928 * m + 30.89978309703729 * y - 0.23883238689178934 * k - 14.183576799673286) + m * (10.49593273432072 * m + 63.02378494754052 * y + 50.606957656360734 * k - 112.23884253719248) + y * (0.03296041114873217 * y + 115.60384449646641 * k - 193.58209356861505) - k * (22.33816807309886 * k + 180.12613974708367);
}
+
return data.subarray(0, offset);
},
getData: function getData(_ref3) {
var width = _ref3.width,
height = _ref3.height,
_ref3$forceRGB = _ref3.forceRGB,
- forceRGB = _ref3$forceRGB === undefined ? false : _ref3$forceRGB,
+ forceRGB = _ref3$forceRGB === void 0 ? false : _ref3$forceRGB,
_ref3$isSourcePDF = _ref3.isSourcePDF,
- isSourcePDF = _ref3$isSourcePDF === undefined ? false : _ref3$isSourcePDF;
+ isSourcePDF = _ref3$isSourcePDF === void 0 ? false : _ref3$isSourcePDF;
if (this.numComponents > 4) {
throw new JpegError('Unsupported color mode');
}
+
var data = this._getLinearizedBlockData(width, height, isSourcePDF);
+
if (this.numComponents === 1 && forceRGB) {
var dataLength = data.length;
var rgbData = new Uint8ClampedArray(dataLength * 3);
var offset = 0;
+
for (var i = 0; i < dataLength; i++) {
var grayColor = data[i];
rgbData[offset++] = grayColor;
rgbData[offset++] = grayColor;
rgbData[offset++] = grayColor;
}
+
return rgbData;
} else if (this.numComponents === 3 && this._isColorConversionNeeded) {
return this._convertYccToRgb(data);
@@ -18278,16 +22092,19 @@ var JpegImage = function JpegImageClosure() {
if (forceRGB) {
return this._convertYcckToRgb(data);
}
+
return this._convertYcckToCmyk(data);
} else if (forceRGB) {
return this._convertCmykToRgb(data);
}
}
+
return data;
}
};
return JpegImage;
}();
+
exports.JpegImage = JpegImage;
/***/ }),
@@ -18300,7 +22117,7 @@ exports.JpegImage = JpegImage;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.JpxStream = undefined;
+exports.JpxStream = void 0;
var _stream = __w_pdfjs_require__(144);
@@ -18314,8 +22131,10 @@ var JpxStream = function JpxStreamClosure() {
this.maybeLength = maybeLength;
this.dict = dict;
this.params = params;
+
_stream.DecodeStream.call(this, maybeLength);
}
+
JpxStream.prototype = Object.create(_stream.DecodeStream.prototype);
Object.defineProperty(JpxStream.prototype, 'bytes', {
get: function JpxStream_bytes() {
@@ -18323,21 +22142,26 @@ var JpxStream = function JpxStreamClosure() {
},
configurable: true
});
+
JpxStream.prototype.ensureBuffer = function (requested) {};
+
JpxStream.prototype.readBlock = function () {
if (this.eof) {
return;
}
+
var jpxImage = new _jpx.JpxImage();
jpxImage.parse(this.bytes);
var width = jpxImage.width;
var height = jpxImage.height;
var componentsCount = jpxImage.componentsCount;
var tileCount = jpxImage.tiles.length;
+
if (tileCount === 1) {
this.buffer = jpxImage.tiles[0].items;
} else {
var data = new Uint8ClampedArray(width * height * componentsCount);
+
for (var k = 0; k < tileCount; k++) {
var tileComponents = jpxImage.tiles[k];
var tileWidth = tileComponents.width;
@@ -18349,6 +22173,7 @@ var JpxStream = function JpxStreamClosure() {
var dataPosition = (width * tileTop + tileLeft) * componentsCount;
var imgRowSize = width * componentsCount;
var tileRowSize = tileWidth * componentsCount;
+
for (var j = 0; j < tileHeight; j++) {
var rowBytes = src.subarray(srcPosition, srcPosition + tileRowSize);
data.set(rowBytes, dataPosition);
@@ -18356,13 +22181,17 @@ var JpxStream = function JpxStreamClosure() {
dataPosition += imgRowSize;
}
}
+
this.buffer = data;
}
+
this.bufferLength = this.buffer.length;
this.eof = true;
};
+
return JpxStream;
}();
+
exports.JpxStream = JpxStream;
/***/ }),
@@ -18375,7 +22204,7 @@ exports.JpxStream = JpxStream;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.JpxImage = undefined;
+exports.JpxImage = void 0;
var _util = __w_pdfjs_require__(2);
@@ -18385,11 +22214,13 @@ var JpxError = function JpxErrorClosure() {
function JpxError(msg) {
this.message = 'JPX error: ' + msg;
}
+
JpxError.prototype = new Error();
JpxError.prototype.name = 'JpxError';
JpxError.constructor = JpxError;
return JpxError;
}();
+
var JpxImage = function JpxImageClosure() {
var SubbandsGainLog2 = {
'LL': 0,
@@ -18397,49 +22228,63 @@ var JpxImage = function JpxImageClosure() {
'HL': 1,
'HH': 2
};
+
function JpxImage() {
this.failOnCorruptedImage = false;
}
+
JpxImage.prototype = {
parse: function JpxImage_parse(data) {
var head = (0, _util.readUint16)(data, 0);
+
if (head === 0xFF4F) {
this.parseCodestream(data, 0, data.length);
return;
}
+
var position = 0,
length = data.length;
+
while (position < length) {
var headerSize = 8;
var lbox = (0, _util.readUint32)(data, position);
var tbox = (0, _util.readUint32)(data, position + 4);
position += headerSize;
+
if (lbox === 1) {
lbox = (0, _util.readUint32)(data, position) * 4294967296 + (0, _util.readUint32)(data, position + 4);
position += 8;
headerSize += 8;
}
+
if (lbox === 0) {
lbox = length - position + headerSize;
}
+
if (lbox < headerSize) {
throw new JpxError('Invalid box field size');
}
+
var dataLength = lbox - headerSize;
var jumpDataLength = true;
+
switch (tbox) {
case 0x6A703268:
jumpDataLength = false;
break;
+
case 0x636F6C72:
var method = data[position];
+
if (method === 1) {
var colorspace = (0, _util.readUint32)(data, position + 3);
+
switch (colorspace) {
case 16:
case 17:
case 18:
break;
+
default:
(0, _util.warn)('Unknown colorspace ' + colorspace);
break;
@@ -18447,26 +22292,33 @@ var JpxImage = function JpxImageClosure() {
} else if (method === 2) {
(0, _util.info)('ICC profile not supported');
}
+
break;
+
case 0x6A703263:
this.parseCodestream(data, position, position + dataLength);
break;
+
case 0x6A502020:
if ((0, _util.readUint32)(data, position) !== 0x0d0a870a) {
(0, _util.warn)('Invalid JP2 signature');
}
+
break;
+
case 0x6A501A1A:
case 0x66747970:
case 0x72726571:
case 0x72657320:
case 0x69686472:
break;
+
default:
var headerType = String.fromCharCode(tbox >> 24 & 0xFF, tbox >> 16 & 0xFF, tbox >> 8 & 0xFF, tbox & 0xFF);
(0, _util.warn)('Unsupported header type ' + tbox + ' (' + headerType + ')');
break;
}
+
if (jumpDataLength) {
position += dataLength;
}
@@ -18474,10 +22326,12 @@ var JpxImage = function JpxImageClosure() {
},
parseImageProperties: function JpxImage_parseImageProperties(stream) {
var newByte = stream.getByte();
+
while (newByte >= 0) {
var oldByte = newByte;
newByte = stream.getByte();
var code = oldByte << 8 | newByte;
+
if (code === 0xFF51) {
stream.skip(4);
var Xsiz = stream.getInt32() >>> 0;
@@ -18493,13 +22347,16 @@ var JpxImage = function JpxImageClosure() {
return;
}
}
+
throw new JpxError('No size marker found in JPX stream');
},
parseCodestream: function JpxImage_parseCodestream(data, start, end) {
var context = {};
var doNotRecover = false;
+
try {
var position = start;
+
while (position + 1 < end) {
var code = (0, _util.readUint16)(data, position);
position += 2;
@@ -18510,12 +22367,15 @@ var JpxImage = function JpxImageClosure() {
spqcdSize,
scalarExpounded,
tile;
+
switch (code) {
case 0xFF4F:
context.mainHeader = true;
break;
+
case 0xFFD9:
break;
+
case 0xFF51:
length = (0, _util.readUint16)(data, position);
var siz = {};
@@ -18531,6 +22391,7 @@ var JpxImage = function JpxImageClosure() {
siz.Csiz = componentsCount;
var components = [];
j = position + 38;
+
for (var i = 0; i < componentsCount; i++) {
var component = {
precision: (data[j] & 0x7F) + 1,
@@ -18542,39 +22403,48 @@ var JpxImage = function JpxImageClosure() {
calculateComponentDimensions(component, siz);
components.push(component);
}
+
context.SIZ = siz;
context.components = components;
calculateTileGrids(context, components);
context.QCC = [];
context.COC = [];
break;
+
case 0xFF5C:
length = (0, _util.readUint16)(data, position);
var qcd = {};
j = position + 2;
sqcd = data[j++];
+
switch (sqcd & 0x1F) {
case 0:
spqcdSize = 8;
scalarExpounded = true;
break;
+
case 1:
spqcdSize = 16;
scalarExpounded = false;
break;
+
case 2:
spqcdSize = 16;
scalarExpounded = true;
break;
+
default:
throw new Error('Invalid SQcd value ' + sqcd);
}
+
qcd.noQuantization = spqcdSize === 8;
qcd.scalarExpounded = scalarExpounded;
qcd.guardBits = sqcd >> 5;
spqcds = [];
+
while (j < length + position) {
var spqcd = {};
+
if (spqcdSize === 8) {
spqcd.epsilon = data[j++] >> 3;
spqcd.mu = 0;
@@ -18583,50 +22453,64 @@ var JpxImage = function JpxImageClosure() {
spqcd.mu = (data[j] & 0x7) << 8 | data[j + 1];
j += 2;
}
+
spqcds.push(spqcd);
}
+
qcd.SPqcds = spqcds;
+
if (context.mainHeader) {
context.QCD = qcd;
} else {
context.currentTile.QCD = qcd;
context.currentTile.QCC = [];
}
+
break;
+
case 0xFF5D:
length = (0, _util.readUint16)(data, position);
var qcc = {};
j = position + 2;
var cqcc;
+
if (context.SIZ.Csiz < 257) {
cqcc = data[j++];
} else {
cqcc = (0, _util.readUint16)(data, j);
j += 2;
}
+
sqcd = data[j++];
+
switch (sqcd & 0x1F) {
case 0:
spqcdSize = 8;
scalarExpounded = true;
break;
+
case 1:
spqcdSize = 16;
scalarExpounded = false;
break;
+
case 2:
spqcdSize = 16;
scalarExpounded = true;
break;
+
default:
throw new Error('Invalid SQcd value ' + sqcd);
}
+
qcc.noQuantization = spqcdSize === 8;
qcc.scalarExpounded = scalarExpounded;
qcc.guardBits = sqcd >> 5;
spqcds = [];
+
while (j < length + position) {
spqcd = {};
+
if (spqcdSize === 8) {
spqcd.epsilon = data[j++] >> 3;
spqcd.mu = 0;
@@ -18635,15 +22519,20 @@ var JpxImage = function JpxImageClosure() {
spqcd.mu = (data[j] & 0x7) << 8 | data[j + 1];
j += 2;
}
+
spqcds.push(spqcd);
}
+
qcc.SPqcds = spqcds;
+
if (context.mainHeader) {
context.QCC[cqcc] = qcc;
} else {
context.currentTile.QCC[cqcc] = qcc;
}
+
break;
+
case 0xFF52:
length = (0, _util.readUint16)(data, position);
var cod = {};
@@ -18667,8 +22556,10 @@ var JpxImage = function JpxImageClosure() {
cod.predictableTermination = !!(blockStyle & 16);
cod.segmentationSymbolUsed = !!(blockStyle & 32);
cod.reversibleTransformation = data[j++];
+
if (cod.entropyCoderWithCustomPrecincts) {
var precinctsSizes = [];
+
while (j < length + position) {
var precinctsSize = data[j++];
precinctsSizes.push({
@@ -18676,35 +22567,46 @@ var JpxImage = function JpxImageClosure() {
PPy: precinctsSize >> 4
});
}
+
cod.precinctsSizes = precinctsSizes;
}
+
var unsupported = [];
+
if (cod.selectiveArithmeticCodingBypass) {
unsupported.push('selectiveArithmeticCodingBypass');
}
+
if (cod.resetContextProbabilities) {
unsupported.push('resetContextProbabilities');
}
+
if (cod.terminationOnEachCodingPass) {
unsupported.push('terminationOnEachCodingPass');
}
+
if (cod.verticallyStripe) {
unsupported.push('verticallyStripe');
}
+
if (cod.predictableTermination) {
unsupported.push('predictableTermination');
}
+
if (unsupported.length > 0) {
doNotRecover = true;
throw new Error('Unsupported COD options (' + unsupported.join(', ') + ')');
}
+
if (context.mainHeader) {
context.COD = cod;
} else {
context.currentTile.COD = cod;
context.currentTile.COC = [];
}
+
break;
+
case 0xFF90:
length = (0, _util.readUint16)(data, position);
tile = {};
@@ -18714,34 +22616,43 @@ var JpxImage = function JpxImageClosure() {
tile.partIndex = data[position + 8];
tile.partsCount = data[position + 9];
context.mainHeader = false;
+
if (tile.partIndex === 0) {
tile.COD = context.COD;
tile.COC = context.COC.slice(0);
tile.QCD = context.QCD;
tile.QCC = context.QCC.slice(0);
}
+
context.currentTile = tile;
break;
+
case 0xFF93:
tile = context.currentTile;
+
if (tile.partIndex === 0) {
initializeTile(context, tile.index);
buildPackets(context);
}
+
length = tile.dataEnd - position;
parseTilePackets(context, data, position, length);
break;
+
case 0xFF55:
case 0xFF57:
case 0xFF58:
case 0xFF64:
length = (0, _util.readUint16)(data, position);
break;
+
case 0xFF53:
throw new Error('Codestream code 0xFF53 (COC) is ' + 'not implemented');
+
default:
throw new Error('Unknown codestream code: ' + code.toString(16));
}
+
position += length;
}
} catch (e) {
@@ -18751,12 +22662,14 @@ var JpxImage = function JpxImageClosure() {
(0, _util.warn)('JPX: Trying to recover from: ' + e.message);
}
}
+
this.tiles = transformComponents(context);
this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
this.componentsCount = context.SIZ.Csiz;
}
};
+
function calculateComponentDimensions(component, siz) {
component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
@@ -18765,12 +22678,14 @@ var JpxImage = function JpxImageClosure() {
component.width = component.x1 - component.x0;
component.height = component.y1 - component.y0;
}
+
function calculateTileGrids(context, components) {
var siz = context.SIZ;
var tile,
tiles = [];
var numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
var numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
+
for (var q = 0; q < numYtiles; q++) {
for (var p = 0; p < numXtiles; p++) {
tile = {};
@@ -18784,10 +22699,13 @@ var JpxImage = function JpxImageClosure() {
tiles.push(tile);
}
}
+
context.tiles = tiles;
var componentsCount = siz.Csiz;
+
for (var i = 0, ii = componentsCount; i < ii; i++) {
var component = components[i];
+
for (var j = 0, jj = tiles.length; j < jj; j++) {
var tileComponent = {};
tile = tiles[j];
@@ -18801,9 +22719,11 @@ var JpxImage = function JpxImageClosure() {
}
}
}
+
function getBlocksDimensions(context, component, r) {
var codOrCoc = component.codingStyleParameters;
var result = {};
+
if (!codOrCoc.entropyCoderWithCustomPrecincts) {
result.PPx = 15;
result.PPy = 15;
@@ -18811,10 +22731,12 @@ var JpxImage = function JpxImageClosure() {
result.PPx = codOrCoc.precinctsSizes[r].PPx;
result.PPy = codOrCoc.precinctsSizes[r].PPy;
}
+
result.xcb_ = r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) : Math.min(codOrCoc.xcb, result.PPx);
result.ycb_ = r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) : Math.min(codOrCoc.ycb, result.PPy);
return result;
}
+
function buildPrecincts(context, resolution, dimensions) {
var precinctWidth = 1 << dimensions.PPx;
var precinctHeight = 1 << dimensions.PPy;
@@ -18834,6 +22756,7 @@ var JpxImage = function JpxImageClosure() {
precinctHeightInSubband: precinctHeightInSubband
};
}
+
function buildCodeblocks(context, subband, dimensions) {
var xcb_ = dimensions.xcb_;
var ycb_ = dimensions.ycb_;
@@ -18847,6 +22770,7 @@ var JpxImage = function JpxImageClosure() {
var codeblocks = [];
var precincts = [];
var i, j, codeblock, precinctNumber;
+
for (j = cby0; j < cby1; j++) {
for (i = cbx0; i < cbx1; i++) {
codeblock = {
@@ -18867,17 +22791,21 @@ var JpxImage = function JpxImageClosure() {
codeblock.precinctNumber = precinctNumber;
codeblock.subbandType = subband.type;
codeblock.Lblock = 3;
+
if (codeblock.tbx1_ <= codeblock.tbx0_ || codeblock.tby1_ <= codeblock.tby0_) {
continue;
}
+
codeblocks.push(codeblock);
var precinct = precincts[precinctNumber];
+
if (precinct !== undefined) {
if (i < precinct.cbxMin) {
precinct.cbxMin = i;
} else if (i > precinct.cbxMax) {
precinct.cbxMax = i;
}
+
if (j < precinct.cbyMin) {
precinct.cbxMin = j;
} else if (j > precinct.cbyMax) {
@@ -18891,9 +22819,11 @@ var JpxImage = function JpxImageClosure() {
cbyMax: j
};
}
+
codeblock.precinct = precinct;
}
}
+
subband.codeblockParameters = {
codeblockWidth: xcb_,
codeblockHeight: ycb_,
@@ -18903,25 +22833,32 @@ var JpxImage = function JpxImageClosure() {
subband.codeblocks = codeblocks;
subband.precincts = precincts;
}
+
function createPacket(resolution, precinctNumber, layerNumber) {
var precinctCodeblocks = [];
var subbands = resolution.subbands;
+
for (var i = 0, ii = subbands.length; i < ii; i++) {
var subband = subbands[i];
var codeblocks = subband.codeblocks;
+
for (var j = 0, jj = codeblocks.length; j < jj; j++) {
var codeblock = codeblocks[j];
+
if (codeblock.precinctNumber !== precinctNumber) {
continue;
}
+
precinctCodeblocks.push(codeblock);
}
}
+
return {
layerNumber: layerNumber,
codeblocks: precinctCodeblocks
};
}
+
function LayerResolutionComponentPositionIterator(context) {
var siz = context.SIZ;
var tileIndex = context.currentTile.index;
@@ -18929,37 +22866,48 @@ var JpxImage = function JpxImageClosure() {
var layersCount = tile.codingStyleDefaultParameters.layersCount;
var componentsCount = siz.Csiz;
var maxDecompositionLevelsCount = 0;
+
for (var q = 0; q < componentsCount; q++) {
maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, tile.components[q].codingStyleParameters.decompositionLevelsCount);
}
+
var l = 0,
r = 0,
i = 0,
k = 0;
+
this.nextPacket = function JpxImage_nextPacket() {
for (; l < layersCount; l++) {
for (; r <= maxDecompositionLevelsCount; r++) {
for (; i < componentsCount; i++) {
var component = tile.components[i];
+
if (r > component.codingStyleParameters.decompositionLevelsCount) {
continue;
}
+
var resolution = component.resolutions[r];
var numprecincts = resolution.precinctParameters.numprecincts;
+
for (; k < numprecincts;) {
var packet = createPacket(resolution, k, l);
k++;
return packet;
}
+
k = 0;
}
+
i = 0;
}
+
r = 0;
}
+
throw new JpxError('Out of packets');
};
}
+
function ResolutionLayerComponentPositionIterator(context) {
var siz = context.SIZ;
var tileIndex = context.currentTile.index;
@@ -18967,37 +22915,48 @@ var JpxImage = function JpxImageClosure() {
var layersCount = tile.codingStyleDefaultParameters.layersCount;
var componentsCount = siz.Csiz;
var maxDecompositionLevelsCount = 0;
+
for (var q = 0; q < componentsCount; q++) {
maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, tile.components[q].codingStyleParameters.decompositionLevelsCount);
}
+
var r = 0,
l = 0,
i = 0,
k = 0;
+
this.nextPacket = function JpxImage_nextPacket() {
for (; r <= maxDecompositionLevelsCount; r++) {
for (; l < layersCount; l++) {
for (; i < componentsCount; i++) {
var component = tile.components[i];
+
if (r > component.codingStyleParameters.decompositionLevelsCount) {
continue;
}
+
var resolution = component.resolutions[r];
var numprecincts = resolution.precinctParameters.numprecincts;
+
for (; k < numprecincts;) {
var packet = createPacket(resolution, k, l);
k++;
return packet;
}
+
k = 0;
}
+
i = 0;
}
+
l = 0;
}
+
throw new JpxError('Out of packets');
};
}
+
function ResolutionPositionComponentLayerIterator(context) {
var siz = context.SIZ;
var tileIndex = context.currentTile.index;
@@ -19006,52 +22965,69 @@ var JpxImage = function JpxImageClosure() {
var componentsCount = siz.Csiz;
var l, r, c, p;
var maxDecompositionLevelsCount = 0;
+
for (c = 0; c < componentsCount; c++) {
var component = tile.components[c];
maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount, component.codingStyleParameters.decompositionLevelsCount);
}
+
var maxNumPrecinctsInLevel = new Int32Array(maxDecompositionLevelsCount + 1);
+
for (r = 0; r <= maxDecompositionLevelsCount; ++r) {
var maxNumPrecincts = 0;
+
for (c = 0; c < componentsCount; ++c) {
var resolutions = tile.components[c].resolutions;
+
if (r < resolutions.length) {
maxNumPrecincts = Math.max(maxNumPrecincts, resolutions[r].precinctParameters.numprecincts);
}
}
+
maxNumPrecinctsInLevel[r] = maxNumPrecincts;
}
+
l = 0;
r = 0;
c = 0;
p = 0;
+
this.nextPacket = function JpxImage_nextPacket() {
for (; r <= maxDecompositionLevelsCount; r++) {
for (; p < maxNumPrecinctsInLevel[r]; p++) {
for (; c < componentsCount; c++) {
var component = tile.components[c];
+
if (r > component.codingStyleParameters.decompositionLevelsCount) {
continue;
}
+
var resolution = component.resolutions[r];
var numprecincts = resolution.precinctParameters.numprecincts;
+
if (p >= numprecincts) {
continue;
}
+
for (; l < layersCount;) {
var packet = createPacket(resolution, p, l);
l++;
return packet;
}
+
l = 0;
}
+
c = 0;
}
+
p = 0;
}
+
throw new JpxError('Out of packets');
};
}
+
function PositionComponentResolutionLayerIterator(context) {
var siz = context.SIZ;
var tileIndex = context.currentTile.index;
@@ -19065,35 +23041,45 @@ var JpxImage = function JpxImageClosure() {
c = 0,
px = 0,
py = 0;
+
this.nextPacket = function JpxImage_nextPacket() {
for (; py < precinctsIterationSizes.maxNumHigh; py++) {
for (; px < precinctsIterationSizes.maxNumWide; px++) {
for (; c < componentsCount; c++) {
var component = tile.components[c];
var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
+
for (; r <= decompositionLevelsCount; r++) {
var resolution = component.resolutions[r];
var sizeInImageScale = precinctsSizes.components[c].resolutions[r];
var k = getPrecinctIndexIfExist(px, py, sizeInImageScale, precinctsIterationSizes, resolution);
+
if (k === null) {
continue;
}
+
for (; l < layersCount;) {
var packet = createPacket(resolution, k, l);
l++;
return packet;
}
+
l = 0;
}
+
r = 0;
}
+
c = 0;
}
+
px = 0;
}
+
throw new JpxError('Out of packets');
};
}
+
function ComponentPositionResolutionLayerIterator(context) {
var siz = context.SIZ;
var tileIndex = context.currentTile.index;
@@ -19106,45 +23092,58 @@ var JpxImage = function JpxImageClosure() {
c = 0,
px = 0,
py = 0;
+
this.nextPacket = function JpxImage_nextPacket() {
for (; c < componentsCount; ++c) {
var component = tile.components[c];
var precinctsIterationSizes = precinctsSizes.components[c];
var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
+
for (; py < precinctsIterationSizes.maxNumHigh; py++) {
for (; px < precinctsIterationSizes.maxNumWide; px++) {
for (; r <= decompositionLevelsCount; r++) {
var resolution = component.resolutions[r];
var sizeInImageScale = precinctsIterationSizes.resolutions[r];
var k = getPrecinctIndexIfExist(px, py, sizeInImageScale, precinctsIterationSizes, resolution);
+
if (k === null) {
continue;
}
+
for (; l < layersCount;) {
var packet = createPacket(resolution, k, l);
l++;
return packet;
}
+
l = 0;
}
+
r = 0;
}
+
px = 0;
}
+
py = 0;
}
+
throw new JpxError('Out of packets');
};
}
+
function getPrecinctIndexIfExist(pxIndex, pyIndex, sizeInImageScale, precinctIterationSizes, resolution) {
var posX = pxIndex * precinctIterationSizes.minWidth;
var posY = pyIndex * precinctIterationSizes.minHeight;
+
if (posX % sizeInImageScale.width !== 0 || posY % sizeInImageScale.height !== 0) {
return null;
}
+
var startPrecinctRowIndex = posY / sizeInImageScale.width * resolution.precinctParameters.numprecinctswide;
return posX / sizeInImageScale.height + startPrecinctRowIndex;
}
+
function getPrecinctSizesInImageScale(tile) {
var componentsCount = tile.components.length;
var minWidth = Number.MAX_VALUE;
@@ -19152,6 +23151,7 @@ var JpxImage = function JpxImageClosure() {
var maxNumWide = 0;
var maxNumHigh = 0;
var sizePerComponent = new Array(componentsCount);
+
for (var c = 0; c < componentsCount; c++) {
var component = tile.components[c];
var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
@@ -19161,6 +23161,7 @@ var JpxImage = function JpxImageClosure() {
var maxNumWideCurrentComponent = 0;
var maxNumHighCurrentComponent = 0;
var scale = 1;
+
for (var r = decompositionLevelsCount; r >= 0; --r) {
var resolution = component.resolutions[r];
var widthCurrentResolution = scale * resolution.precinctParameters.precinctWidth;
@@ -19175,6 +23176,7 @@ var JpxImage = function JpxImageClosure() {
};
scale <<= 1;
}
+
minWidth = Math.min(minWidth, minWidthCurrentComponent);
minHeight = Math.min(minHeight, minHeightCurrentComponent);
maxNumWide = Math.max(maxNumWide, maxNumWideCurrentComponent);
@@ -19187,6 +23189,7 @@ var JpxImage = function JpxImageClosure() {
maxNumHigh: maxNumHighCurrentComponent
};
}
+
return {
components: sizePerComponent,
minWidth: minWidth,
@@ -19195,16 +23198,19 @@ var JpxImage = function JpxImageClosure() {
maxNumHigh: maxNumHigh
};
}
+
function buildPackets(context) {
var siz = context.SIZ;
var tileIndex = context.currentTile.index;
var tile = context.tiles[tileIndex];
var componentsCount = siz.Csiz;
+
for (var c = 0; c < componentsCount; c++) {
var component = tile.components[c];
var decompositionLevelsCount = component.codingStyleParameters.decompositionLevelsCount;
var resolutions = [];
var subbands = [];
+
for (var r = 0; r <= decompositionLevelsCount; r++) {
var blocksDimensions = getBlocksDimensions(context, component, r);
var resolution = {};
@@ -19217,6 +23223,7 @@ var JpxImage = function JpxImageClosure() {
buildPrecincts(context, resolution, blocksDimensions);
resolutions.push(resolution);
var subband;
+
if (r === 0) {
subband = {};
subband.type = 'LL';
@@ -19264,39 +23271,50 @@ var JpxImage = function JpxImageClosure() {
resolution.subbands = resolutionSubbands;
}
}
+
component.resolutions = resolutions;
component.subbands = subbands;
}
+
var progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
+
switch (progressionOrder) {
case 0:
tile.packetsIterator = new LayerResolutionComponentPositionIterator(context);
break;
+
case 1:
tile.packetsIterator = new ResolutionLayerComponentPositionIterator(context);
break;
+
case 2:
tile.packetsIterator = new ResolutionPositionComponentLayerIterator(context);
break;
+
case 3:
tile.packetsIterator = new PositionComponentResolutionLayerIterator(context);
break;
+
case 4:
tile.packetsIterator = new ComponentPositionResolutionLayerIterator(context);
break;
+
default:
- throw new JpxError('Unsupported progression order ' + progressionOrder);
+ throw new JpxError("Unsupported progression order ".concat(progressionOrder));
}
}
+
function parseTilePackets(context, data, offset, dataLength) {
var position = 0;
var buffer,
bufferSize = 0,
skipNextBit = false;
+
function readBits(count) {
while (bufferSize < count) {
var b = data[offset + position];
position++;
+
if (skipNextBit) {
buffer = buffer << 7 | b;
bufferSize += 7;
@@ -19305,13 +23323,16 @@ var JpxImage = function JpxImageClosure() {
buffer = buffer << 8 | b;
bufferSize += 8;
}
+
if (b === 0xFF) {
skipNextBit = true;
}
}
+
bufferSize -= count;
return buffer >>> bufferSize & (1 << count) - 1;
}
+
function skipMarkerIfEqual(value) {
if (data[offset + position - 1] === 0xFF && data[offset + position] === value) {
skipBytes(1);
@@ -19320,53 +23341,71 @@ var JpxImage = function JpxImageClosure() {
skipBytes(2);
return true;
}
+
return false;
}
+
function skipBytes(count) {
position += count;
}
+
function alignToByte() {
bufferSize = 0;
+
if (skipNextBit) {
position++;
skipNextBit = false;
}
}
+
function readCodingpasses() {
if (readBits(1) === 0) {
return 1;
}
+
if (readBits(1) === 0) {
return 2;
}
+
var value = readBits(2);
+
if (value < 3) {
return value + 3;
}
+
value = readBits(5);
+
if (value < 31) {
return value + 6;
}
+
value = readBits(7);
return value + 37;
}
+
var tileIndex = context.currentTile.index;
var tile = context.tiles[tileIndex];
var sopMarkerUsed = context.COD.sopMarkerUsed;
var ephMarkerUsed = context.COD.ephMarkerUsed;
var packetsIterator = tile.packetsIterator;
+
while (position < dataLength) {
alignToByte();
+
if (sopMarkerUsed && skipMarkerIfEqual(0x91)) {
skipBytes(4);
}
+
var packet = packetsIterator.nextPacket();
+
if (!readBits(1)) {
continue;
}
+
var layerNumber = packet.layerNumber;
var queue = [],
codeblock;
+
for (var i = 0, ii = packet.codeblocks.length; i < ii; i++) {
codeblock = packet.codeblocks[i];
var precinct = codeblock.precinct;
@@ -19375,11 +23414,13 @@ var JpxImage = function JpxImageClosure() {
var codeblockIncluded = false;
var firstTimeInclusion = false;
var valueReady;
+
if (codeblock['included'] !== undefined) {
codeblockIncluded = !!readBits(1);
} else {
precinct = codeblock.precinct;
var inclusionTree, zeroBitPlanesTree;
+
if (precinct['inclusionTree'] !== undefined) {
inclusionTree = precinct.inclusionTree;
} else {
@@ -19390,10 +23431,12 @@ var JpxImage = function JpxImageClosure() {
precinct.inclusionTree = inclusionTree;
precinct.zeroBitPlanesTree = zeroBitPlanesTree;
}
+
if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
while (true) {
if (readBits(1)) {
valueReady = !inclusionTree.nextLevel();
+
if (valueReady) {
codeblock.included = true;
codeblockIncluded = firstTimeInclusion = true;
@@ -19406,15 +23449,19 @@ var JpxImage = function JpxImageClosure() {
}
}
}
+
if (!codeblockIncluded) {
continue;
}
+
if (firstTimeInclusion) {
zeroBitPlanesTree = precinct.zeroBitPlanesTree;
zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
+
while (true) {
if (readBits(1)) {
valueReady = !zeroBitPlanesTree.nextLevel();
+
if (valueReady) {
break;
}
@@ -19422,12 +23469,16 @@ var JpxImage = function JpxImageClosure() {
zeroBitPlanesTree.incrementValue();
}
}
+
codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
}
+
var codingpasses = readCodingpasses();
+
while (readBits(1)) {
codeblock.Lblock++;
}
+
var codingpassesLog2 = (0, _util.log2)(codingpasses);
var bits = (codingpasses < 1 << codingpassesLog2 ? codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
var codedDataLength = readBits(bits);
@@ -19437,16 +23488,21 @@ var JpxImage = function JpxImageClosure() {
dataLength: codedDataLength
});
}
+
alignToByte();
+
if (ephMarkerUsed) {
skipMarkerIfEqual(0x92);
}
+
while (queue.length > 0) {
var packetItem = queue.shift();
codeblock = packetItem.codeblock;
+
if (codeblock['data'] === undefined) {
codeblock.data = [];
}
+
codeblock.data.push({
data: data,
start: offset + position,
@@ -19456,8 +23512,10 @@ var JpxImage = function JpxImageClosure() {
position += packetItem.dataLength;
}
}
+
return position;
}
+
function copyCoefficients(coefficients, levelWidth, levelHeight, subband, delta, mb, reversible, segmentationSymbolUsed) {
var x0 = subband.tbx0;
var y0 = subband.tby0;
@@ -19465,16 +23523,20 @@ var JpxImage = function JpxImageClosure() {
var codeblocks = subband.codeblocks;
var right = subband.type.charAt(0) === 'H' ? 1 : 0;
var bottom = subband.type.charAt(1) === 'H' ? levelWidth : 0;
+
for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
var codeblock = codeblocks[i];
var blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
var blockHeight = codeblock.tby1_ - codeblock.tby0_;
+
if (blockWidth === 0 || blockHeight === 0) {
continue;
}
+
if (codeblock['data'] === undefined) {
continue;
}
+
var bitModel, currentCodingpassType;
bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType, codeblock.zeroBitPlanes, mb);
currentCodingpassType = 2;
@@ -19482,38 +23544,49 @@ var JpxImage = function JpxImageClosure() {
totalLength = 0,
codingpasses = 0;
var j, jj, dataItem;
+
for (j = 0, jj = data.length; j < jj; j++) {
dataItem = data[j];
totalLength += dataItem.end - dataItem.start;
codingpasses += dataItem.codingpasses;
}
+
var encodedData = new Uint8Array(totalLength);
var position = 0;
+
for (j = 0, jj = data.length; j < jj; j++) {
dataItem = data[j];
var chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
encodedData.set(chunk, position);
position += chunk.length;
}
+
var decoder = new _arithmetic_decoder.ArithmeticDecoder(encodedData, 0, totalLength);
bitModel.setDecoder(decoder);
+
for (j = 0; j < codingpasses; j++) {
switch (currentCodingpassType) {
case 0:
bitModel.runSignificancePropagationPass();
break;
+
case 1:
bitModel.runMagnitudeRefinementPass();
break;
+
case 2:
bitModel.runCleanupPass();
+
if (segmentationSymbolUsed) {
bitModel.checkSegmentationSymbol();
}
+
break;
}
+
currentCodingpassType = (currentCodingpassType + 1) % 3;
}
+
var offset = codeblock.tbx0_ - x0 + (codeblock.tby0_ - y0) * width;
var sign = bitModel.coefficentsSign;
var magnitude = bitModel.coefficentsMagnitude;
@@ -19522,31 +23595,40 @@ var JpxImage = function JpxImageClosure() {
var k, n, nb;
position = 0;
var interleave = subband.type !== 'LL';
+
for (j = 0; j < blockHeight; j++) {
var row = offset / width | 0;
var levelOffset = 2 * row * (levelWidth - width) + right + bottom;
+
for (k = 0; k < blockWidth; k++) {
n = magnitude[position];
+
if (n !== 0) {
n = (n + magnitudeCorrection) * delta;
+
if (sign[position] !== 0) {
n = -n;
}
+
nb = bitsDecoded[position];
var pos = interleave ? levelOffset + (offset << 1) : offset;
+
if (reversible && nb >= mb) {
coefficients[pos] = n;
} else {
coefficients[pos] = n * (1 << mb - nb);
}
}
+
offset++;
position++;
}
+
offset += width - blockWidth;
}
}
}
+
function transformTile(context, tile, c) {
var component = tile.components[c];
var codingStyleParameters = component.codingStyleParameters;
@@ -19561,13 +23643,16 @@ var JpxImage = function JpxImageClosure() {
var transform = reversible ? new ReversibleTransform() : new IrreversibleTransform();
var subbandCoefficients = [];
var b = 0;
+
for (var i = 0; i <= decompositionLevelsCount; i++) {
var resolution = component.resolutions[i];
var width = resolution.trx1 - resolution.trx0;
var height = resolution.try1 - resolution.try0;
var coefficients = new Float32Array(width * height);
+
for (var j = 0, jj = resolution.subbands.length; j < jj; j++) {
var mu, epsilon;
+
if (!scalarExpounded) {
mu = spqcds[0].mu;
epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
@@ -19576,18 +23661,21 @@ var JpxImage = function JpxImageClosure() {
epsilon = spqcds[b].epsilon;
b++;
}
+
var subband = resolution.subbands[j];
var gainLog2 = SubbandsGainLog2[subband.type];
var delta = reversible ? 1 : Math.pow(2, precision + gainLog2 - epsilon) * (1 + mu / 2048);
var mb = guardBits + epsilon - 1;
copyCoefficients(coefficients, width, height, subband, delta, mb, reversible, segmentationSymbolUsed);
}
+
subbandCoefficients.push({
width: width,
height: height,
items: coefficients
});
}
+
var result = transform.calculate(subbandCoefficients, component.tcx0, component.tcy0);
return {
left: component.tcx0,
@@ -19597,18 +23685,22 @@ var JpxImage = function JpxImageClosure() {
items: result.items
};
}
+
function transformComponents(context) {
var siz = context.SIZ;
var components = context.components;
var componentsCount = siz.Csiz;
var resultImages = [];
+
for (var i = 0, ii = context.tiles.length; i < ii; i++) {
var tile = context.tiles[i];
var transformedTiles = [];
var c;
+
for (c = 0; c < componentsCount; c++) {
transformedTiles[c] = transformTile(context, tile, c);
}
+
var tile0 = transformedTiles[0];
var out = new Uint8ClampedArray(tile0.items.length * componentsCount);
var result = {
@@ -19625,6 +23717,7 @@ var JpxImage = function JpxImageClosure() {
y0,
y1,
y2;
+
if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
var fourComponents = componentsCount === 4;
var y0items = transformedTiles[0].items;
@@ -19636,6 +23729,7 @@ var JpxImage = function JpxImageClosure() {
var component0 = tile.components[0];
var alpha01 = componentsCount - 3;
jj = y0items.length;
+
if (!component0.codingStyleParameters.reversibleTransformation) {
for (j = 0; j < jj; j++, pos += alpha01) {
y0 = y0items[j] + offset;
@@ -19656,6 +23750,7 @@ var JpxImage = function JpxImageClosure() {
out[pos++] = g + y1 >> shift;
}
}
+
if (fourComponents) {
for (j = 0, pos = 3; j < jj; j++, pos += 4) {
out[pos] = y3items[j] + offset >> shift;
@@ -19666,20 +23761,25 @@ var JpxImage = function JpxImageClosure() {
var items = transformedTiles[c].items;
shift = components[c].precision - 8;
offset = (128 << shift) + 0.5;
+
for (pos = c, j = 0, jj = items.length; j < jj; j++) {
out[pos] = items[j] + offset >> shift;
pos += componentsCount;
}
}
}
+
resultImages.push(result);
}
+
return resultImages;
}
+
function initializeTile(context, tileIndex) {
var siz = context.SIZ;
var componentsCount = siz.Csiz;
var tile = context.tiles[tileIndex];
+
for (var c = 0; c < componentsCount; c++) {
var component = tile.components[c];
var qcdOrQcc = context.currentTile.QCC[c] !== undefined ? context.currentTile.QCC[c] : context.currentTile.QCD;
@@ -19687,12 +23787,15 @@ var JpxImage = function JpxImageClosure() {
var codOrCoc = context.currentTile.COC[c] !== undefined ? context.currentTile.COC[c] : context.currentTile.COD;
component.codingStyleParameters = codOrCoc;
}
+
tile.codingStyleDefaultParameters = context.currentTile.COD;
}
+
var TagTree = function TagTreeClosure() {
function TagTree(width, height) {
var levelsLength = (0, _util.log2)(Math.max(width, height)) + 1;
this.levels = [];
+
for (var i = 0; i < levelsLength; i++) {
var level = {
width: width,
@@ -19704,23 +23807,28 @@ var JpxImage = function JpxImageClosure() {
height = Math.ceil(height / 2);
}
}
+
TagTree.prototype = {
reset: function TagTree_reset(i, j) {
var currentLevel = 0,
value = 0,
level;
+
while (currentLevel < this.levels.length) {
level = this.levels[currentLevel];
var index = i + j * level.width;
+
if (level.items[index] !== undefined) {
value = level.items[index];
break;
}
+
level.index = index;
i >>= 1;
j >>= 1;
currentLevel++;
}
+
currentLevel--;
level = this.levels[currentLevel];
level.items[level.index] = value;
@@ -19736,10 +23844,12 @@ var JpxImage = function JpxImageClosure() {
var level = this.levels[currentLevel];
var value = level.items[level.index];
currentLevel--;
+
if (currentLevel < 0) {
this.value = value;
return false;
}
+
this.currentLevel = currentLevel;
level = this.levels[currentLevel];
level.items[level.index] = value;
@@ -19748,15 +23858,19 @@ var JpxImage = function JpxImageClosure() {
};
return TagTree;
}();
+
var InclusionTree = function InclusionTreeClosure() {
function InclusionTree(width, height, defaultValue) {
var levelsLength = (0, _util.log2)(Math.max(width, height)) + 1;
this.levels = [];
+
for (var i = 0; i < levelsLength; i++) {
var items = new Uint8Array(width * height);
+
for (var j = 0, jj = items.length; j < jj; j++) {
items[j] = defaultValue;
}
+
var level = {
width: width,
height: height,
@@ -19767,26 +23881,32 @@ var JpxImage = function JpxImageClosure() {
height = Math.ceil(height / 2);
}
}
+
InclusionTree.prototype = {
reset: function InclusionTree_reset(i, j, stopValue) {
var currentLevel = 0;
+
while (currentLevel < this.levels.length) {
var level = this.levels[currentLevel];
var index = i + j * level.width;
level.index = index;
var value = level.items[index];
+
if (value === 0xFF) {
break;
}
+
if (value > stopValue) {
this.currentLevel = currentLevel;
this.propagateValues();
return false;
}
+
i >>= 1;
j >>= 1;
currentLevel++;
}
+
this.currentLevel = currentLevel - 1;
return true;
},
@@ -19799,6 +23919,7 @@ var JpxImage = function JpxImageClosure() {
var levelIndex = this.currentLevel;
var level = this.levels[levelIndex];
var currentValue = level.items[level.index];
+
while (--levelIndex >= 0) {
level = this.levels[levelIndex];
level.items[level.index] = currentValue;
@@ -19810,9 +23931,11 @@ var JpxImage = function JpxImageClosure() {
var value = level.items[level.index];
level.items[level.index] = 0xFF;
currentLevel--;
+
if (currentLevel < 0) {
return false;
}
+
this.currentLevel = currentLevel;
level = this.levels[currentLevel];
level.items[level.index] = value;
@@ -19821,12 +23944,14 @@ var JpxImage = function JpxImageClosure() {
};
return InclusionTree;
}();
+
var BitModel = function BitModelClosure() {
var UNIFORM_CONTEXT = 17;
var RUNLENGTH_CONTEXT = 18;
var LLAndLHContextsLabel = new Uint8Array([0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8]);
var HLContextLabel = new Uint8Array([0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8]);
var HHContextLabel = new Uint8Array([0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5, 5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8]);
+
function BitModel(width, height, subband, zeroBitPlanes, mb) {
this.width = width;
this.height = height;
@@ -19837,14 +23962,17 @@ var JpxImage = function JpxImageClosure() {
this.coefficentsMagnitude = mb > 14 ? new Uint32Array(coefficientCount) : mb > 6 ? new Uint16Array(coefficientCount) : new Uint8Array(coefficientCount);
this.processingFlags = new Uint8Array(coefficientCount);
var bitsDecoded = new Uint8Array(coefficientCount);
+
if (zeroBitPlanes !== 0) {
for (var i = 0; i < coefficientCount; i++) {
bitsDecoded[i] = zeroBitPlanes;
}
}
+
this.bitsDecoded = bitsDecoded;
this.reset();
}
+
BitModel.prototype = {
setDecoder: function BitModel_setDecoder(decoder) {
this.decoder = decoder;
@@ -19862,32 +23990,43 @@ var JpxImage = function JpxImageClosure() {
var left = column > 0;
var right = column + 1 < width;
var i;
+
if (row > 0) {
i = index - width;
+
if (left) {
neighborsSignificance[i - 1] += 0x10;
}
+
if (right) {
neighborsSignificance[i + 1] += 0x10;
}
+
neighborsSignificance[i] += 0x04;
}
+
if (row + 1 < height) {
i = index + width;
+
if (left) {
neighborsSignificance[i - 1] += 0x10;
}
+
if (right) {
neighborsSignificance[i + 1] += 0x10;
}
+
neighborsSignificance[i] += 0x04;
}
+
if (left) {
neighborsSignificance[index - 1] += 0x01;
}
+
if (right) {
neighborsSignificance[index + 1] += 0x01;
}
+
neighborsSignificance[index] |= 0x80;
},
runSignificancePropagationPass: function BitModel_runSignificancePropagationPass() {
@@ -19904,20 +24043,27 @@ var JpxImage = function JpxImageClosure() {
var processedInverseMask = ~1;
var processedMask = 1;
var firstMagnitudeBitMask = 2;
+
for (var i0 = 0; i0 < height; i0 += 4) {
for (var j = 0; j < width; j++) {
var index = i0 * width + j;
+
for (var i1 = 0; i1 < 4; i1++, index += width) {
var i = i0 + i1;
+
if (i >= height) {
break;
}
+
processingFlags[index] &= processedInverseMask;
+
if (coefficentsMagnitude[index] || !neighborsSignificance[index]) {
continue;
}
+
var contextLabel = labels[neighborsSignificance[index]];
var decision = decoder.readBit(contexts, contextLabel);
+
if (decision) {
var sign = this.decodeSignBit(i, j, index);
coefficentsSign[index] = sign;
@@ -19925,6 +24071,7 @@ var JpxImage = function JpxImageClosure() {
this.setNeighborsSignificance(i, j, index);
processingFlags[index] |= firstMagnitudeBitMask;
}
+
bitsDecoded[index]++;
processingFlags[index] |= processedMask;
}
@@ -19939,8 +24086,10 @@ var JpxImage = function JpxImageClosure() {
var contribution, sign0, sign1, significance1;
var contextLabel, decoded;
significance1 = column > 0 && coefficentsMagnitude[index - 1] !== 0;
+
if (column + 1 < width && coefficentsMagnitude[index + 1] !== 0) {
sign1 = coefficentsSign[index + 1];
+
if (significance1) {
sign0 = coefficentsSign[index - 1];
contribution = 1 - sign1 - sign0;
@@ -19953,10 +24102,13 @@ var JpxImage = function JpxImageClosure() {
} else {
contribution = 0;
}
+
var horizontalContribution = 3 * contribution;
significance1 = row > 0 && coefficentsMagnitude[index - width] !== 0;
+
if (row + 1 < height && coefficentsMagnitude[index + width] !== 0) {
sign1 = coefficentsSign[index + width];
+
if (significance1) {
sign0 = coefficentsSign[index - width];
contribution = 1 - sign1 - sign0 + horizontalContribution;
@@ -19969,6 +24121,7 @@ var JpxImage = function JpxImageClosure() {
} else {
contribution = horizontalContribution;
}
+
if (contribution >= 0) {
contextLabel = 9 + contribution;
decoded = this.decoder.readBit(this.contexts, contextLabel);
@@ -19976,6 +24129,7 @@ var JpxImage = function JpxImageClosure() {
contextLabel = 9 - contribution;
decoded = this.decoder.readBit(this.contexts, contextLabel) ^ 1;
}
+
return decoded;
},
runMagnitudeRefinementPass: function BitModel_runMagnitudeRefinementPass() {
@@ -19991,19 +24145,24 @@ var JpxImage = function JpxImageClosure() {
var firstMagnitudeBitMask = 2;
var length = width * height;
var width4 = width * 4;
+
for (var index0 = 0, indexNext; index0 < length; index0 = indexNext) {
indexNext = Math.min(length, index0 + width4);
+
for (var j = 0; j < width; j++) {
for (var index = index0 + j; index < indexNext; index += width) {
if (!coefficentsMagnitude[index] || (processingFlags[index] & processedMask) !== 0) {
continue;
}
+
var contextLabel = 16;
+
if ((processingFlags[index] & firstMagnitudeBitMask) !== 0) {
processingFlags[index] ^= firstMagnitudeBitMask;
var significance = neighborsSignificance[index] & 127;
contextLabel = significance === 0 ? 15 : 14;
}
+
var bit = decoder.readBit(contexts, contextLabel);
coefficentsMagnitude[index] = coefficentsMagnitude[index] << 1 | bit;
bitsDecoded[index]++;
@@ -20029,10 +24188,12 @@ var JpxImage = function JpxImageClosure() {
var twoRowsDown = width * 2;
var threeRowsDown = width * 3;
var iNext;
+
for (var i0 = 0; i0 < height; i0 = iNext) {
iNext = Math.min(i0 + 4, height);
var indexBase = i0 * width;
var checkAllEmpty = i0 + 3 < height;
+
for (var j = 0; j < width; j++) {
var index0 = indexBase + j;
var allEmpty = checkAllEmpty && processingFlags[index0] === 0 && processingFlags[index0 + oneRowDown] === 0 && processingFlags[index0 + twoRowsDown] === 0 && processingFlags[index0 + threeRowsDown] === 0 && neighborsSignificance[index0] === 0 && neighborsSignificance[index0 + oneRowDown] === 0 && neighborsSignificance[index0 + twoRowsDown] === 0 && neighborsSignificance[index0 + threeRowsDown] === 0;
@@ -20040,8 +24201,10 @@ var JpxImage = function JpxImageClosure() {
index = index0;
var i = i0,
sign;
+
if (allEmpty) {
var hasSignificantCoefficent = decoder.readBit(contexts, RUNLENGTH_CONTEXT);
+
if (!hasSignificantCoefficent) {
bitsDecoded[index0]++;
bitsDecoded[index0 + oneRowDown]++;
@@ -20049,28 +24212,36 @@ var JpxImage = function JpxImageClosure() {
bitsDecoded[index0 + threeRowsDown]++;
continue;
}
+
i1 = decoder.readBit(contexts, UNIFORM_CONTEXT) << 1 | decoder.readBit(contexts, UNIFORM_CONTEXT);
+
if (i1 !== 0) {
i = i0 + i1;
index += i1 * width;
}
+
sign = this.decodeSignBit(i, j, index);
coefficentsSign[index] = sign;
coefficentsMagnitude[index] = 1;
this.setNeighborsSignificance(i, j, index);
processingFlags[index] |= firstMagnitudeBitMask;
index = index0;
+
for (var i2 = i0; i2 <= i; i2++, index += width) {
bitsDecoded[index]++;
}
+
i1++;
}
+
for (i = i0 + i1; i < iNext; i++, index += width) {
if (coefficentsMagnitude[index] || (processingFlags[index] & processedMask) !== 0) {
continue;
}
+
var contextLabel = labels[neighborsSignificance[index]];
var decision = decoder.readBit(contexts, contextLabel);
+
if (decision === 1) {
sign = this.decodeSignBit(i, j, index);
coefficentsSign[index] = sign;
@@ -20078,6 +24249,7 @@ var JpxImage = function JpxImageClosure() {
this.setNeighborsSignificance(i, j, index);
processingFlags[index] |= firstMagnitudeBitMask;
}
+
bitsDecoded[index]++;
}
}
@@ -20087,6 +24259,7 @@ var JpxImage = function JpxImageClosure() {
var decoder = this.decoder;
var contexts = this.contexts;
var symbol = decoder.readBit(contexts, UNIFORM_CONTEXT) << 3 | decoder.readBit(contexts, UNIFORM_CONTEXT) << 2 | decoder.readBit(contexts, UNIFORM_CONTEXT) << 1 | decoder.readBit(contexts, UNIFORM_CONTEXT);
+
if (symbol !== 0xA) {
throw new JpxError('Invalid segmentation symbol');
}
@@ -20094,15 +24267,20 @@ var JpxImage = function JpxImageClosure() {
};
return BitModel;
}();
+
var Transform = function TransformClosure() {
function Transform() {}
+
Transform.prototype.calculate = function transformCalculate(subbands, u0, v0) {
var ll = subbands[0];
+
for (var i = 1, ii = subbands.length; i < ii; i++) {
ll = this.iterate(ll, subbands[i], u0, v0);
}
+
return ll;
};
+
Transform.prototype.extend = function extend(buffer, offset, size) {
var i1 = offset - 1,
j1 = offset + 1;
@@ -20117,6 +24295,7 @@ var JpxImage = function JpxImageClosure() {
buffer[i1] = buffer[j1];
buffer[j2] = buffer[i2];
};
+
Transform.prototype.iterate = function Transform_iterate(ll, hl_lh_hh, u0, v0) {
var llWidth = ll.width,
llHeight = ll.height,
@@ -20125,15 +24304,19 @@ var JpxImage = function JpxImageClosure() {
var height = hl_lh_hh.height;
var items = hl_lh_hh.items;
var i, j, k, l, u, v;
+
for (k = 0, i = 0; i < llHeight; i++) {
l = i * 2 * width;
+
for (j = 0; j < llWidth; j++, k++, l += 2) {
items[l] = llItems[k];
}
}
+
llItems = ll.items = null;
var bufferPadding = 4;
var rowBuffer = new Float32Array(width + 2 * bufferPadding);
+
if (width === 1) {
if ((u0 & 1) !== 0) {
for (v = 0, k = 0; v < height; v++, k += width) {
@@ -20148,14 +24331,18 @@ var JpxImage = function JpxImageClosure() {
items.set(rowBuffer.subarray(bufferPadding, bufferPadding + width), k);
}
}
+
var numBuffers = 16;
var colBuffers = [];
+
for (i = 0; i < numBuffers; i++) {
colBuffers.push(new Float32Array(height + 2 * bufferPadding));
}
+
var b,
currentBuffer = 0;
ll = bufferPadding + height;
+
if (height === 1) {
if ((v0 & 1) !== 0) {
for (u = 0; u < width; u++) {
@@ -20166,19 +24353,24 @@ var JpxImage = function JpxImageClosure() {
for (u = 0; u < width; u++) {
if (currentBuffer === 0) {
numBuffers = Math.min(width - u, numBuffers);
+
for (k = u, l = bufferPadding; l < ll; k += width, l++) {
for (b = 0; b < numBuffers; b++) {
colBuffers[b][l] = items[k + b];
}
}
+
currentBuffer = numBuffers;
}
+
currentBuffer--;
var buffer = colBuffers[currentBuffer];
this.extend(buffer, bufferPadding, height);
this.filter(buffer, bufferPadding, height);
+
if (currentBuffer === 0) {
k = u - numBuffers + 1;
+
for (l = bufferPadding; l < ll; k += width, l++) {
for (b = 0; b < numBuffers; b++) {
items[k + b] = colBuffers[b][l];
@@ -20187,19 +24379,24 @@ var JpxImage = function JpxImageClosure() {
}
}
}
+
return {
width: width,
height: height,
items: items
};
};
+
return Transform;
}();
+
var IrreversibleTransform = function IrreversibleTransformClosure() {
function IrreversibleTransform() {
Transform.call(this);
}
+
IrreversibleTransform.prototype = Object.create(Transform.prototype);
+
IrreversibleTransform.prototype.filter = function irreversibleTransformFilter(x, offset, length) {
var len = length >> 1;
offset = offset | 0;
@@ -20211,14 +24408,18 @@ var JpxImage = function JpxImageClosure() {
var K = 1.230174104914001;
var K_ = 1 / K;
j = offset - 3;
+
for (n = len + 4; n--; j += 2) {
x[j] *= K_;
}
+
j = offset - 2;
current = delta * x[j - 1];
+
for (n = len + 3; n--; j += 2) {
next = delta * x[j + 1];
x[j] = K * x[j] - current - next;
+
if (n--) {
j += 2;
current = delta * x[j + 1];
@@ -20227,11 +24428,14 @@ var JpxImage = function JpxImageClosure() {
break;
}
}
+
j = offset - 1;
current = gamma * x[j - 1];
+
for (n = len + 2; n--; j += 2) {
next = gamma * x[j + 1];
x[j] -= current + next;
+
if (n--) {
j += 2;
current = gamma * x[j + 1];
@@ -20240,11 +24444,14 @@ var JpxImage = function JpxImageClosure() {
break;
}
}
+
j = offset;
current = beta * x[j - 1];
+
for (n = len + 1; n--; j += 2) {
next = beta * x[j + 1];
x[j] -= current + next;
+
if (n--) {
j += 2;
current = beta * x[j + 1];
@@ -20253,12 +24460,15 @@ var JpxImage = function JpxImageClosure() {
break;
}
}
+
if (len !== 0) {
j = offset + 1;
current = alpha * x[j - 1];
+
for (n = len; n--; j += 2) {
next = alpha * x[j + 1];
x[j] -= current + next;
+
if (n--) {
j += 2;
current = alpha * x[j + 1];
@@ -20269,28 +24479,37 @@ var JpxImage = function JpxImageClosure() {
}
}
};
+
return IrreversibleTransform;
}();
+
var ReversibleTransform = function ReversibleTransformClosure() {
function ReversibleTransform() {
Transform.call(this);
}
+
ReversibleTransform.prototype = Object.create(Transform.prototype);
+
ReversibleTransform.prototype.filter = function reversibleTransformFilter(x, offset, length) {
var len = length >> 1;
offset = offset | 0;
var j, n;
+
for (j = offset, n = len + 1; n--; j += 2) {
x[j] -= x[j - 1] + x[j + 1] + 2 >> 2;
}
+
for (j = offset + 1, n = len; n--; j += 2) {
x[j] += x[j - 1] + x[j + 1] >> 1;
}
};
+
return ReversibleTransform;
}();
+
return JpxImage;
}();
+
exports.JpxImage = JpxImage;
/***/ }),
@@ -20303,9 +24522,7 @@ exports.JpxImage = JpxImage;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.calculateSHA512 = exports.calculateSHA384 = exports.calculateSHA256 = exports.calculateMD5 = exports.PDF20 = exports.PDF17 = exports.CipherTransformFactory = exports.ARCFourCipher = exports.AES256Cipher = exports.AES128Cipher = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.calculateSHA512 = exports.calculateSHA384 = exports.calculateSHA256 = exports.calculateMD5 = exports.PDF20 = exports.PDF17 = exports.CipherTransformFactory = exports.ARCFourCipher = exports.AES256Cipher = exports.AES128Cipher = void 0;
var _util = __w_pdfjs_require__(2);
@@ -20313,12 +24530,24 @@ var _primitives = __w_pdfjs_require__(142);
var _stream = __w_pdfjs_require__(144);
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var ARCFourCipher = function ARCFourCipherClosure() {
function ARCFourCipher(key) {
this.a = 0;
@@ -20328,17 +24557,21 @@ var ARCFourCipher = function ARCFourCipherClosure() {
j = 0,
tmp,
keyLength = key.length;
+
for (i = 0; i < 256; ++i) {
s[i] = i;
}
+
for (i = 0; i < 256; ++i) {
tmp = s[i];
j = j + tmp + key[i % keyLength] & 0xFF;
s[i] = s[j];
s[j] = tmp;
}
+
this.s = s;
}
+
ARCFourCipher.prototype = {
encryptBlock: function ARCFourCipher_encryptBlock(data) {
var i,
@@ -20349,6 +24582,7 @@ var ARCFourCipher = function ARCFourCipherClosure() {
b = this.b,
s = this.s;
var output = new Uint8Array(n);
+
for (i = 0; i < n; ++i) {
a = a + 1 & 0xFF;
tmp = s[a];
@@ -20358,6 +24592,7 @@ var ARCFourCipher = function ARCFourCipherClosure() {
s[b] = tmp;
output[i] = data[i] ^ s[tmp + tmp2 & 0xFF];
}
+
this.a = a;
this.b = b;
return output;
@@ -20366,9 +24601,13 @@ var ARCFourCipher = function ARCFourCipherClosure() {
ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
return ARCFourCipher;
}();
+
+exports.ARCFourCipher = ARCFourCipher;
+
var calculateMD5 = function calculateMD5Closure() {
var r = new Uint8Array([7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
var k = new Int32Array([-680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426, -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162, 1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632, 643717713, -373897302, -701558691, 38016083, -660478335, -405537848, 568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784, 1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556, -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222, -722521979, 76029189, -640364487, -421815835, 530742520, -995338651, -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606, -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649, -145523070, -1120210379, 718787259, -343485551]);
+
function hash(data, offset, length) {
var h0 = 1732584193,
h1 = -271733879,
@@ -20377,14 +24616,18 @@ var calculateMD5 = function calculateMD5Closure() {
var paddedLength = length + 72 & ~63;
var padded = new Uint8Array(paddedLength);
var i, j, n;
+
for (i = 0; i < length; ++i) {
padded[i] = data[offset++];
}
+
padded[i++] = 0x80;
n = paddedLength - 8;
+
while (i < n) {
padded[i++] = 0;
}
+
padded[i++] = length << 3 & 0xFF;
padded[i++] = length >> 5 & 0xFF;
padded[i++] = length >> 13 & 0xFF;
@@ -20394,16 +24637,19 @@ var calculateMD5 = function calculateMD5Closure() {
padded[i++] = 0;
padded[i++] = 0;
var w = new Int32Array(16);
+
for (i = 0; i < paddedLength;) {
for (j = 0; j < 16; ++j, i += 4) {
w[j] = padded[i] | padded[i + 1] << 8 | padded[i + 2] << 16 | padded[i + 3] << 24;
}
+
var a = h0,
b = h1,
c = h2,
d = h3,
f,
g;
+
for (j = 0; j < 64; ++j) {
if (j < 16) {
f = b & c | ~b & d;
@@ -20418,6 +24664,7 @@ var calculateMD5 = function calculateMD5Closure() {
f = c ^ (b | ~d);
g = 7 * j & 15;
}
+
var tmp = d,
rotateArg = a + f + k[j] + w[g] | 0,
rotate = r[j];
@@ -20426,20 +24673,27 @@ var calculateMD5 = function calculateMD5Closure() {
b = b + (rotateArg << rotate | rotateArg >>> 32 - rotate) | 0;
a = tmp;
}
+
h0 = h0 + a | 0;
h1 = h1 + b | 0;
h2 = h2 + c | 0;
h3 = h3 + d | 0;
}
+
return new Uint8Array([h0 & 0xFF, h0 >> 8 & 0xFF, h0 >> 16 & 0xFF, h0 >>> 24 & 0xFF, h1 & 0xFF, h1 >> 8 & 0xFF, h1 >> 16 & 0xFF, h1 >>> 24 & 0xFF, h2 & 0xFF, h2 >> 8 & 0xFF, h2 >> 16 & 0xFF, h2 >>> 24 & 0xFF, h3 & 0xFF, h3 >> 8 & 0xFF, h3 >> 16 & 0xFF, h3 >>> 24 & 0xFF]);
}
+
return hash;
}();
+
+exports.calculateMD5 = calculateMD5;
+
var Word64 = function Word64Closure() {
function Word64(highInteger, lowInteger) {
this.high = highInteger | 0;
this.low = lowInteger | 0;
}
+
Word64.prototype = {
and: function Word64_and(word) {
this.high &= word.high;
@@ -20473,6 +24727,7 @@ var Word64 = function Word64Closure() {
},
rotateRight: function Word64_rotateRight(places) {
var low, high;
+
if (places & 32) {
high = this.low;
low = this.high;
@@ -20480,6 +24735,7 @@ var Word64 = function Word64Closure() {
low = this.low;
high = this.high;
}
+
places &= 31;
this.low = low >>> places | high << 32 - places;
this.high = high >>> places | low << 32 - places;
@@ -20491,9 +24747,11 @@ var Word64 = function Word64Closure() {
add: function Word64_add(word) {
var lowAdd = (this.low >>> 0) + (word.low >>> 0);
var highAdd = (this.high >>> 0) + (word.high >>> 0);
+
if (lowAdd > 0xFFFFFFFF) {
highAdd += 1;
}
+
this.low = lowAdd | 0;
this.high = highAdd | 0;
},
@@ -20514,29 +24772,38 @@ var Word64 = function Word64Closure() {
};
return Word64;
}();
+
var calculateSHA256 = function calculateSHA256Closure() {
function rotr(x, n) {
return x >>> n | x << 32 - n;
}
+
function ch(x, y, z) {
return x & y ^ ~x & z;
}
+
function maj(x, y, z) {
return x & y ^ x & z ^ y & z;
}
+
function sigma(x) {
return rotr(x, 2) ^ rotr(x, 13) ^ rotr(x, 22);
}
+
function sigmaPrime(x) {
return rotr(x, 6) ^ rotr(x, 11) ^ rotr(x, 25);
}
+
function littleSigma(x) {
return rotr(x, 7) ^ rotr(x, 18) ^ x >>> 3;
}
+
function littleSigmaPrime(x) {
return rotr(x, 17) ^ rotr(x, 19) ^ x >>> 10;
}
+
var k = [0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2];
+
function hash(data, offset, length) {
var h0 = 0x6a09e667,
h1 = 0xbb67ae85,
@@ -20549,14 +24816,18 @@ var calculateSHA256 = function calculateSHA256Closure() {
var paddedLength = Math.ceil((length + 9) / 64) * 64;
var padded = new Uint8Array(paddedLength);
var i, j, n;
+
for (i = 0; i < length; ++i) {
padded[i] = data[offset++];
}
+
padded[i++] = 0x80;
n = paddedLength - 8;
+
while (i < n) {
padded[i++] = 0;
}
+
padded[i++] = 0;
padded[i++] = 0;
padded[i++] = 0;
@@ -20566,14 +24837,17 @@ var calculateSHA256 = function calculateSHA256Closure() {
padded[i++] = length >> 5 & 0xFF;
padded[i++] = length << 3 & 0xFF;
var w = new Uint32Array(64);
+
for (i = 0; i < paddedLength;) {
for (j = 0; j < 16; ++j) {
w[j] = padded[i] << 24 | padded[i + 1] << 16 | padded[i + 2] << 8 | padded[i + 3];
i += 4;
}
+
for (j = 16; j < 64; ++j) {
w[j] = littleSigmaPrime(w[j - 2]) + w[j - 7] + littleSigma(w[j - 15]) + w[j - 16] | 0;
}
+
var a = h0,
b = h1,
c = h2,
@@ -20584,6 +24858,7 @@ var calculateSHA256 = function calculateSHA256Closure() {
h = h7,
t1,
t2;
+
for (j = 0; j < 64; ++j) {
t1 = h + sigmaPrime(e) + ch(e, f, g) + k[j] + w[j];
t2 = sigma(a) + maj(a, b, c);
@@ -20596,6 +24871,7 @@ var calculateSHA256 = function calculateSHA256Closure() {
b = a;
a = t1 + t2 | 0;
}
+
h0 = h0 + a | 0;
h1 = h1 + b | 0;
h2 = h2 + c | 0;
@@ -20605,10 +24881,15 @@ var calculateSHA256 = function calculateSHA256Closure() {
h6 = h6 + g | 0;
h7 = h7 + h | 0;
}
+
return new Uint8Array([h0 >> 24 & 0xFF, h0 >> 16 & 0xFF, h0 >> 8 & 0xFF, h0 & 0xFF, h1 >> 24 & 0xFF, h1 >> 16 & 0xFF, h1 >> 8 & 0xFF, h1 & 0xFF, h2 >> 24 & 0xFF, h2 >> 16 & 0xFF, h2 >> 8 & 0xFF, h2 & 0xFF, h3 >> 24 & 0xFF, h3 >> 16 & 0xFF, h3 >> 8 & 0xFF, h3 & 0xFF, h4 >> 24 & 0xFF, h4 >> 16 & 0xFF, h4 >> 8 & 0xFF, h4 & 0xFF, h5 >> 24 & 0xFF, h5 >> 16 & 0xFF, h5 >> 8 & 0xFF, h5 & 0xFF, h6 >> 24 & 0xFF, h6 >> 16 & 0xFF, h6 >> 8 & 0xFF, h6 & 0xFF, h7 >> 24 & 0xFF, h7 >> 16 & 0xFF, h7 >> 8 & 0xFF, h7 & 0xFF]);
}
+
return hash;
}();
+
+exports.calculateSHA256 = calculateSHA256;
+
var calculateSHA512 = function calculateSHA512Closure() {
function ch(result, x, y, z, tmp) {
result.assign(x);
@@ -20618,6 +24899,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp.and(z);
result.xor(tmp);
}
+
function maj(result, x, y, z, tmp) {
result.assign(x);
result.and(y);
@@ -20628,6 +24910,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp.and(z);
result.xor(tmp);
}
+
function sigma(result, x, tmp) {
result.assign(x);
result.rotateRight(28);
@@ -20638,6 +24921,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp.rotateRight(39);
result.xor(tmp);
}
+
function sigmaPrime(result, x, tmp) {
result.assign(x);
result.rotateRight(14);
@@ -20648,6 +24932,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp.rotateRight(41);
result.xor(tmp);
}
+
function littleSigma(result, x, tmp) {
result.assign(x);
result.rotateRight(1);
@@ -20658,6 +24943,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp.shiftRight(7);
result.xor(tmp);
}
+
function littleSigmaPrime(result, x, tmp) {
result.assign(x);
result.rotateRight(19);
@@ -20668,10 +24954,13 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp.shiftRight(6);
result.xor(tmp);
}
+
var k = [new Word64(0x428a2f98, 0xd728ae22), new Word64(0x71374491, 0x23ef65cd), new Word64(0xb5c0fbcf, 0xec4d3b2f), new Word64(0xe9b5dba5, 0x8189dbbc), new Word64(0x3956c25b, 0xf348b538), new Word64(0x59f111f1, 0xb605d019), new Word64(0x923f82a4, 0xaf194f9b), new Word64(0xab1c5ed5, 0xda6d8118), new Word64(0xd807aa98, 0xa3030242), new Word64(0x12835b01, 0x45706fbe), new Word64(0x243185be, 0x4ee4b28c), new Word64(0x550c7dc3, 0xd5ffb4e2), new Word64(0x72be5d74, 0xf27b896f), new Word64(0x80deb1fe, 0x3b1696b1), new Word64(0x9bdc06a7, 0x25c71235), new Word64(0xc19bf174, 0xcf692694), new Word64(0xe49b69c1, 0x9ef14ad2), new Word64(0xefbe4786, 0x384f25e3), new Word64(0x0fc19dc6, 0x8b8cd5b5), new Word64(0x240ca1cc, 0x77ac9c65), new Word64(0x2de92c6f, 0x592b0275), new Word64(0x4a7484aa, 0x6ea6e483), new Word64(0x5cb0a9dc, 0xbd41fbd4), new Word64(0x76f988da, 0x831153b5), new Word64(0x983e5152, 0xee66dfab), new Word64(0xa831c66d, 0x2db43210), new Word64(0xb00327c8, 0x98fb213f), new Word64(0xbf597fc7, 0xbeef0ee4), new Word64(0xc6e00bf3, 0x3da88fc2), new Word64(0xd5a79147, 0x930aa725), new Word64(0x06ca6351, 0xe003826f), new Word64(0x14292967, 0x0a0e6e70), new Word64(0x27b70a85, 0x46d22ffc), new Word64(0x2e1b2138, 0x5c26c926), new Word64(0x4d2c6dfc, 0x5ac42aed), new Word64(0x53380d13, 0x9d95b3df), new Word64(0x650a7354, 0x8baf63de), new Word64(0x766a0abb, 0x3c77b2a8), new Word64(0x81c2c92e, 0x47edaee6), new Word64(0x92722c85, 0x1482353b), new Word64(0xa2bfe8a1, 0x4cf10364), new Word64(0xa81a664b, 0xbc423001), new Word64(0xc24b8b70, 0xd0f89791), new Word64(0xc76c51a3, 0x0654be30), new Word64(0xd192e819, 0xd6ef5218), new Word64(0xd6990624, 0x5565a910), new Word64(0xf40e3585, 0x5771202a), new Word64(0x106aa070, 0x32bbd1b8), new Word64(0x19a4c116, 0xb8d2d0c8), new Word64(0x1e376c08, 0x5141ab53), new Word64(0x2748774c, 0xdf8eeb99), new Word64(0x34b0bcb5, 0xe19b48a8), new Word64(0x391c0cb3, 0xc5c95a63), new Word64(0x4ed8aa4a, 0xe3418acb), new Word64(0x5b9cca4f, 0x7763e373), new Word64(0x682e6ff3, 0xd6b2b8a3), new Word64(0x748f82ee, 0x5defb2fc), new Word64(0x78a5636f, 0x43172f60), new Word64(0x84c87814, 0xa1f0ab72), new Word64(0x8cc70208, 0x1a6439ec), new Word64(0x90befffa, 0x23631e28), new Word64(0xa4506ceb, 0xde82bde9), new Word64(0xbef9a3f7, 0xb2c67915), new Word64(0xc67178f2, 0xe372532b), new Word64(0xca273ece, 0xea26619c), new Word64(0xd186b8c7, 0x21c0c207), new Word64(0xeada7dd6, 0xcde0eb1e), new Word64(0xf57d4f7f, 0xee6ed178), new Word64(0x06f067aa, 0x72176fba), new Word64(0x0a637dc5, 0xa2c898a6), new Word64(0x113f9804, 0xbef90dae), new Word64(0x1b710b35, 0x131c471b), new Word64(0x28db77f5, 0x23047d84), new Word64(0x32caab7b, 0x40c72493), new Word64(0x3c9ebe0a, 0x15c9bebc), new Word64(0x431d67c4, 0x9c100d4c), new Word64(0x4cc5d4be, 0xcb3e42b6), new Word64(0x597f299c, 0xfc657e2a), new Word64(0x5fcb6fab, 0x3ad6faec), new Word64(0x6c44198c, 0x4a475817)];
+
function hash(data, offset, length, mode384) {
mode384 = !!mode384;
var h0, h1, h2, h3, h4, h5, h6, h7;
+
if (!mode384) {
h0 = new Word64(0x6a09e667, 0xf3bcc908);
h1 = new Word64(0xbb67ae85, 0x84caa73b);
@@ -20691,17 +24980,22 @@ var calculateSHA512 = function calculateSHA512Closure() {
h6 = new Word64(0xdb0c2e0d, 0x64f98fa7);
h7 = new Word64(0x47b5481d, 0xbefa4fa4);
}
+
var paddedLength = Math.ceil((length + 17) / 128) * 128;
var padded = new Uint8Array(paddedLength);
var i, j, n;
+
for (i = 0; i < length; ++i) {
padded[i] = data[offset++];
}
+
padded[i++] = 0x80;
n = paddedLength - 16;
+
while (i < n) {
padded[i++] = 0;
}
+
padded[i++] = 0;
padded[i++] = 0;
padded[i++] = 0;
@@ -20719,9 +25013,11 @@ var calculateSHA512 = function calculateSHA512Closure() {
padded[i++] = length >> 5 & 0xFF;
padded[i++] = length << 3 & 0xFF;
var w = new Array(80);
+
for (i = 0; i < 80; i++) {
w[i] = new Word64(0, 0);
}
+
var a = new Word64(0, 0),
b = new Word64(0, 0),
c = new Word64(0, 0);
@@ -20735,12 +25031,14 @@ var calculateSHA512 = function calculateSHA512Closure() {
var tmp1 = new Word64(0, 0),
tmp2 = new Word64(0, 0),
tmp3;
+
for (i = 0; i < paddedLength;) {
for (j = 0; j < 16; ++j) {
w[j].high = padded[i] << 24 | padded[i + 1] << 16 | padded[i + 2] << 8 | padded[i + 3];
w[j].low = padded[i + 4] << 24 | padded[i + 5] << 16 | padded[i + 6] << 8 | padded[i + 7];
i += 8;
}
+
for (j = 16; j < 80; ++j) {
tmp3 = w[j];
littleSigmaPrime(tmp3, w[j - 2], tmp2);
@@ -20749,6 +25047,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp3.add(tmp1);
tmp3.add(w[j - 16]);
}
+
a.assign(h0);
b.assign(h1);
c.assign(h2);
@@ -20757,6 +25056,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
f.assign(h5);
g.assign(h6);
h.assign(h7);
+
for (j = 0; j < 80; ++j) {
t1.assign(h);
sigmaPrime(tmp1, e, tmp2);
@@ -20781,6 +25081,7 @@ var calculateSHA512 = function calculateSHA512Closure() {
tmp3.add(t2);
a = tmp3;
}
+
h0.add(a);
h1.add(b);
h2.add(c);
@@ -20790,7 +25091,9 @@ var calculateSHA512 = function calculateSHA512Closure() {
h6.add(g);
h7.add(h);
}
+
var result;
+
if (!mode384) {
result = new Uint8Array(64);
h0.copyTo(result, 0);
@@ -20810,18 +25113,28 @@ var calculateSHA512 = function calculateSHA512Closure() {
h4.copyTo(result, 32);
h5.copyTo(result, 40);
}
+
return result;
}
+
return hash;
}();
+
+exports.calculateSHA512 = calculateSHA512;
+
var calculateSHA384 = function calculateSHA384Closure() {
function hash(data, offset, length) {
return calculateSHA512(data, offset, length, true);
}
+
return hash;
}();
+
+exports.calculateSHA384 = calculateSHA384;
+
var NullCipher = function NullCipherClosure() {
function NullCipher() {}
+
NullCipher.prototype = {
decryptBlock: function NullCipher_decryptBlock(data) {
return data;
@@ -20830,17 +25143,21 @@ var NullCipher = function NullCipherClosure() {
return NullCipher;
}();
-var AESBaseCipher = function () {
+var AESBaseCipher =
+/*#__PURE__*/
+function () {
function AESBaseCipher() {
_classCallCheck(this, AESBaseCipher);
if (this.constructor === AESBaseCipher) {
(0, _util.unreachable)('Cannot initialize AESBaseCipher.');
}
+
this._s = new Uint8Array([0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16]);
this._inv_s = new Uint8Array([0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d]);
this._mix = new Uint32Array([0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927, 0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45, 0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb, 0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381, 0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf, 0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66, 0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28, 0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012, 0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec, 0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e, 0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd, 0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7, 0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89, 0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b, 0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815, 0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f, 0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa, 0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8, 0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36, 0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c, 0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742, 0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea, 0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4, 0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e, 0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360, 0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502, 0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87, 0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd, 0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3, 0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621, 0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f, 0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55, 0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26, 0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844, 0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba, 0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480, 0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce, 0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67, 0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929, 0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713, 0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed, 0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f, 0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
this._mixCol = new Uint8Array(256);
+
for (var i = 0; i < 256; i++) {
if (i < 128) {
this._mixCol[i] = i << 1;
@@ -20848,26 +25165,27 @@ var AESBaseCipher = function () {
this._mixCol[i] = i << 1 ^ 0x1b;
}
}
+
this.buffer = new Uint8Array(16);
this.bufferPosition = 0;
}
_createClass(AESBaseCipher, [{
- key: '_expandKey',
+ key: "_expandKey",
value: function _expandKey(cipherKey) {
(0, _util.unreachable)('Cannot call `_expandKey` on the base class');
}
}, {
- key: '_decrypt',
+ key: "_decrypt",
value: function _decrypt(input, key) {
- var t = void 0,
- u = void 0,
- v = void 0;
+ var t, u, v;
var state = new Uint8Array(16);
state.set(input);
+
for (var j = 0, k = this._keySize; j < 16; ++j, ++k) {
state[j] ^= key[k];
}
+
for (var i = this._cyclesOfRepetition - 1; i >= 1; --i) {
t = state[13];
state[13] = state[9];
@@ -20887,12 +25205,15 @@ var AESBaseCipher = function () {
state[11] = t;
state[7] = u;
state[3] = v;
+
for (var _j = 0; _j < 16; ++_j) {
state[_j] = this._inv_s[state[_j]];
}
+
for (var _j2 = 0, _k = i * 16; _j2 < 16; ++_j2, ++_k) {
state[_j2] ^= key[_k];
}
+
for (var _j3 = 0; _j3 < 16; _j3 += 4) {
var s0 = this._mix[state[_j3]];
var s1 = this._mix[state[_j3 + 1]];
@@ -20905,6 +25226,7 @@ var AESBaseCipher = function () {
state[_j3 + 3] = t & 0xFF;
}
}
+
t = state[13];
state[13] = state[9];
state[9] = state[5];
@@ -20923,28 +25245,31 @@ var AESBaseCipher = function () {
state[11] = t;
state[7] = u;
state[3] = v;
+
for (var _j4 = 0; _j4 < 16; ++_j4) {
state[_j4] = this._inv_s[state[_j4]];
state[_j4] ^= key[_j4];
}
+
return state;
}
}, {
- key: '_encrypt',
+ key: "_encrypt",
value: function _encrypt(input, key) {
var s = this._s;
- var t = void 0,
- u = void 0,
- v = void 0;
+ var t, u, v;
var state = new Uint8Array(16);
state.set(input);
+
for (var j = 0; j < 16; ++j) {
state[j] ^= key[j];
}
+
for (var i = 1; i < this._cyclesOfRepetition; i++) {
for (var _j5 = 0; _j5 < 16; ++_j5) {
state[_j5] = s[state[_j5]];
}
+
v = state[1];
state[1] = state[5];
state[5] = state[9];
@@ -20963,6 +25288,7 @@ var AESBaseCipher = function () {
state[7] = v;
state[11] = u;
state[15] = t;
+
for (var _j6 = 0; _j6 < 16; _j6 += 4) {
var s0 = state[_j6 + 0];
var s1 = state[_j6 + 1];
@@ -20974,13 +25300,16 @@ var AESBaseCipher = function () {
state[_j6 + 2] ^= t ^ this._mixCol[s2 ^ s3];
state[_j6 + 3] ^= t ^ this._mixCol[s3 ^ s0];
}
+
for (var _j7 = 0, k = i * 16; _j7 < 16; ++_j7, ++k) {
state[_j7] ^= key[k];
}
}
+
for (var _j8 = 0; _j8 < 16; ++_j8) {
state[_j8] = s[state[_j8]];
}
+
v = state[1];
state[1] = state[5];
state[5] = state[9];
@@ -20999,44 +25328,56 @@ var AESBaseCipher = function () {
state[7] = v;
state[11] = u;
state[15] = t;
+
for (var _j9 = 0, _k2 = this._keySize; _j9 < 16; ++_j9, ++_k2) {
state[_j9] ^= key[_k2];
}
+
return state;
}
}, {
- key: '_decryptBlock2',
+ key: "_decryptBlock2",
value: function _decryptBlock2(data, finalize) {
var sourceLength = data.length;
var buffer = this.buffer,
bufferLength = this.bufferPosition;
var result = [],
iv = this.iv;
+
for (var i = 0; i < sourceLength; ++i) {
buffer[bufferLength] = data[i];
++bufferLength;
+
if (bufferLength < 16) {
continue;
}
+
var plain = this._decrypt(buffer, this._key);
+
for (var j = 0; j < 16; ++j) {
plain[j] ^= iv[j];
}
+
iv = buffer;
result.push(plain);
buffer = new Uint8Array(16);
bufferLength = 0;
}
+
this.buffer = buffer;
this.bufferLength = bufferLength;
this.iv = iv;
+
if (result.length === 0) {
return new Uint8Array(0);
}
+
var outputLength = 16 * result.length;
+
if (finalize) {
var lastBlock = result[result.length - 1];
var psLen = lastBlock[15];
+
if (psLen <= 16) {
for (var _i = 15, ii = 16 - psLen; _i >= ii; --_i) {
if (lastBlock[_i] !== psLen) {
@@ -21044,78 +25385,96 @@ var AESBaseCipher = function () {
break;
}
}
+
outputLength -= psLen;
result[result.length - 1] = lastBlock.subarray(0, 16 - psLen);
}
}
+
var output = new Uint8Array(outputLength);
+
for (var _i2 = 0, _j10 = 0, _ii = result.length; _i2 < _ii; ++_i2, _j10 += 16) {
output.set(result[_i2], _j10);
}
+
return output;
}
}, {
- key: 'decryptBlock',
+ key: "decryptBlock",
value: function decryptBlock(data, finalize) {
var iv = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-
var sourceLength = data.length;
var buffer = this.buffer,
bufferLength = this.bufferPosition;
+
if (iv) {
this.iv = iv;
} else {
for (var i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength) {
buffer[bufferLength] = data[i];
}
+
if (bufferLength < 16) {
this.bufferLength = bufferLength;
return new Uint8Array(0);
}
+
this.iv = buffer;
data = data.subarray(16);
}
+
this.buffer = new Uint8Array(16);
this.bufferLength = 0;
this.decryptBlock = this._decryptBlock2;
return this.decryptBlock(data, finalize);
}
}, {
- key: 'encrypt',
+ key: "encrypt",
value: function encrypt(data, iv) {
var sourceLength = data.length;
var buffer = this.buffer,
bufferLength = this.bufferPosition;
var result = [];
+
if (!iv) {
iv = new Uint8Array(16);
}
+
for (var i = 0; i < sourceLength; ++i) {
buffer[bufferLength] = data[i];
++bufferLength;
+
if (bufferLength < 16) {
continue;
}
+
for (var j = 0; j < 16; ++j) {
buffer[j] ^= iv[j];
}
+
var cipher = this._encrypt(buffer, this._key);
+
iv = cipher;
result.push(cipher);
buffer = new Uint8Array(16);
bufferLength = 0;
}
+
this.buffer = buffer;
this.bufferLength = bufferLength;
this.iv = iv;
+
if (result.length === 0) {
return new Uint8Array(0);
}
+
var outputLength = 16 * result.length;
var output = new Uint8Array(outputLength);
+
for (var _i3 = 0, _j11 = 0, ii = result.length; _i3 < ii; ++_i3, _j11 += 16) {
output.set(result[_i3], _j11);
}
+
return output;
}
}]);
@@ -21123,14 +25482,17 @@ var AESBaseCipher = function () {
return AESBaseCipher;
}();
-var AES128Cipher = function (_AESBaseCipher) {
+var AES128Cipher =
+/*#__PURE__*/
+function (_AESBaseCipher) {
_inherits(AES128Cipher, _AESBaseCipher);
function AES128Cipher(key) {
- _classCallCheck(this, AES128Cipher);
+ var _this;
- var _this = _possibleConstructorReturn(this, (AES128Cipher.__proto__ || Object.getPrototypeOf(AES128Cipher)).call(this));
+ _classCallCheck(this, AES128Cipher);
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(AES128Cipher).call(this));
_this._cyclesOfRepetition = 10;
_this._keySize = 160;
_this._rcon = new Uint8Array([0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d]);
@@ -21139,13 +25501,14 @@ var AES128Cipher = function (_AESBaseCipher) {
}
_createClass(AES128Cipher, [{
- key: '_expandKey',
+ key: "_expandKey",
value: function _expandKey(cipherKey) {
var b = 176;
var s = this._s;
var rcon = this._rcon;
var result = new Uint8Array(b);
result.set(cipherKey);
+
for (var j = 16, i = 1; j < b; ++i) {
var t1 = result[j - 3];
var t2 = result[j - 2];
@@ -21156,6 +25519,7 @@ var AES128Cipher = function (_AESBaseCipher) {
t3 = s[t3];
t4 = s[t4];
t1 = t1 ^ rcon[i];
+
for (var n = 0; n < 4; ++n) {
result[j] = t1 ^= result[j - 16];
j++;
@@ -21167,6 +25531,7 @@ var AES128Cipher = function (_AESBaseCipher) {
j++;
}
}
+
return result;
}
}]);
@@ -21174,14 +25539,19 @@ var AES128Cipher = function (_AESBaseCipher) {
return AES128Cipher;
}(AESBaseCipher);
-var AES256Cipher = function (_AESBaseCipher2) {
+exports.AES128Cipher = AES128Cipher;
+
+var AES256Cipher =
+/*#__PURE__*/
+function (_AESBaseCipher2) {
_inherits(AES256Cipher, _AESBaseCipher2);
function AES256Cipher(key) {
- _classCallCheck(this, AES256Cipher);
+ var _this2;
- var _this2 = _possibleConstructorReturn(this, (AES256Cipher.__proto__ || Object.getPrototypeOf(AES256Cipher)).call(this));
+ _classCallCheck(this, AES256Cipher);
+ _this2 = _possibleConstructorReturn(this, _getPrototypeOf(AES256Cipher).call(this));
_this2._cyclesOfRepetition = 14;
_this2._keySize = 224;
_this2._key = _this2._expandKey(key);
@@ -21189,17 +25559,15 @@ var AES256Cipher = function (_AESBaseCipher2) {
}
_createClass(AES256Cipher, [{
- key: '_expandKey',
+ key: "_expandKey",
value: function _expandKey(cipherKey) {
var b = 240;
var s = this._s;
var result = new Uint8Array(b);
result.set(cipherKey);
var r = 1;
- var t1 = void 0,
- t2 = void 0,
- t3 = void 0,
- t4 = void 0;
+ var t1, t2, t3, t4;
+
for (var j = 32, i = 1; j < b; ++i) {
if (j % 32 === 16) {
t1 = s[t1];
@@ -21216,10 +25584,12 @@ var AES256Cipher = function (_AESBaseCipher2) {
t3 = s[t3];
t4 = s[t4];
t1 = t1 ^ r;
+
if ((r <<= 1) >= 256) {
r = (r ^ 0x1b) & 0xFF;
}
}
+
for (var n = 0; n < 4; ++n) {
result[j] = t1 ^= result[j - 32];
j++;
@@ -21231,6 +25601,7 @@ var AES256Cipher = function (_AESBaseCipher2) {
j++;
}
}
+
return result;
}
}]);
@@ -21238,19 +25609,25 @@ var AES256Cipher = function (_AESBaseCipher2) {
return AES256Cipher;
}(AESBaseCipher);
+exports.AES256Cipher = AES256Cipher;
+
var PDF17 = function PDF17Closure() {
function compareByteArrays(array1, array2) {
if (array1.length !== array2.length) {
return false;
}
+
for (var i = 0; i < array1.length; i++) {
if (array1[i] !== array2[i]) {
return false;
}
}
+
return true;
}
+
function PDF17() {}
+
PDF17.prototype = {
checkOwnerPassword: function PDF17_checkOwnerPassword(password, ownerValidationSalt, userBytes, ownerPassword) {
var hashData = new Uint8Array(password.length + 56);
@@ -21287,6 +25664,9 @@ var PDF17 = function PDF17Closure() {
};
return PDF17;
}();
+
+exports.PDF17 = PDF17;
+
var PDF20 = function PDF20Closure() {
function concatArrays(array1, array2) {
var t = new Uint8Array(array1.length + array2.length);
@@ -21294,27 +25674,33 @@ var PDF20 = function PDF20Closure() {
t.set(array2, array1.length);
return t;
}
+
function calculatePDF20Hash(password, input, userBytes) {
var k = calculateSHA256(input, 0, input.length).subarray(0, 32);
var e = [0];
var i = 0;
+
while (i < 64 || e[e.length - 1] > i - 32) {
var arrayLength = password.length + k.length + userBytes.length;
var k1 = new Uint8Array(arrayLength * 64);
var array = concatArrays(password, k);
array = concatArrays(array, userBytes);
+
for (var j = 0, pos = 0; j < 64; j++, pos += arrayLength) {
k1.set(array, pos);
}
+
var cipher = new AES128Cipher(k.subarray(0, 16));
e = cipher.encrypt(k1, k.subarray(16, 32));
var remainder = 0;
+
for (var z = 0; z < 16; z++) {
remainder *= 256 % 3;
remainder %= 3;
remainder += (e[z] >>> 0) % 3;
remainder %= 3;
}
+
if (remainder === 0) {
k = calculateSHA256(e, 0, e.length);
} else if (remainder === 1) {
@@ -21322,22 +25708,29 @@ var PDF20 = function PDF20Closure() {
} else if (remainder === 2) {
k = calculateSHA512(e, 0, e.length);
}
+
i++;
}
+
return k.subarray(0, 32);
}
+
function PDF20() {}
+
function compareByteArrays(array1, array2) {
if (array1.length !== array2.length) {
return false;
}
+
for (var i = 0; i < array1.length; i++) {
if (array1[i] !== array2[i]) {
return false;
}
}
+
return true;
}
+
PDF20.prototype = {
hash: function PDF20_hash(password, concatBytes, userBytes) {
return calculatePDF20Hash(password, concatBytes, userBytes);
@@ -21377,11 +25770,15 @@ var PDF20 = function PDF20Closure() {
};
return PDF20;
}();
+
+exports.PDF20 = PDF20;
+
var CipherTransform = function CipherTransformClosure() {
function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
this.StringCipherConstructor = stringCipherConstructor;
this.StreamCipherConstructor = streamCipherConstructor;
}
+
CipherTransform.prototype = {
createStream: function CipherTransform_createStream(stream, length) {
var cipher = new this.StreamCipherConstructor();
@@ -21398,8 +25795,10 @@ var CipherTransform = function CipherTransformClosure() {
};
return CipherTransform;
}();
+
var CipherTransformFactory = function CipherTransformFactoryClosure() {
var defaultPasswordBytes = new Uint8Array([0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08, 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
+
function createEncryptionKey20(revision, password, ownerPassword, ownerValidationSalt, ownerKeySalt, uBytes, userPassword, userValidationSalt, userKeySalt, ownerEncryption, userEncryption, perms) {
if (password) {
var passwordLength = Math.min(127, password.length);
@@ -21407,79 +25806,101 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() {
} else {
password = [];
}
+
var pdfAlgorithm;
+
if (revision === 6) {
pdfAlgorithm = new PDF20();
} else {
pdfAlgorithm = new PDF17();
}
+
if (pdfAlgorithm.checkUserPassword(password, userValidationSalt, userPassword)) {
return pdfAlgorithm.getUserKey(password, userKeySalt, userEncryption);
} else if (password.length && pdfAlgorithm.checkOwnerPassword(password, ownerValidationSalt, uBytes, ownerPassword)) {
return pdfAlgorithm.getOwnerKey(password, ownerKeySalt, uBytes, ownerEncryption);
}
+
return null;
}
+
function prepareKeyData(fileId, password, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata) {
var hashDataSize = 40 + ownerPassword.length + fileId.length;
var hashData = new Uint8Array(hashDataSize),
i = 0,
j,
n;
+
if (password) {
n = Math.min(32, password.length);
+
for (; i < n; ++i) {
hashData[i] = password[i];
}
}
+
j = 0;
+
while (i < 32) {
hashData[i++] = defaultPasswordBytes[j++];
}
+
for (j = 0, n = ownerPassword.length; j < n; ++j) {
hashData[i++] = ownerPassword[j];
}
+
hashData[i++] = flags & 0xFF;
hashData[i++] = flags >> 8 & 0xFF;
hashData[i++] = flags >> 16 & 0xFF;
hashData[i++] = flags >>> 24 & 0xFF;
+
for (j = 0, n = fileId.length; j < n; ++j) {
hashData[i++] = fileId[j];
}
+
if (revision >= 4 && !encryptMetadata) {
hashData[i++] = 0xFF;
hashData[i++] = 0xFF;
hashData[i++] = 0xFF;
hashData[i++] = 0xFF;
}
+
var hash = calculateMD5(hashData, 0, i);
var keyLengthInBytes = keyLength >> 3;
+
if (revision >= 3) {
for (j = 0; j < 50; ++j) {
hash = calculateMD5(hash, 0, keyLengthInBytes);
}
}
+
var encryptionKey = hash.subarray(0, keyLengthInBytes);
var cipher, checkData;
+
if (revision >= 3) {
for (i = 0; i < 32; ++i) {
hashData[i] = defaultPasswordBytes[i];
}
+
for (j = 0, n = fileId.length; j < n; ++j) {
hashData[i++] = fileId[j];
}
+
cipher = new ARCFourCipher(encryptionKey);
checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
n = encryptionKey.length;
var derivedKey = new Uint8Array(n),
k;
+
for (j = 1; j <= 19; ++j) {
for (k = 0; k < n; ++k) {
derivedKey[k] = encryptionKey[k] ^ j;
}
+
cipher = new ARCFourCipher(derivedKey);
checkData = cipher.encryptBlock(checkData);
}
+
for (j = 0, n = checkData.length; j < n; ++j) {
if (userPassword[j] !== checkData[j]) {
return null;
@@ -21488,43 +25909,55 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() {
} else {
cipher = new ARCFourCipher(encryptionKey);
checkData = cipher.encryptBlock(defaultPasswordBytes);
+
for (j = 0, n = checkData.length; j < n; ++j) {
if (userPassword[j] !== checkData[j]) {
return null;
}
}
}
+
return encryptionKey;
}
+
function decodeUserPassword(password, ownerPassword, revision, keyLength) {
var hashData = new Uint8Array(32),
i = 0,
j,
n;
n = Math.min(32, password.length);
+
for (; i < n; ++i) {
hashData[i] = password[i];
}
+
j = 0;
+
while (i < 32) {
hashData[i++] = defaultPasswordBytes[j++];
}
+
var hash = calculateMD5(hashData, 0, i);
var keyLengthInBytes = keyLength >> 3;
+
if (revision >= 3) {
for (j = 0; j < 50; ++j) {
hash = calculateMD5(hash, 0, hash.length);
}
}
+
var cipher, userPassword;
+
if (revision >= 3) {
userPassword = ownerPassword;
var derivedKey = new Uint8Array(keyLengthInBytes),
k;
+
for (j = 19; j >= 0; j--) {
for (k = 0; k < keyLengthInBytes; ++k) {
derivedKey[k] = hash[k] ^ j;
}
+
cipher = new ARCFourCipher(derivedKey);
userPassword = cipher.encryptBlock(userPassword);
}
@@ -21532,40 +25965,52 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() {
cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
userPassword = cipher.encryptBlock(ownerPassword);
}
+
return userPassword;
}
+
var identityName = _primitives.Name.get('Identity');
+
function CipherTransformFactory(dict, fileId, password) {
var filter = dict.get('Filter');
+
if (!(0, _primitives.isName)(filter, 'Standard')) {
throw new _util.FormatError('unknown encryption method');
}
+
this.dict = dict;
var algorithm = dict.get('V');
+
if (!Number.isInteger(algorithm) || algorithm !== 1 && algorithm !== 2 && algorithm !== 4 && algorithm !== 5) {
throw new _util.FormatError('unsupported encryption algorithm');
}
+
this.algorithm = algorithm;
var keyLength = dict.get('Length');
+
if (!keyLength) {
if (algorithm <= 3) {
keyLength = 40;
} else {
var cfDict = dict.get('CF');
var streamCryptoName = dict.get('StmF');
+
if ((0, _primitives.isDict)(cfDict) && (0, _primitives.isName)(streamCryptoName)) {
cfDict.suppressEncryption = true;
var handlerDict = cfDict.get(streamCryptoName.name);
keyLength = handlerDict && handlerDict.get('Length') || 128;
+
if (keyLength < 40) {
keyLength <<= 3;
}
}
}
}
+
if (!Number.isInteger(keyLength) || keyLength < 40 || keyLength % 8 !== 0) {
throw new _util.FormatError('invalid key length');
}
+
var ownerPassword = (0, _util.stringToBytes)(dict.get('O')).subarray(0, 32);
var userPassword = (0, _util.stringToBytes)(dict.get('U')).subarray(0, 32);
var flags = dict.get('P');
@@ -21574,6 +26019,7 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() {
this.encryptMetadata = encryptMetadata;
var fileIdBytes = (0, _util.stringToBytes)(fileId);
var passwordBytes;
+
if (password) {
if (revision === 6) {
try {
@@ -21582,9 +26028,12 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() {
(0, _util.warn)('CipherTransformFactory: ' + 'Unable to convert UTF8 encoded password.');
}
}
+
passwordBytes = (0, _util.stringToBytes)(password);
}
+
var encryptionKey;
+
if (algorithm !== 5) {
encryptionKey = prepareKeyData(fileIdBytes, passwordBytes, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata);
} else {
@@ -21598,103 +26047,118 @@ var CipherTransformFactory = function CipherTransformFactoryClosure() {
var perms = (0, _util.stringToBytes)(dict.get('Perms'));
encryptionKey = createEncryptionKey20(revision, passwordBytes, ownerPassword, ownerValidationSalt, ownerKeySalt, uBytes, userPassword, userValidationSalt, userKeySalt, ownerEncryption, userEncryption, perms);
}
+
if (!encryptionKey && !password) {
throw new _util.PasswordException('No password given', _util.PasswordResponses.NEED_PASSWORD);
} else if (!encryptionKey && password) {
var decodedPassword = decodeUserPassword(passwordBytes, ownerPassword, revision, keyLength);
encryptionKey = prepareKeyData(fileIdBytes, decodedPassword, ownerPassword, userPassword, flags, revision, keyLength, encryptMetadata);
}
+
if (!encryptionKey) {
throw new _util.PasswordException('Incorrect Password', _util.PasswordResponses.INCORRECT_PASSWORD);
}
+
this.encryptionKey = encryptionKey;
+
if (algorithm >= 4) {
var cf = dict.get('CF');
+
if ((0, _primitives.isDict)(cf)) {
cf.suppressEncryption = true;
}
+
this.cf = cf;
this.stmf = dict.get('StmF') || identityName;
this.strf = dict.get('StrF') || identityName;
this.eff = dict.get('EFF') || this.stmf;
}
}
+
function buildObjectKey(num, gen, encryptionKey, isAes) {
var key = new Uint8Array(encryptionKey.length + 9),
i,
n;
+
for (i = 0, n = encryptionKey.length; i < n; ++i) {
key[i] = encryptionKey[i];
}
+
key[i++] = num & 0xFF;
key[i++] = num >> 8 & 0xFF;
key[i++] = num >> 16 & 0xFF;
key[i++] = gen & 0xFF;
key[i++] = gen >> 8 & 0xFF;
+
if (isAes) {
key[i++] = 0x73;
key[i++] = 0x41;
key[i++] = 0x6C;
key[i++] = 0x54;
}
+
var hash = calculateMD5(key, 0, i);
return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
}
+
function buildCipherConstructor(cf, name, num, gen, key) {
if (!(0, _primitives.isName)(name)) {
throw new _util.FormatError('Invalid crypt filter name.');
}
+
var cryptFilter = cf.get(name.name);
var cfm;
+
if (cryptFilter !== null && cryptFilter !== undefined) {
cfm = cryptFilter.get('CFM');
}
+
if (!cfm || cfm.name === 'None') {
return function cipherTransformFactoryBuildCipherConstructorNone() {
return new NullCipher();
};
}
+
if (cfm.name === 'V2') {
return function cipherTransformFactoryBuildCipherConstructorV2() {
return new ARCFourCipher(buildObjectKey(num, gen, key, false));
};
}
+
if (cfm.name === 'AESV2') {
return function cipherTransformFactoryBuildCipherConstructorAESV2() {
return new AES128Cipher(buildObjectKey(num, gen, key, true));
};
}
+
if (cfm.name === 'AESV3') {
return function cipherTransformFactoryBuildCipherConstructorAESV3() {
return new AES256Cipher(key);
};
}
+
throw new _util.FormatError('Unknown crypto method');
}
+
CipherTransformFactory.prototype = {
createCipherTransform: function CipherTransformFactory_createCipherTransform(num, gen) {
if (this.algorithm === 4 || this.algorithm === 5) {
return new CipherTransform(buildCipherConstructor(this.cf, this.stmf, num, gen, this.encryptionKey), buildCipherConstructor(this.cf, this.strf, num, gen, this.encryptionKey));
}
+
var key = buildObjectKey(num, gen, this.encryptionKey, false);
+
var cipherConstructor = function buildCipherCipherConstructor() {
return new ARCFourCipher(key);
};
+
return new CipherTransform(cipherConstructor, cipherConstructor);
}
};
return CipherTransformFactory;
}();
-exports.AES128Cipher = AES128Cipher;
-exports.AES256Cipher = AES256Cipher;
-exports.ARCFourCipher = ARCFourCipher;
+
exports.CipherTransformFactory = CipherTransformFactory;
-exports.PDF17 = PDF17;
-exports.PDF20 = PDF20;
-exports.calculateMD5 = calculateMD5;
-exports.calculateSHA256 = calculateSHA256;
-exports.calculateSHA384 = calculateSHA384;
-exports.calculateSHA512 = calculateSHA512;
/***/ }),
/* 155 */
@@ -21706,34 +26170,47 @@ exports.calculateSHA512 = calculateSHA512;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.ColorSpace = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.ColorSpace = void 0;
var _util = __w_pdfjs_require__(2);
var _primitives = __w_pdfjs_require__(142);
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
function resizeRgbImage(src, dest, w1, h1, w2, h2, alpha01) {
var COMPONENTS = 3;
alpha01 = alpha01 !== 1 ? 0 : alpha01;
var xRatio = w1 / w2;
var yRatio = h1 / h2;
var newIndex = 0,
- oldIndex = void 0;
+ oldIndex;
var xScaled = new Uint16Array(w2);
var w1Scanline = w1 * COMPONENTS;
+
for (var i = 0; i < w2; i++) {
xScaled[i] = Math.floor(i * xRatio) * COMPONENTS;
}
+
for (var _i = 0; _i < h2; _i++) {
var py = Math.floor(_i * yRatio) * w1Scanline;
+
for (var j = 0; j < w2; j++) {
oldIndex = py + xScaled[j];
dest[newIndex++] = src[oldIndex++];
@@ -21744,62 +26221,70 @@ function resizeRgbImage(src, dest, w1, h1, w2, h2, alpha01) {
}
}
-var ColorSpace = function () {
+var ColorSpace =
+/*#__PURE__*/
+function () {
function ColorSpace(name, numComps) {
_classCallCheck(this, ColorSpace);
if (this.constructor === ColorSpace) {
(0, _util.unreachable)('Cannot initialize ColorSpace.');
}
+
this.name = name;
this.numComps = numComps;
}
_createClass(ColorSpace, [{
- key: 'getRgb',
+ key: "getRgb",
value: function getRgb(src, srcOffset) {
var rgb = new Uint8ClampedArray(3);
this.getRgbItem(src, srcOffset, rgb, 0);
return rgb;
}
}, {
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
(0, _util.unreachable)('Should not call ColorSpace.getRgbItem');
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
(0, _util.unreachable)('Should not call ColorSpace.getRgbBuffer');
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
(0, _util.unreachable)('Should not call ColorSpace.getOutputLength');
}
}, {
- key: 'isPassthrough',
+ key: "isPassthrough",
value: function isPassthrough(bits) {
return false;
}
}, {
- key: 'fillRgb',
+ key: "fillRgb",
value: function fillRgb(dest, originalWidth, originalHeight, width, height, actualHeight, bpc, comps, alpha01) {
var count = originalWidth * originalHeight;
var rgbBuf = null;
var numComponentColors = 1 << bpc;
var needsResizing = originalHeight !== height || originalWidth !== width;
+
if (this.isPassthrough(bpc)) {
rgbBuf = comps;
} else if (this.numComps === 1 && count > numComponentColors && this.name !== 'DeviceGray' && this.name !== 'DeviceRGB') {
var allColors = bpc <= 8 ? new Uint8Array(numComponentColors) : new Uint16Array(numComponentColors);
+
for (var i = 0; i < numComponentColors; i++) {
allColors[i] = i;
}
+
var colorMap = new Uint8ClampedArray(numComponentColors * 3);
this.getRgbBuffer(allColors, 0, numComponentColors, colorMap, 0, bpc, 0);
+
if (!needsResizing) {
var destPos = 0;
+
for (var _i2 = 0; _i2 < count; ++_i2) {
var key = comps[_i2] * 3;
dest[destPos++] = colorMap[key];
@@ -21810,8 +26295,10 @@ var ColorSpace = function () {
} else {
rgbBuf = new Uint8Array(count * 3);
var rgbPos = 0;
+
for (var _i3 = 0; _i3 < count; ++_i3) {
var _key = comps[_i3] * 3;
+
rgbBuf[rgbPos++] = colorMap[_key];
rgbBuf[rgbPos++] = colorMap[_key + 1];
rgbBuf[rgbPos++] = colorMap[_key + 2];
@@ -21825,12 +26312,14 @@ var ColorSpace = function () {
this.getRgbBuffer(comps, 0, count, rgbBuf, 0, bpc, 0);
}
}
+
if (rgbBuf) {
if (needsResizing) {
resizeRgbImage(rgbBuf, dest, originalWidth, originalHeight, width, height, alpha01);
} else {
var _destPos = 0,
_rgbPos = 0;
+
for (var _i4 = 0, ii = width * actualHeight; _i4 < ii; _i4++) {
dest[_destPos++] = rgbBuf[_rgbPos++];
dest[_destPos++] = rgbBuf[_rgbPos++];
@@ -21841,127 +26330,146 @@ var ColorSpace = function () {
}
}
}, {
- key: 'usesZeroToOneRange',
+ key: "usesZeroToOneRange",
get: function get() {
return (0, _util.shadow)(this, 'usesZeroToOneRange', true);
}
}], [{
- key: 'parse',
+ key: "parse",
value: function parse(cs, xref, res, pdfFunctionFactory) {
var IR = this.parseToIR(cs, xref, res, pdfFunctionFactory);
return this.fromIR(IR);
}
}, {
- key: 'fromIR',
+ key: "fromIR",
value: function fromIR(IR) {
var name = Array.isArray(IR) ? IR[0] : IR;
- var whitePoint = void 0,
- blackPoint = void 0,
- gamma = void 0;
+ var whitePoint, blackPoint, gamma;
+
switch (name) {
case 'DeviceGrayCS':
return this.singletons.gray;
+
case 'DeviceRgbCS':
return this.singletons.rgb;
+
case 'DeviceCmykCS':
return this.singletons.cmyk;
+
case 'CalGrayCS':
whitePoint = IR[1];
blackPoint = IR[2];
gamma = IR[3];
return new CalGrayCS(whitePoint, blackPoint, gamma);
+
case 'CalRGBCS':
whitePoint = IR[1];
blackPoint = IR[2];
gamma = IR[3];
var matrix = IR[4];
return new CalRGBCS(whitePoint, blackPoint, gamma, matrix);
+
case 'PatternCS':
var basePatternCS = IR[1];
+
if (basePatternCS) {
basePatternCS = this.fromIR(basePatternCS);
}
+
return new PatternCS(basePatternCS);
+
case 'IndexedCS':
var baseIndexedCS = IR[1];
var hiVal = IR[2];
var lookup = IR[3];
return new IndexedCS(this.fromIR(baseIndexedCS), hiVal, lookup);
+
case 'AlternateCS':
var numComps = IR[1];
var alt = IR[2];
var tintFn = IR[3];
return new AlternateCS(numComps, this.fromIR(alt), tintFn);
+
case 'LabCS':
whitePoint = IR[1];
blackPoint = IR[2];
var range = IR[3];
return new LabCS(whitePoint, blackPoint, range);
+
default:
- throw new _util.FormatError('Unknown colorspace name: ' + name);
+ throw new _util.FormatError("Unknown colorspace name: ".concat(name));
}
}
}, {
- key: 'parseToIR',
+ key: "parseToIR",
value: function parseToIR(cs, xref) {
var res = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
- var pdfFunctionFactory = arguments[3];
-
+ var pdfFunctionFactory = arguments.length > 3 ? arguments[3] : undefined;
cs = xref.fetchIfRef(cs);
+
if ((0, _primitives.isName)(cs)) {
switch (cs.name) {
case 'DeviceGray':
case 'G':
return 'DeviceGrayCS';
+
case 'DeviceRGB':
case 'RGB':
return 'DeviceRgbCS';
+
case 'DeviceCMYK':
case 'CMYK':
return 'DeviceCmykCS';
+
case 'Pattern':
return ['PatternCS', null];
+
default:
if ((0, _primitives.isDict)(res)) {
var colorSpaces = res.get('ColorSpace');
+
if ((0, _primitives.isDict)(colorSpaces)) {
var resCS = colorSpaces.get(cs.name);
+
if (resCS) {
if ((0, _primitives.isName)(resCS)) {
return this.parseToIR(resCS, xref, res, pdfFunctionFactory);
}
+
cs = resCS;
break;
}
}
}
- throw new _util.FormatError('unrecognized colorspace ' + cs.name);
+
+ throw new _util.FormatError("unrecognized colorspace ".concat(cs.name));
}
}
+
if (Array.isArray(cs)) {
var mode = xref.fetchIfRef(cs[0]).name;
- var numComps = void 0,
- params = void 0,
- alt = void 0,
- whitePoint = void 0,
- blackPoint = void 0,
- gamma = void 0;
+ var numComps, params, alt, whitePoint, blackPoint, gamma;
+
switch (mode) {
case 'DeviceGray':
case 'G':
return 'DeviceGrayCS';
+
case 'DeviceRGB':
case 'RGB':
return 'DeviceRgbCS';
+
case 'DeviceCMYK':
case 'CMYK':
return 'DeviceCmykCS';
+
case 'CalGray':
params = xref.fetchIfRef(cs[1]);
whitePoint = params.getArray('WhitePoint');
blackPoint = params.getArray('BlackPoint');
gamma = params.get('Gamma');
return ['CalGrayCS', whitePoint, blackPoint, gamma];
+
case 'CalRGB':
params = xref.fetchIfRef(cs[1]);
whitePoint = params.getArray('WhitePoint');
@@ -21969,19 +26477,24 @@ var ColorSpace = function () {
gamma = params.getArray('Gamma');
var matrix = params.getArray('Matrix');
return ['CalRGBCS', whitePoint, blackPoint, gamma, matrix];
+
case 'ICCBased':
var stream = xref.fetchIfRef(cs[1]);
var dict = stream.dict;
numComps = dict.get('N');
alt = dict.get('Alternate');
+
if (alt) {
var altIR = this.parseToIR(alt, xref, res, pdfFunctionFactory);
var altCS = this.fromIR(altIR, pdfFunctionFactory);
+
if (altCS.numComps === numComps) {
return altIR;
}
+
(0, _util.warn)('ICCBased color space: Ignoring incorrect /Alternate entry.');
}
+
if (numComps === 1) {
return 'DeviceGrayCS';
} else if (numComps === 3) {
@@ -21989,22 +26502,30 @@ var ColorSpace = function () {
} else if (numComps === 4) {
return 'DeviceCmykCS';
}
+
break;
+
case 'Pattern':
var basePatternCS = cs[1] || null;
+
if (basePatternCS) {
basePatternCS = this.parseToIR(basePatternCS, xref, res, pdfFunctionFactory);
}
+
return ['PatternCS', basePatternCS];
+
case 'Indexed':
case 'I':
var baseIndexedCS = this.parseToIR(cs[1], xref, res, pdfFunctionFactory);
var hiVal = xref.fetchIfRef(cs[2]) + 1;
var lookup = xref.fetchIfRef(cs[3]);
+
if ((0, _primitives.isStream)(lookup)) {
lookup = lookup.getBytes();
}
+
return ['IndexedCS', baseIndexedCS, hiVal, lookup];
+
case 'Separation':
case 'DeviceN':
var name = xref.fetchIfRef(cs[1]);
@@ -22012,48 +26533,57 @@ var ColorSpace = function () {
alt = this.parseToIR(cs[2], xref, res, pdfFunctionFactory);
var tintFn = pdfFunctionFactory.create(xref.fetchIfRef(cs[3]));
return ['AlternateCS', numComps, alt, tintFn];
+
case 'Lab':
params = xref.fetchIfRef(cs[1]);
whitePoint = params.getArray('WhitePoint');
blackPoint = params.getArray('BlackPoint');
var range = params.getArray('Range');
return ['LabCS', whitePoint, blackPoint, range];
+
default:
- throw new _util.FormatError('unimplemented color space object "' + mode + '"');
+ throw new _util.FormatError("unimplemented color space object \"".concat(mode, "\""));
}
}
- throw new _util.FormatError('unrecognized color space object: "' + cs + '"');
+
+ throw new _util.FormatError("unrecognized color space object: \"".concat(cs, "\""));
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decode, n) {
if (!Array.isArray(decode)) {
return true;
}
+
if (n * 2 !== decode.length) {
(0, _util.warn)('The decode map is not the correct length');
return true;
}
+
for (var i = 0, ii = decode.length; i < ii; i += 2) {
if (decode[i] !== 0 || decode[i + 1] !== 1) {
return false;
}
}
+
return true;
}
}, {
- key: 'singletons',
+ key: "singletons",
get: function get() {
return (0, _util.shadow)(this, 'singletons', {
get gray() {
return (0, _util.shadow)(this, 'gray', new DeviceGrayCS());
},
+
get rgb() {
return (0, _util.shadow)(this, 'rgb', new DeviceRgbCS());
},
+
get cmyk() {
return (0, _util.shadow)(this, 'cmyk', new DeviceCmykCS());
}
+
});
}
}]);
@@ -22061,14 +26591,19 @@ var ColorSpace = function () {
return ColorSpace;
}();
-var AlternateCS = function (_ColorSpace) {
+exports.ColorSpace = ColorSpace;
+
+var AlternateCS =
+/*#__PURE__*/
+function (_ColorSpace) {
_inherits(AlternateCS, _ColorSpace);
function AlternateCS(numComps, base, tintFn) {
- _classCallCheck(this, AlternateCS);
+ var _this;
- var _this = _possibleConstructorReturn(this, (AlternateCS.__proto__ || Object.getPrototypeOf(AlternateCS)).call(this, 'Alternate', numComps));
+ _classCallCheck(this, AlternateCS);
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(AlternateCS).call(this, 'Alternate', numComps));
_this.base = base;
_this.tintFn = tintFn;
_this.tmpBuf = new Float32Array(base.numComps);
@@ -22076,14 +26611,14 @@ var AlternateCS = function (_ColorSpace) {
}
_createClass(AlternateCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
var tmpBuf = this.tmpBuf;
this.tintFn(src, srcOffset, tmpBuf, 0);
this.base.getRgbItem(tmpBuf, 0, dest, destOffset);
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var tintFn = this.tintFn;
var base = this.base;
@@ -22096,13 +26631,15 @@ var AlternateCS = function (_ColorSpace) {
var numComps = this.numComps;
var scaled = new Float32Array(numComps);
var tinted = new Float32Array(baseNumComps);
- var i = void 0,
- j = void 0;
+ var i, j;
+
for (i = 0; i < count; i++) {
for (j = 0; j < numComps; j++) {
scaled[j] = src[srcOffset++] * scale;
}
+
tintFn(scaled, 0, tinted, 0);
+
if (usesZeroToOneRange) {
for (j = 0; j < baseNumComps; j++) {
baseBuf[pos++] = tinted[j] * 255;
@@ -22112,17 +26649,18 @@ var AlternateCS = function (_ColorSpace) {
pos += baseNumComps;
}
}
+
if (!isPassthrough) {
base.getRgbBuffer(baseBuf, 0, count, dest, destOffset, 8, alpha01);
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return this.base.getOutputLength(inputLength * this.base.numComps / this.numComps, alpha01);
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
}
@@ -22131,14 +26669,17 @@ var AlternateCS = function (_ColorSpace) {
return AlternateCS;
}(ColorSpace);
-var PatternCS = function (_ColorSpace2) {
+var PatternCS =
+/*#__PURE__*/
+function (_ColorSpace2) {
_inherits(PatternCS, _ColorSpace2);
function PatternCS(baseCS) {
- _classCallCheck(this, PatternCS);
+ var _this2;
- var _this2 = _possibleConstructorReturn(this, (PatternCS.__proto__ || Object.getPrototypeOf(PatternCS)).call(this, 'Pattern', null));
+ _classCallCheck(this, PatternCS);
+ _this2 = _possibleConstructorReturn(this, _getPrototypeOf(PatternCS).call(this, 'Pattern', null));
_this2.base = baseCS;
return _this2;
}
@@ -22146,49 +26687,57 @@ var PatternCS = function (_ColorSpace2) {
return PatternCS;
}(ColorSpace);
-var IndexedCS = function (_ColorSpace3) {
+var IndexedCS =
+/*#__PURE__*/
+function (_ColorSpace3) {
_inherits(IndexedCS, _ColorSpace3);
function IndexedCS(base, highVal, lookup) {
- _classCallCheck(this, IndexedCS);
+ var _this3;
- var _this3 = _possibleConstructorReturn(this, (IndexedCS.__proto__ || Object.getPrototypeOf(IndexedCS)).call(this, 'Indexed', 1));
+ _classCallCheck(this, IndexedCS);
+ _this3 = _possibleConstructorReturn(this, _getPrototypeOf(IndexedCS).call(this, 'Indexed', 1));
_this3.base = base;
_this3.highVal = highVal;
var baseNumComps = base.numComps;
var length = baseNumComps * highVal;
+
if ((0, _primitives.isStream)(lookup)) {
_this3.lookup = new Uint8Array(length);
var bytes = lookup.getBytes(length);
+
_this3.lookup.set(bytes);
} else if ((0, _util.isString)(lookup)) {
_this3.lookup = new Uint8Array(length);
+
for (var i = 0; i < length; ++i) {
_this3.lookup[i] = lookup.charCodeAt(i);
}
} else if (lookup instanceof Uint8Array) {
_this3.lookup = lookup;
} else {
- throw new _util.FormatError('Unrecognized lookup table: ' + lookup);
+ throw new _util.FormatError("Unrecognized lookup table: ".concat(lookup));
}
+
return _this3;
}
_createClass(IndexedCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
var numComps = this.base.numComps;
var start = src[srcOffset] * numComps;
this.base.getRgbBuffer(this.lookup, start, 1, dest, destOffset, 8, 0);
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var base = this.base;
var numComps = base.numComps;
var outputDelta = base.getOutputLength(numComps, alpha01);
var lookup = this.lookup;
+
for (var i = 0; i < count; ++i) {
var lookupPos = src[srcOffset++] * numComps;
base.getRgbBuffer(lookup, lookupPos, 1, dest, destOffset, 8, alpha01);
@@ -22196,12 +26745,12 @@ var IndexedCS = function (_ColorSpace3) {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return this.base.getOutputLength(inputLength * this.base.numComps, alpha01);
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return true;
}
@@ -22210,27 +26759,30 @@ var IndexedCS = function (_ColorSpace3) {
return IndexedCS;
}(ColorSpace);
-var DeviceGrayCS = function (_ColorSpace4) {
+var DeviceGrayCS =
+/*#__PURE__*/
+function (_ColorSpace4) {
_inherits(DeviceGrayCS, _ColorSpace4);
function DeviceGrayCS() {
_classCallCheck(this, DeviceGrayCS);
- return _possibleConstructorReturn(this, (DeviceGrayCS.__proto__ || Object.getPrototypeOf(DeviceGrayCS)).call(this, 'DeviceGray', 1));
+ return _possibleConstructorReturn(this, _getPrototypeOf(DeviceGrayCS).call(this, 'DeviceGray', 1));
}
_createClass(DeviceGrayCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
var c = src[srcOffset] * 255;
dest[destOffset] = dest[destOffset + 1] = dest[destOffset + 2] = c;
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var scale = 255 / ((1 << bits) - 1);
var j = srcOffset,
q = destOffset;
+
for (var i = 0; i < count; ++i) {
var c = scale * src[j++];
dest[q++] = c;
@@ -22240,12 +26792,12 @@ var DeviceGrayCS = function (_ColorSpace4) {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return inputLength * (3 + alpha01);
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
}
@@ -22254,32 +26806,36 @@ var DeviceGrayCS = function (_ColorSpace4) {
return DeviceGrayCS;
}(ColorSpace);
-var DeviceRgbCS = function (_ColorSpace5) {
+var DeviceRgbCS =
+/*#__PURE__*/
+function (_ColorSpace5) {
_inherits(DeviceRgbCS, _ColorSpace5);
function DeviceRgbCS() {
_classCallCheck(this, DeviceRgbCS);
- return _possibleConstructorReturn(this, (DeviceRgbCS.__proto__ || Object.getPrototypeOf(DeviceRgbCS)).call(this, 'DeviceRGB', 3));
+ return _possibleConstructorReturn(this, _getPrototypeOf(DeviceRgbCS).call(this, 'DeviceRGB', 3));
}
_createClass(DeviceRgbCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
dest[destOffset] = src[srcOffset] * 255;
dest[destOffset + 1] = src[srcOffset + 1] * 255;
dest[destOffset + 2] = src[srcOffset + 2] * 255;
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
if (bits === 8 && alpha01 === 0) {
dest.set(src.subarray(srcOffset, srcOffset + count * 3), destOffset);
return;
}
+
var scale = 255 / ((1 << bits) - 1);
var j = srcOffset,
q = destOffset;
+
for (var i = 0; i < count; ++i) {
dest[q++] = scale * src[j++];
dest[q++] = scale * src[j++];
@@ -22288,17 +26844,17 @@ var DeviceRgbCS = function (_ColorSpace5) {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return inputLength * (3 + alpha01) / 3 | 0;
}
}, {
- key: 'isPassthrough',
+ key: "isPassthrough",
value: function isPassthrough(bits) {
return bits === 8;
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
}
@@ -22318,24 +26874,27 @@ var DeviceCmykCS = function DeviceCmykCSClosure() {
dest[destOffset + 2] = 255 + c * (0.8842522430003296 * c + 8.078677503112928 * m + 30.89978309703729 * y - 0.23883238689178934 * k + -14.183576799673286) + m * (10.49593273432072 * m + 63.02378494754052 * y + 50.606957656360734 * k - 112.23884253719248) + y * (0.03296041114873217 * y + 115.60384449646641 * k + -193.58209356861505) + k * (-22.33816807309886 * k - 180.12613974708367);
}
- var DeviceCmykCS = function (_ColorSpace6) {
+ var DeviceCmykCS =
+ /*#__PURE__*/
+ function (_ColorSpace6) {
_inherits(DeviceCmykCS, _ColorSpace6);
function DeviceCmykCS() {
_classCallCheck(this, DeviceCmykCS);
- return _possibleConstructorReturn(this, (DeviceCmykCS.__proto__ || Object.getPrototypeOf(DeviceCmykCS)).call(this, 'DeviceCMYK', 4));
+ return _possibleConstructorReturn(this, _getPrototypeOf(DeviceCmykCS).call(this, 'DeviceCMYK', 4));
}
_createClass(DeviceCmykCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
convertToRgb(src, srcOffset, 1, dest, destOffset);
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var scale = 1 / ((1 << bits) - 1);
+
for (var i = 0; i < count; i++) {
convertToRgb(src, srcOffset, scale, dest, destOffset);
srcOffset += 4;
@@ -22343,12 +26902,12 @@ var DeviceCmykCS = function DeviceCmykCSClosure() {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return inputLength / 4 * (3 + alpha01) | 0;
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
}
@@ -22359,6 +26918,7 @@ var DeviceCmykCS = function DeviceCmykCSClosure() {
return DeviceCmykCS;
}();
+
var CalGrayCS = function CalGrayCSClosure() {
function convertToRgb(cs, src, srcOffset, dest, destOffset, scale) {
var A = src[srcOffset] * scale;
@@ -22370,52 +26930,63 @@ var CalGrayCS = function CalGrayCSClosure() {
dest[destOffset + 2] = val;
}
- var CalGrayCS = function (_ColorSpace7) {
+ var CalGrayCS =
+ /*#__PURE__*/
+ function (_ColorSpace7) {
_inherits(CalGrayCS, _ColorSpace7);
function CalGrayCS(whitePoint, blackPoint, gamma) {
+ var _this4;
+
_classCallCheck(this, CalGrayCS);
- var _this7 = _possibleConstructorReturn(this, (CalGrayCS.__proto__ || Object.getPrototypeOf(CalGrayCS)).call(this, 'CalGray', 1));
+ _this4 = _possibleConstructorReturn(this, _getPrototypeOf(CalGrayCS).call(this, 'CalGray', 1));
if (!whitePoint) {
throw new _util.FormatError('WhitePoint missing - required for color space CalGray');
}
+
blackPoint = blackPoint || [0, 0, 0];
gamma = gamma || 1;
- _this7.XW = whitePoint[0];
- _this7.YW = whitePoint[1];
- _this7.ZW = whitePoint[2];
- _this7.XB = blackPoint[0];
- _this7.YB = blackPoint[1];
- _this7.ZB = blackPoint[2];
- _this7.G = gamma;
- if (_this7.XW < 0 || _this7.ZW < 0 || _this7.YW !== 1) {
- throw new _util.FormatError('Invalid WhitePoint components for ' + _this7.name + ', no fallback available');
+ _this4.XW = whitePoint[0];
+ _this4.YW = whitePoint[1];
+ _this4.ZW = whitePoint[2];
+ _this4.XB = blackPoint[0];
+ _this4.YB = blackPoint[1];
+ _this4.ZB = blackPoint[2];
+ _this4.G = gamma;
+
+ if (_this4.XW < 0 || _this4.ZW < 0 || _this4.YW !== 1) {
+ throw new _util.FormatError("Invalid WhitePoint components for ".concat(_this4.name) + ', no fallback available');
}
- if (_this7.XB < 0 || _this7.YB < 0 || _this7.ZB < 0) {
- (0, _util.info)('Invalid BlackPoint for ' + _this7.name + ', falling back to default.');
- _this7.XB = _this7.YB = _this7.ZB = 0;
+
+ if (_this4.XB < 0 || _this4.YB < 0 || _this4.ZB < 0) {
+ (0, _util.info)("Invalid BlackPoint for ".concat(_this4.name, ", falling back to default."));
+ _this4.XB = _this4.YB = _this4.ZB = 0;
}
- if (_this7.XB !== 0 || _this7.YB !== 0 || _this7.ZB !== 0) {
- (0, _util.warn)(_this7.name + ', BlackPoint: XB: ' + _this7.XB + ', YB: ' + _this7.YB + ', ' + ('ZB: ' + _this7.ZB + ', only default values are supported.'));
+
+ if (_this4.XB !== 0 || _this4.YB !== 0 || _this4.ZB !== 0) {
+ (0, _util.warn)("".concat(_this4.name, ", BlackPoint: XB: ").concat(_this4.XB, ", YB: ").concat(_this4.YB, ", ") + "ZB: ".concat(_this4.ZB, ", only default values are supported."));
}
- if (_this7.G < 1) {
- (0, _util.info)('Invalid Gamma: ' + _this7.G + ' for ' + _this7.name + ', ' + 'falling back to default.');
- _this7.G = 1;
+
+ if (_this4.G < 1) {
+ (0, _util.info)("Invalid Gamma: ".concat(_this4.G, " for ").concat(_this4.name, ", ") + 'falling back to default.');
+ _this4.G = 1;
}
- return _this7;
+
+ return _this4;
}
_createClass(CalGrayCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
convertToRgb(this, src, srcOffset, dest, destOffset, 1);
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var scale = 1 / ((1 << bits) - 1);
+
for (var i = 0; i < count; ++i) {
convertToRgb(this, src, srcOffset, dest, destOffset, scale);
srcOffset += 1;
@@ -22423,12 +26994,12 @@ var CalGrayCS = function CalGrayCSClosure() {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return inputLength * (3 + alpha01);
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
}
@@ -22439,6 +27010,7 @@ var CalGrayCS = function CalGrayCSClosure() {
return CalGrayCS;
}();
+
var CalRGBCS = function CalRGBCSClosure() {
var BRADFORD_SCALE_MATRIX = new Float32Array([0.8951, 0.2664, -0.1614, -0.7502, 1.7135, 0.0367, 0.0389, -0.0685, 1.0296]);
var BRADFORD_SCALE_INVERSE_MATRIX = new Float32Array([0.9869929, -0.1470543, 0.1599627, 0.4323053, 0.5183603, 0.0492912, -0.0085287, 0.0400428, 0.9684867]);
@@ -22448,16 +27020,19 @@ var CalRGBCS = function CalRGBCSClosure() {
var tempConvertMatrix1 = new Float32Array(3);
var tempConvertMatrix2 = new Float32Array(3);
var DECODE_L_CONSTANT = Math.pow((8 + 16) / 116, 3) / 8.0;
+
function matrixProduct(a, b, result) {
result[0] = a[0] * b[0] + a[1] * b[1] + a[2] * b[2];
result[1] = a[3] * b[0] + a[4] * b[1] + a[5] * b[2];
result[2] = a[6] * b[0] + a[7] * b[1] + a[8] * b[2];
}
+
function convertToFlat(sourceWhitePoint, LMS, result) {
result[0] = LMS[0] * 1 / sourceWhitePoint[0];
result[1] = LMS[1] * 1 / sourceWhitePoint[1];
result[2] = LMS[2] * 1 / sourceWhitePoint[2];
}
+
function convertToD65(sourceWhitePoint, LMS, result) {
var D65X = 0.95047;
var D65Y = 1;
@@ -22466,24 +27041,31 @@ var CalRGBCS = function CalRGBCSClosure() {
result[1] = LMS[1] * D65Y / sourceWhitePoint[1];
result[2] = LMS[2] * D65Z / sourceWhitePoint[2];
}
+
function sRGBTransferFunction(color) {
if (color <= 0.0031308) {
return adjustToRange(0, 1, 12.92 * color);
}
+
return adjustToRange(0, 1, (1 + 0.055) * Math.pow(color, 1 / 2.4) - 0.055);
}
+
function adjustToRange(min, max, value) {
return Math.max(min, Math.min(max, value));
}
+
function decodeL(L) {
if (L < 0) {
return -decodeL(-L);
}
+
if (L > 8.0) {
return Math.pow((L + 16) / 116, 3);
}
+
return L * DECODE_L_CONSTANT;
}
+
function compensateBlackPoint(sourceBlackPoint, XYZ_Flat, result) {
if (sourceBlackPoint[0] === 0 && sourceBlackPoint[1] === 0 && sourceBlackPoint[2] === 0) {
result[0] = XYZ_Flat[0];
@@ -22491,6 +27073,7 @@ var CalRGBCS = function CalRGBCSClosure() {
result[2] = XYZ_Flat[2];
return;
}
+
var zeroDecodeL = decodeL(0);
var X_DST = zeroDecodeL;
var X_SRC = decodeL(sourceBlackPoint[0]);
@@ -22508,6 +27091,7 @@ var CalRGBCS = function CalRGBCSClosure() {
result[1] = XYZ_Flat[1] * Y_Scale + Y_Offset;
result[2] = XYZ_Flat[2] * Z_Scale + Z_Offset;
}
+
function normalizeWhitePointToFlat(sourceWhitePoint, XYZ_In, result) {
if (sourceWhitePoint[0] === 1 && sourceWhitePoint[2] === 1) {
result[0] = XYZ_In[0];
@@ -22515,12 +27099,14 @@ var CalRGBCS = function CalRGBCSClosure() {
result[2] = XYZ_In[2];
return;
}
+
var LMS = result;
matrixProduct(BRADFORD_SCALE_MATRIX, XYZ_In, LMS);
var LMS_Flat = tempNormalizeMatrix;
convertToFlat(sourceWhitePoint, LMS, LMS_Flat);
matrixProduct(BRADFORD_SCALE_INVERSE_MATRIX, LMS_Flat, result);
}
+
function normalizeWhitePointToD65(sourceWhitePoint, XYZ_In, result) {
var LMS = result;
matrixProduct(BRADFORD_SCALE_MATRIX, XYZ_In, LMS);
@@ -22528,6 +27114,7 @@ var CalRGBCS = function CalRGBCSClosure() {
convertToD65(sourceWhitePoint, LMS, LMS_D65);
matrixProduct(BRADFORD_SCALE_INVERSE_MATRIX, LMS_D65, result);
}
+
function convertToRgb(cs, src, srcOffset, dest, destOffset, scale) {
var A = adjustToRange(0, 1, src[srcOffset] * scale);
var B = adjustToRange(0, 1, src[srcOffset + 1] * scale);
@@ -22555,63 +27142,73 @@ var CalRGBCS = function CalRGBCSClosure() {
dest[destOffset + 2] = sRGBTransferFunction(SRGB[2]) * 255;
}
- var CalRGBCS = function (_ColorSpace8) {
+ var CalRGBCS =
+ /*#__PURE__*/
+ function (_ColorSpace8) {
_inherits(CalRGBCS, _ColorSpace8);
function CalRGBCS(whitePoint, blackPoint, gamma, matrix) {
+ var _this5;
+
_classCallCheck(this, CalRGBCS);
- var _this8 = _possibleConstructorReturn(this, (CalRGBCS.__proto__ || Object.getPrototypeOf(CalRGBCS)).call(this, 'CalRGB', 3));
+ _this5 = _possibleConstructorReturn(this, _getPrototypeOf(CalRGBCS).call(this, 'CalRGB', 3));
if (!whitePoint) {
throw new _util.FormatError('WhitePoint missing - required for color space CalRGB');
}
+
blackPoint = blackPoint || new Float32Array(3);
gamma = gamma || new Float32Array([1, 1, 1]);
matrix = matrix || new Float32Array([1, 0, 0, 0, 1, 0, 0, 0, 1]);
var XW = whitePoint[0];
var YW = whitePoint[1];
var ZW = whitePoint[2];
- _this8.whitePoint = whitePoint;
+ _this5.whitePoint = whitePoint;
var XB = blackPoint[0];
var YB = blackPoint[1];
var ZB = blackPoint[2];
- _this8.blackPoint = blackPoint;
- _this8.GR = gamma[0];
- _this8.GG = gamma[1];
- _this8.GB = gamma[2];
- _this8.MXA = matrix[0];
- _this8.MYA = matrix[1];
- _this8.MZA = matrix[2];
- _this8.MXB = matrix[3];
- _this8.MYB = matrix[4];
- _this8.MZB = matrix[5];
- _this8.MXC = matrix[6];
- _this8.MYC = matrix[7];
- _this8.MZC = matrix[8];
+ _this5.blackPoint = blackPoint;
+ _this5.GR = gamma[0];
+ _this5.GG = gamma[1];
+ _this5.GB = gamma[2];
+ _this5.MXA = matrix[0];
+ _this5.MYA = matrix[1];
+ _this5.MZA = matrix[2];
+ _this5.MXB = matrix[3];
+ _this5.MYB = matrix[4];
+ _this5.MZB = matrix[5];
+ _this5.MXC = matrix[6];
+ _this5.MYC = matrix[7];
+ _this5.MZC = matrix[8];
+
if (XW < 0 || ZW < 0 || YW !== 1) {
- throw new _util.FormatError('Invalid WhitePoint components for ' + _this8.name + ', no fallback available');
+ throw new _util.FormatError("Invalid WhitePoint components for ".concat(_this5.name) + ', no fallback available');
}
+
if (XB < 0 || YB < 0 || ZB < 0) {
- (0, _util.info)('Invalid BlackPoint for ' + _this8.name + ' [' + XB + ', ' + YB + ', ' + ZB + '], ' + 'falling back to default.');
- _this8.blackPoint = new Float32Array(3);
+ (0, _util.info)("Invalid BlackPoint for ".concat(_this5.name, " [").concat(XB, ", ").concat(YB, ", ").concat(ZB, "], ") + 'falling back to default.');
+ _this5.blackPoint = new Float32Array(3);
}
- if (_this8.GR < 0 || _this8.GG < 0 || _this8.GB < 0) {
- (0, _util.info)('Invalid Gamma [' + _this8.GR + ', ' + _this8.GG + ', ' + _this8.GB + '] for ' + (_this8.name + ', falling back to default.'));
- _this8.GR = _this8.GG = _this8.GB = 1;
+
+ if (_this5.GR < 0 || _this5.GG < 0 || _this5.GB < 0) {
+ (0, _util.info)("Invalid Gamma [".concat(_this5.GR, ", ").concat(_this5.GG, ", ").concat(_this5.GB, "] for ") + "".concat(_this5.name, ", falling back to default."));
+ _this5.GR = _this5.GG = _this5.GB = 1;
}
- return _this8;
+
+ return _this5;
}
_createClass(CalRGBCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
convertToRgb(this, src, srcOffset, dest, destOffset, 1);
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var scale = 1 / ((1 << bits) - 1);
+
for (var i = 0; i < count; ++i) {
convertToRgb(this, src, srcOffset, dest, destOffset, scale);
srcOffset += 3;
@@ -22619,12 +27216,12 @@ var CalRGBCS = function CalRGBCSClosure() {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return inputLength * (3 + alpha01) / 3 | 0;
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
}
@@ -22635,28 +27232,35 @@ var CalRGBCS = function CalRGBCSClosure() {
return CalRGBCS;
}();
+
var LabCS = function LabCSClosure() {
function fn_g(x) {
- var result = void 0;
+ var result;
+
if (x >= 6 / 29) {
result = x * x * x;
} else {
result = 108 / 841 * (x - 4 / 29);
}
+
return result;
}
+
function decode(value, high1, low2, high2) {
return low2 + value * (high2 - low2) / high1;
}
+
function convertToRgb(cs, src, srcOffset, maxVal, dest, destOffset) {
var Ls = src[srcOffset];
var as = src[srcOffset + 1];
var bs = src[srcOffset + 2];
+
if (maxVal !== false) {
Ls = decode(Ls, maxVal, 0, 100);
as = decode(as, maxVal, cs.amin, cs.amax);
bs = decode(bs, maxVal, cs.bmin, cs.bmax);
}
+
as = as > cs.amax ? cs.amax : as < cs.amin ? cs.amin : as;
bs = bs > cs.bmax ? cs.bmax : bs < cs.bmin ? cs.bmin : bs;
var M = (Ls + 16) / 116;
@@ -22665,9 +27269,8 @@ var LabCS = function LabCSClosure() {
var X = cs.XW * fn_g(L);
var Y = cs.YW * fn_g(M);
var Z = cs.ZW * fn_g(N);
- var r = void 0,
- g = void 0,
- b = void 0;
+ var r, g, b;
+
if (cs.ZW < 1) {
r = X * 3.1339 + Y * -1.6170 + Z * -0.4906;
g = X * -0.9785 + Y * 1.9160 + Z * 0.0333;
@@ -22677,60 +27280,71 @@ var LabCS = function LabCSClosure() {
g = X * -0.9689 + Y * 1.8758 + Z * 0.0415;
b = X * 0.0557 + Y * -0.2040 + Z * 1.0570;
}
+
dest[destOffset] = Math.sqrt(r) * 255;
dest[destOffset + 1] = Math.sqrt(g) * 255;
dest[destOffset + 2] = Math.sqrt(b) * 255;
}
- var LabCS = function (_ColorSpace9) {
+ var LabCS =
+ /*#__PURE__*/
+ function (_ColorSpace9) {
_inherits(LabCS, _ColorSpace9);
function LabCS(whitePoint, blackPoint, range) {
+ var _this6;
+
_classCallCheck(this, LabCS);
- var _this9 = _possibleConstructorReturn(this, (LabCS.__proto__ || Object.getPrototypeOf(LabCS)).call(this, 'Lab', 3));
+ _this6 = _possibleConstructorReturn(this, _getPrototypeOf(LabCS).call(this, 'Lab', 3));
if (!whitePoint) {
throw new _util.FormatError('WhitePoint missing - required for color space Lab');
}
+
blackPoint = blackPoint || [0, 0, 0];
range = range || [-100, 100, -100, 100];
- _this9.XW = whitePoint[0];
- _this9.YW = whitePoint[1];
- _this9.ZW = whitePoint[2];
- _this9.amin = range[0];
- _this9.amax = range[1];
- _this9.bmin = range[2];
- _this9.bmax = range[3];
- _this9.XB = blackPoint[0];
- _this9.YB = blackPoint[1];
- _this9.ZB = blackPoint[2];
- if (_this9.XW < 0 || _this9.ZW < 0 || _this9.YW !== 1) {
+ _this6.XW = whitePoint[0];
+ _this6.YW = whitePoint[1];
+ _this6.ZW = whitePoint[2];
+ _this6.amin = range[0];
+ _this6.amax = range[1];
+ _this6.bmin = range[2];
+ _this6.bmax = range[3];
+ _this6.XB = blackPoint[0];
+ _this6.YB = blackPoint[1];
+ _this6.ZB = blackPoint[2];
+
+ if (_this6.XW < 0 || _this6.ZW < 0 || _this6.YW !== 1) {
throw new _util.FormatError('Invalid WhitePoint components, no fallback available');
}
- if (_this9.XB < 0 || _this9.YB < 0 || _this9.ZB < 0) {
+
+ if (_this6.XB < 0 || _this6.YB < 0 || _this6.ZB < 0) {
(0, _util.info)('Invalid BlackPoint, falling back to default');
- _this9.XB = _this9.YB = _this9.ZB = 0;
+ _this6.XB = _this6.YB = _this6.ZB = 0;
}
- if (_this9.amin > _this9.amax || _this9.bmin > _this9.bmax) {
+
+ if (_this6.amin > _this6.amax || _this6.bmin > _this6.bmax) {
(0, _util.info)('Invalid Range, falling back to defaults');
- _this9.amin = -100;
- _this9.amax = 100;
- _this9.bmin = -100;
- _this9.bmax = 100;
+ _this6.amin = -100;
+ _this6.amax = 100;
+ _this6.bmin = -100;
+ _this6.bmax = 100;
}
- return _this9;
+
+ return _this6;
}
_createClass(LabCS, [{
- key: 'getRgbItem',
+ key: "getRgbItem",
value: function getRgbItem(src, srcOffset, dest, destOffset) {
convertToRgb(this, src, srcOffset, false, dest, destOffset);
}
}, {
- key: 'getRgbBuffer',
+ key: "getRgbBuffer",
value: function getRgbBuffer(src, srcOffset, count, dest, destOffset, bits, alpha01) {
var maxVal = (1 << bits) - 1;
+
for (var i = 0; i < count; i++) {
convertToRgb(this, src, srcOffset, maxVal, dest, destOffset);
srcOffset += 3;
@@ -22738,17 +27352,17 @@ var LabCS = function LabCSClosure() {
}
}
}, {
- key: 'getOutputLength',
+ key: "getOutputLength",
value: function getOutputLength(inputLength, alpha01) {
return inputLength * (3 + alpha01) / 3 | 0;
}
}, {
- key: 'isDefaultDecode',
+ key: "isDefaultDecode",
value: function isDefaultDecode(decodeMap) {
return true;
}
}, {
- key: 'usesZeroToOneRange',
+ key: "usesZeroToOneRange",
get: function get() {
return (0, _util.shadow)(this, 'usesZeroToOneRange', false);
}
@@ -22759,7 +27373,6 @@ var LabCS = function LabCSClosure() {
return LabCS;
}();
-exports.ColorSpace = ColorSpace;
/***/ }),
/* 156 */
@@ -22771,11 +27384,7 @@ exports.ColorSpace = ColorSpace;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.AnnotationFactory = exports.AnnotationBorderStyle = exports.Annotation = undefined;
-
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.AnnotationFactory = exports.AnnotationBorderStyle = exports.Annotation = void 0;
var _util = __w_pdfjs_require__(2);
@@ -22789,29 +27398,49 @@ var _operator_list = __w_pdfjs_require__(157);
var _stream = __w_pdfjs_require__(144);
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
+
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var AnnotationFactory = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var AnnotationFactory =
+/*#__PURE__*/
+function () {
function AnnotationFactory() {
_classCallCheck(this, AnnotationFactory);
}
_createClass(AnnotationFactory, null, [{
- key: 'create',
+ key: "create",
value: function create(xref, ref, pdfManager, idFactory) {
return pdfManager.ensure(this, '_create', [xref, ref, pdfManager, idFactory]);
}
}, {
- key: '_create',
+ key: "_create",
value: function _create(xref, ref, pdfManager, idFactory) {
var dict = xref.fetchIfRef(ref);
+
if (!(0, _primitives.isDict)(dict)) {
return;
}
+
var id = (0, _primitives.isRef)(ref) ? ref.toString() : 'annot_' + idFactory.createObjId();
var subtype = dict.get('Subtype');
subtype = (0, _primitives.isName)(subtype) ? subtype.name : null;
@@ -22823,59 +27452,81 @@ var AnnotationFactory = function () {
id: id,
pdfManager: pdfManager
};
+
switch (subtype) {
case 'Link':
return new LinkAnnotation(parameters);
+
case 'Text':
return new TextAnnotation(parameters);
+
case 'Widget':
var fieldType = (0, _util.getInheritableProperty)({
dict: dict,
key: 'FT'
});
fieldType = (0, _primitives.isName)(fieldType) ? fieldType.name : null;
+
switch (fieldType) {
case 'Tx':
return new TextWidgetAnnotation(parameters);
+
case 'Btn':
return new ButtonWidgetAnnotation(parameters);
+
case 'Ch':
return new ChoiceWidgetAnnotation(parameters);
}
+
(0, _util.warn)('Unimplemented widget field type "' + fieldType + '", ' + 'falling back to base field type.');
return new WidgetAnnotation(parameters);
+
case 'Popup':
return new PopupAnnotation(parameters);
+
case 'Line':
return new LineAnnotation(parameters);
+
case 'Square':
return new SquareAnnotation(parameters);
+
case 'Circle':
return new CircleAnnotation(parameters);
+
case 'PolyLine':
return new PolylineAnnotation(parameters);
+
case 'Polygon':
return new PolygonAnnotation(parameters);
+
case 'Ink':
return new InkAnnotation(parameters);
+
case 'Highlight':
return new HighlightAnnotation(parameters);
+
case 'Underline':
return new UnderlineAnnotation(parameters);
+
case 'Squiggly':
return new SquigglyAnnotation(parameters);
+
case 'StrikeOut':
return new StrikeOutAnnotation(parameters);
+
case 'Stamp':
return new StampAnnotation(parameters);
+
case 'FileAttachment':
return new FileAttachmentAnnotation(parameters);
+
default:
if (!subtype) {
(0, _util.warn)('Annotation is missing the required /Subtype.');
} else {
(0, _util.warn)('Unimplemented annotation type "' + subtype + '", ' + 'falling back to base annotation.');
}
+
return new Annotation(parameters);
}
}
@@ -22884,21 +27535,28 @@ var AnnotationFactory = function () {
return AnnotationFactory;
}();
+exports.AnnotationFactory = AnnotationFactory;
+
function getTransformMatrix(rect, bbox, matrix) {
var bounds = _util.Util.getAxialAlignedBoundingBox(bbox, matrix);
+
var minX = bounds[0];
var minY = bounds[1];
var maxX = bounds[2];
var maxY = bounds[3];
+
if (minX === maxX || minY === maxY) {
return [1, 0, 0, 1, rect[0], rect[1]];
}
+
var xRatio = (rect[2] - rect[0]) / (maxX - minX);
var yRatio = (rect[3] - rect[1]) / (maxY - minY);
return [xRatio, 0, 0, yRatio, rect[0] - minX * xRatio, rect[1] - minY * yRatio];
}
-var Annotation = function () {
+var Annotation =
+/*#__PURE__*/
+function () {
function Annotation(params) {
_classCallCheck(this, Annotation);
@@ -22920,32 +27578,32 @@ var Annotation = function () {
}
_createClass(Annotation, [{
- key: '_hasFlag',
+ key: "_hasFlag",
value: function _hasFlag(flags, flag) {
return !!(flags & flag);
}
}, {
- key: '_isViewable',
+ key: "_isViewable",
value: function _isViewable(flags) {
return !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN) && !this._hasFlag(flags, _util.AnnotationFlag.NOVIEW);
}
}, {
- key: '_isPrintable',
+ key: "_isPrintable",
value: function _isPrintable(flags) {
return this._hasFlag(flags, _util.AnnotationFlag.PRINT) && !this._hasFlag(flags, _util.AnnotationFlag.INVISIBLE) && !this._hasFlag(flags, _util.AnnotationFlag.HIDDEN);
}
}, {
- key: 'setFlags',
+ key: "setFlags",
value: function setFlags(flags) {
this.flags = Number.isInteger(flags) && flags > 0 ? flags : 0;
}
}, {
- key: 'hasFlag',
+ key: "hasFlag",
value: function hasFlag(flag) {
return this._hasFlag(this.flags, flag);
}
}, {
- key: 'setRectangle',
+ key: "setRectangle",
value: function setRectangle(rectangle) {
if (Array.isArray(rectangle) && rectangle.length === 4) {
this.rectangle = _util.Util.normalizeRect(rectangle);
@@ -22954,44 +27612,56 @@ var Annotation = function () {
}
}
}, {
- key: 'setColor',
+ key: "setColor",
value: function setColor(color) {
var rgbColor = new Uint8ClampedArray(3);
+
if (!Array.isArray(color)) {
this.color = rgbColor;
return;
}
+
switch (color.length) {
case 0:
this.color = null;
break;
+
case 1:
_colorspace.ColorSpace.singletons.gray.getRgbItem(color, 0, rgbColor, 0);
+
this.color = rgbColor;
break;
+
case 3:
_colorspace.ColorSpace.singletons.rgb.getRgbItem(color, 0, rgbColor, 0);
+
this.color = rgbColor;
break;
+
case 4:
_colorspace.ColorSpace.singletons.cmyk.getRgbItem(color, 0, rgbColor, 0);
+
this.color = rgbColor;
break;
+
default:
this.color = rgbColor;
break;
}
}
}, {
- key: 'setBorderStyle',
+ key: "setBorderStyle",
value: function setBorderStyle(borderStyle) {
this.borderStyle = new AnnotationBorderStyle();
+
if (!(0, _primitives.isDict)(borderStyle)) {
return;
}
+
if (borderStyle.has('BS')) {
var dict = borderStyle.get('BS');
var dictType = dict.get('Type');
+
if (!dictType || (0, _primitives.isName)(dictType, 'Border')) {
this.borderStyle.setWidth(dict.get('W'));
this.borderStyle.setStyle(dict.get('S'));
@@ -22999,10 +27669,12 @@ var Annotation = function () {
}
} else if (borderStyle.has('Border')) {
var array = borderStyle.getArray('Border');
+
if (Array.isArray(array) && array.length >= 3) {
this.borderStyle.setHorizontalCornerRadius(array[0]);
this.borderStyle.setVerticalCornerRadius(array[1]);
this.borderStyle.setWidth(array[2]);
+
if (array.length === 4) {
this.borderStyle.setDashArray(array[3]);
}
@@ -23012,44 +27684,53 @@ var Annotation = function () {
}
}
}, {
- key: 'setAppearance',
+ key: "setAppearance",
value: function setAppearance(dict) {
this.appearance = null;
var appearanceStates = dict.get('AP');
+
if (!(0, _primitives.isDict)(appearanceStates)) {
return;
}
+
var normalAppearanceState = appearanceStates.get('N');
+
if ((0, _primitives.isStream)(normalAppearanceState)) {
this.appearance = normalAppearanceState;
return;
}
+
if (!(0, _primitives.isDict)(normalAppearanceState)) {
return;
}
+
var as = dict.get('AS');
+
if (!(0, _primitives.isName)(as) || !normalAppearanceState.has(as.name)) {
return;
}
+
this.appearance = normalAppearanceState.get(as.name);
}
}, {
- key: '_preparePopup',
+ key: "_preparePopup",
value: function _preparePopup(dict) {
if (!dict.has('C')) {
this.data.color = null;
}
+
this.data.hasPopup = dict.has('Popup');
this.data.title = (0, _util.stringToPDFString)(dict.get('T') || '');
this.data.contents = (0, _util.stringToPDFString)(dict.get('Contents') || '');
}
}, {
- key: 'loadResources',
+ key: "loadResources",
value: function loadResources(keys) {
return this.appearance.dict.getAsync('Resources').then(function (resources) {
if (!resources) {
return;
}
+
var objectLoader = new _obj.ObjectLoader(resources, keys, resources.xref);
return objectLoader.load().then(function () {
return resources;
@@ -23057,13 +27738,14 @@ var Annotation = function () {
});
}
}, {
- key: 'getOperatorList',
+ key: "getOperatorList",
value: function getOperatorList(evaluator, task, renderForms) {
var _this = this;
if (!this.appearance) {
return Promise.resolve(new _operator_list.OperatorList());
}
+
var data = this.data;
var appearanceDict = this.appearance.dict;
var resourcesPromise = this.loadResources(['ExtGState', 'ColorSpace', 'Pattern', 'Shading', 'XObject', 'Font']);
@@ -23080,25 +27762,29 @@ var Annotation = function () {
operatorList: opList
}).then(function () {
opList.addOp(_util.OPS.endAnnotation, []);
+
_this.appearance.reset();
+
return opList;
});
});
}
}, {
- key: 'viewable',
+ key: "viewable",
get: function get() {
if (this.flags === 0) {
return true;
}
+
return this._isViewable(this.flags);
}
}, {
- key: 'printable',
+ key: "printable",
get: function get() {
if (this.flags === 0) {
return false;
}
+
return this._isPrintable(this.flags);
}
}]);
@@ -23106,7 +27792,11 @@ var Annotation = function () {
return Annotation;
}();
-var AnnotationBorderStyle = function () {
+exports.Annotation = Annotation;
+
+var AnnotationBorderStyle =
+/*#__PURE__*/
+function () {
function AnnotationBorderStyle() {
_classCallCheck(this, AnnotationBorderStyle);
@@ -23118,47 +27808,55 @@ var AnnotationBorderStyle = function () {
}
_createClass(AnnotationBorderStyle, [{
- key: 'setWidth',
+ key: "setWidth",
value: function setWidth(width) {
if (Number.isInteger(width)) {
this.width = width;
}
}
}, {
- key: 'setStyle',
+ key: "setStyle",
value: function setStyle(style) {
if (!style) {
return;
}
+
switch (style.name) {
case 'S':
this.style = _util.AnnotationBorderStyleType.SOLID;
break;
+
case 'D':
this.style = _util.AnnotationBorderStyleType.DASHED;
break;
+
case 'B':
this.style = _util.AnnotationBorderStyleType.BEVELED;
break;
+
case 'I':
this.style = _util.AnnotationBorderStyleType.INSET;
break;
+
case 'U':
this.style = _util.AnnotationBorderStyleType.UNDERLINE;
break;
+
default:
break;
}
}
}, {
- key: 'setDashArray',
+ key: "setDashArray",
value: function setDashArray(dashArray) {
if (Array.isArray(dashArray) && dashArray.length > 0) {
var isValid = true;
var allZeros = true;
+
for (var i = 0, len = dashArray.length; i < len; i++) {
var element = dashArray[i];
var validNumber = +element >= 0;
+
if (!validNumber) {
isValid = false;
break;
@@ -23166,6 +27864,7 @@ var AnnotationBorderStyle = function () {
allZeros = false;
}
}
+
if (isValid && !allZeros) {
this.dashArray = dashArray;
} else {
@@ -23176,14 +27875,14 @@ var AnnotationBorderStyle = function () {
}
}
}, {
- key: 'setHorizontalCornerRadius',
+ key: "setHorizontalCornerRadius",
value: function setHorizontalCornerRadius(radius) {
if (Number.isInteger(radius)) {
this.horizontalCornerRadius = radius;
}
}
}, {
- key: 'setVerticalCornerRadius',
+ key: "setVerticalCornerRadius",
value: function setVerticalCornerRadius(radius) {
if (Number.isInteger(radius)) {
this.verticalCornerRadius = radius;
@@ -23194,14 +27893,19 @@ var AnnotationBorderStyle = function () {
return AnnotationBorderStyle;
}();
-var WidgetAnnotation = function (_Annotation) {
+exports.AnnotationBorderStyle = AnnotationBorderStyle;
+
+var WidgetAnnotation =
+/*#__PURE__*/
+function (_Annotation) {
_inherits(WidgetAnnotation, _Annotation);
function WidgetAnnotation(params) {
- _classCallCheck(this, WidgetAnnotation);
+ var _this2;
- var _this2 = _possibleConstructorReturn(this, (WidgetAnnotation.__proto__ || Object.getPrototypeOf(WidgetAnnotation)).call(this, params));
+ _classCallCheck(this, WidgetAnnotation);
+ _this2 = _possibleConstructorReturn(this, _getPrototypeOf(WidgetAnnotation).call(this, params));
var dict = params.dict;
var data = _this2.data;
data.annotationType = _util.AnnotationType.WIDGET;
@@ -23229,85 +27933,107 @@ var WidgetAnnotation = function (_Annotation) {
dict: dict,
key: 'Ff'
});
+
if (!Number.isInteger(data.fieldFlags) || data.fieldFlags < 0) {
data.fieldFlags = 0;
}
+
data.readOnly = _this2.hasFieldFlag(_util.AnnotationFieldFlag.READONLY);
+
if (data.fieldType === 'Sig') {
+ data.fieldValue = null;
+
_this2.setFlags(_util.AnnotationFlag.HIDDEN);
}
+
return _this2;
}
_createClass(WidgetAnnotation, [{
- key: '_constructFieldName',
+ key: "_constructFieldName",
value: function _constructFieldName(dict) {
if (!dict.has('T') && !dict.has('Parent')) {
(0, _util.warn)('Unknown field name, falling back to empty field name.');
return '';
}
+
if (!dict.has('Parent')) {
return (0, _util.stringToPDFString)(dict.get('T'));
}
+
var fieldName = [];
+
if (dict.has('T')) {
fieldName.unshift((0, _util.stringToPDFString)(dict.get('T')));
}
+
var loopDict = dict;
+
while (loopDict.has('Parent')) {
loopDict = loopDict.get('Parent');
+
if (!(0, _primitives.isDict)(loopDict)) {
break;
}
+
if (loopDict.has('T')) {
fieldName.unshift((0, _util.stringToPDFString)(loopDict.get('T')));
}
}
+
return fieldName.join('.');
}
}, {
- key: 'hasFieldFlag',
+ key: "hasFieldFlag",
value: function hasFieldFlag(flag) {
return !!(this.data.fieldFlags & flag);
}
}, {
- key: 'getOperatorList',
+ key: "getOperatorList",
value: function getOperatorList(evaluator, task, renderForms) {
if (renderForms) {
return Promise.resolve(new _operator_list.OperatorList());
}
- return _get(WidgetAnnotation.prototype.__proto__ || Object.getPrototypeOf(WidgetAnnotation.prototype), 'getOperatorList', this).call(this, evaluator, task, renderForms);
+
+ return _get(_getPrototypeOf(WidgetAnnotation.prototype), "getOperatorList", this).call(this, evaluator, task, renderForms);
}
}]);
return WidgetAnnotation;
}(Annotation);
-var TextWidgetAnnotation = function (_WidgetAnnotation) {
+var TextWidgetAnnotation =
+/*#__PURE__*/
+function (_WidgetAnnotation) {
_inherits(TextWidgetAnnotation, _WidgetAnnotation);
function TextWidgetAnnotation(params) {
- _classCallCheck(this, TextWidgetAnnotation);
+ var _this3;
- var _this3 = _possibleConstructorReturn(this, (TextWidgetAnnotation.__proto__ || Object.getPrototypeOf(TextWidgetAnnotation)).call(this, params));
+ _classCallCheck(this, TextWidgetAnnotation);
+ _this3 = _possibleConstructorReturn(this, _getPrototypeOf(TextWidgetAnnotation).call(this, params));
var dict = params.dict;
_this3.data.fieldValue = (0, _util.stringToPDFString)(_this3.data.fieldValue || '');
var alignment = (0, _util.getInheritableProperty)({
dict: dict,
key: 'Q'
});
+
if (!Number.isInteger(alignment) || alignment < 0 || alignment > 2) {
alignment = null;
}
+
_this3.data.textAlignment = alignment;
var maximumLength = (0, _util.getInheritableProperty)({
dict: dict,
key: 'MaxLen'
});
+
if (!Number.isInteger(maximumLength) || maximumLength < 0) {
maximumLength = null;
}
+
_this3.data.maxLen = maximumLength;
_this3.data.multiLine = _this3.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE);
_this3.data.comb = _this3.hasFieldFlag(_util.AnnotationFieldFlag.COMB) && !_this3.hasFieldFlag(_util.AnnotationFieldFlag.MULTILINE) && !_this3.hasFieldFlag(_util.AnnotationFieldFlag.PASSWORD) && !_this3.hasFieldFlag(_util.AnnotationFieldFlag.FILESELECT) && _this3.data.maxLen !== null;
@@ -23315,15 +28041,18 @@ var TextWidgetAnnotation = function (_WidgetAnnotation) {
}
_createClass(TextWidgetAnnotation, [{
- key: 'getOperatorList',
+ key: "getOperatorList",
value: function getOperatorList(evaluator, task, renderForms) {
if (renderForms || this.appearance) {
- return _get(TextWidgetAnnotation.prototype.__proto__ || Object.getPrototypeOf(TextWidgetAnnotation.prototype), 'getOperatorList', this).call(this, evaluator, task, renderForms);
+ return _get(_getPrototypeOf(TextWidgetAnnotation.prototype), "getOperatorList", this).call(this, evaluator, task, renderForms);
}
+
var operatorList = new _operator_list.OperatorList();
+
if (!this.data.defaultAppearance) {
return Promise.resolve(operatorList);
}
+
var stream = new _stream.Stream((0, _util.stringToBytes)(this.data.defaultAppearance));
return evaluator.getOperatorList({
stream: stream,
@@ -23339,17 +28068,21 @@ var TextWidgetAnnotation = function (_WidgetAnnotation) {
return TextWidgetAnnotation;
}(WidgetAnnotation);
-var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
+var ButtonWidgetAnnotation =
+/*#__PURE__*/
+function (_WidgetAnnotation2) {
_inherits(ButtonWidgetAnnotation, _WidgetAnnotation2);
function ButtonWidgetAnnotation(params) {
- _classCallCheck(this, ButtonWidgetAnnotation);
+ var _this4;
- var _this4 = _possibleConstructorReturn(this, (ButtonWidgetAnnotation.__proto__ || Object.getPrototypeOf(ButtonWidgetAnnotation)).call(this, params));
+ _classCallCheck(this, ButtonWidgetAnnotation);
+ _this4 = _possibleConstructorReturn(this, _getPrototypeOf(ButtonWidgetAnnotation).call(this, params));
_this4.data.checkBox = !_this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.pushButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
+
if (_this4.data.checkBox) {
_this4._processCheckBox(params);
} else if (_this4.data.radioButton) {
@@ -23359,50 +28092,66 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
} else {
(0, _util.warn)('Invalid field flags for button widget annotation');
}
+
return _this4;
}
_createClass(ButtonWidgetAnnotation, [{
- key: '_processCheckBox',
+ key: "_processCheckBox",
value: function _processCheckBox(params) {
if ((0, _primitives.isName)(this.data.fieldValue)) {
this.data.fieldValue = this.data.fieldValue.name;
}
+
var customAppearance = params.dict.get('AP');
+
if (!(0, _primitives.isDict)(customAppearance)) {
return;
}
+
var exportValueOptionsDict = customAppearance.get('D');
+
if (!(0, _primitives.isDict)(exportValueOptionsDict)) {
return;
}
+
var exportValues = exportValueOptionsDict.getKeys();
var hasCorrectOptionCount = exportValues.length === 2;
+
if (!hasCorrectOptionCount) {
return;
}
+
this.data.exportValue = exportValues[0] === 'Off' ? exportValues[1] : exportValues[0];
}
}, {
- key: '_processRadioButton',
+ key: "_processRadioButton",
value: function _processRadioButton(params) {
this.data.fieldValue = this.data.buttonValue = null;
var fieldParent = params.dict.get('Parent');
+
if ((0, _primitives.isDict)(fieldParent) && fieldParent.has('V')) {
var fieldParentValue = fieldParent.get('V');
+
if ((0, _primitives.isName)(fieldParentValue)) {
this.data.fieldValue = fieldParentValue.name;
}
}
+
var appearanceStates = params.dict.get('AP');
+
if (!(0, _primitives.isDict)(appearanceStates)) {
return;
}
+
var normalAppearanceState = appearanceStates.get('N');
+
if (!(0, _primitives.isDict)(normalAppearanceState)) {
return;
}
+
var keys = normalAppearanceState.getKeys();
+
for (var i = 0, ii = keys.length; i < ii; i++) {
if (keys[i] !== 'Off') {
this.data.buttonValue = keys[i];
@@ -23411,12 +28160,13 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
}
}
}, {
- key: '_processPushButton',
+ key: "_processPushButton",
value: function _processPushButton(params) {
if (!params.dict.has('A')) {
(0, _util.warn)('Push buttons without action dictionaries are not supported');
return;
}
+
_obj.Catalog.parseDestDictionary({
destDict: params.dict,
resultObj: this.data,
@@ -23428,21 +28178,26 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
return ButtonWidgetAnnotation;
}(WidgetAnnotation);
-var ChoiceWidgetAnnotation = function (_WidgetAnnotation3) {
+var ChoiceWidgetAnnotation =
+/*#__PURE__*/
+function (_WidgetAnnotation3) {
_inherits(ChoiceWidgetAnnotation, _WidgetAnnotation3);
function ChoiceWidgetAnnotation(params) {
- _classCallCheck(this, ChoiceWidgetAnnotation);
+ var _this5;
- var _this5 = _possibleConstructorReturn(this, (ChoiceWidgetAnnotation.__proto__ || Object.getPrototypeOf(ChoiceWidgetAnnotation)).call(this, params));
+ _classCallCheck(this, ChoiceWidgetAnnotation);
+ _this5 = _possibleConstructorReturn(this, _getPrototypeOf(ChoiceWidgetAnnotation).call(this, params));
_this5.data.options = [];
var options = (0, _util.getInheritableProperty)({
dict: params.dict,
key: 'Opt'
});
+
if (Array.isArray(options)) {
var xref = params.xref;
+
for (var i = 0, ii = options.length; i < ii; i++) {
var option = xref.fetchIfRef(options[i]);
var isOptionArray = Array.isArray(option);
@@ -23452,9 +28207,11 @@ var ChoiceWidgetAnnotation = function (_WidgetAnnotation3) {
};
}
}
+
if (!Array.isArray(_this5.data.fieldValue)) {
_this5.data.fieldValue = [_this5.data.fieldValue];
}
+
_this5.data.combo = _this5.hasFieldFlag(_util.AnnotationFieldFlag.COMBO);
_this5.data.multiSelect = _this5.hasFieldFlag(_util.AnnotationFieldFlag.MULTISELECT);
return _this5;
@@ -23463,17 +28220,20 @@ var ChoiceWidgetAnnotation = function (_WidgetAnnotation3) {
return ChoiceWidgetAnnotation;
}(WidgetAnnotation);
-var TextAnnotation = function (_Annotation2) {
+var TextAnnotation =
+/*#__PURE__*/
+function (_Annotation2) {
_inherits(TextAnnotation, _Annotation2);
function TextAnnotation(parameters) {
+ var _this6;
+
_classCallCheck(this, TextAnnotation);
var DEFAULT_ICON_SIZE = 22;
-
- var _this6 = _possibleConstructorReturn(this, (TextAnnotation.__proto__ || Object.getPrototypeOf(TextAnnotation)).call(this, parameters));
-
+ _this6 = _possibleConstructorReturn(this, _getPrototypeOf(TextAnnotation).call(this, parameters));
_this6.data.annotationType = _util.AnnotationType.TEXT;
+
if (_this6.data.hasAppearance) {
_this6.data.name = 'NoIcon';
} else {
@@ -23481,154 +28241,195 @@ var TextAnnotation = function (_Annotation2) {
_this6.data.rect[2] = _this6.data.rect[0] + DEFAULT_ICON_SIZE;
_this6.data.name = parameters.dict.has('Name') ? parameters.dict.get('Name').name : 'Note';
}
+
_this6._preparePopup(parameters.dict);
+
return _this6;
}
return TextAnnotation;
}(Annotation);
-var LinkAnnotation = function (_Annotation3) {
+var LinkAnnotation =
+/*#__PURE__*/
+function (_Annotation3) {
_inherits(LinkAnnotation, _Annotation3);
function LinkAnnotation(params) {
- _classCallCheck(this, LinkAnnotation);
+ var _this7;
- var _this7 = _possibleConstructorReturn(this, (LinkAnnotation.__proto__ || Object.getPrototypeOf(LinkAnnotation)).call(this, params));
+ _classCallCheck(this, LinkAnnotation);
+ _this7 = _possibleConstructorReturn(this, _getPrototypeOf(LinkAnnotation).call(this, params));
_this7.data.annotationType = _util.AnnotationType.LINK;
+
_obj.Catalog.parseDestDictionary({
destDict: params.dict,
resultObj: _this7.data,
docBaseUrl: params.pdfManager.docBaseUrl
});
+
return _this7;
}
return LinkAnnotation;
}(Annotation);
-var PopupAnnotation = function (_Annotation4) {
+var PopupAnnotation =
+/*#__PURE__*/
+function (_Annotation4) {
_inherits(PopupAnnotation, _Annotation4);
function PopupAnnotation(parameters) {
- _classCallCheck(this, PopupAnnotation);
+ var _this8;
- var _this8 = _possibleConstructorReturn(this, (PopupAnnotation.__proto__ || Object.getPrototypeOf(PopupAnnotation)).call(this, parameters));
+ _classCallCheck(this, PopupAnnotation);
+ _this8 = _possibleConstructorReturn(this, _getPrototypeOf(PopupAnnotation).call(this, parameters));
_this8.data.annotationType = _util.AnnotationType.POPUP;
var dict = parameters.dict;
var parentItem = dict.get('Parent');
+
if (!parentItem) {
(0, _util.warn)('Popup annotation has a missing or invalid parent annotation.');
return _possibleConstructorReturn(_this8);
}
+
var parentSubtype = parentItem.get('Subtype');
_this8.data.parentType = (0, _primitives.isName)(parentSubtype) ? parentSubtype.name : null;
_this8.data.parentId = dict.getRaw('Parent').toString();
_this8.data.title = (0, _util.stringToPDFString)(parentItem.get('T') || '');
_this8.data.contents = (0, _util.stringToPDFString)(parentItem.get('Contents') || '');
+
if (!parentItem.has('C')) {
_this8.data.color = null;
} else {
_this8.setColor(parentItem.getArray('C'));
+
_this8.data.color = _this8.color;
}
+
if (!_this8.viewable) {
var parentFlags = parentItem.get('F');
+
if (_this8._isViewable(parentFlags)) {
_this8.setFlags(parentFlags);
}
}
+
return _this8;
}
return PopupAnnotation;
}(Annotation);
-var LineAnnotation = function (_Annotation5) {
+var LineAnnotation =
+/*#__PURE__*/
+function (_Annotation5) {
_inherits(LineAnnotation, _Annotation5);
function LineAnnotation(parameters) {
- _classCallCheck(this, LineAnnotation);
+ var _this9;
- var _this9 = _possibleConstructorReturn(this, (LineAnnotation.__proto__ || Object.getPrototypeOf(LineAnnotation)).call(this, parameters));
+ _classCallCheck(this, LineAnnotation);
+ _this9 = _possibleConstructorReturn(this, _getPrototypeOf(LineAnnotation).call(this, parameters));
_this9.data.annotationType = _util.AnnotationType.LINE;
var dict = parameters.dict;
_this9.data.lineCoordinates = _util.Util.normalizeRect(dict.getArray('L'));
+
_this9._preparePopup(dict);
+
return _this9;
}
return LineAnnotation;
}(Annotation);
-var SquareAnnotation = function (_Annotation6) {
+var SquareAnnotation =
+/*#__PURE__*/
+function (_Annotation6) {
_inherits(SquareAnnotation, _Annotation6);
function SquareAnnotation(parameters) {
- _classCallCheck(this, SquareAnnotation);
+ var _this10;
- var _this10 = _possibleConstructorReturn(this, (SquareAnnotation.__proto__ || Object.getPrototypeOf(SquareAnnotation)).call(this, parameters));
+ _classCallCheck(this, SquareAnnotation);
+ _this10 = _possibleConstructorReturn(this, _getPrototypeOf(SquareAnnotation).call(this, parameters));
_this10.data.annotationType = _util.AnnotationType.SQUARE;
+
_this10._preparePopup(parameters.dict);
+
return _this10;
}
return SquareAnnotation;
}(Annotation);
-var CircleAnnotation = function (_Annotation7) {
+var CircleAnnotation =
+/*#__PURE__*/
+function (_Annotation7) {
_inherits(CircleAnnotation, _Annotation7);
function CircleAnnotation(parameters) {
- _classCallCheck(this, CircleAnnotation);
+ var _this11;
- var _this11 = _possibleConstructorReturn(this, (CircleAnnotation.__proto__ || Object.getPrototypeOf(CircleAnnotation)).call(this, parameters));
+ _classCallCheck(this, CircleAnnotation);
+ _this11 = _possibleConstructorReturn(this, _getPrototypeOf(CircleAnnotation).call(this, parameters));
_this11.data.annotationType = _util.AnnotationType.CIRCLE;
+
_this11._preparePopup(parameters.dict);
+
return _this11;
}
return CircleAnnotation;
}(Annotation);
-var PolylineAnnotation = function (_Annotation8) {
+var PolylineAnnotation =
+/*#__PURE__*/
+function (_Annotation8) {
_inherits(PolylineAnnotation, _Annotation8);
function PolylineAnnotation(parameters) {
- _classCallCheck(this, PolylineAnnotation);
+ var _this12;
- var _this12 = _possibleConstructorReturn(this, (PolylineAnnotation.__proto__ || Object.getPrototypeOf(PolylineAnnotation)).call(this, parameters));
+ _classCallCheck(this, PolylineAnnotation);
+ _this12 = _possibleConstructorReturn(this, _getPrototypeOf(PolylineAnnotation).call(this, parameters));
_this12.data.annotationType = _util.AnnotationType.POLYLINE;
var dict = parameters.dict;
var rawVertices = dict.getArray('Vertices');
_this12.data.vertices = [];
+
for (var i = 0, ii = rawVertices.length; i < ii; i += 2) {
_this12.data.vertices.push({
x: rawVertices[i],
y: rawVertices[i + 1]
});
}
+
_this12._preparePopup(dict);
+
return _this12;
}
return PolylineAnnotation;
}(Annotation);
-var PolygonAnnotation = function (_PolylineAnnotation) {
+var PolygonAnnotation =
+/*#__PURE__*/
+function (_PolylineAnnotation) {
_inherits(PolygonAnnotation, _PolylineAnnotation);
function PolygonAnnotation(parameters) {
- _classCallCheck(this, PolygonAnnotation);
+ var _this13;
- var _this13 = _possibleConstructorReturn(this, (PolygonAnnotation.__proto__ || Object.getPrototypeOf(PolygonAnnotation)).call(this, parameters));
+ _classCallCheck(this, PolygonAnnotation);
+ _this13 = _possibleConstructorReturn(this, _getPrototypeOf(PolygonAnnotation).call(this, parameters));
_this13.data.annotationType = _util.AnnotationType.POLYGON;
return _this13;
}
@@ -23636,21 +28437,26 @@ var PolygonAnnotation = function (_PolylineAnnotation) {
return PolygonAnnotation;
}(PolylineAnnotation);
-var InkAnnotation = function (_Annotation9) {
+var InkAnnotation =
+/*#__PURE__*/
+function (_Annotation9) {
_inherits(InkAnnotation, _Annotation9);
function InkAnnotation(parameters) {
- _classCallCheck(this, InkAnnotation);
+ var _this14;
- var _this14 = _possibleConstructorReturn(this, (InkAnnotation.__proto__ || Object.getPrototypeOf(InkAnnotation)).call(this, parameters));
+ _classCallCheck(this, InkAnnotation);
+ _this14 = _possibleConstructorReturn(this, _getPrototypeOf(InkAnnotation).call(this, parameters));
_this14.data.annotationType = _util.AnnotationType.INK;
var dict = parameters.dict;
var xref = parameters.xref;
var originalInkLists = dict.getArray('InkList');
_this14.data.inkLists = [];
+
for (var i = 0, ii = originalInkLists.length; i < ii; ++i) {
_this14.data.inkLists.push([]);
+
for (var j = 0, jj = originalInkLists[i].length; j < jj; j += 2) {
_this14.data.inkLists[i].push({
x: xref.fetchIfRef(originalInkLists[i][j]),
@@ -23658,115 +28464,143 @@ var InkAnnotation = function (_Annotation9) {
});
}
}
+
_this14._preparePopup(dict);
+
return _this14;
}
return InkAnnotation;
}(Annotation);
-var HighlightAnnotation = function (_Annotation10) {
+var HighlightAnnotation =
+/*#__PURE__*/
+function (_Annotation10) {
_inherits(HighlightAnnotation, _Annotation10);
function HighlightAnnotation(parameters) {
- _classCallCheck(this, HighlightAnnotation);
+ var _this15;
- var _this15 = _possibleConstructorReturn(this, (HighlightAnnotation.__proto__ || Object.getPrototypeOf(HighlightAnnotation)).call(this, parameters));
+ _classCallCheck(this, HighlightAnnotation);
+ _this15 = _possibleConstructorReturn(this, _getPrototypeOf(HighlightAnnotation).call(this, parameters));
_this15.data.annotationType = _util.AnnotationType.HIGHLIGHT;
+
_this15._preparePopup(parameters.dict);
+
return _this15;
}
return HighlightAnnotation;
}(Annotation);
-var UnderlineAnnotation = function (_Annotation11) {
+var UnderlineAnnotation =
+/*#__PURE__*/
+function (_Annotation11) {
_inherits(UnderlineAnnotation, _Annotation11);
function UnderlineAnnotation(parameters) {
- _classCallCheck(this, UnderlineAnnotation);
+ var _this16;
- var _this16 = _possibleConstructorReturn(this, (UnderlineAnnotation.__proto__ || Object.getPrototypeOf(UnderlineAnnotation)).call(this, parameters));
+ _classCallCheck(this, UnderlineAnnotation);
+ _this16 = _possibleConstructorReturn(this, _getPrototypeOf(UnderlineAnnotation).call(this, parameters));
_this16.data.annotationType = _util.AnnotationType.UNDERLINE;
+
_this16._preparePopup(parameters.dict);
+
return _this16;
}
return UnderlineAnnotation;
}(Annotation);
-var SquigglyAnnotation = function (_Annotation12) {
+var SquigglyAnnotation =
+/*#__PURE__*/
+function (_Annotation12) {
_inherits(SquigglyAnnotation, _Annotation12);
function SquigglyAnnotation(parameters) {
- _classCallCheck(this, SquigglyAnnotation);
+ var _this17;
- var _this17 = _possibleConstructorReturn(this, (SquigglyAnnotation.__proto__ || Object.getPrototypeOf(SquigglyAnnotation)).call(this, parameters));
+ _classCallCheck(this, SquigglyAnnotation);
+ _this17 = _possibleConstructorReturn(this, _getPrototypeOf(SquigglyAnnotation).call(this, parameters));
_this17.data.annotationType = _util.AnnotationType.SQUIGGLY;
+
_this17._preparePopup(parameters.dict);
+
return _this17;
}
return SquigglyAnnotation;
}(Annotation);
-var StrikeOutAnnotation = function (_Annotation13) {
+var StrikeOutAnnotation =
+/*#__PURE__*/
+function (_Annotation13) {
_inherits(StrikeOutAnnotation, _Annotation13);
function StrikeOutAnnotation(parameters) {
- _classCallCheck(this, StrikeOutAnnotation);
+ var _this18;
- var _this18 = _possibleConstructorReturn(this, (StrikeOutAnnotation.__proto__ || Object.getPrototypeOf(StrikeOutAnnotation)).call(this, parameters));
+ _classCallCheck(this, StrikeOutAnnotation);
+ _this18 = _possibleConstructorReturn(this, _getPrototypeOf(StrikeOutAnnotation).call(this, parameters));
_this18.data.annotationType = _util.AnnotationType.STRIKEOUT;
+
_this18._preparePopup(parameters.dict);
+
return _this18;
}
return StrikeOutAnnotation;
}(Annotation);
-var StampAnnotation = function (_Annotation14) {
+var StampAnnotation =
+/*#__PURE__*/
+function (_Annotation14) {
_inherits(StampAnnotation, _Annotation14);
function StampAnnotation(parameters) {
- _classCallCheck(this, StampAnnotation);
+ var _this19;
- var _this19 = _possibleConstructorReturn(this, (StampAnnotation.__proto__ || Object.getPrototypeOf(StampAnnotation)).call(this, parameters));
+ _classCallCheck(this, StampAnnotation);
+ _this19 = _possibleConstructorReturn(this, _getPrototypeOf(StampAnnotation).call(this, parameters));
_this19.data.annotationType = _util.AnnotationType.STAMP;
+
_this19._preparePopup(parameters.dict);
+
return _this19;
}
return StampAnnotation;
}(Annotation);
-var FileAttachmentAnnotation = function (_Annotation15) {
+var FileAttachmentAnnotation =
+/*#__PURE__*/
+function (_Annotation15) {
_inherits(FileAttachmentAnnotation, _Annotation15);
function FileAttachmentAnnotation(parameters) {
- _classCallCheck(this, FileAttachmentAnnotation);
+ var _this20;
- var _this20 = _possibleConstructorReturn(this, (FileAttachmentAnnotation.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotation)).call(this, parameters));
+ _classCallCheck(this, FileAttachmentAnnotation);
+ _this20 = _possibleConstructorReturn(this, _getPrototypeOf(FileAttachmentAnnotation).call(this, parameters));
var file = new _obj.FileSpec(parameters.dict.get('FS'), parameters.xref);
_this20.data.annotationType = _util.AnnotationType.FILEATTACHMENT;
_this20.data.file = file.serializable;
+
_this20._preparePopup(parameters.dict);
+
return _this20;
}
return FileAttachmentAnnotation;
}(Annotation);
-exports.Annotation = Annotation;
-exports.AnnotationBorderStyle = AnnotationBorderStyle;
-exports.AnnotationFactory = AnnotationFactory;
-
/***/ }),
/* 157 */
/***/ (function(module, exports, __w_pdfjs_require__) {
@@ -23777,48 +28611,60 @@ exports.AnnotationFactory = AnnotationFactory;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.OperatorList = undefined;
+exports.OperatorList = void 0;
var _util = __w_pdfjs_require__(2);
var QueueOptimizer = function QueueOptimizerClosure() {
function addState(parentState, pattern, checkFn, iterateFn, processFn) {
var state = parentState;
+
for (var i = 0, ii = pattern.length - 1; i < ii; i++) {
var item = pattern[i];
state = state[item] || (state[item] = []);
}
+
state[pattern[pattern.length - 1]] = {
checkFn: checkFn,
iterateFn: iterateFn,
processFn: processFn
};
}
+
function handlePaintSolidColorImageMask(iFirstSave, count, fnArray, argsArray) {
var iFirstPIMXO = iFirstSave + 2;
+
for (var i = 0; i < count; i++) {
var arg = argsArray[iFirstPIMXO + 4 * i];
var imageMask = arg.length === 1 && arg[0];
+
if (imageMask && imageMask.width === 1 && imageMask.height === 1 && (!imageMask.data.length || imageMask.data.length === 1 && imageMask.data[0] === 0)) {
fnArray[iFirstPIMXO + 4 * i] = _util.OPS.paintSolidColorImageMask;
continue;
}
+
break;
}
+
return count - i;
}
+
var InitialState = [];
addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintInlineImageXObject, _util.OPS.restore], null, function iterateInlineImageGroup(context, i) {
var fnArray = context.fnArray;
var iFirstSave = context.iCurr - 3;
var pos = (i - iFirstSave) % 4;
+
switch (pos) {
case 0:
return fnArray[i] === _util.OPS.save;
+
case 1:
return fnArray[i] === _util.OPS.transform;
+
case 2:
return fnArray[i] === _util.OPS.paintInlineImageXObject;
+
case 3:
return fnArray[i] === _util.OPS.restore;
}
@@ -23834,24 +28680,29 @@ var QueueOptimizer = function QueueOptimizerClosure() {
var iFirstTransform = curr - 2;
var iFirstPIIXO = curr - 1;
var count = Math.min(Math.floor((i - iFirstSave) / 4), MAX_IMAGES_IN_INLINE_IMAGES_BLOCK);
+
if (count < MIN_IMAGES_IN_INLINE_IMAGES_BLOCK) {
return i - (i - iFirstSave) % 4;
}
+
var maxX = 0;
var map = [],
maxLineHeight = 0;
var currentX = IMAGE_PADDING,
currentY = IMAGE_PADDING;
var q;
+
for (q = 0; q < count; q++) {
var transform = argsArray[iFirstTransform + (q << 2)];
var img = argsArray[iFirstPIIXO + (q << 2)][0];
+
if (currentX + img.width > MAX_WIDTH) {
maxX = Math.max(maxX, currentX);
currentY += maxLineHeight + 2 * IMAGE_PADDING;
currentX = 0;
maxLineHeight = 0;
}
+
map.push({
transform: transform,
x: currentX,
@@ -23862,22 +28713,27 @@ var QueueOptimizer = function QueueOptimizerClosure() {
currentX += img.width + 2 * IMAGE_PADDING;
maxLineHeight = Math.max(maxLineHeight, img.height);
}
+
var imgWidth = Math.max(maxX, currentX) + IMAGE_PADDING;
var imgHeight = currentY + maxLineHeight + IMAGE_PADDING;
var imgData = new Uint8ClampedArray(imgWidth * imgHeight * 4);
var imgRowSize = imgWidth << 2;
+
for (q = 0; q < count; q++) {
var data = argsArray[iFirstPIIXO + (q << 2)][0].data;
var rowSize = map[q].w << 2;
var dataOffset = 0;
var offset = map[q].x + map[q].y * imgWidth << 2;
imgData.set(data.subarray(0, rowSize), offset - imgRowSize);
+
for (var k = 0, kk = map[q].h; k < kk; k++) {
imgData.set(data.subarray(dataOffset, dataOffset + rowSize), offset);
dataOffset += rowSize;
offset += imgRowSize;
}
+
imgData.set(data.subarray(dataOffset - rowSize, dataOffset), offset);
+
while (offset >= 0) {
data[offset - 4] = data[offset];
data[offset - 3] = data[offset + 1];
@@ -23890,6 +28746,7 @@ var QueueOptimizer = function QueueOptimizerClosure() {
offset -= imgRowSize;
}
}
+
fnArray.splice(iFirstSave, count * 4, _util.OPS.paintInlineImageXObjectGroup);
argsArray.splice(iFirstSave, count * 4, [{
width: imgWidth,
@@ -23903,13 +28760,17 @@ var QueueOptimizer = function QueueOptimizerClosure() {
var fnArray = context.fnArray;
var iFirstSave = context.iCurr - 3;
var pos = (i - iFirstSave) % 4;
+
switch (pos) {
case 0:
return fnArray[i] === _util.OPS.save;
+
case 1:
return fnArray[i] === _util.OPS.transform;
+
case 2:
return fnArray[i] === _util.OPS.paintImageMaskXObject;
+
case 3:
return fnArray[i] === _util.OPS.restore;
}
@@ -23925,45 +28786,55 @@ var QueueOptimizer = function QueueOptimizerClosure() {
var iFirstPIMXO = curr - 1;
var count = Math.floor((i - iFirstSave) / 4);
count = handlePaintSolidColorImageMask(iFirstSave, count, fnArray, argsArray);
+
if (count < MIN_IMAGES_IN_MASKS_BLOCK) {
return i - (i - iFirstSave) % 4;
}
+
var q;
var isSameImage = false;
var iTransform, transformArgs;
var firstPIMXOArg0 = argsArray[iFirstPIMXO][0];
+
if (argsArray[iFirstTransform][1] === 0 && argsArray[iFirstTransform][2] === 0) {
isSameImage = true;
var firstTransformArg0 = argsArray[iFirstTransform][0];
var firstTransformArg3 = argsArray[iFirstTransform][3];
iTransform = iFirstTransform + 4;
var iPIMXO = iFirstPIMXO + 4;
+
for (q = 1; q < count; q++, iTransform += 4, iPIMXO += 4) {
transformArgs = argsArray[iTransform];
+
if (argsArray[iPIMXO][0] !== firstPIMXOArg0 || transformArgs[0] !== firstTransformArg0 || transformArgs[1] !== 0 || transformArgs[2] !== 0 || transformArgs[3] !== firstTransformArg3) {
if (q < MIN_IMAGES_IN_MASKS_BLOCK) {
isSameImage = false;
} else {
count = q;
}
+
break;
}
}
}
+
if (isSameImage) {
count = Math.min(count, MAX_SAME_IMAGES_IN_MASKS_BLOCK);
var positions = new Float32Array(count * 2);
iTransform = iFirstTransform;
+
for (q = 0; q < count; q++, iTransform += 4) {
transformArgs = argsArray[iTransform];
positions[q << 1] = transformArgs[4];
positions[(q << 1) + 1] = transformArgs[5];
}
+
fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageMaskXObjectRepeat);
argsArray.splice(iFirstSave, count * 4, [firstPIMXOArg0, firstTransformArg0, firstTransformArg3, positions]);
} else {
count = Math.min(count, MAX_IMAGES_IN_MASKS_BLOCK);
var images = [];
+
for (q = 0; q < count; q++) {
transformArgs = argsArray[iFirstTransform + (q << 2)];
var maskParams = argsArray[iFirstPIMXO + (q << 2)][0];
@@ -23974,9 +28845,11 @@ var QueueOptimizer = function QueueOptimizerClosure() {
transform: transformArgs
});
}
+
fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageMaskXObjectGroup);
argsArray.splice(iFirstSave, count * 4, [images]);
}
+
return iFirstSave + 1;
});
addState(InitialState, [_util.OPS.save, _util.OPS.transform, _util.OPS.paintImageXObject, _util.OPS.restore], function (context) {
@@ -23988,30 +28861,40 @@ var QueueOptimizer = function QueueOptimizerClosure() {
argsArray = context.argsArray;
var iFirstSave = context.iCurr - 3;
var pos = (i - iFirstSave) % 4;
+
switch (pos) {
case 0:
return fnArray[i] === _util.OPS.save;
+
case 1:
if (fnArray[i] !== _util.OPS.transform) {
return false;
}
+
var iFirstTransform = context.iCurr - 2;
var firstTransformArg0 = argsArray[iFirstTransform][0];
var firstTransformArg3 = argsArray[iFirstTransform][3];
+
if (argsArray[i][0] !== firstTransformArg0 || argsArray[i][1] !== 0 || argsArray[i][2] !== 0 || argsArray[i][3] !== firstTransformArg3) {
return false;
}
+
return true;
+
case 2:
if (fnArray[i] !== _util.OPS.paintImageXObject) {
return false;
}
+
var iFirstPIXO = context.iCurr - 1;
var firstPIXOArg0 = argsArray[iFirstPIXO][0];
+
if (argsArray[i][0] !== firstPIXOArg0) {
return false;
}
+
return true;
+
case 3:
return fnArray[i] === _util.OPS.restore;
}
@@ -24028,16 +28911,20 @@ var QueueOptimizer = function QueueOptimizerClosure() {
var firstTransformArg0 = argsArray[iFirstTransform][0];
var firstTransformArg3 = argsArray[iFirstTransform][3];
var count = Math.min(Math.floor((i - iFirstSave) / 4), MAX_IMAGES_IN_BLOCK);
+
if (count < MIN_IMAGES_IN_BLOCK) {
return i - (i - iFirstSave) % 4;
}
+
var positions = new Float32Array(count * 2);
var iTransform = iFirstTransform;
+
for (var q = 0; q < count; q++, iTransform += 4) {
var transformArgs = argsArray[iTransform];
positions[q << 1] = transformArgs[4];
positions[(q << 1) + 1] = transformArgs[5];
}
+
var args = [firstPIXOArg0, firstTransformArg0, firstTransformArg3, positions];
fnArray.splice(iFirstSave, count * 4, _util.OPS.paintImageXObjectRepeat);
argsArray.splice(iFirstSave, count * 4, args);
@@ -24048,24 +28935,32 @@ var QueueOptimizer = function QueueOptimizerClosure() {
argsArray = context.argsArray;
var iFirstSave = context.iCurr - 4;
var pos = (i - iFirstSave) % 5;
+
switch (pos) {
case 0:
return fnArray[i] === _util.OPS.beginText;
+
case 1:
return fnArray[i] === _util.OPS.setFont;
+
case 2:
return fnArray[i] === _util.OPS.setTextMatrix;
+
case 3:
if (fnArray[i] !== _util.OPS.showText) {
return false;
}
+
var iFirstSetFont = context.iCurr - 3;
var firstSetFontArg0 = argsArray[iFirstSetFont][0];
var firstSetFontArg1 = argsArray[iFirstSetFont][1];
+
if (argsArray[i][0] !== firstSetFontArg0 || argsArray[i][1] !== firstSetFontArg1) {
return false;
}
+
return true;
+
case 4:
return fnArray[i] === _util.OPS.endText;
}
@@ -24083,22 +28978,29 @@ var QueueOptimizer = function QueueOptimizerClosure() {
var firstSetFontArg0 = argsArray[iFirstSetFont][0];
var firstSetFontArg1 = argsArray[iFirstSetFont][1];
var count = Math.min(Math.floor((i - iFirstBeginText) / 5), MAX_CHARS_IN_BLOCK);
+
if (count < MIN_CHARS_IN_BLOCK) {
return i - (i - iFirstBeginText) % 5;
}
+
var iFirst = iFirstBeginText;
+
if (iFirstBeginText >= 4 && fnArray[iFirstBeginText - 4] === fnArray[iFirstSetFont] && fnArray[iFirstBeginText - 3] === fnArray[iFirstSetTextMatrix] && fnArray[iFirstBeginText - 2] === fnArray[iFirstShowText] && fnArray[iFirstBeginText - 1] === fnArray[iFirstEndText] && argsArray[iFirstBeginText - 4][0] === firstSetFontArg0 && argsArray[iFirstBeginText - 4][1] === firstSetFontArg1) {
count++;
iFirst -= 5;
}
+
var iEndText = iFirst + 4;
+
for (var q = 1; q < count; q++) {
fnArray.splice(iEndText, 3);
argsArray.splice(iEndText, 3);
iEndText += 2;
}
+
return iEndText + 1;
});
+
function QueueOptimizer(queue) {
this.queue = queue;
this.state = null;
@@ -24110,6 +29012,7 @@ var QueueOptimizer = function QueueOptimizerClosure() {
this.match = null;
this.lastProcessed = 0;
}
+
QueueOptimizer.prototype = {
_optimize: function _optimize() {
var fnArray = this.queue.fnArray;
@@ -24117,40 +29020,52 @@ var QueueOptimizer = function QueueOptimizerClosure() {
ii = fnArray.length;
var state = this.state;
var match = this.match;
+
if (!state && !match && i + 1 === ii && !InitialState[fnArray[i]]) {
this.lastProcessed = ii;
return;
}
+
var context = this.context;
+
while (i < ii) {
if (match) {
var iterate = (0, match.iterateFn)(context, i);
+
if (iterate) {
i++;
continue;
}
+
i = (0, match.processFn)(context, i + 1);
ii = fnArray.length;
match = null;
state = null;
+
if (i >= ii) {
break;
}
}
+
state = (state || InitialState)[fnArray[i]];
+
if (!state || Array.isArray(state)) {
i++;
continue;
}
+
context.iCurr = i;
i++;
+
if (state.checkFn && !(0, state.checkFn)(context)) {
state = null;
continue;
}
+
match = state;
state = null;
}
+
this.state = state;
this.match = match;
this.lastProcessed = i;
@@ -24158,6 +29073,7 @@ var QueueOptimizer = function QueueOptimizerClosure() {
push: function push(fn, args) {
this.queue.fnArray.push(fn);
this.queue.argsArray.push(args);
+
this._optimize();
},
flush: function flush() {
@@ -24166,6 +29082,7 @@ var QueueOptimizer = function QueueOptimizerClosure() {
this.lastProcessed = (0, this.match.processFn)(this.context, length);
this.match = null;
this.state = null;
+
this._optimize();
}
},
@@ -24177,10 +29094,12 @@ var QueueOptimizer = function QueueOptimizerClosure() {
};
return QueueOptimizer;
}();
+
var NullOptimizer = function NullOptimizerClosure() {
function NullOptimizer(queue) {
this.queue = queue;
}
+
NullOptimizer.prototype = {
push: function push(fn, args) {
this.queue.fnArray.push(fn);
@@ -24190,13 +29109,16 @@ var NullOptimizer = function NullOptimizerClosure() {
};
return NullOptimizer;
}();
+
var OperatorList = function OperatorListClosure() {
var CHUNK_SIZE = 1000;
var CHUNK_SIZE_ABOUT = CHUNK_SIZE - 5;
+
function getTransfers(queue) {
var transfers = [];
var fnArray = queue.fnArray,
argsArray = queue.argsArray;
+
for (var i = 0, ii = queue.length; i < ii; i++) {
switch (fnArray[i]) {
case _util.OPS.paintInlineImageXObject:
@@ -24204,39 +29126,49 @@ var OperatorList = function OperatorListClosure() {
case _util.OPS.paintImageMaskXObject:
var arg = argsArray[i][0];
;
+
if (!arg.cached) {
transfers.push(arg.data.buffer);
}
+
break;
}
}
+
return transfers;
}
+
function OperatorList(intent, messageHandler, pageIndex) {
this.messageHandler = messageHandler;
this.fnArray = [];
this.argsArray = [];
+
if (messageHandler && this.intent !== 'oplist') {
this.optimizer = new QueueOptimizer(this);
} else {
this.optimizer = new NullOptimizer(this);
}
+
this.dependencies = Object.create(null);
this._totalLength = 0;
this.pageIndex = pageIndex;
this.intent = intent;
this.weight = 0;
}
+
OperatorList.prototype = {
get length() {
return this.argsArray.length;
},
+
get totalLength() {
return this._totalLength + this.length;
},
+
addOp: function addOp(fn, args) {
this.optimizer.push(fn, args);
this.weight++;
+
if (this.messageHandler) {
if (this.weight >= CHUNK_SIZE) {
this.flush();
@@ -24249,6 +29181,7 @@ var OperatorList = function OperatorListClosure() {
if (dependency in this.dependencies) {
return;
}
+
this.dependencies[dependency] = true;
this.addOp(_util.OPS.dependency, [dependency]);
},
@@ -24259,6 +29192,7 @@ var OperatorList = function OperatorListClosure() {
},
addOpList: function addOpList(opList) {
Object.assign(this.dependencies, opList.dependencies);
+
for (var i = 0, ii = opList.length; i < ii; i++) {
this.addOp(opList.fnArray[i], opList.argsArray[i]);
}
@@ -24294,6 +29228,7 @@ var OperatorList = function OperatorListClosure() {
};
return OperatorList;
}();
+
exports.OperatorList = OperatorList;
/***/ }),
@@ -24306,11 +29241,9 @@ exports.OperatorList = OperatorList;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PartialEvaluator = undefined;
-
-var _regenerator = __w_pdfjs_require__(135);
+exports.PartialEvaluator = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(135));
var _util = __w_pdfjs_require__(2);
@@ -24352,7 +29285,9 @@ var _image = __w_pdfjs_require__(175);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
var PartialEvaluator = function PartialEvaluatorClosure() {
var DefaultPartialEvaluatorOptions = {
@@ -24363,20 +29298,21 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
ignoreErrors: false,
isEvalSupported: true
};
+
function NativeImageDecoder(_ref) {
var xref = _ref.xref,
resources = _ref.resources,
handler = _ref.handler,
_ref$forceDataSchema = _ref.forceDataSchema,
- forceDataSchema = _ref$forceDataSchema === undefined ? false : _ref$forceDataSchema,
+ forceDataSchema = _ref$forceDataSchema === void 0 ? false : _ref$forceDataSchema,
pdfFunctionFactory = _ref.pdfFunctionFactory;
-
this.xref = xref;
this.resources = resources;
this.handler = handler;
this.forceDataSchema = forceDataSchema;
this.pdfFunctionFactory = pdfFunctionFactory;
}
+
NativeImageDecoder.prototype = {
canDecode: function canDecode(image) {
return image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isDecodable(image, this.xref, this.resources, this.pdfFunctionFactory);
@@ -24389,27 +29325,35 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var data = _ref2.data,
width = _ref2.width,
height = _ref2.height;
-
return new _stream.Stream(data, 0, data.length, image.dict);
});
}
};
+
NativeImageDecoder.isSupported = function (image, xref, res, pdfFunctionFactory) {
var dict = image.dict;
+
if (dict.has('DecodeParms') || dict.has('DP')) {
return false;
}
+
var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory);
+
return (cs.name === 'DeviceGray' || cs.name === 'DeviceRGB') && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
};
+
NativeImageDecoder.isDecodable = function (image, xref, res, pdfFunctionFactory) {
var dict = image.dict;
+
if (dict.has('DecodeParms') || dict.has('DP')) {
return false;
}
+
var cs = _colorspace.ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res, pdfFunctionFactory);
+
return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
};
+
function PartialEvaluator(_ref3) {
var _this = this;
@@ -24421,9 +29365,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
fontCache = _ref3.fontCache,
builtInCMapCache = _ref3.builtInCMapCache,
_ref3$options = _ref3.options,
- options = _ref3$options === undefined ? null : _ref3$options,
+ options = _ref3$options === void 0 ? null : _ref3$options,
pdfFunctionFactory = _ref3.pdfFunctionFactory;
-
this.pdfManager = pdfManager;
this.xref = xref;
this.handler = handler;
@@ -24433,10 +29376,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
this.builtInCMapCache = builtInCMapCache;
this.options = options || DefaultPartialEvaluatorOptions;
this.pdfFunctionFactory = pdfFunctionFactory;
- this.fetchBuiltInCMap = function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(name) {
+
+ this.fetchBuiltInCMap =
+ /*#__PURE__*/
+ function () {
+ var _ref4 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(name) {
var data;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -24445,11 +29393,13 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
break;
}
- return _context.abrupt('return', _this.builtInCMapCache.get(name));
+ return _context.abrupt("return", _this.builtInCMapCache.get(name));
case 2:
_context.next = 4;
- return _this.handler.sendWithPromise('FetchBuiltInCMap', { name: name });
+ return _this.handler.sendWithPromise('FetchBuiltInCMap', {
+ name: name
+ });
case 4:
data = _context.sent;
@@ -24457,14 +29407,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (data.compressionType !== _util.CMapCompressionType.NONE) {
_this.builtInCMapCache.set(name, data);
}
- return _context.abrupt('return', data);
+
+ return _context.abrupt("return", data);
case 7:
- case 'end':
+ case "end":
return _context.stop();
}
}
- }, _callee, _this);
+ }, _callee, this);
}));
return function (_x) {
@@ -24472,16 +29423,20 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
};
}();
}
+
var TIME_SLOT_DURATION_MS = 20;
var CHECK_TIME_EVERY = 100;
+
function TimeSlotManager() {
this.reset();
}
+
TimeSlotManager.prototype = {
check: function TimeSlotManager_check() {
if (++this.checked < CHECK_TIME_EVERY) {
return false;
}
+
this.checked = 0;
return this.endTime <= Date.now();
},
@@ -24490,129 +29445,169 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
this.checked = 0;
}
};
+
function normalizeBlendMode(value) {
if (!(0, _primitives.isName)(value)) {
return 'source-over';
}
+
switch (value.name) {
case 'Normal':
case 'Compatible':
return 'source-over';
+
case 'Multiply':
return 'multiply';
+
case 'Screen':
return 'screen';
+
case 'Overlay':
return 'overlay';
+
case 'Darken':
return 'darken';
+
case 'Lighten':
return 'lighten';
+
case 'ColorDodge':
return 'color-dodge';
+
case 'ColorBurn':
return 'color-burn';
+
case 'HardLight':
return 'hard-light';
+
case 'SoftLight':
return 'soft-light';
+
case 'Difference':
return 'difference';
+
case 'Exclusion':
return 'exclusion';
+
case 'Hue':
return 'hue';
+
case 'Saturation':
return 'saturation';
+
case 'Color':
return 'color';
+
case 'Luminosity':
return 'luminosity';
}
+
(0, _util.warn)('Unsupported blend mode: ' + value.name);
return 'source-over';
}
+
var deferred = Promise.resolve();
var TILING_PATTERN = 1,
SHADING_PATTERN = 2;
PartialEvaluator.prototype = {
clone: function clone() {
var newOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DefaultPartialEvaluatorOptions;
-
var newEvaluator = Object.create(this);
newEvaluator.options = newOptions;
return newEvaluator;
},
-
hasBlendModes: function PartialEvaluator_hasBlendModes(resources) {
if (!(0, _primitives.isDict)(resources)) {
return false;
}
+
var processed = Object.create(null);
+
if (resources.objId) {
processed[resources.objId] = true;
}
+
var nodes = [resources],
xref = this.xref;
+
while (nodes.length) {
var key, i, ii;
var node = nodes.shift();
var graphicStates = node.get('ExtGState');
+
if ((0, _primitives.isDict)(graphicStates)) {
var graphicStatesKeys = graphicStates.getKeys();
+
for (i = 0, ii = graphicStatesKeys.length; i < ii; i++) {
key = graphicStatesKeys[i];
var graphicState = graphicStates.get(key);
var bm = graphicState.get('BM');
+
if ((0, _primitives.isName)(bm) && bm.name !== 'Normal') {
return true;
}
}
}
+
var xObjects = node.get('XObject');
+
if (!(0, _primitives.isDict)(xObjects)) {
continue;
}
+
var xObjectsKeys = xObjects.getKeys();
+
for (i = 0, ii = xObjectsKeys.length; i < ii; i++) {
key = xObjectsKeys[i];
var xObject = xObjects.getRaw(key);
+
if ((0, _primitives.isRef)(xObject)) {
if (processed[xObject.toString()]) {
continue;
}
+
xObject = xref.fetch(xObject);
}
+
if (!(0, _primitives.isStream)(xObject)) {
continue;
}
+
if (xObject.dict.objId) {
if (processed[xObject.dict.objId]) {
continue;
}
+
processed[xObject.dict.objId] = true;
}
+
var xResources = xObject.dict.get('Resources');
+
if ((0, _primitives.isDict)(xResources) && (!xResources.objId || !processed[xResources.objId])) {
nodes.push(xResources);
+
if (xResources.objId) {
processed[xResources.objId] = true;
}
}
}
}
+
return false;
},
buildFormXObject: function PartialEvaluator_buildFormXObject(resources, xobj, smask, operatorList, task, initialState) {
var dict = xobj.dict;
var matrix = dict.getArray('Matrix');
var bbox = dict.getArray('BBox');
+
if (Array.isArray(bbox) && bbox.length === 4) {
bbox = _util.Util.normalizeRect(bbox);
} else {
bbox = null;
}
+
var group = dict.get('Group');
+
if (group) {
var groupOptions = {
matrix: matrix,
@@ -24623,19 +29618,24 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
};
var groupSubtype = group.get('S');
var colorSpace = null;
+
if ((0, _primitives.isName)(groupSubtype, 'Transparency')) {
groupOptions.isolated = group.get('I') || false;
groupOptions.knockout = group.get('K') || false;
+
if (group.has('CS')) {
colorSpace = _colorspace.ColorSpace.parse(group.get('CS'), this.xref, resources, this.pdfFunctionFactory);
}
}
+
if (smask && smask.backdrop) {
colorSpace = colorSpace || _colorspace.ColorSpace.singletons.rgb;
smask.backdrop = colorSpace.getRgb(smask.backdrop, 0);
}
+
operatorList.addOp(_util.OPS.beginGroup, [groupOptions]);
}
+
operatorList.addOp(_util.OPS.paintFormXObjectBegin, [matrix, bbox]);
return this.getOperatorList({
stream: xobj,
@@ -24645,6 +29645,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
initialState: initialState
}).then(function () {
operatorList.addOp(_util.OPS.paintFormXObjectEnd, []);
+
if (group) {
operatorList.addOp(_util.OPS.endGroup, [groupOptions]);
}
@@ -24656,27 +29657,31 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var resources = _ref5.resources,
image = _ref5.image,
_ref5$isInline = _ref5.isInline,
- isInline = _ref5$isInline === undefined ? false : _ref5$isInline,
+ isInline = _ref5$isInline === void 0 ? false : _ref5$isInline,
operatorList = _ref5.operatorList,
cacheKey = _ref5.cacheKey,
imageCache = _ref5.imageCache,
_ref5$forceDisableNat = _ref5.forceDisableNativeImageDecoder,
- forceDisableNativeImageDecoder = _ref5$forceDisableNat === undefined ? false : _ref5$forceDisableNat;
-
+ forceDisableNativeImageDecoder = _ref5$forceDisableNat === void 0 ? false : _ref5$forceDisableNat;
var dict = image.dict;
var w = dict.get('Width', 'W');
var h = dict.get('Height', 'H');
+
if (!(w && (0, _util.isNum)(w)) || !(h && (0, _util.isNum)(h))) {
(0, _util.warn)('Image dimensions are missing, or not numbers.');
return Promise.resolve();
}
+
var maxImageSize = this.options.maxImageSize;
+
if (maxImageSize !== -1 && w * h > maxImageSize) {
(0, _util.warn)('Image exceeded maximum allowed size and was removed.');
return Promise.resolve();
}
+
var imageMask = dict.get('ImageMask', 'IM') || false;
var imgData, args;
+
if (imageMask) {
var width = dict.get('Width', 'W');
var height = dict.get('Height', 'H');
@@ -24693,17 +29698,21 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
imgData.cached = true;
args = [imgData];
operatorList.addOp(_util.OPS.paintImageMaskXObject, args);
+
if (cacheKey) {
imageCache[cacheKey] = {
fn: _util.OPS.paintImageMaskXObject,
args: args
};
}
+
return Promise.resolve();
}
+
var softMask = dict.get('SMask', 'SM') || false;
var mask = dict.get('Mask') || false;
var SMALL_IMAGE_DIMENSIONS = 200;
+
if (isInline && !softMask && !mask && !(image instanceof _jpeg_stream.JpegStream) && w + h < SMALL_IMAGE_DIMENSIONS) {
var imageObj = new _image.PDFImage({
xref: this.xref,
@@ -24716,13 +29725,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
operatorList.addOp(_util.OPS.paintInlineImageXObject, [imgData]);
return Promise.resolve();
}
+
var nativeImageDecoderSupport = forceDisableNativeImageDecoder ? _util.NativeImageDecoding.NONE : this.options.nativeImageDecoderSupport;
var objId = 'img_' + this.idFactory.createObjId();
+
if (nativeImageDecoderSupport !== _util.NativeImageDecoding.NONE && !softMask && !mask && image instanceof _jpeg_stream.JpegStream && NativeImageDecoder.isSupported(image, this.xref, resources, this.pdfFunctionFactory)) {
return this.handler.sendWithPromise('obj', [objId, this.pageIndex, 'JpegStream', image.getIR(this.options.forceDataSchema)]).then(function () {
operatorList.addDependency(objId);
args = [objId, w, h];
operatorList.addOp(_util.OPS.paintJpegXObject, args);
+
if (cacheKey) {
imageCache[cacheKey] = {
fn: _util.OPS.paintJpegXObject,
@@ -24742,7 +29754,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
});
});
}
+
var nativeImageDecoder = null;
+
if (nativeImageDecoderSupport === _util.NativeImageDecoding.DECODE && (image instanceof _jpeg_stream.JpegStream || mask instanceof _jpeg_stream.JpegStream || softMask instanceof _jpeg_stream.JpegStream)) {
nativeImageDecoder = new NativeImageDecoder({
xref: this.xref,
@@ -24752,8 +29766,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
pdfFunctionFactory: this.pdfFunctionFactory
});
}
+
operatorList.addDependency(objId);
args = [objId, w, h];
+
_image.PDFImage.buildImage({
handler: this.handler,
xref: this.xref,
@@ -24764,21 +29780,25 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
pdfFunctionFactory: this.pdfFunctionFactory
}).then(function (imageObj) {
var imgData = imageObj.createImageData(false);
+
_this2.handler.send('obj', [objId, _this2.pageIndex, 'Image', imgData], [imgData.data.buffer]);
}).catch(function (reason) {
(0, _util.warn)('Unable to decode image: ' + reason);
+
_this2.handler.send('obj', [objId, _this2.pageIndex, 'Image', null]);
});
+
operatorList.addOp(_util.OPS.paintImageXObject, args);
+
if (cacheKey) {
imageCache[cacheKey] = {
fn: _util.OPS.paintImageXObject,
args: args
};
}
+
return Promise.resolve();
},
-
handleSMask: function PartialEvaluator_handleSmask(smask, resources, operatorList, task, stateManager) {
var smaskContent = smask.get('G');
var smaskOptions = {
@@ -24786,17 +29806,21 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
backdrop: smask.get('BC')
};
var transferObj = smask.get('TR');
+
if ((0, _function.isPDFFunction)(transferObj)) {
var transferFn = this.pdfFunctionFactory.create(transferObj);
var transferMap = new Uint8Array(256);
var tmp = new Float32Array(1);
+
for (var i = 0; i < 256; i++) {
tmp[0] = i / 255;
transferFn(tmp, 0, tmp, 0);
transferMap[i] = tmp[0] * 255 | 0;
}
+
smaskOptions.transferMap = transferMap;
}
+
return this.buildFormXObject(resources, smaskContent, smaskOptions, operatorList, task, stateManager.state.clone());
},
handleTilingType: function handleTilingType(fn, args, resources, pattern, patternDict, operatorList, task) {
@@ -24804,7 +29828,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var tilingOpList = new _operator_list.OperatorList();
var resourcesArray = [patternDict.get('Resources'), resources];
+
var patternResources = _primitives.Dict.merge(this.xref, resourcesArray);
+
return this.getOperatorList({
stream: pattern,
task: task,
@@ -24820,30 +29846,39 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
operatorList.addOp(fn, tilingPatternIR);
}, function (reason) {
if (_this3.options.ignoreErrors) {
- _this3.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
- (0, _util.warn)('handleTilingType - ignoring pattern: "' + reason + '".');
+ _this3.handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.unknown
+ });
+
+ (0, _util.warn)("handleTilingType - ignoring pattern: \"".concat(reason, "\"."));
return;
}
+
throw reason;
});
},
-
handleSetFont: function PartialEvaluator_handleSetFont(resources, fontArgs, fontRef, operatorList, task, state) {
var _this4 = this;
var fontName;
+
if (fontArgs) {
fontArgs = fontArgs.slice();
fontName = fontArgs[0].name;
}
+
return this.loadFont(fontName, fontRef, resources).then(function (translated) {
if (!translated.font.isType3Font) {
return translated;
}
+
return translated.loadType3Data(_this4, resources, operatorList, task).then(function () {
return translated;
}).catch(function (reason) {
- _this4.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.font });
+ _this4.handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.font
+ });
+
return new TranslatedFont('g_font_error', new _fonts.ErrorFont('Type3 font load error: ' + reason), translated.font);
});
}).then(function (translated) {
@@ -24858,22 +29893,27 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var font = state.font;
var glyphs = font.charsToGlyphs(chars);
var isAddToPathSet = !!(state.textRenderingMode & _util.TextRenderingMode.ADD_TO_PATH_FLAG);
+
if (font.data && (isAddToPathSet || this.options.disableFontFace || state.fillColorSpace.name === 'Pattern')) {
var buildPath = function buildPath(fontChar) {
if (!font.renderer.hasBuiltPath(fontChar)) {
var path = font.renderer.getPathJs(fontChar);
+
_this5.handler.send('commonobj', [font.loadedName + '_path_' + fontChar, 'FontPath', path]);
}
};
+
for (var i = 0, ii = glyphs.length; i < ii; i++) {
var glyph = glyphs[i];
buildPath(glyph.fontChar);
var accent = glyph.accent;
+
if (accent && accent.fontChar) {
buildPath(accent.fontChar);
}
}
}
+
return glyphs;
},
setGState: function PartialEvaluator_setGState(resources, gState, operatorList, task, stateManager) {
@@ -24886,9 +29926,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var _loop = function _loop() {
var key = gStateKeys[i];
var value = gState.get(key);
+
switch (key) {
case 'Type':
break;
+
case 'LW':
case 'LC':
case 'LJ':
@@ -24900,6 +29942,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
case 'ca':
gStateObj.push([key, value]);
break;
+
case 'Font':
promise = promise.then(function () {
return _this6.handleSetFont(resources, null, value[0], operatorList, task, stateManager.state).then(function (loadedName) {
@@ -24908,14 +29951,17 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
});
});
break;
+
case 'BM':
gStateObj.push([key, normalizeBlendMode(value)]);
break;
+
case 'SMask':
if ((0, _primitives.isName)(value, 'None')) {
gStateObj.push([key, false]);
break;
}
+
if ((0, _primitives.isDict)(value)) {
promise = promise.then(function () {
return _this6.handleSMask(value, resources, operatorList, task, stateManager);
@@ -24924,7 +29970,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else {
(0, _util.warn)('Unsupported SMask type');
}
+
break;
+
case 'OP':
case 'op':
case 'OPM':
@@ -24941,6 +29989,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
case 'TK':
(0, _util.info)('graphic state operator ' + key);
break;
+
default:
(0, _util.info)('Unknown graphic state operator ' + key);
break;
@@ -24950,6 +29999,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
for (var i = 0, ii = gStateKeys.length; i < ii; i++) {
_loop();
}
+
return promise.then(function () {
if (gStateObj.length > 0) {
operatorList.addOp(_util.OPS.setGState, [gStateObj]);
@@ -24962,15 +30012,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
function errorFont() {
return Promise.resolve(new TranslatedFont('g_font_error', new _fonts.ErrorFont('Font ' + fontName + ' is not available'), font));
}
+
var fontRef,
xref = this.xref;
+
if (font) {
if (!(0, _primitives.isRef)(font)) {
throw new Error('The "font" object should be a reference.');
}
+
fontRef = font;
} else {
var fontRes = resources.get('Font');
+
if (fontRes) {
fontRef = fontRes.getRaw(fontName);
} else {
@@ -24978,73 +30032,97 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
return errorFont();
}
}
+
if (!fontRef) {
(0, _util.warn)('fontRef not available');
return errorFont();
}
+
if (this.fontCache.has(fontRef)) {
return this.fontCache.get(fontRef);
}
+
font = xref.fetchIfRef(fontRef);
+
if (!(0, _primitives.isDict)(font)) {
return errorFont();
}
+
if (font.translated) {
return font.translated;
}
+
var fontCapability = (0, _util.createPromiseCapability)();
var preEvaluatedFont = this.preEvaluateFont(font);
var descriptor = preEvaluatedFont.descriptor;
var fontRefIsRef = (0, _primitives.isRef)(fontRef),
fontID;
+
if (fontRefIsRef) {
fontID = fontRef.toString();
}
+
if ((0, _primitives.isDict)(descriptor)) {
if (!descriptor.fontAliases) {
descriptor.fontAliases = Object.create(null);
}
+
var fontAliases = descriptor.fontAliases;
var hash = preEvaluatedFont.hash;
+
if (fontAliases[hash]) {
var aliasFontRef = fontAliases[hash].aliasRef;
+
if (fontRefIsRef && aliasFontRef && this.fontCache.has(aliasFontRef)) {
this.fontCache.putAlias(fontRef, aliasFontRef);
return this.fontCache.get(fontRef);
}
} else {
- fontAliases[hash] = { fontID: _fonts.Font.getFontID() };
+ fontAliases[hash] = {
+ fontID: _fonts.Font.getFontID()
+ };
}
+
if (fontRefIsRef) {
fontAliases[hash].aliasRef = fontRef;
}
+
fontID = fontAliases[hash].fontID;
}
+
if (fontRefIsRef) {
this.fontCache.put(fontRef, fontCapability.promise);
} else {
if (!fontID) {
fontID = this.idFactory.createObjId();
}
+
this.fontCache.put('id_' + fontID, fontCapability.promise);
}
+
(0, _util.assert)(fontID, 'The "fontID" must be defined.');
font.loadedName = 'g_' + this.pdfManager.docId + '_f' + fontID;
font.translated = fontCapability.promise;
var translatedPromise;
+
try {
translatedPromise = this.translateFont(preEvaluatedFont);
} catch (e) {
translatedPromise = Promise.reject(e);
}
+
translatedPromise.then(function (translatedFont) {
if (translatedFont.fontType !== undefined) {
var xrefFontStats = xref.stats.fontTypes;
xrefFontStats[translatedFont.fontType] = true;
}
+
fontCapability.resolve(new TranslatedFont(font.loadedName, translatedFont, font));
}).catch(function (reason) {
- _this7.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.font });
+ _this7.handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.font
+ });
+
try {
var descriptor = preEvaluatedFont.descriptor;
var fontFile3 = descriptor && descriptor.get('FontFile3');
@@ -25053,15 +30131,18 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var xrefFontStats = xref.stats.fontTypes;
xrefFontStats[fontType] = true;
} catch (ex) {}
+
fontCapability.resolve(new TranslatedFont(font.loadedName, new _fonts.ErrorFont(reason instanceof Error ? reason.message : reason), font));
});
return fontCapability.promise;
},
buildPath: function PartialEvaluator_buildPath(operatorList, fn, args) {
var lastIndex = operatorList.length - 1;
+
if (!args) {
args = [];
}
+
if (lastIndex < 0 || operatorList.fnArray[lastIndex] !== _util.OPS.constructPath) {
operatorList.addOp(_util.OPS.constructPath, [[fn], args]);
} else {
@@ -25073,9 +30154,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
handleColorN: function PartialEvaluator_handleColorN(operatorList, fn, args, cs, patterns, resources, task) {
var patternName = args[args.length - 1];
var pattern;
+
if ((0, _primitives.isName)(patternName) && (pattern = patterns.get(patternName.name))) {
var dict = (0, _primitives.isStream)(pattern) ? pattern.dict : pattern;
var typeNum = dict.get('PatternType');
+
if (typeNum === TILING_PATTERN) {
var color = cs.base ? cs.base.getRgb(args, 0) : null;
return this.handleTilingType(fn, color, resources, pattern, dict, operatorList, task);
@@ -25086,8 +30169,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
operatorList.addOp(fn, pattern.getIR());
return Promise.resolve();
}
+
return Promise.reject(new Error('Unknown PatternType: ' + typeNum));
}
+
operatorList.addOp(fn, args);
return Promise.resolve();
},
@@ -25099,26 +30184,32 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
resources = _ref6.resources,
operatorList = _ref6.operatorList,
_ref6$initialState = _ref6.initialState,
- initialState = _ref6$initialState === undefined ? null : _ref6$initialState;
-
+ initialState = _ref6$initialState === void 0 ? null : _ref6$initialState;
resources = resources || _primitives.Dict.empty;
initialState = initialState || new EvalState();
+
if (!operatorList) {
throw new Error('getOperatorList: missing "operatorList" parameter');
}
+
var self = this;
var xref = this.xref;
var imageCache = Object.create(null);
+
var xobjs = resources.get('XObject') || _primitives.Dict.empty;
+
var patterns = resources.get('Pattern') || _primitives.Dict.empty;
+
var stateManager = new StateManager(initialState);
var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
var timeSlotManager = new TimeSlotManager();
+
function closePendingRestoreOPS(argument) {
for (var i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) {
operatorList.addOp(_util.OPS.restore, []);
}
}
+
return new Promise(function promiseBody(resolve, reject) {
var next = function next(promise) {
promise.then(function () {
@@ -25129,6 +30220,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}
}, reject);
};
+
task.ensureNotTerminated();
timeSlotManager.reset();
var stop,
@@ -25136,38 +30228,50 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
i,
ii,
cs;
+
while (!(stop = timeSlotManager.check())) {
operation.args = null;
+
if (!preprocessor.read(operation)) {
break;
}
+
var args = operation.args;
var fn = operation.fn;
+
switch (fn | 0) {
case _util.OPS.paintXObject:
var name = args[0].name;
+
if (name && imageCache[name] !== undefined) {
operatorList.addOp(imageCache[name].fn, imageCache[name].args);
args = null;
continue;
}
+
next(new Promise(function (resolveXObject, rejectXObject) {
if (!name) {
throw new _util.FormatError('XObject must be referred to by name.');
}
+
var xobj = xobjs.get(name);
+
if (!xobj) {
operatorList.addOp(fn, args);
resolveXObject();
return;
}
+
if (!(0, _primitives.isStream)(xobj)) {
throw new _util.FormatError('XObject should be a stream');
}
+
var type = xobj.dict.get('Subtype');
+
if (!(0, _primitives.isName)(type)) {
throw new _util.FormatError('XObject should have a Name subtype');
}
+
if (type.name === 'Form') {
stateManager.save();
self.buildFormXObject(resources, xobj, null, operatorList, task, stateManager.state.clone()).then(function () {
@@ -25187,18 +30291,23 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else if (type.name === 'PS') {
(0, _util.info)('Ignored XObject subtype PS');
} else {
- throw new _util.FormatError('Unhandled XObject subtype ' + type.name);
+ throw new _util.FormatError("Unhandled XObject subtype ".concat(type.name));
}
+
resolveXObject();
}).catch(function (reason) {
if (self.options.ignoreErrors) {
- self.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
- (0, _util.warn)('getOperatorList - ignoring XObject: "' + reason + '".');
+ self.handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.unknown
+ });
+ (0, _util.warn)("getOperatorList - ignoring XObject: \"".concat(reason, "\"."));
return;
}
+
throw reason;
}));
return;
+
case _util.OPS.setFont:
var fontSize = args[1];
next(self.handleSetFont(resources, args, null, operatorList, task, stateManager.state).then(function (loadedName) {
@@ -25206,16 +30315,20 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
operatorList.addOp(_util.OPS.setFont, [loadedName, fontSize]);
}));
return;
+
case _util.OPS.endInlineImage:
var cacheKey = args[0].cacheKey;
+
if (cacheKey) {
var cacheEntry = imageCache[cacheKey];
+
if (cacheEntry !== undefined) {
operatorList.addOp(cacheEntry.fn, cacheEntry.args);
args = null;
continue;
}
}
+
next(self.buildPaintImageXObject({
resources: resources,
image: args[0],
@@ -25225,30 +30338,37 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
imageCache: imageCache
}));
return;
+
case _util.OPS.showText:
args[0] = self.handleText(args[0], stateManager.state);
break;
+
case _util.OPS.showSpacedText:
var arr = args[0];
var combinedGlyphs = [];
var arrLength = arr.length;
var state = stateManager.state;
+
for (i = 0; i < arrLength; ++i) {
var arrItem = arr[i];
+
if ((0, _util.isString)(arrItem)) {
Array.prototype.push.apply(combinedGlyphs, self.handleText(arrItem, state));
} else if ((0, _util.isNum)(arrItem)) {
combinedGlyphs.push(arrItem);
}
}
+
args[0] = combinedGlyphs;
fn = _util.OPS.showText;
break;
+
case _util.OPS.nextLineShowText:
operatorList.addOp(_util.OPS.nextLine);
args[0] = self.handleText(args[0], stateManager.state);
fn = _util.OPS.showText;
break;
+
case _util.OPS.nextLineSetSpacingShowText:
operatorList.addOp(_util.OPS.nextLine);
operatorList.addOp(_util.OPS.setWordSpacing, [args.shift()]);
@@ -25256,94 +30376,121 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
args[0] = self.handleText(args[0], stateManager.state);
fn = _util.OPS.showText;
break;
+
case _util.OPS.setTextRenderingMode:
stateManager.state.textRenderingMode = args[0];
break;
+
case _util.OPS.setFillColorSpace:
stateManager.state.fillColorSpace = _colorspace.ColorSpace.parse(args[0], xref, resources, self.pdfFunctionFactory);
continue;
+
case _util.OPS.setStrokeColorSpace:
stateManager.state.strokeColorSpace = _colorspace.ColorSpace.parse(args[0], xref, resources, self.pdfFunctionFactory);
continue;
+
case _util.OPS.setFillColor:
cs = stateManager.state.fillColorSpace;
args = cs.getRgb(args, 0);
fn = _util.OPS.setFillRGBColor;
break;
+
case _util.OPS.setStrokeColor:
cs = stateManager.state.strokeColorSpace;
args = cs.getRgb(args, 0);
fn = _util.OPS.setStrokeRGBColor;
break;
+
case _util.OPS.setFillGray:
stateManager.state.fillColorSpace = _colorspace.ColorSpace.singletons.gray;
args = _colorspace.ColorSpace.singletons.gray.getRgb(args, 0);
fn = _util.OPS.setFillRGBColor;
break;
+
case _util.OPS.setStrokeGray:
stateManager.state.strokeColorSpace = _colorspace.ColorSpace.singletons.gray;
args = _colorspace.ColorSpace.singletons.gray.getRgb(args, 0);
fn = _util.OPS.setStrokeRGBColor;
break;
+
case _util.OPS.setFillCMYKColor:
stateManager.state.fillColorSpace = _colorspace.ColorSpace.singletons.cmyk;
args = _colorspace.ColorSpace.singletons.cmyk.getRgb(args, 0);
fn = _util.OPS.setFillRGBColor;
break;
+
case _util.OPS.setStrokeCMYKColor:
stateManager.state.strokeColorSpace = _colorspace.ColorSpace.singletons.cmyk;
args = _colorspace.ColorSpace.singletons.cmyk.getRgb(args, 0);
fn = _util.OPS.setStrokeRGBColor;
break;
+
case _util.OPS.setFillRGBColor:
stateManager.state.fillColorSpace = _colorspace.ColorSpace.singletons.rgb;
args = _colorspace.ColorSpace.singletons.rgb.getRgb(args, 0);
break;
+
case _util.OPS.setStrokeRGBColor:
stateManager.state.strokeColorSpace = _colorspace.ColorSpace.singletons.rgb;
args = _colorspace.ColorSpace.singletons.rgb.getRgb(args, 0);
break;
+
case _util.OPS.setFillColorN:
cs = stateManager.state.fillColorSpace;
+
if (cs.name === 'Pattern') {
next(self.handleColorN(operatorList, _util.OPS.setFillColorN, args, cs, patterns, resources, task));
return;
}
+
args = cs.getRgb(args, 0);
fn = _util.OPS.setFillRGBColor;
break;
+
case _util.OPS.setStrokeColorN:
cs = stateManager.state.strokeColorSpace;
+
if (cs.name === 'Pattern') {
next(self.handleColorN(operatorList, _util.OPS.setStrokeColorN, args, cs, patterns, resources, task));
return;
}
+
args = cs.getRgb(args, 0);
fn = _util.OPS.setStrokeRGBColor;
break;
+
case _util.OPS.shadingFill:
var shadingRes = resources.get('Shading');
+
if (!shadingRes) {
throw new _util.FormatError('No shading resource found');
}
+
var shading = shadingRes.get(args[0].name);
+
if (!shading) {
throw new _util.FormatError('No shading object found');
}
+
var shadingFill = _pattern.Pattern.parseShading(shading, null, xref, resources, self.handler, self.pdfFunctionFactory);
+
var patternIR = shadingFill.getIR();
args = [patternIR];
fn = _util.OPS.shadingFill;
break;
+
case _util.OPS.setGState:
var dictName = args[0];
var extGState = resources.get('ExtGState');
+
if (!(0, _primitives.isDict)(extGState) || !extGState.has(dictName.name)) {
break;
}
+
var gState = extGState.get(dictName.name);
next(self.setGState(resources, gState, operatorList, task, stateManager));
return;
+
case _util.OPS.moveTo:
case _util.OPS.lineTo:
case _util.OPS.curveTo:
@@ -25352,9 +30499,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
case _util.OPS.closePath:
self.buildPath(operatorList, fn, args);
continue;
+
case _util.OPS.rectangle:
self.buildPath(operatorList, fn, args);
continue;
+
case _util.OPS.markPoint:
case _util.OPS.markPointProps:
case _util.OPS.beginMarkedContent:
@@ -25363,6 +30512,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
case _util.OPS.beginCompat:
case _util.OPS.endCompat:
continue;
+
default:
if (args !== null) {
for (i = 0, ii = args.length; i < ii; i++) {
@@ -25370,27 +30520,36 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
break;
}
}
+
if (i < ii) {
(0, _util.warn)('getOperatorList - ignoring operator: ' + fn);
continue;
}
}
+
}
+
operatorList.addOp(fn, args);
}
+
if (stop) {
next(deferred);
return;
}
+
closePendingRestoreOPS();
resolve();
}).catch(function (reason) {
if (_this8.options.ignoreErrors) {
- _this8.handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.unknown });
- (0, _util.warn)('getOperatorList - ignoring errors during "' + task.name + '" ' + ('task: "' + reason + '".'));
+ _this8.handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.unknown
+ });
+
+ (0, _util.warn)("getOperatorList - ignoring errors during \"".concat(task.name, "\" ") + "task: \"".concat(reason, "\"."));
closePendingRestoreOPS();
return;
}
+
throw reason;
});
},
@@ -25401,15 +30560,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
task = _ref7.task,
resources = _ref7.resources,
_ref7$stateManager = _ref7.stateManager,
- stateManager = _ref7$stateManager === undefined ? null : _ref7$stateManager,
+ stateManager = _ref7$stateManager === void 0 ? null : _ref7$stateManager,
_ref7$normalizeWhites = _ref7.normalizeWhitespace,
- normalizeWhitespace = _ref7$normalizeWhites === undefined ? false : _ref7$normalizeWhites,
+ normalizeWhitespace = _ref7$normalizeWhites === void 0 ? false : _ref7$normalizeWhites,
_ref7$combineTextItem = _ref7.combineTextItems,
- combineTextItems = _ref7$combineTextItem === undefined ? false : _ref7$combineTextItem,
+ combineTextItems = _ref7$combineTextItem === void 0 ? false : _ref7$combineTextItem,
sink = _ref7.sink,
_ref7$seenStyles = _ref7.seenStyles,
- seenStyles = _ref7$seenStyles === undefined ? Object.create(null) : _ref7$seenStyles;
-
+ seenStyles = _ref7$seenStyles === void 0 ? Object.create(null) : _ref7$seenStyles;
resources = resources || _primitives.Dict.empty;
stateManager = stateManager || new StateManager(new TextState());
var WhitespaceRegexp = /\s/g;
@@ -25443,11 +30601,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var skipEmptyXObjs = Object.create(null);
var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
var textState;
+
function ensureTextContentItem() {
if (textContentItem.initialized) {
return textContentItem;
}
+
var font = textState.font;
+
if (!(font.loadedName in seenStyles)) {
seenStyles[font.loadedName] = true;
textContent.styles[font.loadedName] = {
@@ -25457,17 +30618,23 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
vertical: font.vertical
};
}
+
textContentItem.fontName = font.loadedName;
var tsm = [textState.fontSize * textState.textHScale, 0, 0, textState.fontSize, 0, textState.textRise];
+
if (font.isType3Font && textState.fontMatrix !== _util.FONT_IDENTITY_MATRIX && textState.fontSize === 1) {
var glyphHeight = font.bbox[3] - font.bbox[1];
+
if (glyphHeight > 0) {
glyphHeight = glyphHeight * textState.fontMatrix[3];
tsm[3] *= glyphHeight;
}
}
+
var trm = _util.Util.transform(textState.ctm, _util.Util.transform(textState.textMatrix, tsm));
+
textContentItem.transform = trm;
+
if (!font.vertical) {
textContentItem.width = 0;
textContentItem.height = Math.sqrt(trm[2] * trm[2] + trm[3] * trm[3]);
@@ -25477,6 +30644,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textContentItem.height = 0;
textContentItem.vertical = true;
}
+
var a = textState.textLineMatrix[0];
var b = textState.textLineMatrix[1];
var scaleLineX = Math.sqrt(a * a + b * b);
@@ -25487,6 +30655,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textContentItem.lastAdvanceWidth = 0;
textContentItem.lastAdvanceHeight = 0;
var spaceWidth = font.spaceWidth / 1000 * textState.fontSize;
+
if (spaceWidth) {
textContentItem.spaceWidth = spaceWidth;
textContentItem.fakeSpaceMin = spaceWidth * SPACE_FACTOR;
@@ -25500,18 +30669,23 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textContentItem.fakeMultiSpaceMax = 0;
textContentItem.textRunBreakAllowed = false;
}
+
textContentItem.initialized = true;
return textContentItem;
}
+
function replaceWhitespace(str) {
var i = 0,
ii = str.length,
code;
+
while (i < ii && (code = str.charCodeAt(i)) >= 0x20 && code <= 0x7F) {
i++;
}
+
return i < ii ? str.replace(WhitespaceRegexp, ' ') : str;
}
+
function runBidiTransform(textChunk) {
var str = textChunk.str.join('');
var bidiResult = (0, _bidi.bidi)(str, -1, textChunk.vertical);
@@ -25524,42 +30698,53 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
fontName: textChunk.fontName
};
}
+
function handleSetFont(fontName, fontRef) {
return self.loadFont(fontName, fontRef, resources).then(function (translated) {
textState.font = translated.font;
textState.fontMatrix = translated.font.fontMatrix || _util.FONT_IDENTITY_MATRIX;
});
}
+
function buildTextContentItem(chars) {
var font = textState.font;
var textChunk = ensureTextContentItem();
var width = 0;
var height = 0;
var glyphs = font.charsToGlyphs(chars);
+
for (var i = 0; i < glyphs.length; i++) {
var glyph = glyphs[i];
var glyphWidth = null;
+
if (font.vertical && glyph.vmetric) {
glyphWidth = glyph.vmetric[0];
} else {
glyphWidth = glyph.width;
}
+
var glyphUnicode = glyph.unicode;
var NormalizedUnicodes = (0, _unicode.getNormalizedUnicodes)();
+
if (NormalizedUnicodes[glyphUnicode] !== undefined) {
glyphUnicode = NormalizedUnicodes[glyphUnicode];
}
+
glyphUnicode = (0, _unicode.reverseIfRtl)(glyphUnicode);
var charSpacing = textState.charSpacing;
+
if (glyph.isSpace) {
var wordSpacing = textState.wordSpacing;
charSpacing += wordSpacing;
+
if (wordSpacing > 0) {
addFakeSpaces(wordSpacing, textChunk.str);
}
}
+
var tx = 0;
var ty = 0;
+
if (!font.vertical) {
var w0 = glyphWidth * textState.fontMatrix[0];
tx = (w0 * textState.fontSize + charSpacing) * textState.textHScale;
@@ -25569,9 +30754,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
ty = w1 * textState.fontSize + charSpacing;
height += ty;
}
+
textState.translateTextMatrix(tx, ty);
textChunk.str.push(glyphUnicode);
}
+
if (!font.vertical) {
textChunk.lastAdvanceWidth = width;
textChunk.width += width;
@@ -25579,39 +30766,49 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textChunk.lastAdvanceHeight = height;
textChunk.height += Math.abs(height);
}
+
return textChunk;
}
+
function addFakeSpaces(width, strBuf) {
if (width < textContentItem.fakeSpaceMin) {
return;
}
+
if (width < textContentItem.fakeMultiSpaceMin) {
strBuf.push(' ');
return;
}
+
var fakeSpaces = Math.round(width / textContentItem.spaceWidth);
+
while (fakeSpaces-- > 0) {
strBuf.push(' ');
}
}
+
function flushTextContentItem() {
if (!textContentItem.initialized) {
return;
}
+
textContentItem.width *= textContentItem.textAdvanceScale;
textContentItem.height *= textContentItem.textAdvanceScale;
textContent.items.push(runBidiTransform(textContentItem));
textContentItem.initialized = false;
textContentItem.str.length = 0;
}
+
function enqueueChunk() {
var length = textContent.items.length;
+
if (length > 0) {
sink.enqueue(textContent, length);
textContent.items = [];
textContent.styles = Object.create(null);
}
}
+
var timeSlotManager = new TimeSlotManager();
return new Promise(function promiseBody(resolve, reject) {
var next = function next(promise) {
@@ -25624,48 +30821,60 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}
}, reject);
};
+
task.ensureNotTerminated();
timeSlotManager.reset();
var stop,
operation = {},
args = [];
+
while (!(stop = timeSlotManager.check())) {
args.length = 0;
operation.args = args;
+
if (!preprocessor.read(operation)) {
break;
}
+
textState = stateManager.state;
var fn = operation.fn;
args = operation.args;
var advance, diff;
+
switch (fn | 0) {
case _util.OPS.setFont:
var fontNameArg = args[0].name,
fontSizeArg = args[1];
+
if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
break;
}
+
flushTextContentItem();
textState.fontName = fontNameArg;
textState.fontSize = fontSizeArg;
next(handleSetFont(fontNameArg, null));
return;
+
case _util.OPS.setTextRise:
flushTextContentItem();
textState.textRise = args[0];
break;
+
case _util.OPS.setHScale:
flushTextContentItem();
textState.textHScale = args[0] / 100;
break;
+
case _util.OPS.setLeading:
flushTextContentItem();
textState.leading = args[0];
break;
+
case _util.OPS.moveText:
var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
advance = args[0] - args[1];
+
if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
textState.translateTextLineMatrix(args[0], args[1]);
textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
@@ -25674,22 +30883,27 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
addFakeSpaces(diff, textContentItem.str);
break;
}
+
flushTextContentItem();
textState.translateTextLineMatrix(args[0], args[1]);
textState.textMatrix = textState.textLineMatrix.slice();
break;
+
case _util.OPS.setLeadingMoveText:
flushTextContentItem();
textState.leading = -args[1];
textState.translateTextLineMatrix(args[0], args[1]);
textState.textMatrix = textState.textLineMatrix.slice();
break;
+
case _util.OPS.nextLine:
flushTextContentItem();
textState.carriageReturn();
break;
+
case _util.OPS.setTextMatrix:
advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
+
if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
textState.translateTextLineMatrix(advance.width, advance.height);
textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
@@ -25698,24 +30912,30 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
addFakeSpaces(diff, textContentItem.str);
break;
}
+
flushTextContentItem();
textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
break;
+
case _util.OPS.setCharSpacing:
textState.charSpacing = args[0];
break;
+
case _util.OPS.setWordSpacing:
textState.wordSpacing = args[0];
break;
+
case _util.OPS.beginText:
flushTextContentItem();
textState.textMatrix = _util.IDENTITY_MATRIX.slice();
textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
break;
+
case _util.OPS.showSpacedText:
var items = args[0];
var offset;
+
for (var j = 0, jj = items.length; j < jj; j++) {
if (typeof items[j] === 'string') {
buildTextContentItem(items[j]);
@@ -25723,10 +30943,12 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
ensureTextContentItem();
advance = items[j] * textState.fontSize / 1000;
var breakTextRun = false;
+
if (textState.font.vertical) {
offset = advance;
textState.translateTextMatrix(0, offset);
breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+
if (!breakTextRun) {
textContentItem.height += offset;
}
@@ -25735,10 +30957,12 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
offset = advance * textState.textHScale;
textState.translateTextMatrix(offset, 0);
breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+
if (!breakTextRun) {
textContentItem.width += offset;
}
}
+
if (breakTextRun) {
flushTextContentItem();
} else if (advance > 0) {
@@ -25746,15 +30970,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}
}
}
+
break;
+
case _util.OPS.showText:
buildTextContentItem(args[0]);
break;
+
case _util.OPS.nextLineShowText:
flushTextContentItem();
textState.carriageReturn();
buildTextContentItem(args[0]);
break;
+
case _util.OPS.nextLineSetSpacingShowText:
flushTextContentItem();
textState.wordSpacing = args[0];
@@ -25762,42 +30990,56 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
textState.carriageReturn();
buildTextContentItem(args[2]);
break;
+
case _util.OPS.paintXObject:
flushTextContentItem();
+
if (!xobjs) {
xobjs = resources.get('XObject') || _primitives.Dict.empty;
}
+
var name = args[0].name;
+
if (name && skipEmptyXObjs[name] !== undefined) {
break;
}
+
next(new Promise(function (resolveXObject, rejectXObject) {
if (!name) {
throw new _util.FormatError('XObject must be referred to by name.');
}
+
var xobj = xobjs.get(name);
+
if (!xobj) {
resolveXObject();
return;
}
+
if (!(0, _primitives.isStream)(xobj)) {
throw new _util.FormatError('XObject should be a stream');
}
+
var type = xobj.dict.get('Subtype');
+
if (!(0, _primitives.isName)(type)) {
throw new _util.FormatError('XObject should have a Name subtype');
}
+
if (type.name !== 'Form') {
skipEmptyXObjs[name] = true;
resolveXObject();
return;
}
+
var currentState = stateManager.state.clone();
var xObjStateManager = new StateManager(currentState);
var matrix = xobj.dict.getArray('Matrix');
+
if (Array.isArray(matrix) && matrix.length === 6) {
xObjStateManager.transform(matrix);
}
+
enqueueChunk();
var sinkWrapper = {
enqueueInvoked: false,
@@ -25809,9 +31051,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
get desiredSize() {
return sink.desiredSize;
},
+
get ready() {
return sink.ready;
}
+
};
self.getTextContent({
stream: xobj,
@@ -25826,48 +31070,61 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (!sinkWrapper.enqueueInvoked) {
skipEmptyXObjs[name] = true;
}
+
resolveXObject();
}, rejectXObject);
}).catch(function (reason) {
if (reason instanceof _util.AbortException) {
return;
}
+
if (self.options.ignoreErrors) {
- (0, _util.warn)('getTextContent - ignoring XObject: "' + reason + '".');
+ (0, _util.warn)("getTextContent - ignoring XObject: \"".concat(reason, "\"."));
return;
}
+
throw reason;
}));
return;
+
case _util.OPS.setGState:
flushTextContentItem();
var dictName = args[0];
var extGState = resources.get('ExtGState');
+
if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
break;
}
+
var gState = extGState.get(dictName.name);
+
if (!(0, _primitives.isDict)(gState)) {
break;
}
+
var gStateFont = gState.get('Font');
+
if (gStateFont) {
textState.fontName = null;
textState.fontSize = gStateFont[1];
next(handleSetFont(null, gStateFont[0]));
return;
}
+
break;
}
+
if (textContent.items.length >= sink.desiredSize) {
stop = true;
break;
}
}
+
if (stop) {
next(deferred);
return;
}
+
flushTextContentItem();
enqueueChunk();
resolve();
@@ -25875,24 +31132,27 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (reason instanceof _util.AbortException) {
return;
}
+
if (_this9.options.ignoreErrors) {
- (0, _util.warn)('getTextContent - ignoring errors during "' + task.name + '" ' + ('task: "' + reason + '".'));
+ (0, _util.warn)("getTextContent - ignoring errors during \"".concat(task.name, "\" ") + "task: \"".concat(reason, "\"."));
flushTextContentItem();
enqueueChunk();
return;
}
+
throw reason;
});
},
-
extractDataStructures: function PartialEvaluator_extractDataStructures(dict, baseDict, properties) {
var _this10 = this;
var xref = this.xref;
var toUnicode = dict.get('ToUnicode') || baseDict.get('ToUnicode');
var toUnicodePromise = toUnicode ? this.readToUnicode(toUnicode) : Promise.resolve(undefined);
+
if (properties.composite) {
var cidSystemInfo = dict.get('CIDSystemInfo');
+
if ((0, _primitives.isDict)(cidSystemInfo)) {
properties.cidSystemInfo = {
registry: (0, _util.stringToPDFString)(cidSystemInfo.get('Registry')),
@@ -25900,30 +31160,38 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
supplement: cidSystemInfo.get('Supplement')
};
}
+
var cidToGidMap = dict.get('CIDToGIDMap');
+
if ((0, _primitives.isStream)(cidToGidMap)) {
properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
}
}
+
var differences = [];
var baseEncodingName = null;
var encoding;
+
if (dict.has('Encoding')) {
encoding = dict.get('Encoding');
+
if ((0, _primitives.isDict)(encoding)) {
baseEncodingName = encoding.get('BaseEncoding');
baseEncodingName = (0, _primitives.isName)(baseEncodingName) ? baseEncodingName.name : null;
+
if (encoding.has('Differences')) {
var diffEncoding = encoding.get('Differences');
var index = 0;
+
for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
var data = xref.fetchIfRef(diffEncoding[j]);
+
if ((0, _util.isNum)(data)) {
index = data;
} else if ((0, _primitives.isName)(data)) {
differences[index++] = data.name;
} else {
- throw new _util.FormatError('Invalid entry in \'Differences\' array: ' + data);
+ throw new _util.FormatError("Invalid entry in 'Differences' array: ".concat(data));
}
}
}
@@ -25932,21 +31200,26 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else {
throw new _util.FormatError('Encoding is not a Name nor a Dict');
}
+
if (baseEncodingName !== 'MacRomanEncoding' && baseEncodingName !== 'MacExpertEncoding' && baseEncodingName !== 'WinAnsiEncoding') {
baseEncodingName = null;
}
}
+
if (baseEncodingName) {
properties.defaultEncoding = (0, _encodings.getEncoding)(baseEncodingName).slice();
} else {
var isSymbolicFont = !!(properties.flags & _fonts.FontFlags.Symbolic);
var isNonsymbolicFont = !!(properties.flags & _fonts.FontFlags.Nonsymbolic);
encoding = _encodings.StandardEncoding;
+
if (properties.type === 'TrueType' && !isNonsymbolicFont) {
encoding = _encodings.WinAnsiEncoding;
}
+
if (isSymbolicFont) {
encoding = _encodings.MacRomanEncoding;
+
if (!properties.file) {
if (/Symbol/i.test(properties.name)) {
encoding = _encodings.SymbolSetEncoding;
@@ -25955,8 +31228,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}
}
}
+
properties.defaultEncoding = encoding;
}
+
properties.differences = differences;
properties.baseEncodingName = baseEncodingName;
properties.hasEncoding = !!baseEncodingName || differences.length > 0;
@@ -25972,79 +31247,106 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
_buildSimpleFontToUnicode: function _buildSimpleFontToUnicode(properties) {
(0, _util.assert)(!properties.composite, 'Must be a simple font.');
var toUnicode = [],
- charcode = void 0,
- glyphName = void 0;
+ charcode,
+ glyphName;
var encoding = properties.defaultEncoding.slice();
var baseEncodingName = properties.baseEncodingName;
var differences = properties.differences;
+
for (charcode in differences) {
glyphName = differences[charcode];
+
if (glyphName === '.notdef') {
continue;
}
+
encoding[charcode] = glyphName;
}
+
var glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+
for (charcode in encoding) {
glyphName = encoding[charcode];
+
if (glyphName === '') {
continue;
} else if (glyphsUnicodeMap[glyphName] === undefined) {
var code = 0;
+
switch (glyphName[0]) {
case 'G':
if (glyphName.length === 3) {
code = parseInt(glyphName.substring(1), 16);
}
+
break;
+
case 'g':
if (glyphName.length === 5) {
code = parseInt(glyphName.substring(1), 16);
}
+
break;
+
case 'C':
case 'c':
if (glyphName.length >= 3) {
code = +glyphName.substring(1);
}
+
break;
+
default:
var unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
+
if (unicode !== -1) {
code = unicode;
}
+
}
+
if (code) {
if (baseEncodingName && code === +charcode) {
var baseEncoding = (0, _encodings.getEncoding)(baseEncodingName);
+
if (baseEncoding && (glyphName = baseEncoding[charcode])) {
toUnicode[charcode] = String.fromCharCode(glyphsUnicodeMap[glyphName]);
continue;
}
}
+
toUnicode[charcode] = String.fromCharCode(code);
}
+
continue;
}
+
toUnicode[charcode] = String.fromCharCode(glyphsUnicodeMap[glyphName]);
}
+
return new _fonts.ToUnicodeMap(toUnicode);
},
buildToUnicode: function buildToUnicode(properties) {
properties.hasIncludedToUnicodeMap = !!properties.toUnicode && properties.toUnicode.length > 0;
+
if (properties.hasIncludedToUnicodeMap) {
if (!properties.composite && properties.hasEncoding) {
properties.fallbackToUnicode = this._buildSimpleFontToUnicode(properties);
}
+
return Promise.resolve(properties.toUnicode);
}
+
if (!properties.composite) {
return Promise.resolve(this._buildSimpleFontToUnicode(properties));
}
+
if (properties.composite && (properties.cMap.builtInCMap && !(properties.cMap instanceof _cmap.IdentityCMap) || properties.cidSystemInfo.registry === 'Adobe' && (properties.cidSystemInfo.ordering === 'GB1' || properties.cidSystemInfo.ordering === 'CNS1' || properties.cidSystemInfo.ordering === 'Japan1' || properties.cidSystemInfo.ordering === 'Korea1'))) {
var registry = properties.cidSystemInfo.registry;
var ordering = properties.cidSystemInfo.ordering;
+
var ucs2CMapName = _primitives.Name.get(registry + '-' + ordering + '-UCS2');
+
return _cmap.CMapFactory.create({
encoding: ucs2CMapName,
fetchBuiltInCMap: this.fetchBuiltInCMap,
@@ -26056,7 +31358,9 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (cid > 0xffff) {
throw new _util.FormatError('Max size of CID is 65,535');
}
+
var ucs2 = ucs2CMap.lookup(cid);
+
if (ucs2) {
toUnicode[charcode] = String.fromCharCode((ucs2.charCodeAt(0) << 8) + ucs2.charCodeAt(1));
}
@@ -26064,11 +31368,12 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
return new _fonts.ToUnicodeMap(toUnicode);
});
}
+
return Promise.resolve(new _fonts.IdentityToUnicodeMap(properties.firstChar, properties.lastChar));
},
-
readToUnicode: function PartialEvaluator_readToUnicode(toUnicode) {
var cmapObj = toUnicode;
+
if ((0, _primitives.isName)(cmapObj)) {
return _cmap.CMapFactory.create({
encoding: cmapObj,
@@ -26078,6 +31383,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (cmap instanceof _cmap.IdentityCMap) {
return new _fonts.IdentityToUnicodeMap(0, 0xFFFF);
}
+
return new _fonts.ToUnicodeMap(cmap.getMap());
});
} else if ((0, _primitives.isStream)(cmapObj)) {
@@ -26089,37 +31395,47 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
if (cmap instanceof _cmap.IdentityCMap) {
return new _fonts.IdentityToUnicodeMap(0, 0xFFFF);
}
+
var map = new Array(cmap.length);
cmap.forEach(function (charCode, token) {
var str = [];
+
for (var k = 0; k < token.length; k += 2) {
var w1 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
+
if ((w1 & 0xF800) !== 0xD800) {
str.push(w1);
continue;
}
+
k += 2;
var w2 = token.charCodeAt(k) << 8 | token.charCodeAt(k + 1);
str.push(((w1 & 0x3ff) << 10) + (w2 & 0x3ff) + 0x10000);
}
+
map[charCode] = String.fromCharCode.apply(String, str);
});
return new _fonts.ToUnicodeMap(map);
});
}
+
return Promise.resolve(null);
},
readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
var glyphsData = cidToGidStream.getBytes();
var result = [];
+
for (var j = 0, jj = glyphsData.length; j < jj; j++) {
var glyphID = glyphsData[j++] << 8 | glyphsData[j];
+
if (glyphID === 0) {
continue;
}
+
var code = j >> 1;
result[code] = glyphID;
}
+
return result;
},
extractWidths: function PartialEvaluator_extractWidths(dict, descriptor, properties) {
@@ -26129,39 +31445,47 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var glyphsVMetrics = [];
var defaultVMetrics;
var i, ii, j, jj, start, code, widths;
+
if (properties.composite) {
defaultWidth = dict.has('DW') ? dict.get('DW') : 1000;
widths = dict.get('W');
+
if (widths) {
for (i = 0, ii = widths.length; i < ii; i++) {
start = xref.fetchIfRef(widths[i++]);
code = xref.fetchIfRef(widths[i]);
+
if (Array.isArray(code)) {
for (j = 0, jj = code.length; j < jj; j++) {
glyphsWidths[start++] = xref.fetchIfRef(code[j]);
}
} else {
var width = xref.fetchIfRef(widths[++i]);
+
for (j = start; j <= code; j++) {
glyphsWidths[j] = width;
}
}
}
}
+
if (properties.vertical) {
var vmetrics = dict.getArray('DW2') || [880, -1000];
defaultVMetrics = [vmetrics[1], defaultWidth * 0.5, vmetrics[0]];
vmetrics = dict.get('W2');
+
if (vmetrics) {
for (i = 0, ii = vmetrics.length; i < ii; i++) {
start = xref.fetchIfRef(vmetrics[i++]);
code = xref.fetchIfRef(vmetrics[i]);
+
if (Array.isArray(code)) {
for (j = 0, jj = code.length; j < jj; j++) {
glyphsVMetrics[start++] = [xref.fetchIfRef(code[j++]), xref.fetchIfRef(code[j++]), xref.fetchIfRef(code[j])];
}
} else {
var vmetric = [xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i]), xref.fetchIfRef(vmetrics[++i])];
+
for (j = start; j <= code; j++) {
glyphsVMetrics[j] = vmetric;
}
@@ -26172,14 +31496,18 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else {
var firstChar = properties.firstChar;
widths = dict.get('Widths');
+
if (widths) {
j = firstChar;
+
for (i = 0, ii = widths.length; i < ii; i++) {
glyphsWidths[j++] = xref.fetchIfRef(widths[i]);
}
+
defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
} else {
var baseFontName = dict.get('BaseFont');
+
if ((0, _primitives.isName)(baseFontName)) {
var metrics = this.getBaseFontMetrics(baseFontName.name);
glyphsWidths = this.buildCharCodeToWidth(metrics.widths, properties);
@@ -26187,25 +31515,32 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
}
}
}
+
var isMonospace = true;
var firstWidth = defaultWidth;
+
for (var glyph in glyphsWidths) {
var glyphWidth = glyphsWidths[glyph];
+
if (!glyphWidth) {
continue;
}
+
if (!firstWidth) {
firstWidth = glyphWidth;
continue;
}
+
if (firstWidth !== glyphWidth) {
isMonospace = false;
break;
}
}
+
if (isMonospace) {
properties.flags |= _fonts.FontFlags.FixedPitch;
}
+
properties.defaultWidth = defaultWidth;
properties.widths = glyphsWidths;
properties.defaultVMetrics = defaultVMetrics;
@@ -26222,6 +31557,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var stdFontMap = (0, _standard_fonts.getStdFontMap)();
var lookupName = stdFontMap[name] || name;
var Metrics = (0, _metrics.getMetrics)();
+
if (!(lookupName in Metrics)) {
if (this.isSerifFont(name)) {
lookupName = 'Times-Roman';
@@ -26229,13 +31565,16 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
lookupName = 'Helvetica';
}
}
+
var glyphWidths = Metrics[lookupName];
+
if ((0, _util.isNum)(glyphWidths)) {
defaultWidth = glyphWidths;
monospace = true;
} else {
widths = glyphWidths();
}
+
return {
defaultWidth: defaultWidth,
monospace: monospace,
@@ -26246,50 +31585,65 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var widths = Object.create(null);
var differences = properties.differences;
var encoding = properties.defaultEncoding;
+
for (var charCode = 0; charCode < 256; charCode++) {
if (charCode in differences && widthsByGlyphName[differences[charCode]]) {
widths[charCode] = widthsByGlyphName[differences[charCode]];
continue;
}
+
if (charCode in encoding && widthsByGlyphName[encoding[charCode]]) {
widths[charCode] = widthsByGlyphName[encoding[charCode]];
continue;
}
}
+
return widths;
},
preEvaluateFont: function PartialEvaluator_preEvaluateFont(dict) {
var baseDict = dict;
var type = dict.get('Subtype');
+
if (!(0, _primitives.isName)(type)) {
throw new _util.FormatError('invalid font Subtype');
}
+
var composite = false;
var uint8array;
+
if (type.name === 'Type0') {
var df = dict.get('DescendantFonts');
+
if (!df) {
throw new _util.FormatError('Descendant fonts are not specified');
}
+
dict = Array.isArray(df) ? this.xref.fetchIfRef(df[0]) : df;
type = dict.get('Subtype');
+
if (!(0, _primitives.isName)(type)) {
throw new _util.FormatError('invalid font Subtype');
}
+
composite = true;
}
+
var descriptor = dict.get('FontDescriptor');
+
if (descriptor) {
var hash = new _murmurhash.MurmurHash3_64();
var encoding = baseDict.getRaw('Encoding');
+
if ((0, _primitives.isName)(encoding)) {
hash.update(encoding.name);
} else if ((0, _primitives.isRef)(encoding)) {
hash.update(encoding.toString());
} else if ((0, _primitives.isDict)(encoding)) {
var keys = encoding.getKeys();
+
for (var i = 0, ii = keys.length; i < ii; i++) {
var entry = encoding.getRaw(keys[i]);
+
if ((0, _primitives.isName)(entry)) {
hash.update(entry.name);
} else if ((0, _primitives.isRef)(entry)) {
@@ -26297,19 +31651,24 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else if (Array.isArray(entry)) {
var diffLength = entry.length,
diffBuf = new Array(diffLength);
+
for (var j = 0; j < diffLength; j++) {
var diffEntry = entry[j];
+
if ((0, _primitives.isName)(diffEntry)) {
diffBuf[j] = diffEntry.name;
} else if ((0, _util.isNum)(diffEntry) || (0, _primitives.isRef)(diffEntry)) {
diffBuf[j] = diffEntry.toString();
}
}
+
hash.update(diffBuf.join());
}
}
}
+
var toUnicode = dict.get('ToUnicode') || baseDict.get('ToUnicode');
+
if ((0, _primitives.isStream)(toUnicode)) {
var stream = toUnicode.str || toUnicode;
uint8array = stream.buffer ? new Uint8Array(stream.buffer.buffer, 0, stream.bufferLength) : new Uint8Array(stream.bytes.buffer, stream.start, stream.end - stream.start);
@@ -26317,12 +31676,15 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else if ((0, _primitives.isName)(toUnicode)) {
hash.update(toUnicode.name);
}
+
var widths = dict.get('Widths') || baseDict.get('Widths');
+
if (widths) {
uint8array = new Uint8Array(new Uint32Array(widths).buffer);
hash.update(uint8array);
}
}
+
return {
descriptor: descriptor,
dict: dict,
@@ -26342,6 +31704,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
var type = preEvaluatedFont.type;
var maxCharIndex = composite ? 0xFFFF : 0xFF;
var properties;
+
if (!descriptor) {
if (type === 'Type3') {
descriptor = new _primitives.Dict(null);
@@ -26349,9 +31712,11 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
descriptor.set('FontBBox', dict.getArray('FontBBox'));
} else {
var baseFontName = dict.get('BaseFont');
+
if (!(0, _primitives.isName)(baseFontName)) {
throw new _util.FormatError('Base font is not specified');
}
+
baseFontName = baseFontName.name.replace(/[,_]/g, '-');
var metrics = this.getBaseFontMetrics(baseFontName);
var fontNameWoStyle = baseFontName.split('-')[0];
@@ -26371,42 +31736,55 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
});
}
}
+
var firstChar = dict.get('FirstChar') || 0;
var lastChar = dict.get('LastChar') || maxCharIndex;
var fontName = descriptor.get('FontName');
var baseFont = dict.get('BaseFont');
+
if ((0, _util.isString)(fontName)) {
fontName = _primitives.Name.get(fontName);
}
+
if ((0, _util.isString)(baseFont)) {
baseFont = _primitives.Name.get(baseFont);
}
+
if (type !== 'Type3') {
var fontNameStr = fontName && fontName.name;
var baseFontStr = baseFont && baseFont.name;
+
if (fontNameStr !== baseFontStr) {
(0, _util.info)('The FontDescriptor\'s FontName is "' + fontNameStr + '" but should be the same as the Font\'s BaseFont "' + baseFontStr + '"');
+
if (fontNameStr && baseFontStr && baseFontStr.indexOf(fontNameStr) === 0) {
fontName = baseFont;
}
}
}
+
fontName = fontName || baseFont;
+
if (!(0, _primitives.isName)(fontName)) {
throw new _util.FormatError('invalid font name');
}
+
var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
+
if (fontFile) {
if (fontFile.dict) {
var subtype = fontFile.dict.get('Subtype');
+
if (subtype) {
subtype = subtype.name;
}
+
var length1 = fontFile.dict.get('Length1');
var length2 = fontFile.dict.get('Length2');
var length3 = fontFile.dict.get('Length3');
}
}
+
properties = {
type: type,
name: fontName.name,
@@ -26432,11 +31810,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
isType3Font: false
};
var cMapPromise;
+
if (composite) {
var cidEncoding = baseDict.get('Encoding');
+
if ((0, _primitives.isName)(cidEncoding)) {
properties.cidEncoding = cidEncoding.name;
}
+
cMapPromise = _cmap.CMapFactory.create({
encoding: cidEncoding,
fetchBuiltInCMap: this.fetchBuiltInCMap,
@@ -26448,19 +31829,25 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
} else {
cMapPromise = Promise.resolve(undefined);
}
+
return cMapPromise.then(function () {
return _this11.extractDataStructures(dict, baseDict, properties);
}).then(function (properties) {
_this11.extractWidths(dict, descriptor, properties);
+
if (type === 'Type3') {
properties.isType3Font = true;
}
+
return new _fonts.Font(fontName.name, fontFile, properties);
});
}
};
return PartialEvaluator;
}();
+
+exports.PartialEvaluator = PartialEvaluator;
+
var TranslatedFont = function TranslatedFontClosure() {
function TranslatedFont(loadedName, font, dict) {
this.loadedName = loadedName;
@@ -26469,11 +31856,13 @@ var TranslatedFont = function TranslatedFontClosure() {
this.type3Loaded = null;
this.sent = false;
}
+
TranslatedFont.prototype = {
send: function send(handler) {
if (this.sent) {
return;
}
+
var fontData = this.font.exportData();
handler.send('commonobj', [this.loadedName, 'Font', fontData]);
this.sent = true;
@@ -26482,9 +31871,11 @@ var TranslatedFont = function TranslatedFontClosure() {
if (!this.font.isType3Font) {
throw new Error('Must be a Type3 font.');
}
+
if (this.type3Loaded) {
return this.type3Loaded;
}
+
var type3Options = Object.create(evaluator.options);
type3Options.ignoreErrors = false;
var type3Evaluator = evaluator.clone(type3Options);
@@ -26509,7 +31900,7 @@ var TranslatedFont = function TranslatedFontClosure() {
charProcOperatorList[key] = operatorList.getIR();
parentOperatorList.addDependencies(operatorList.dependencies);
}).catch(function (reason) {
- (0, _util.warn)('Type3 font resource "' + key + '" is not available.');
+ (0, _util.warn)("Type3 font resource \"".concat(key, "\" is not available."));
var operatorList = new _operator_list.OperatorList();
charProcOperatorList[key] = operatorList.getIR();
});
@@ -26519,6 +31910,7 @@ var TranslatedFont = function TranslatedFontClosure() {
for (var i = 0, n = charProcKeys.length; i < n; ++i) {
_loop2();
}
+
this.type3Loaded = loadCharProcsPromise.then(function () {
translatedFont.charProcOperatorList = charProcOperatorList;
});
@@ -26527,11 +31919,13 @@ var TranslatedFont = function TranslatedFontClosure() {
};
return TranslatedFont;
}();
+
var StateManager = function StateManagerClosure() {
function StateManager(initialState) {
this.state = initialState;
this.stateStack = [];
}
+
StateManager.prototype = {
save: function save() {
var old = this.state;
@@ -26540,6 +31934,7 @@ var StateManager = function StateManagerClosure() {
},
restore: function restore() {
var prev = this.stateStack.pop();
+
if (prev) {
this.state = prev;
}
@@ -26550,6 +31945,7 @@ var StateManager = function StateManagerClosure() {
};
return StateManager;
}();
+
var TextState = function TextStateClosure() {
function TextState() {
this.ctm = new Float32Array(_util.IDENTITY_MATRIX);
@@ -26565,6 +31961,7 @@ var TextState = function TextStateClosure() {
this.textHScale = 1;
this.textRise = 0;
}
+
TextState.prototype = {
setTextMatrix: function TextState_setTextMatrix(a, b, c, d, e, f) {
var m = this.textMatrix;
@@ -26596,21 +31993,28 @@ var TextState = function TextStateClosure() {
},
calcTextLineMatrixAdvance: function TextState_calcTextLineMatrixAdvance(a, b, c, d, e, f) {
var font = this.font;
+
if (!font) {
return null;
}
+
var m = this.textLineMatrix;
+
if (!(a === m[0] && b === m[1] && c === m[2] && d === m[3])) {
return null;
}
+
var txDiff = e - m[4],
tyDiff = f - m[5];
+
if (font.vertical && txDiff !== 0 || !font.vertical && tyDiff !== 0) {
return null;
}
+
var tx,
ty,
denominator = a * d - b * c;
+
if (font.vertical) {
tx = -tyDiff * c / denominator;
ty = tyDiff * a / denominator;
@@ -26618,6 +32022,7 @@ var TextState = function TextStateClosure() {
tx = txDiff * d / denominator;
ty = -txDiff * b / denominator;
}
+
return {
width: tx,
height: ty,
@@ -26642,6 +32047,7 @@ var TextState = function TextStateClosure() {
};
return TextState;
}();
+
var EvalState = function EvalStateClosure() {
function EvalState() {
this.ctm = new Float32Array(_util.IDENTITY_MATRIX);
@@ -26650,6 +32056,7 @@ var EvalState = function EvalStateClosure() {
this.fillColorSpace = _colorspace.ColorSpace.singletons.gray;
this.strokeColorSpace = _colorspace.ColorSpace.singletons.gray;
}
+
EvalState.prototype = {
clone: function CanvasExtraState_clone() {
return Object.create(this);
@@ -26657,6 +32064,7 @@ var EvalState = function EvalStateClosure() {
};
return EvalState;
}();
+
var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
var getOPMap = (0, _util.getLookupTableFactory)(function (t) {
t['w'] = {
@@ -27036,6 +32444,7 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
t['null'] = null;
});
var MAX_INVALID_PATH_OPS = 20;
+
function EvaluatorPreprocessor(stream, xref, stateManager) {
this.opMap = getOPMap();
this.parser = new _parser.Parser(new _parser.Lexer(stream, this.opMap), false, xref);
@@ -27043,66 +32452,86 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
this.nonProcessedArgs = [];
this._numInvalidPathOPS = 0;
}
+
EvaluatorPreprocessor.prototype = {
get savedStatesDepth() {
return this.stateManager.stateStack.length;
},
+
read: function EvaluatorPreprocessor_read(operation) {
var args = operation.args;
+
while (true) {
var obj = this.parser.getObj();
+
if ((0, _primitives.isCmd)(obj)) {
var cmd = obj.cmd;
var opSpec = this.opMap[cmd];
+
if (!opSpec) {
- (0, _util.warn)('Unknown command "' + cmd + '".');
+ (0, _util.warn)("Unknown command \"".concat(cmd, "\"."));
continue;
}
+
var fn = opSpec.id;
var numArgs = opSpec.numArgs;
var argsLength = args !== null ? args.length : 0;
+
if (!opSpec.variableArgs) {
if (argsLength !== numArgs) {
var nonProcessedArgs = this.nonProcessedArgs;
+
while (argsLength > numArgs) {
nonProcessedArgs.push(args.shift());
argsLength--;
}
+
while (argsLength < numArgs && nonProcessedArgs.length !== 0) {
if (args === null) {
args = [];
}
+
args.unshift(nonProcessedArgs.pop());
argsLength++;
}
}
+
if (argsLength < numArgs) {
- var partialMsg = 'command ' + cmd + ': expected ' + numArgs + ' args, ' + ('but received ' + argsLength + ' args.');
+ var partialMsg = "command ".concat(cmd, ": expected ").concat(numArgs, " args, ") + "but received ".concat(argsLength, " args.");
+
if (fn >= _util.OPS.moveTo && fn <= _util.OPS.endPath && ++this._numInvalidPathOPS > MAX_INVALID_PATH_OPS) {
- throw new _util.FormatError('Invalid ' + partialMsg);
+ throw new _util.FormatError("Invalid ".concat(partialMsg));
}
- (0, _util.warn)('Skipping ' + partialMsg);
+
+ (0, _util.warn)("Skipping ".concat(partialMsg));
+
if (args !== null) {
args.length = 0;
}
+
continue;
}
} else if (argsLength > numArgs) {
- (0, _util.info)('Command ' + cmd + ': expected [0, ' + numArgs + '] args, ' + ('but received ' + argsLength + ' args.'));
+ (0, _util.info)("Command ".concat(cmd, ": expected [0, ").concat(numArgs, "] args, ") + "but received ".concat(argsLength, " args."));
}
+
this.preprocessCommand(fn, args);
operation.fn = fn;
operation.args = args;
return true;
}
+
if ((0, _primitives.isEOF)(obj)) {
return false;
}
+
if (obj !== null) {
if (args === null) {
args = [];
}
+
args.push(obj);
+
if (args.length > 33) {
throw new _util.FormatError('Too many arguments');
}
@@ -27114,9 +32543,11 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
case _util.OPS.save:
this.stateManager.save();
break;
+
case _util.OPS.restore:
this.stateManager.restore();
break;
+
case _util.OPS.transform:
this.stateManager.transform(args);
break;
@@ -27125,7 +32556,6 @@ var EvaluatorPreprocessor = function EvaluatorPreprocessorClosure() {
};
return EvaluatorPreprocessor;
}();
-exports.PartialEvaluator = PartialEvaluator;
/***/ }),
/* 159 */
@@ -27137,9 +32567,7 @@ exports.PartialEvaluator = PartialEvaluator;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.CMapFactory = exports.IdentityCMap = exports.CMap = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.CMapFactory = exports.IdentityCMap = exports.CMap = void 0;
var _util = __w_pdfjs_require__(2);
@@ -27149,15 +32577,29 @@ var _parser = __w_pdfjs_require__(143);
var _stream = __w_pdfjs_require__(144);
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var BUILT_IN_CMAPS = ['Adobe-GB1-UCS2', 'Adobe-CNS1-UCS2', 'Adobe-Japan1-UCS2', 'Adobe-Korea1-UCS2', '78-EUC-H', '78-EUC-V', '78-H', '78-RKSJ-H', '78-RKSJ-V', '78-V', '78ms-RKSJ-H', '78ms-RKSJ-V', '83pv-RKSJ-H', '90ms-RKSJ-H', '90ms-RKSJ-V', '90msp-RKSJ-H', '90msp-RKSJ-V', '90pv-RKSJ-H', '90pv-RKSJ-V', 'Add-H', 'Add-RKSJ-H', 'Add-RKSJ-V', 'Add-V', 'Adobe-CNS1-0', 'Adobe-CNS1-1', 'Adobe-CNS1-2', 'Adobe-CNS1-3', 'Adobe-CNS1-4', 'Adobe-CNS1-5', 'Adobe-CNS1-6', 'Adobe-GB1-0', 'Adobe-GB1-1', 'Adobe-GB1-2', 'Adobe-GB1-3', 'Adobe-GB1-4', 'Adobe-GB1-5', 'Adobe-Japan1-0', 'Adobe-Japan1-1', 'Adobe-Japan1-2', 'Adobe-Japan1-3', 'Adobe-Japan1-4', 'Adobe-Japan1-5', 'Adobe-Japan1-6', 'Adobe-Korea1-0', 'Adobe-Korea1-1', 'Adobe-Korea1-2', 'B5-H', 'B5-V', 'B5pc-H', 'B5pc-V', 'CNS-EUC-H', 'CNS-EUC-V', 'CNS1-H', 'CNS1-V', 'CNS2-H', 'CNS2-V', 'ETHK-B5-H', 'ETHK-B5-V', 'ETen-B5-H', 'ETen-B5-V', 'ETenms-B5-H', 'ETenms-B5-V', 'EUC-H', 'EUC-V', 'Ext-H', 'Ext-RKSJ-H', 'Ext-RKSJ-V', 'Ext-V', 'GB-EUC-H', 'GB-EUC-V', 'GB-H', 'GB-V', 'GBK-EUC-H', 'GBK-EUC-V', 'GBK2K-H', 'GBK2K-V', 'GBKp-EUC-H', 'GBKp-EUC-V', 'GBT-EUC-H', 'GBT-EUC-V', 'GBT-H', 'GBT-V', 'GBTpc-EUC-H', 'GBTpc-EUC-V', 'GBpc-EUC-H', 'GBpc-EUC-V', 'H', 'HKdla-B5-H', 'HKdla-B5-V', 'HKdlb-B5-H', 'HKdlb-B5-V', 'HKgccs-B5-H', 'HKgccs-B5-V', 'HKm314-B5-H', 'HKm314-B5-V', 'HKm471-B5-H', 'HKm471-B5-V', 'HKscs-B5-H', 'HKscs-B5-V', 'Hankaku', 'Hiragana', 'KSC-EUC-H', 'KSC-EUC-V', 'KSC-H', 'KSC-Johab-H', 'KSC-Johab-V', 'KSC-V', 'KSCms-UHC-H', 'KSCms-UHC-HW-H', 'KSCms-UHC-HW-V', 'KSCms-UHC-V', 'KSCpc-EUC-H', 'KSCpc-EUC-V', 'Katakana', 'NWP-H', 'NWP-V', 'RKSJ-H', 'RKSJ-V', 'Roman', 'UniCNS-UCS2-H', 'UniCNS-UCS2-V', 'UniCNS-UTF16-H', 'UniCNS-UTF16-V', 'UniCNS-UTF32-H', 'UniCNS-UTF32-V', 'UniCNS-UTF8-H', 'UniCNS-UTF8-V', 'UniGB-UCS2-H', 'UniGB-UCS2-V', 'UniGB-UTF16-H', 'UniGB-UTF16-V', 'UniGB-UTF32-H', 'UniGB-UTF32-V', 'UniGB-UTF8-H', 'UniGB-UTF8-V', 'UniJIS-UCS2-H', 'UniJIS-UCS2-HW-H', 'UniJIS-UCS2-HW-V', 'UniJIS-UCS2-V', 'UniJIS-UTF16-H', 'UniJIS-UTF16-V', 'UniJIS-UTF32-H', 'UniJIS-UTF32-V', 'UniJIS-UTF8-H', 'UniJIS-UTF8-V', 'UniJIS2004-UTF16-H', 'UniJIS2004-UTF16-V', 'UniJIS2004-UTF32-H', 'UniJIS2004-UTF32-V', 'UniJIS2004-UTF8-H', 'UniJIS2004-UTF8-V', 'UniJISPro-UCS2-HW-V', 'UniJISPro-UCS2-V', 'UniJISPro-UTF8-V', 'UniJISX0213-UTF32-H', 'UniJISX0213-UTF32-V', 'UniJISX02132004-UTF32-H', 'UniJISX02132004-UTF32-V', 'UniKS-UCS2-H', 'UniKS-UCS2-V', 'UniKS-UTF16-H', 'UniKS-UTF16-V', 'UniKS-UTF32-H', 'UniKS-UTF32-V', 'UniKS-UTF8-H', 'UniKS-UTF8-V', 'V', 'WP-Symbol'];
-var CMap = function () {
+var CMap =
+/*#__PURE__*/
+function () {
function CMap() {
var builtInCMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -27173,57 +32615,60 @@ var CMap = function () {
}
_createClass(CMap, [{
- key: 'addCodespaceRange',
+ key: "addCodespaceRange",
value: function addCodespaceRange(n, low, high) {
this.codespaceRanges[n - 1].push(low, high);
this.numCodespaceRanges++;
}
}, {
- key: 'mapCidRange',
+ key: "mapCidRange",
value: function mapCidRange(low, high, dstLow) {
while (low <= high) {
this._map[low++] = dstLow++;
}
}
}, {
- key: 'mapBfRange',
+ key: "mapBfRange",
value: function mapBfRange(low, high, dstLow) {
var lastByte = dstLow.length - 1;
+
while (low <= high) {
this._map[low++] = dstLow;
dstLow = dstLow.substring(0, lastByte) + String.fromCharCode(dstLow.charCodeAt(lastByte) + 1);
}
}
}, {
- key: 'mapBfRangeToArray',
+ key: "mapBfRangeToArray",
value: function mapBfRangeToArray(low, high, array) {
var i = 0,
ii = array.length;
+
while (low <= high && i < ii) {
this._map[low] = array[i++];
++low;
}
}
}, {
- key: 'mapOne',
+ key: "mapOne",
value: function mapOne(src, dst) {
this._map[src] = dst;
}
}, {
- key: 'lookup',
+ key: "lookup",
value: function lookup(code) {
return this._map[code];
}
}, {
- key: 'contains',
+ key: "contains",
value: function contains(code) {
return this._map[code] !== undefined;
}
}, {
- key: 'forEach',
+ key: "forEach",
value: function forEach(callback) {
var map = this._map;
var length = map.length;
+
if (length <= 0x10000) {
for (var i = 0; i < length; i++) {
if (map[i] !== undefined) {
@@ -27237,35 +32682,41 @@ var CMap = function () {
}
}
}, {
- key: 'charCodeOf',
+ key: "charCodeOf",
value: function charCodeOf(value) {
var map = this._map;
+
if (map.length <= 0x10000) {
return map.indexOf(value);
}
+
for (var charCode in map) {
if (map[charCode] === value) {
return charCode | 0;
}
}
+
return -1;
}
}, {
- key: 'getMap',
+ key: "getMap",
value: function getMap() {
return this._map;
}
}, {
- key: 'readCharCode',
+ key: "readCharCode",
value: function readCharCode(str, offset, out) {
var c = 0;
var codespaceRanges = this.codespaceRanges;
+
for (var n = 0, nn = codespaceRanges.length; n < nn; n++) {
c = (c << 8 | str.charCodeAt(offset + n)) >>> 0;
var codespaceRange = codespaceRanges[n];
+
for (var k = 0, kk = codespaceRange.length; k < kk;) {
var low = codespaceRange[k++];
var high = codespaceRange[k++];
+
if (c >= low && c <= high) {
out.charcode = c;
out.length = n + 1;
@@ -27273,28 +32724,32 @@ var CMap = function () {
}
}
}
+
out.charcode = 0;
out.length = 1;
}
}, {
- key: 'length',
+ key: "length",
get: function get() {
return this._map.length;
}
}, {
- key: 'isIdentityCMap',
+ key: "isIdentityCMap",
get: function get() {
if (!(this.name === 'Identity-H' || this.name === 'Identity-V')) {
return false;
}
+
if (this._map.length !== 0x10000) {
return false;
}
+
for (var i = 0; i < 0x10000; i++) {
if (this._map[i] !== i) {
return false;
}
}
+
return true;
}
}]);
@@ -27302,77 +32757,86 @@ var CMap = function () {
return CMap;
}();
-var IdentityCMap = function (_CMap) {
+exports.CMap = CMap;
+
+var IdentityCMap =
+/*#__PURE__*/
+function (_CMap) {
_inherits(IdentityCMap, _CMap);
function IdentityCMap(vertical, n) {
- _classCallCheck(this, IdentityCMap);
+ var _this;
- var _this = _possibleConstructorReturn(this, (IdentityCMap.__proto__ || Object.getPrototypeOf(IdentityCMap)).call(this));
+ _classCallCheck(this, IdentityCMap);
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(IdentityCMap).call(this));
_this.vertical = vertical;
+
_this.addCodespaceRange(n, 0, 0xffff);
+
return _this;
}
_createClass(IdentityCMap, [{
- key: 'mapCidRange',
+ key: "mapCidRange",
value: function mapCidRange(low, high, dstLow) {
(0, _util.unreachable)('should not call mapCidRange');
}
}, {
- key: 'mapBfRange',
+ key: "mapBfRange",
value: function mapBfRange(low, high, dstLow) {
(0, _util.unreachable)('should not call mapBfRange');
}
}, {
- key: 'mapBfRangeToArray',
+ key: "mapBfRangeToArray",
value: function mapBfRangeToArray(low, high, array) {
(0, _util.unreachable)('should not call mapBfRangeToArray');
}
}, {
- key: 'mapOne',
+ key: "mapOne",
value: function mapOne(src, dst) {
(0, _util.unreachable)('should not call mapCidOne');
}
}, {
- key: 'lookup',
+ key: "lookup",
value: function lookup(code) {
return Number.isInteger(code) && code <= 0xffff ? code : undefined;
}
}, {
- key: 'contains',
+ key: "contains",
value: function contains(code) {
return Number.isInteger(code) && code <= 0xffff;
}
}, {
- key: 'forEach',
+ key: "forEach",
value: function forEach(callback) {
for (var i = 0; i <= 0xffff; i++) {
callback(i, i);
}
}
}, {
- key: 'charCodeOf',
+ key: "charCodeOf",
value: function charCodeOf(value) {
return Number.isInteger(value) && value <= 0xffff ? value : -1;
}
}, {
- key: 'getMap',
+ key: "getMap",
value: function getMap() {
var map = new Array(0x10000);
+
for (var i = 0; i <= 0xffff; i++) {
map[i] = i;
}
+
return map;
}
}, {
- key: 'length',
+ key: "length",
get: function get() {
return 0x10000;
}
}, {
- key: 'isIdentityCMap',
+ key: "isIdentityCMap",
get: function get() {
(0, _util.unreachable)('should not access .isIdentityCMap');
}
@@ -27381,65 +32845,84 @@ var IdentityCMap = function (_CMap) {
return IdentityCMap;
}(CMap);
+exports.IdentityCMap = IdentityCMap;
+
var BinaryCMapReader = function BinaryCMapReaderClosure() {
function hexToInt(a, size) {
var n = 0;
+
for (var i = 0; i <= size; i++) {
n = n << 8 | a[i];
}
+
return n >>> 0;
}
+
function hexToStr(a, size) {
if (size === 1) {
return String.fromCharCode(a[0], a[1]);
}
+
if (size === 3) {
return String.fromCharCode(a[0], a[1], a[2], a[3]);
}
+
return String.fromCharCode.apply(null, a.subarray(0, size + 1));
}
+
function addHex(a, b, size) {
var c = 0;
+
for (var i = size; i >= 0; i--) {
c += a[i] + b[i];
a[i] = c & 255;
c >>= 8;
}
}
+
function incHex(a, size) {
var c = 1;
+
for (var i = size; i >= 0 && c > 0; i--) {
c += a[i];
a[i] = c & 255;
c >>= 8;
}
}
+
var MAX_NUM_SIZE = 16;
var MAX_ENCODED_NUM_SIZE = 19;
+
function BinaryCMapStream(data) {
this.buffer = data;
this.pos = 0;
this.end = data.length;
this.tmpBuf = new Uint8Array(MAX_ENCODED_NUM_SIZE);
}
+
BinaryCMapStream.prototype = {
readByte: function readByte() {
if (this.pos >= this.end) {
return -1;
}
+
return this.buffer[this.pos++];
},
readNumber: function readNumber() {
var n = 0;
var last;
+
do {
var b = this.readByte();
+
if (b < 0) {
throw new _util.FormatError('unexpected EOF in bcmap');
}
+
last = !(b & 0x80);
n = n << 7 | b & 0x7F;
} while (!last);
+
return n;
},
readSigned: function readSigned() {
@@ -27454,22 +32937,28 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
var last;
var stack = this.tmpBuf,
sp = 0;
+
do {
var b = this.readByte();
+
if (b < 0) {
throw new _util.FormatError('unexpected EOF in bcmap');
}
+
last = !(b & 0x80);
stack[sp++] = b & 0x7F;
} while (!last);
+
var i = size,
buffer = 0,
bufferSize = 0;
+
while (i >= 0) {
while (bufferSize < 8 && stack.length > 0) {
buffer = stack[--sp] << bufferSize | buffer;
bufferSize += 7;
}
+
num[i] = buffer & 255;
i--;
buffer >>= 8;
@@ -27480,6 +32969,7 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
this.readHexNumber(num, size);
var sign = num[size] & 1 ? 255 : 0;
var c = 0;
+
for (var i = 0; i <= size; i++) {
c = (c & 1) << 8 | num[i];
num[i] = c >> 1 ^ sign;
@@ -27488,12 +32978,15 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
readString: function readString() {
var len = this.readNumber();
var s = '';
+
for (var i = 0; i < len; i++) {
s += String.fromCharCode(this.readNumber());
}
+
return s;
}
};
+
function processBinaryCMap(data, cMap, extend) {
return new Promise(function (resolve, reject) {
var stream = new BinaryCMapStream(data);
@@ -27507,33 +33000,42 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
var tmp = new Uint8Array(MAX_NUM_SIZE);
var code;
var b;
+
while ((b = stream.readByte()) >= 0) {
var type = b >> 5;
+
if (type === 7) {
switch (b & 0x1F) {
case 0:
stream.readString();
break;
+
case 1:
useCMap = stream.readString();
break;
}
+
continue;
}
+
var sequence = !!(b & 0x10);
var dataSize = b & 15;
+
if (dataSize + 1 > MAX_NUM_SIZE) {
throw new Error('processBinaryCMap: Invalid dataSize.');
}
+
var ucs2DataSize = 1;
var subitemsCount = stream.readNumber();
var i;
+
switch (type) {
case 0:
stream.readHex(start, dataSize);
stream.readHexNumber(end, dataSize);
addHex(end, start, dataSize);
cMap.addCodespaceRange(dataSize + 1, hexToInt(start, dataSize), hexToInt(end, dataSize));
+
for (i = 1; i < subitemsCount; i++) {
incHex(end, dataSize);
stream.readHexNumber(start, dataSize);
@@ -27542,12 +33044,15 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
addHex(end, start, dataSize);
cMap.addCodespaceRange(dataSize + 1, hexToInt(start, dataSize), hexToInt(end, dataSize));
}
+
break;
+
case 1:
stream.readHex(start, dataSize);
stream.readHexNumber(end, dataSize);
addHex(end, start, dataSize);
stream.readNumber();
+
for (i = 1; i < subitemsCount; i++) {
incHex(end, dataSize);
stream.readHexNumber(start, dataSize);
@@ -27556,120 +33061,157 @@ var BinaryCMapReader = function BinaryCMapReaderClosure() {
addHex(end, start, dataSize);
stream.readNumber();
}
+
break;
+
case 2:
stream.readHex(char, dataSize);
code = stream.readNumber();
cMap.mapOne(hexToInt(char, dataSize), code);
+
for (i = 1; i < subitemsCount; i++) {
incHex(char, dataSize);
+
if (!sequence) {
stream.readHexNumber(tmp, dataSize);
addHex(char, tmp, dataSize);
}
+
code = stream.readSigned() + (code + 1);
cMap.mapOne(hexToInt(char, dataSize), code);
}
+
break;
+
case 3:
stream.readHex(start, dataSize);
stream.readHexNumber(end, dataSize);
addHex(end, start, dataSize);
code = stream.readNumber();
cMap.mapCidRange(hexToInt(start, dataSize), hexToInt(end, dataSize), code);
+
for (i = 1; i < subitemsCount; i++) {
incHex(end, dataSize);
+
if (!sequence) {
stream.readHexNumber(start, dataSize);
addHex(start, end, dataSize);
} else {
start.set(end);
}
+
stream.readHexNumber(end, dataSize);
addHex(end, start, dataSize);
code = stream.readNumber();
cMap.mapCidRange(hexToInt(start, dataSize), hexToInt(end, dataSize), code);
}
+
break;
+
case 4:
stream.readHex(char, ucs2DataSize);
stream.readHex(charCode, dataSize);
cMap.mapOne(hexToInt(char, ucs2DataSize), hexToStr(charCode, dataSize));
+
for (i = 1; i < subitemsCount; i++) {
incHex(char, ucs2DataSize);
+
if (!sequence) {
stream.readHexNumber(tmp, ucs2DataSize);
addHex(char, tmp, ucs2DataSize);
}
+
incHex(charCode, dataSize);
stream.readHexSigned(tmp, dataSize);
addHex(charCode, tmp, dataSize);
cMap.mapOne(hexToInt(char, ucs2DataSize), hexToStr(charCode, dataSize));
}
+
break;
+
case 5:
stream.readHex(start, ucs2DataSize);
stream.readHexNumber(end, ucs2DataSize);
addHex(end, start, ucs2DataSize);
stream.readHex(charCode, dataSize);
cMap.mapBfRange(hexToInt(start, ucs2DataSize), hexToInt(end, ucs2DataSize), hexToStr(charCode, dataSize));
+
for (i = 1; i < subitemsCount; i++) {
incHex(end, ucs2DataSize);
+
if (!sequence) {
stream.readHexNumber(start, ucs2DataSize);
addHex(start, end, ucs2DataSize);
} else {
start.set(end);
}
+
stream.readHexNumber(end, ucs2DataSize);
addHex(end, start, ucs2DataSize);
stream.readHex(charCode, dataSize);
cMap.mapBfRange(hexToInt(start, ucs2DataSize), hexToInt(end, ucs2DataSize), hexToStr(charCode, dataSize));
}
+
break;
+
default:
reject(new Error('processBinaryCMap: Unknown type: ' + type));
return;
}
}
+
if (useCMap) {
resolve(extend(useCMap));
return;
}
+
resolve(cMap);
});
}
+
function BinaryCMapReader() {}
- BinaryCMapReader.prototype = { process: processBinaryCMap };
+
+ BinaryCMapReader.prototype = {
+ process: processBinaryCMap
+ };
return BinaryCMapReader;
}();
+
var CMapFactory = function CMapFactoryClosure() {
function strToInt(str) {
var a = 0;
+
for (var i = 0; i < str.length; i++) {
a = a << 8 | str.charCodeAt(i);
}
+
return a >>> 0;
}
+
function expectString(obj) {
if (!(0, _util.isString)(obj)) {
throw new _util.FormatError('Malformed CMap: expected string.');
}
}
+
function expectInt(obj) {
if (!Number.isInteger(obj)) {
throw new _util.FormatError('Malformed CMap: expected int.');
}
}
+
function parseBfChar(cMap, lexer) {
while (true) {
var obj = lexer.getObj();
+
if ((0, _primitives.isEOF)(obj)) {
break;
}
+
if ((0, _primitives.isCmd)(obj, 'endbfchar')) {
return;
}
+
expectString(obj);
var src = strToInt(obj);
obj = lexer.getObj();
@@ -27678,47 +33220,59 @@ var CMapFactory = function CMapFactoryClosure() {
cMap.mapOne(src, dst);
}
}
+
function parseBfRange(cMap, lexer) {
while (true) {
var obj = lexer.getObj();
+
if ((0, _primitives.isEOF)(obj)) {
break;
}
+
if ((0, _primitives.isCmd)(obj, 'endbfrange')) {
return;
}
+
expectString(obj);
var low = strToInt(obj);
obj = lexer.getObj();
expectString(obj);
var high = strToInt(obj);
obj = lexer.getObj();
+
if (Number.isInteger(obj) || (0, _util.isString)(obj)) {
var dstLow = Number.isInteger(obj) ? String.fromCharCode(obj) : obj;
cMap.mapBfRange(low, high, dstLow);
} else if ((0, _primitives.isCmd)(obj, '[')) {
obj = lexer.getObj();
var array = [];
+
while (!(0, _primitives.isCmd)(obj, ']') && !(0, _primitives.isEOF)(obj)) {
array.push(obj);
obj = lexer.getObj();
}
+
cMap.mapBfRangeToArray(low, high, array);
} else {
break;
}
}
+
throw new _util.FormatError('Invalid bf range.');
}
+
function parseCidChar(cMap, lexer) {
while (true) {
var obj = lexer.getObj();
+
if ((0, _primitives.isEOF)(obj)) {
break;
}
+
if ((0, _primitives.isCmd)(obj, 'endcidchar')) {
return;
}
+
expectString(obj);
var src = strToInt(obj);
obj = lexer.getObj();
@@ -27727,15 +33281,19 @@ var CMapFactory = function CMapFactoryClosure() {
cMap.mapOne(src, dst);
}
}
+
function parseCidRange(cMap, lexer) {
while (true) {
var obj = lexer.getObj();
+
if ((0, _primitives.isEOF)(obj)) {
break;
}
+
if ((0, _primitives.isCmd)(obj, 'endcidrange')) {
return;
}
+
expectString(obj);
var low = strToInt(obj);
obj = lexer.getObj();
@@ -27747,46 +33305,61 @@ var CMapFactory = function CMapFactoryClosure() {
cMap.mapCidRange(low, high, dstLow);
}
}
+
function parseCodespaceRange(cMap, lexer) {
while (true) {
var obj = lexer.getObj();
+
if ((0, _primitives.isEOF)(obj)) {
break;
}
+
if ((0, _primitives.isCmd)(obj, 'endcodespacerange')) {
return;
}
+
if (!(0, _util.isString)(obj)) {
break;
}
+
var low = strToInt(obj);
obj = lexer.getObj();
+
if (!(0, _util.isString)(obj)) {
break;
}
+
var high = strToInt(obj);
cMap.addCodespaceRange(obj.length, low, high);
}
+
throw new _util.FormatError('Invalid codespace range.');
}
+
function parseWMode(cMap, lexer) {
var obj = lexer.getObj();
+
if (Number.isInteger(obj)) {
cMap.vertical = !!obj;
}
}
+
function parseCMapName(cMap, lexer) {
var obj = lexer.getObj();
+
if ((0, _primitives.isName)(obj) && (0, _util.isString)(obj.name)) {
cMap.name = obj.name;
}
}
+
function parseCMap(cMap, lexer, fetchBuiltInCMap, useCMap) {
var previous;
var embeddedUseCMap;
+
objLoop: while (true) {
try {
var obj = lexer.getObj();
+
if ((0, _primitives.isEOF)(obj)) {
break;
} else if ((0, _primitives.isName)(obj)) {
@@ -27795,28 +33368,36 @@ var CMapFactory = function CMapFactoryClosure() {
} else if (obj.name === 'CMapName') {
parseCMapName(cMap, lexer);
}
+
previous = obj;
} else if ((0, _primitives.isCmd)(obj)) {
switch (obj.cmd) {
case 'endcmap':
break objLoop;
+
case 'usecmap':
if ((0, _primitives.isName)(previous)) {
embeddedUseCMap = previous.name;
}
+
break;
+
case 'begincodespacerange':
parseCodespaceRange(cMap, lexer);
break;
+
case 'beginbfchar':
parseBfChar(cMap, lexer);
break;
+
case 'begincidchar':
parseCidChar(cMap, lexer);
break;
+
case 'beginbfrange':
parseBfRange(cMap, lexer);
break;
+
case 'begincidrange':
parseCidRange(cMap, lexer);
break;
@@ -27826,28 +33407,37 @@ var CMapFactory = function CMapFactoryClosure() {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
+
(0, _util.warn)('Invalid cMap data: ' + ex);
continue;
}
}
+
if (!useCMap && embeddedUseCMap) {
useCMap = embeddedUseCMap;
}
+
if (useCMap) {
return extendCMap(cMap, fetchBuiltInCMap, useCMap);
}
+
return Promise.resolve(cMap);
}
+
function extendCMap(cMap, fetchBuiltInCMap, useCMap) {
return createBuiltInCMap(useCMap, fetchBuiltInCMap).then(function (newCMap) {
cMap.useCMap = newCMap;
+
if (cMap.numCodespaceRanges === 0) {
var useCodespaceRanges = cMap.useCMap.codespaceRanges;
+
for (var i = 0; i < useCodespaceRanges.length; i++) {
cMap.codespaceRanges[i] = useCodespaceRanges[i].slice();
}
+
cMap.numCodespaceRanges = cMap.useCMap.numCodespaceRanges;
}
+
cMap.useCMap.forEach(function (key, value) {
if (!cMap.contains(key)) {
cMap.mapOne(key, cMap.useCMap.lookup(key));
@@ -27856,39 +33446,48 @@ var CMapFactory = function CMapFactoryClosure() {
return cMap;
});
}
+
function createBuiltInCMap(name, fetchBuiltInCMap) {
if (name === 'Identity-H') {
return Promise.resolve(new IdentityCMap(false, 2));
} else if (name === 'Identity-V') {
return Promise.resolve(new IdentityCMap(true, 2));
}
+
if (!BUILT_IN_CMAPS.includes(name)) {
return Promise.reject(new Error('Unknown CMap name: ' + name));
}
+
if (!fetchBuiltInCMap) {
return Promise.reject(new Error('Built-in CMap parameters are not provided.'));
}
+
return fetchBuiltInCMap(name).then(function (data) {
var cMapData = data.cMapData,
compressionType = data.compressionType;
var cMap = new CMap(true);
+
if (compressionType === _util.CMapCompressionType.BINARY) {
return new BinaryCMapReader().process(cMapData, cMap, function (useCMap) {
return extendCMap(cMap, fetchBuiltInCMap, useCMap);
});
}
+
if (compressionType === _util.CMapCompressionType.NONE) {
var lexer = new _parser.Lexer(new _stream.Stream(cMapData));
return parseCMap(cMap, lexer, fetchBuiltInCMap, null);
}
+
return Promise.reject(new Error('TODO: Only BINARY/NONE CMap compression is currently supported.'));
});
}
+
return {
create: function create(params) {
var encoding = params.encoding;
var fetchBuiltInCMap = params.fetchBuiltInCMap;
var useCMap = params.useCMap;
+
if ((0, _primitives.isName)(encoding)) {
return createBuiltInCMap(encoding.name, fetchBuiltInCMap);
} else if ((0, _primitives.isStream)(encoding)) {
@@ -27898,15 +33497,16 @@ var CMapFactory = function CMapFactoryClosure() {
if (parsedCMap.isIdentityCMap) {
return createBuiltInCMap(parsedCMap.name, fetchBuiltInCMap);
}
+
return parsedCMap;
});
}
+
return Promise.reject(new Error('Encoding required.'));
}
};
}();
-exports.CMap = CMap;
-exports.IdentityCMap = IdentityCMap;
+
exports.CMapFactory = CMapFactory;
/***/ }),
@@ -27919,9 +33519,8 @@ exports.CMapFactory = CMapFactory;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.getFontType = exports.IdentityToUnicodeMap = exports.ToUnicodeMap = exports.FontFlags = exports.Font = exports.ErrorFont = exports.SEAC_ANALYSIS_ENABLED = undefined;
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+exports.getFontType = getFontType;
+exports.IdentityToUnicodeMap = exports.ToUnicodeMap = exports.FontFlags = exports.Font = exports.ErrorFont = exports.SEAC_ANALYSIS_ENABLED = void 0;
var _util = __w_pdfjs_require__(2);
@@ -27943,9 +33542,18 @@ var _stream = __w_pdfjs_require__(144);
var _type1_parser = __w_pdfjs_require__(168);
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
var PRIVATE_USE_AREAS = [[0xE000, 0xF8FF], [0x100000, 0x10FFFD]];
var PDF_GLYPH_SPACE_UNITS = 1000;
var SEAC_ANALYSIS_ENABLED = true;
+exports.SEAC_ANALYSIS_ENABLED = SEAC_ANALYSIS_ENABLED;
var FontFlags = {
FixedPitch: 1,
Serif: 2,
@@ -27957,70 +33565,95 @@ var FontFlags = {
SmallCap: 131072,
ForceBold: 262144
};
+exports.FontFlags = FontFlags;
var MacStandardGlyphOrdering = ['.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis', 'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis', 'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve', 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex', 'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet', 'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute', 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin', 'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis', 'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash', 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright', 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar', 'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply', 'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter', 'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla', 'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
+
function adjustWidths(properties) {
if (!properties.fontMatrix) {
return;
}
+
if (properties.fontMatrix[0] === _util.FONT_IDENTITY_MATRIX[0]) {
return;
}
+
var scale = 0.001 / properties.fontMatrix[0];
var glyphsWidths = properties.widths;
+
for (var glyph in glyphsWidths) {
glyphsWidths[glyph] *= scale;
}
+
properties.defaultWidth *= scale;
}
+
function adjustToUnicode(properties, builtInEncoding) {
if (properties.hasIncludedToUnicodeMap) {
return;
}
+
if (properties.hasEncoding) {
return;
}
+
if (builtInEncoding === properties.defaultEncoding) {
return;
}
+
if (properties.toUnicode instanceof IdentityToUnicodeMap) {
return;
}
+
var toUnicode = [],
glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+
for (var charCode in builtInEncoding) {
var glyphName = builtInEncoding[charCode];
var unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
+
if (unicode !== -1) {
toUnicode[charCode] = String.fromCharCode(unicode);
}
}
+
properties.toUnicode.amend(toUnicode);
}
+
function getFontType(type, subtype) {
switch (type) {
case 'Type1':
return subtype === 'Type1C' ? _util.FontType.TYPE1C : _util.FontType.TYPE1;
+
case 'CIDFontType0':
return subtype === 'CIDFontType0C' ? _util.FontType.CIDFONTTYPE0C : _util.FontType.CIDFONTTYPE0;
+
case 'OpenType':
return _util.FontType.OPENTYPE;
+
case 'TrueType':
return _util.FontType.TRUETYPE;
+
case 'CIDFontType2':
return _util.FontType.CIDFONTTYPE2;
+
case 'MMType1':
return _util.FontType.MMTYPE1;
+
case 'Type0':
return _util.FontType.TYPE0;
+
default:
return _util.FontType.UNKNOWN;
}
}
+
function recoverGlyphName(name, glyphsUnicodeMap) {
if (glyphsUnicodeMap[name] !== undefined) {
return name;
}
+
var unicode = (0, _unicode.getUnicodeForGlyph)(name, glyphsUnicodeMap);
+
if (unicode !== -1) {
for (var key in glyphsUnicodeMap) {
if (glyphsUnicodeMap[key] === unicode) {
@@ -28028,9 +33661,11 @@ function recoverGlyphName(name, glyphsUnicodeMap) {
}
}
}
+
(0, _util.info)('Unable to recover a standard glyph name for: ' + name);
return name;
}
+
var Glyph = function GlyphClosure() {
function Glyph(fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont) {
this.fontChar = fontChar;
@@ -28042,21 +33677,25 @@ var Glyph = function GlyphClosure() {
this.isSpace = isSpace;
this.isInFont = isInFont;
}
+
Glyph.prototype.matchesForCache = function (fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont) {
return this.fontChar === fontChar && this.unicode === unicode && this.accent === accent && this.width === width && this.vmetric === vmetric && this.operatorListId === operatorListId && this.isSpace === isSpace && this.isInFont === isInFont;
};
+
return Glyph;
}();
+
var ToUnicodeMap = function ToUnicodeMapClosure() {
function ToUnicodeMap() {
var cmap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-
this._map = cmap;
}
+
ToUnicodeMap.prototype = {
get length() {
return this._map.length;
},
+
forEach: function forEach(callback) {
for (var charCode in this._map) {
callback(charCode, this._map[charCode].charCodeAt(0));
@@ -28070,14 +33709,17 @@ var ToUnicodeMap = function ToUnicodeMapClosure() {
},
charCodeOf: function charCodeOf(value) {
var map = this._map;
+
if (map.length <= 0x10000) {
return map.indexOf(value);
}
+
for (var charCode in map) {
if (map[charCode] === value) {
return charCode | 0;
}
}
+
return -1;
},
amend: function amend(map) {
@@ -28088,15 +33730,20 @@ var ToUnicodeMap = function ToUnicodeMapClosure() {
};
return ToUnicodeMap;
}();
+
+exports.ToUnicodeMap = ToUnicodeMap;
+
var IdentityToUnicodeMap = function IdentityToUnicodeMapClosure() {
function IdentityToUnicodeMap(firstChar, lastChar) {
this.firstChar = firstChar;
this.lastChar = lastChar;
}
+
IdentityToUnicodeMap.prototype = {
get length() {
return this.lastChar + 1 - this.firstChar;
},
+
forEach: function forEach(callback) {
for (var i = this.firstChar, ii = this.lastChar; i <= ii; i++) {
callback(i, i);
@@ -28109,6 +33756,7 @@ var IdentityToUnicodeMap = function IdentityToUnicodeMapClosure() {
if (this.firstChar <= i && i <= this.lastChar) {
return String.fromCharCode(i);
}
+
return undefined;
},
charCodeOf: function charCodeOf(v) {
@@ -28120,19 +33768,25 @@ var IdentityToUnicodeMap = function IdentityToUnicodeMapClosure() {
};
return IdentityToUnicodeMap;
}();
+
+exports.IdentityToUnicodeMap = IdentityToUnicodeMap;
+
var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
function writeInt16(dest, offset, num) {
dest[offset] = num >> 8 & 0xFF;
dest[offset + 1] = num & 0xFF;
}
+
function writeInt32(dest, offset, num) {
dest[offset] = num >> 24 & 0xFF;
dest[offset + 1] = num >> 16 & 0xFF;
dest[offset + 2] = num >> 8 & 0xFF;
dest[offset + 3] = num & 0xFF;
}
+
function writeData(dest, offset, data) {
var i, ii;
+
if (data instanceof Uint8Array) {
dest.set(data, offset);
} else if (typeof data === 'string') {
@@ -28145,17 +33799,21 @@ var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
}
}
}
+
function OpenTypeFileBuilder(sfnt) {
this.sfnt = sfnt;
this.tables = Object.create(null);
}
+
OpenTypeFileBuilder.getSearchParams = function OpenTypeFileBuilder_getSearchParams(entriesCount, entrySize) {
var maxPower2 = 1,
log2 = 0;
+
while ((maxPower2 ^ entriesCount) > maxPower2) {
maxPower2 <<= 1;
log2++;
}
+
var searchRange = maxPower2 * entrySize;
return {
range: searchRange,
@@ -28163,6 +33821,7 @@ var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
rangeShift: entrySize * entriesCount - searchRange
};
};
+
var OTF_HEADER_SIZE = 12;
var OTF_TABLE_ENTRY_SIZE = 16;
OpenTypeFileBuilder.prototype = {
@@ -28175,20 +33834,25 @@ var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
var i, j, jj, table, tableName;
var offset = OTF_HEADER_SIZE + numTables * OTF_TABLE_ENTRY_SIZE;
var tableOffsets = [offset];
+
for (i = 0; i < numTables; i++) {
table = tables[tablesNames[i]];
var paddedLength = (table.length + 3 & ~3) >>> 0;
offset += paddedLength;
tableOffsets.push(offset);
}
+
var file = new Uint8Array(offset);
+
for (i = 0; i < numTables; i++) {
table = tables[tablesNames[i]];
writeData(file, tableOffsets[i], table);
}
+
if (sfnt === 'true') {
sfnt = (0, _util.string32)(0x00010000);
}
+
file[0] = sfnt.charCodeAt(0) & 0xFF;
file[1] = sfnt.charCodeAt(1) & 0xFF;
file[2] = sfnt.charCodeAt(2) & 0xFF;
@@ -28199,6 +33863,7 @@ var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
writeInt16(file, 8, searchParams.entry);
writeInt16(file, 10, searchParams.rangeShift);
offset = OTF_HEADER_SIZE;
+
for (i = 0; i < numTables; i++) {
tableName = tablesNames[i];
file[offset] = tableName.charCodeAt(0) & 0xFF;
@@ -28206,26 +33871,31 @@ var OpenTypeFileBuilder = function OpenTypeFileBuilderClosure() {
file[offset + 2] = tableName.charCodeAt(2) & 0xFF;
file[offset + 3] = tableName.charCodeAt(3) & 0xFF;
var checksum = 0;
+
for (j = tableOffsets[i], jj = tableOffsets[i + 1]; j < jj; j += 4) {
var quad = (0, _util.readUint32)(file, j);
checksum = checksum + quad >>> 0;
}
+
writeInt32(file, offset + 4, checksum);
writeInt32(file, offset + 8, tableOffsets[i]);
writeInt32(file, offset + 12, tables[tableName].length);
offset += OTF_TABLE_ENTRY_SIZE;
}
+
return file;
},
addTable: function OpenTypeFileBuilder_addTable(tag, data) {
if (tag in this.tables) {
throw new Error('Table ' + tag + ' already exists');
}
+
this.tables[tag] = data;
}
};
return OpenTypeFileBuilder;
}();
+
var Font = function FontClosure() {
function Font(name, file, properties) {
var charCode;
@@ -28257,23 +33927,29 @@ var Font = function FontClosure() {
this.toUnicode = properties.toUnicode;
this.fallbackToUnicode = properties.fallbackToUnicode || new ToUnicodeMap();
this.toFontChar = [];
+
if (properties.type === 'Type3') {
for (charCode = 0; charCode < 256; charCode++) {
this.toFontChar[charCode] = this.differences[charCode] || properties.defaultEncoding[charCode];
}
+
this.fontType = _util.FontType.TYPE3;
return;
}
+
this.cidEncoding = properties.cidEncoding;
this.vertical = properties.vertical;
+
if (this.vertical) {
this.vmetrics = properties.vmetrics;
this.defaultVMetrics = properties.defaultVMetrics;
}
+
if (!file || file.isEmpty) {
if (file) {
(0, _util.warn)('Font file is empty in "' + name + '" (' + this.loadedName + ')');
}
+
this.fallbackToSystemFont();
return;
}
@@ -28286,13 +33962,16 @@ var Font = function FontClosure() {
subtype = _getFontFileType2[1];
if (type !== this.type || subtype !== this.subtype) {
- (0, _util.info)('Inconsistent font file Type/SubType, expected: ' + (this.type + '/' + this.subtype + ' but found: ' + type + '/' + subtype + '.'));
+ (0, _util.info)('Inconsistent font file Type/SubType, expected: ' + "".concat(this.type, "/").concat(this.subtype, " but found: ").concat(type, "/").concat(subtype, "."));
}
+
try {
var data;
+
switch (type) {
case 'MMType1':
(0, _util.info)('MMType1 font (' + name + '), falling back to Type1.');
+
case 'Type1':
case 'CIDFontType0':
this.mimetype = 'font/opentype';
@@ -28300,24 +33979,29 @@ var Font = function FontClosure() {
adjustWidths(properties);
data = this.convert(name, cff, properties);
break;
+
case 'OpenType':
case 'TrueType':
case 'CIDFontType2':
this.mimetype = 'font/opentype';
data = this.checkAndRepair(name, file, properties);
+
if (this.isOpenType) {
adjustWidths(properties);
type = 'OpenType';
}
+
break;
+
default:
- throw new _util.FormatError('Font ' + type + ' is not supported');
+ throw new _util.FormatError("Font ".concat(type, " is not supported"));
}
} catch (e) {
(0, _util.warn)(e);
this.fallbackToSystemFont();
return;
}
+
this.data = data;
this.fontType = getFontType(type, subtype);
this.fontMatrix = properties.fontMatrix;
@@ -28327,69 +34011,86 @@ var Font = function FontClosure() {
this.encoding = properties.baseEncoding;
this.seacMap = properties.seacMap;
}
+
Font.getFontID = function () {
var ID = 1;
return function Font_getFontID() {
return String(ID++);
};
}();
+
function int16(b0, b1) {
return (b0 << 8) + b1;
}
+
function writeSignedInt16(bytes, index, value) {
bytes[index + 1] = value;
bytes[index] = value >>> 8;
}
+
function signedInt16(b0, b1) {
var value = (b0 << 8) + b1;
return value & 1 << 15 ? value - 0x10000 : value;
}
+
function int32(b0, b1, b2, b3) {
return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
}
+
function string16(value) {
return String.fromCharCode(value >> 8 & 0xff, value & 0xff);
}
+
function safeString16(value) {
value = value > 0x7FFF ? 0x7FFF : value < -0x8000 ? -0x8000 : value;
return String.fromCharCode(value >> 8 & 0xff, value & 0xff);
}
+
function isTrueTypeFile(file) {
var header = file.peekBytes(4);
return (0, _util.readUint32)(header, 0) === 0x00010000 || (0, _util.bytesToString)(header) === 'true';
}
+
function isTrueTypeCollectionFile(file) {
var header = file.peekBytes(4);
return (0, _util.bytesToString)(header) === 'ttcf';
}
+
function isOpenTypeFile(file) {
var header = file.peekBytes(4);
return (0, _util.bytesToString)(header) === 'OTTO';
}
+
function isType1File(file) {
var header = file.peekBytes(2);
+
if (header[0] === 0x25 && header[1] === 0x21) {
return true;
}
+
if (header[0] === 0x80 && header[1] === 0x01) {
return true;
}
+
return false;
}
+
function isCFFFile(file) {
var header = file.peekBytes(4);
+
if (header[0] >= 1 && header[3] >= 1 && header[3] <= 4) {
return true;
}
+
return false;
}
+
function getFontFileType(file, _ref) {
var type = _ref.type,
subtype = _ref.subtype,
composite = _ref.composite;
+ var fileType, fileSubtype;
- var fileType = void 0,
- fileSubtype = void 0;
if (isTrueTypeFile(file) || isTrueTypeCollectionFile(file)) {
if (composite) {
fileType = 'CIDFontType2';
@@ -28421,112 +34122,144 @@ var Font = function FontClosure() {
fileType = type;
fileSubtype = subtype;
}
+
return [fileType, fileSubtype];
}
+
function buildToFontChar(encoding, glyphsUnicodeMap, differences) {
var toFontChar = [],
unicode;
+
for (var i = 0, ii = encoding.length; i < ii; i++) {
unicode = (0, _unicode.getUnicodeForGlyph)(encoding[i], glyphsUnicodeMap);
+
if (unicode !== -1) {
toFontChar[i] = unicode;
}
}
+
for (var charCode in differences) {
unicode = (0, _unicode.getUnicodeForGlyph)(differences[charCode], glyphsUnicodeMap);
+
if (unicode !== -1) {
toFontChar[+charCode] = unicode;
}
}
+
return toFontChar;
}
+
function adjustMapping(charCodeToGlyphId, hasGlyph, newGlyphZeroId) {
var newMap = Object.create(null);
var toFontChar = [];
var privateUseAreaIndex = 0;
var nextAvailableFontCharCode = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
var privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
+
for (var originalCharCode in charCodeToGlyphId) {
originalCharCode |= 0;
var glyphId = charCodeToGlyphId[originalCharCode];
+
if (!hasGlyph(glyphId)) {
continue;
}
+
if (nextAvailableFontCharCode > privateUseOffetEnd) {
privateUseAreaIndex++;
+
if (privateUseAreaIndex >= PRIVATE_USE_AREAS.length) {
(0, _util.warn)('Ran out of space in font private use area.');
break;
}
+
nextAvailableFontCharCode = PRIVATE_USE_AREAS[privateUseAreaIndex][0];
privateUseOffetEnd = PRIVATE_USE_AREAS[privateUseAreaIndex][1];
}
+
var fontCharCode = nextAvailableFontCharCode++;
+
if (glyphId === 0) {
glyphId = newGlyphZeroId;
}
+
newMap[fontCharCode] = glyphId;
toFontChar[originalCharCode] = fontCharCode;
}
+
return {
toFontChar: toFontChar,
charCodeToGlyphId: newMap,
nextAvailableFontCharCode: nextAvailableFontCharCode
};
}
+
function getRanges(glyphs, numGlyphs) {
var codes = [];
+
for (var charCode in glyphs) {
if (glyphs[charCode] >= numGlyphs) {
continue;
}
+
codes.push({
fontCharCode: charCode | 0,
glyphId: glyphs[charCode]
});
}
+
if (codes.length === 0) {
codes.push({
fontCharCode: 0,
glyphId: 0
});
}
+
codes.sort(function fontGetRangesSort(a, b) {
return a.fontCharCode - b.fontCharCode;
});
var ranges = [];
var length = codes.length;
+
for (var n = 0; n < length;) {
var start = codes[n].fontCharCode;
var codeIndices = [codes[n].glyphId];
++n;
var end = start;
+
while (n < length && end + 1 === codes[n].fontCharCode) {
codeIndices.push(codes[n].glyphId);
++end;
++n;
+
if (end === 0xFFFF) {
break;
}
}
+
ranges.push([start, end, codeIndices]);
}
+
return ranges;
}
+
function createCmapTable(glyphs, numGlyphs) {
var ranges = getRanges(glyphs, numGlyphs);
var numTables = ranges[ranges.length - 1][1] > 0xFFFF ? 2 : 1;
var cmap = '\x00\x00' + string16(numTables) + '\x00\x03' + '\x00\x01' + (0, _util.string32)(4 + numTables * 8);
var i, ii, j, jj;
+
for (i = ranges.length - 1; i >= 0; --i) {
if (ranges[i][0] <= 0xFFFF) {
break;
}
}
+
var bmpLength = i + 1;
+
if (ranges[i][0] < 0xFFFF && ranges[i][1] === 0xFFFF) {
ranges[i][1] = 0xFFFE;
}
+
var trailingRangesCount = ranges[i][1] < 0xFFFF ? 1 : 0;
var segCount = bmpLength + trailingRangesCount;
var searchParams = OpenTypeFileBuilder.getSearchParams(segCount, 2);
@@ -28537,6 +34270,7 @@ var Font = function FontClosure() {
var glyphsIds = '';
var bias = 0;
var range, start, end, codes;
+
for (i = 0, ii = bmpLength; i < ii; i++) {
range = ranges[i];
start = range[0];
@@ -28545,17 +34279,20 @@ var Font = function FontClosure() {
endCount += string16(end);
codes = range[2];
var contiguous = true;
+
for (j = 1, jj = codes.length; j < jj; ++j) {
if (codes[j] !== codes[j - 1] + 1) {
contiguous = false;
break;
}
}
+
if (!contiguous) {
var offset = (segCount - i) * 2 + bias * 2;
bias += end - start + 1;
idDeltas += string16(0);
idRangeOffsets += string16(offset);
+
for (j = 0, jj = codes.length; j < jj; ++j) {
glyphsIds += string16(codes[j]);
}
@@ -28565,23 +34302,28 @@ var Font = function FontClosure() {
idRangeOffsets += string16(0);
}
}
+
if (trailingRangesCount > 0) {
endCount += '\xFF\xFF';
startCount += '\xFF\xFF';
idDeltas += '\x00\x01';
idRangeOffsets += '\x00\x00';
}
+
var format314 = '\x00\x00' + string16(2 * segCount) + string16(searchParams.range) + string16(searchParams.entry) + string16(searchParams.rangeShift) + endCount + '\x00\x00' + startCount + idDeltas + idRangeOffsets + glyphsIds;
var format31012 = '';
var header31012 = '';
+
if (numTables > 1) {
cmap += '\x00\x03' + '\x00\x0A' + (0, _util.string32)(4 + numTables * 8 + 4 + format314.length);
format31012 = '';
+
for (i = 0, ii = ranges.length; i < ii; i++) {
range = ranges[i];
start = range[0];
codes = range[2];
var code = codes[0];
+
for (j = 1, jj = codes.length; j < jj; ++j) {
if (codes[j] !== codes[j - 1] + 1) {
end = range[0] + j - 1;
@@ -28590,33 +34332,44 @@ var Font = function FontClosure() {
code = codes[j];
}
}
+
format31012 += (0, _util.string32)(start) + (0, _util.string32)(range[1]) + (0, _util.string32)(code);
}
+
header31012 = '\x00\x0C' + '\x00\x00' + (0, _util.string32)(format31012.length + 16) + '\x00\x00\x00\x00' + (0, _util.string32)(format31012.length / 12);
}
+
return cmap + '\x00\x04' + string16(format314.length + 4) + format314 + header31012 + format31012;
}
+
function validateOS2Table(os2) {
var stream = new _stream.Stream(os2.data);
var version = stream.getUint16();
stream.getBytes(60);
var selection = stream.getUint16();
+
if (version < 4 && selection & 0x0300) {
return false;
}
+
var firstChar = stream.getUint16();
var lastChar = stream.getUint16();
+
if (firstChar > lastChar) {
return false;
}
+
stream.getBytes(6);
var usWinAscent = stream.getUint16();
+
if (usWinAscent === 0) {
return false;
}
+
os2.data[8] = os2.data[9] = 0;
return true;
}
+
function createOS2Table(properties, charstrings, override) {
override = override || {
unitsPerEm: 0,
@@ -28631,16 +34384,21 @@ var Font = function FontClosure() {
var ulUnicodeRange4 = 0;
var firstCharIndex = null;
var lastCharIndex = 0;
+
if (charstrings) {
for (var code in charstrings) {
code |= 0;
+
if (firstCharIndex > code || !firstCharIndex) {
firstCharIndex = code;
}
+
if (lastCharIndex < code) {
lastCharIndex = code;
}
+
var position = (0, _unicode.getUnicodeRangeFor)(code);
+
if (position < 32) {
ulUnicodeRange1 |= 1 << position;
} else if (position < 64) {
@@ -28653,6 +34411,7 @@ var Font = function FontClosure() {
throw new _util.FormatError('Unicode ranges Bits > 123 are reserved for internal usage');
}
}
+
if (lastCharIndex > 0xFFFF) {
lastCharIndex = 0xFFFF;
}
@@ -28660,37 +34419,47 @@ var Font = function FontClosure() {
firstCharIndex = 0;
lastCharIndex = 255;
}
+
var bbox = properties.bbox || [0, 0, 0, 0];
var unitsPerEm = override.unitsPerEm || 1 / (properties.fontMatrix || _util.FONT_IDENTITY_MATRIX)[0];
var scale = properties.ascentScaled ? 1.0 : unitsPerEm / PDF_GLYPH_SPACE_UNITS;
var typoAscent = override.ascent || Math.round(scale * (properties.ascent || bbox[3]));
var typoDescent = override.descent || Math.round(scale * (properties.descent || bbox[1]));
+
if (typoDescent > 0 && properties.descent > 0 && bbox[1] < 0) {
typoDescent = -typoDescent;
}
+
var winAscent = override.yMax || typoAscent;
var winDescent = -override.yMin || -typoDescent;
return '\x00\x03' + '\x02\x24' + '\x01\xF4' + '\x00\x05' + '\x00\x00' + '\x02\x8A' + '\x02\xBB' + '\x00\x00' + '\x00\x8C' + '\x02\x8A' + '\x02\xBB' + '\x00\x00' + '\x01\xDF' + '\x00\x31' + '\x01\x02' + '\x00\x00' + '\x00\x00\x06' + String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) + '\x00\x00\x00\x00\x00\x00' + (0, _util.string32)(ulUnicodeRange1) + (0, _util.string32)(ulUnicodeRange2) + (0, _util.string32)(ulUnicodeRange3) + (0, _util.string32)(ulUnicodeRange4) + '\x2A\x32\x31\x2A' + string16(properties.italicAngle ? 1 : 0) + string16(firstCharIndex || properties.firstChar) + string16(lastCharIndex || properties.lastChar) + string16(typoAscent) + string16(typoDescent) + '\x00\x64' + string16(winAscent) + string16(winDescent) + '\x00\x00\x00\x00' + '\x00\x00\x00\x00' + string16(properties.xHeight) + string16(properties.capHeight) + string16(0) + string16(firstCharIndex || properties.firstChar) + '\x00\x03';
}
+
function createPostTable(properties) {
var angle = Math.floor(properties.italicAngle * Math.pow(2, 16));
return '\x00\x03\x00\x00' + (0, _util.string32)(angle) + '\x00\x00' + '\x00\x00' + (0, _util.string32)(properties.fixedPitch) + '\x00\x00\x00\x00' + '\x00\x00\x00\x00' + '\x00\x00\x00\x00' + '\x00\x00\x00\x00';
}
+
function createNameTable(name, proto) {
if (!proto) {
proto = [[], []];
}
+
var strings = [proto[0][0] || 'Original licence', proto[0][1] || name, proto[0][2] || 'Unknown', proto[0][3] || 'uniqueID', proto[0][4] || name, proto[0][5] || 'Version 0.11', proto[0][6] || '', proto[0][7] || 'Unknown', proto[0][8] || 'Unknown', proto[0][9] || 'Unknown'];
var stringsUnicode = [];
var i, ii, j, jj, str;
+
for (i = 0, ii = strings.length; i < ii; i++) {
str = proto[1][i] || strings[i];
var strBufUnicode = [];
+
for (j = 0, jj = str.length; j < jj; j++) {
strBufUnicode.push(string16(str.charCodeAt(j)));
}
+
stringsUnicode.push(strBufUnicode.join(''));
}
+
var names = [strings, stringsUnicode];
var platforms = ['\x00\x01', '\x00\x03'];
var encodings = ['\x00\x00', '\x00\x01'];
@@ -28698,8 +34467,10 @@ var Font = function FontClosure() {
var namesRecordCount = strings.length * platforms.length;
var nameTable = '\x00\x00' + string16(namesRecordCount) + string16(namesRecordCount * 12 + 6);
var strOffset = 0;
+
for (i = 0, ii = platforms.length; i < ii; i++) {
var strs = names[i];
+
for (j = 0, jj = strs.length; j < jj; j++) {
str = strs[j];
var nameRecord = platforms[i] + encodings[i] + languages[i] + string16(j) + string16(str.length) + string16(strOffset);
@@ -28707,25 +34478,32 @@ var Font = function FontClosure() {
strOffset += str.length;
}
}
+
nameTable += strings.join('') + stringsUnicode.join('');
return nameTable;
}
+
Font.prototype = {
name: null,
font: null,
mimetype: null,
encoding: null,
+
get renderer() {
var renderer = _font_renderer.FontRendererFactory.create(this, SEAC_ANALYSIS_ENABLED);
+
return (0, _util.shadow)(this, 'renderer', renderer);
},
+
exportData: function Font_exportData() {
var data = {};
+
for (var i in this) {
if (this.hasOwnProperty(i)) {
data[i] = this[i];
}
}
+
return data;
},
fallbackToSystemFont: function Font_fallbackToSystemFont() {
@@ -28745,29 +34523,37 @@ var Font = function FontClosure() {
this.italic = fontName.search(/oblique/gi) !== -1 || fontName.search(/italic/gi) !== -1;
this.black = name.search(/Black/g) !== -1;
this.remeasure = Object.keys(this.widths).length > 0;
+
if (isStandardFont && type === 'CIDFontType2' && this.cidEncoding.indexOf('Identity-') === 0) {
var GlyphMapForStandardFonts = (0, _standard_fonts.getGlyphMapForStandardFonts)();
var map = [];
+
for (charCode in GlyphMapForStandardFonts) {
map[+charCode] = GlyphMapForStandardFonts[charCode];
}
+
if (/Arial-?Black/i.test(name)) {
var SupplementalGlyphMapForArialBlack = (0, _standard_fonts.getSupplementalGlyphMapForArialBlack)();
+
for (charCode in SupplementalGlyphMapForArialBlack) {
map[+charCode] = SupplementalGlyphMapForArialBlack[charCode];
}
} else if (/Calibri/i.test(name)) {
var SupplementalGlyphMapForCalibri = (0, _standard_fonts.getSupplementalGlyphMapForCalibri)();
+
for (charCode in SupplementalGlyphMapForCalibri) {
map[+charCode] = SupplementalGlyphMapForCalibri[charCode];
}
}
+
var isIdentityUnicode = this.toUnicode instanceof IdentityToUnicodeMap;
+
if (!isIdentityUnicode) {
this.toUnicode.forEach(function (charCode, unicodeCharCode) {
map[+charCode] = unicodeCharCode;
});
}
+
this.toFontChar = map;
this.toUnicode = new ToUnicodeMap(map);
} else if (/Symbol/i.test(fontName)) {
@@ -28776,6 +34562,7 @@ var Font = function FontClosure() {
if (/Wingdings/i.test(name)) {
(0, _util.warn)('Non-embedded Wingdings font, falling back to ZapfDingbats.');
}
+
this.toFontChar = buildToFontChar(_encodings.ZapfDingbatsEncoding, (0, _glyphlist.getDingbatsGlyphsUnicode)(), this.differences);
} else if (isStandardFont) {
this.toFontChar = buildToFontChar(this.defaultEncoding, (0, _glyphlist.getGlyphsUnicode)(), this.differences);
@@ -28785,18 +34572,22 @@ var Font = function FontClosure() {
if (!_this.composite) {
var glyphName = _this.differences[charCode] || _this.defaultEncoding[charCode];
unicode = (0, _unicode.getUnicodeForGlyph)(glyphName, glyphsUnicodeMap);
+
if (unicode !== -1) {
unicodeCharCode = unicode;
}
}
+
_this.toFontChar[charCode] = unicodeCharCode;
});
}
+
this.loadedName = fontName.split('-')[0];
this.fontType = getFontType(type, subtype);
},
checkAndRepair: function Font_checkAndRepair(name, font, properties) {
var VALID_TABLES = ['OS/2', 'cmap', 'head', 'hhea', 'hmtx', 'maxp', 'name', 'post', 'loca', 'glyf', 'fpgm', 'prep', 'cvt ', 'CFF '];
+
function readTables(file, numTables) {
var tables = Object.create(null);
tables['OS/2'] = null;
@@ -28807,18 +34598,24 @@ var Font = function FontClosure() {
tables['maxp'] = null;
tables['name'] = null;
tables['post'] = null;
+
for (var i = 0; i < numTables; i++) {
var table = readTableEntry(font);
+
if (!VALID_TABLES.includes(table.tag)) {
continue;
}
+
if (table.length === 0) {
continue;
}
+
tables[table.tag] = table;
}
+
return tables;
}
+
function readTableEntry(file) {
var tag = (0, _util.bytesToString)(file.getBytes(4));
var checksum = file.getInt32() >>> 0;
@@ -28829,10 +34626,12 @@ var Font = function FontClosure() {
file.skip(offset);
var data = file.getBytes(length);
file.pos = previousPosition;
+
if (tag === 'head') {
data[8] = data[9] = data[10] = data[11] = 0;
data[17] |= 0x20;
}
+
return {
tag: tag,
checksum: checksum,
@@ -28841,6 +34640,7 @@ var Font = function FontClosure() {
data: data
};
}
+
function readOpenTypeHeader(ttf) {
return {
version: (0, _util.bytesToString)(ttf.getBytes(4)),
@@ -28850,6 +34650,7 @@ var Font = function FontClosure() {
rangeShift: ttf.getUint16()
};
}
+
function readTrueTypeCollectionHeader(ttc) {
var ttcTag = (0, _util.bytesToString)(ttc.getBytes(4));
(0, _util.assert)(ttcTag === 'ttcf', 'Must be a TrueType Collection font.');
@@ -28857,9 +34658,11 @@ var Font = function FontClosure() {
var minorVersion = ttc.getUint16();
var numFonts = ttc.getInt32() >>> 0;
var offsetTable = [];
+
for (var i = 0; i < numFonts; i++) {
offsetTable.push(ttc.getInt32() >>> 0);
}
+
var header = {
ttcTag: ttcTag,
majorVersion: majorVersion,
@@ -28867,17 +34670,21 @@ var Font = function FontClosure() {
numFonts: numFonts,
offsetTable: offsetTable
};
+
switch (majorVersion) {
case 1:
return header;
+
case 2:
header.dsigTag = ttc.getInt32() >>> 0;
header.dsigLength = ttc.getInt32() >>> 0;
header.dsigOffset = ttc.getInt32() >>> 0;
return header;
}
- throw new _util.FormatError('Invalid TrueType Collection majorVersion: ' + majorVersion + '.');
+
+ throw new _util.FormatError("Invalid TrueType Collection majorVersion: ".concat(majorVersion, "."));
}
+
function readTrueTypeCollectionData(ttc, fontName) {
var _readTrueTypeCollecti = readTrueTypeCollectionHeader(ttc),
numFonts = _readTrueTypeCollecti.numFonts,
@@ -28887,13 +34694,17 @@ var Font = function FontClosure() {
ttc.pos = (ttc.start || 0) + offsetTable[i];
var potentialHeader = readOpenTypeHeader(ttc);
var potentialTables = readTables(ttc, potentialHeader.numTables);
+
if (!potentialTables['name']) {
throw new _util.FormatError('TrueType Collection font must contain a "name" table.');
}
+
var nameTable = readNameTable(potentialTables['name']);
+
for (var j = 0, jj = nameTable.length; j < jj; j++) {
for (var k = 0, kk = nameTable[j].length; k < kk; k++) {
var nameEntry = nameTable[j][k];
+
if (nameEntry && nameEntry.replace(/\s/g, '') === fontName) {
return {
header: potentialHeader,
@@ -28903,8 +34714,10 @@ var Font = function FontClosure() {
}
}
}
- throw new _util.FormatError('TrueType Collection does not contain "' + fontName + '" font.');
+
+ throw new _util.FormatError("TrueType Collection does not contain \"".concat(fontName, "\" font."));
}
+
function readCmapTable(cmap, font, isSymbolicFont, hasEncoding) {
if (!cmap) {
(0, _util.warn)('No cmap table available.');
@@ -28915,6 +34728,7 @@ var Font = function FontClosure() {
hasShortCmap: false
};
}
+
var segment;
var start = (font.start ? font.start : 0) + cmap.offset;
font.pos = start;
@@ -28922,20 +34736,24 @@ var Font = function FontClosure() {
var numTables = font.getUint16();
var potentialTable;
var canBreak = false;
+
for (var i = 0; i < numTables; i++) {
var platformId = font.getUint16();
var encodingId = font.getUint16();
var offset = font.getInt32() >>> 0;
var useTable = false;
+
if (potentialTable && potentialTable.platformId === platformId && potentialTable.encodingId === encodingId) {
continue;
}
+
if (platformId === 0 && encodingId === 0) {
useTable = true;
} else if (platformId === 1 && encodingId === 0) {
useTable = true;
} else if (platformId === 3 && encodingId === 1 && (hasEncoding || !potentialTable)) {
useTable = true;
+
if (!isSymbolicFont) {
canBreak = true;
}
@@ -28943,6 +34761,7 @@ var Font = function FontClosure() {
useTable = true;
canBreak = true;
}
+
if (useTable) {
potentialTable = {
platformId: platformId,
@@ -28950,13 +34769,16 @@ var Font = function FontClosure() {
offset: offset
};
}
+
if (canBreak) {
break;
}
}
+
if (potentialTable) {
font.pos = start + potentialTable.offset;
}
+
if (!potentialTable || font.peekByte() === -1) {
(0, _util.warn)('Could not find a preferred cmap table.');
return {
@@ -28966,65 +34788,85 @@ var Font = function FontClosure() {
hasShortCmap: false
};
}
+
var format = font.getUint16();
font.getUint16();
font.getUint16();
var hasShortCmap = false;
var mappings = [];
var j, glyphId;
+
if (format === 0) {
for (j = 0; j < 256; j++) {
var index = font.getByte();
+
if (!index) {
continue;
}
+
mappings.push({
charCode: j,
glyphId: index
});
}
+
hasShortCmap = true;
} else if (format === 4) {
var segCount = font.getUint16() >> 1;
font.getBytes(6);
var segIndex,
segments = [];
+
for (segIndex = 0; segIndex < segCount; segIndex++) {
- segments.push({ end: font.getUint16() });
+ segments.push({
+ end: font.getUint16()
+ });
}
+
font.getUint16();
+
for (segIndex = 0; segIndex < segCount; segIndex++) {
segments[segIndex].start = font.getUint16();
}
+
for (segIndex = 0; segIndex < segCount; segIndex++) {
segments[segIndex].delta = font.getUint16();
}
+
var offsetsCount = 0;
+
for (segIndex = 0; segIndex < segCount; segIndex++) {
segment = segments[segIndex];
var rangeOffset = font.getUint16();
+
if (!rangeOffset) {
segment.offsetIndex = -1;
continue;
}
+
var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
segment.offsetIndex = offsetIndex;
offsetsCount = Math.max(offsetsCount, offsetIndex + segment.end - segment.start + 1);
}
+
var offsets = [];
+
for (j = 0; j < offsetsCount; j++) {
offsets.push(font.getUint16());
}
+
for (segIndex = 0; segIndex < segCount; segIndex++) {
segment = segments[segIndex];
start = segment.start;
var end = segment.end;
var delta = segment.delta;
offsetIndex = segment.offsetIndex;
+
for (j = start; j <= end; j++) {
if (j === 0xFFFF) {
continue;
}
+
glyphId = offsetIndex < 0 ? j : offsets[offsetIndex + j - start];
glyphId = glyphId + delta & 0xFFFF;
mappings.push({
@@ -29036,6 +34878,7 @@ var Font = function FontClosure() {
} else if (format === 6) {
var firstCode = font.getUint16();
var entryCount = font.getUint16();
+
for (j = 0; j < entryCount; j++) {
glyphId = font.getUint16();
var charCode = firstCode + j;
@@ -29053,15 +34896,18 @@ var Font = function FontClosure() {
hasShortCmap: false
};
}
+
mappings.sort(function (a, b) {
return a.charCode - b.charCode;
});
+
for (i = 1; i < mappings.length; i++) {
if (mappings[i - 1].charCode === mappings[i].charCode) {
mappings.splice(i, 1);
i--;
}
}
+
return {
platformId: potentialTable.platformId,
encodingId: potentialTable.encodingId,
@@ -29069,40 +34915,50 @@ var Font = function FontClosure() {
hasShortCmap: hasShortCmap
};
}
+
function sanitizeMetrics(font, header, metrics, numGlyphs) {
if (!header) {
if (metrics) {
metrics.data = null;
}
+
return;
}
+
font.pos = (font.start ? font.start : 0) + header.offset;
font.pos += header.length - 2;
var numOfMetrics = font.getUint16();
+
if (numOfMetrics > numGlyphs) {
(0, _util.info)('The numOfMetrics (' + numOfMetrics + ') should not be ' + 'greater than the numGlyphs (' + numGlyphs + ')');
numOfMetrics = numGlyphs;
header.data[34] = (numOfMetrics & 0xff00) >> 8;
header.data[35] = numOfMetrics & 0x00ff;
}
+
var numOfSidebearings = numGlyphs - numOfMetrics;
var numMissing = numOfSidebearings - (metrics.length - numOfMetrics * 4 >> 1);
+
if (numMissing > 0) {
var entries = new Uint8Array(metrics.length + numMissing * 2);
entries.set(metrics.data);
metrics.data = entries;
}
}
+
function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart, hintsValid) {
var glyphProfile = {
length: 0,
sizeOfInstructions: 0
};
+
if (sourceEnd - sourceStart <= 12) {
return glyphProfile;
}
+
var glyf = source.subarray(sourceStart, sourceEnd);
var contoursCount = signedInt16(glyf[0], glyf[1]);
+
if (contoursCount < 0) {
contoursCount = -1;
writeSignedInt16(glyf, 0, contoursCount);
@@ -29110,64 +34966,81 @@ var Font = function FontClosure() {
glyphProfile.length = glyf.length;
return glyphProfile;
}
+
var i,
j = 10,
flagsCount = 0;
+
for (i = 0; i < contoursCount; i++) {
var endPoint = glyf[j] << 8 | glyf[j + 1];
flagsCount = endPoint + 1;
j += 2;
}
+
var instructionsStart = j;
var instructionsLength = glyf[j] << 8 | glyf[j + 1];
glyphProfile.sizeOfInstructions = instructionsLength;
j += 2 + instructionsLength;
var instructionsEnd = j;
var coordinatesLength = 0;
+
for (i = 0; i < flagsCount; i++) {
var flag = glyf[j++];
+
if (flag & 0xC0) {
glyf[j - 1] = flag & 0x3F;
}
+
var xyLength = (flag & 2 ? 1 : flag & 16 ? 0 : 2) + (flag & 4 ? 1 : flag & 32 ? 0 : 2);
coordinatesLength += xyLength;
+
if (flag & 8) {
var repeat = glyf[j++];
i += repeat;
coordinatesLength += repeat * xyLength;
}
}
+
if (coordinatesLength === 0) {
return glyphProfile;
}
+
var glyphDataLength = j + coordinatesLength;
+
if (glyphDataLength > glyf.length) {
return glyphProfile;
}
+
if (!hintsValid && instructionsLength > 0) {
dest.set(glyf.subarray(0, instructionsStart), destStart);
dest.set([0, 0], destStart + instructionsStart);
dest.set(glyf.subarray(instructionsEnd, glyphDataLength), destStart + instructionsStart + 2);
glyphDataLength -= instructionsLength;
+
if (glyf.length - glyphDataLength > 3) {
glyphDataLength = glyphDataLength + 3 & ~3;
}
+
glyphProfile.length = glyphDataLength;
return glyphProfile;
}
+
if (glyf.length - glyphDataLength > 3) {
glyphDataLength = glyphDataLength + 3 & ~3;
dest.set(glyf.subarray(0, glyphDataLength), destStart);
glyphProfile.length = glyphDataLength;
return glyphProfile;
}
+
dest.set(glyf, destStart);
glyphProfile.length = glyf.length;
return glyphProfile;
}
+
function sanitizeHead(head, numGlyphs, locaLength) {
var data = head.data;
var version = int32(data[0], data[1], data[2], data[3]);
+
if (version >> 16 !== 1) {
(0, _util.info)('Attempting to fix invalid version in head table: ' + version);
data[0] = 0;
@@ -29175,10 +35048,13 @@ var Font = function FontClosure() {
data[2] = 0;
data[3] = 0;
}
+
var indexToLocFormat = int16(data[50], data[51]);
+
if (indexToLocFormat < 0 || indexToLocFormat > 1) {
(0, _util.info)('Attempting to fix invalid indexToLocFormat in head table: ' + indexToLocFormat);
var numGlyphsPlusOne = numGlyphs + 1;
+
if (locaLength === numGlyphsPlusOne << 1) {
data[50] = 0;
data[51] = 0;
@@ -29190,13 +35066,17 @@ var Font = function FontClosure() {
}
}
}
+
function sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong, hintsValid, dupFirstEntry, maxSizeOfInstructions) {
var itemSize, itemDecode, itemEncode;
+
if (isGlyphLocationsLong) {
itemSize = 4;
+
itemDecode = function fontItemDecodeLong(data, offset) {
return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
};
+
itemEncode = function fontItemEncodeLong(data, offset, value) {
data[offset] = value >>> 24 & 0xFF;
data[offset + 1] = value >> 16 & 0xFF;
@@ -29205,14 +35085,17 @@ var Font = function FontClosure() {
};
} else {
itemSize = 2;
+
itemDecode = function fontItemDecode(data, offset) {
return data[offset] << 9 | data[offset + 1] << 1;
};
+
itemEncode = function fontItemEncode(data, offset, value) {
data[offset] = value >> 9 & 0xFF;
data[offset + 1] = value >> 1 & 0xFF;
};
}
+
var numGlyphsOut = dupFirstEntry ? numGlyphs + 1 : numGlyphs;
var locaData = loca.data;
var locaDataSize = itemSize * (1 + numGlyphsOut);
@@ -29227,53 +35110,68 @@ var Font = function FontClosure() {
var missingGlyphs = Object.create(null);
itemEncode(locaData, 0, writeOffset);
var i, j;
+
for (i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
var endOffset = itemDecode(locaData, j);
+
if (endOffset === 0) {
endOffset = startOffset;
}
+
if (endOffset > oldGlyfDataLength && (oldGlyfDataLength + 3 & ~3) === endOffset) {
endOffset = oldGlyfDataLength;
}
+
if (endOffset > oldGlyfDataLength) {
startOffset = endOffset;
}
+
var glyphProfile = sanitizeGlyph(oldGlyfData, startOffset, endOffset, newGlyfData, writeOffset, hintsValid);
var newLength = glyphProfile.length;
+
if (newLength === 0) {
missingGlyphs[i] = true;
}
+
if (glyphProfile.sizeOfInstructions > maxSizeOfInstructions) {
maxSizeOfInstructions = glyphProfile.sizeOfInstructions;
}
+
writeOffset += newLength;
itemEncode(locaData, j, writeOffset);
startOffset = endOffset;
}
+
if (writeOffset === 0) {
var simpleGlyph = new Uint8Array([0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
+
for (i = 0, j = itemSize; i < numGlyphsOut; i++, j += itemSize) {
itemEncode(locaData, j, simpleGlyph.length);
}
+
glyf.data = simpleGlyph;
} else if (dupFirstEntry) {
var firstEntryLength = itemDecode(locaData, itemSize);
+
if (newGlyfData.length > firstEntryLength + writeOffset) {
glyf.data = newGlyfData.subarray(0, firstEntryLength + writeOffset);
} else {
glyf.data = new Uint8Array(firstEntryLength + writeOffset);
glyf.data.set(newGlyfData.subarray(0, writeOffset));
}
+
glyf.data.set(newGlyfData.subarray(0, firstEntryLength), writeOffset);
itemEncode(loca.data, locaData.length - itemSize, writeOffset + firstEntryLength);
} else {
glyf.data = newGlyfData.subarray(0, writeOffset);
}
+
return {
missingGlyphs: missingGlyphs,
maxSizeOfInstructions: maxSizeOfInstructions
};
}
+
function readPostScriptTable(post, properties, maxpNumGlyphs) {
var start = (font.start ? font.start : 0) + post.offset;
font.pos = start;
@@ -29284,61 +35182,84 @@ var Font = function FontClosure() {
var glyphNames;
var valid = true;
var i;
+
switch (version) {
case 0x00010000:
glyphNames = MacStandardGlyphOrdering;
break;
+
case 0x00020000:
var numGlyphs = font.getUint16();
+
if (numGlyphs !== maxpNumGlyphs) {
valid = false;
break;
}
+
var glyphNameIndexes = [];
+
for (i = 0; i < numGlyphs; ++i) {
var index = font.getUint16();
+
if (index >= 32768) {
valid = false;
break;
}
+
glyphNameIndexes.push(index);
}
+
if (!valid) {
break;
}
+
var customNames = [];
var strBuf = [];
+
while (font.pos < end) {
var stringLength = font.getByte();
strBuf.length = stringLength;
+
for (i = 0; i < stringLength; ++i) {
strBuf[i] = String.fromCharCode(font.getByte());
}
+
customNames.push(strBuf.join(''));
}
+
glyphNames = [];
+
for (i = 0; i < numGlyphs; ++i) {
var j = glyphNameIndexes[i];
+
if (j < 258) {
glyphNames.push(MacStandardGlyphOrdering[j]);
continue;
}
+
glyphNames.push(customNames[j - 258]);
}
+
break;
+
case 0x00030000:
break;
+
default:
(0, _util.warn)('Unknown/unsupported post table version ' + version);
valid = false;
+
if (properties.defaultEncoding) {
glyphNames = properties.defaultEncoding;
}
+
break;
}
+
properties.glyphNames = glyphNames;
return valid;
}
+
function readNameTable(nameTable) {
var start = (font.start ? font.start : 0) + nameTable.offset;
font.pos = start;
@@ -29347,14 +35268,17 @@ var Font = function FontClosure() {
end = start + length;
var format = font.getUint16();
var FORMAT_0_HEADER_LENGTH = 6;
+
if (format !== 0 || length < FORMAT_0_HEADER_LENGTH) {
return names;
}
+
var numRecords = font.getUint16();
var stringsStart = font.getUint16();
var records = [];
var NAME_RECORD_LENGTH = 12;
var i, ii;
+
for (i = 0; i < numRecords && font.pos + NAME_RECORD_LENGTH <= end; i++) {
var r = {
platform: font.getUint16(),
@@ -29364,34 +35288,46 @@ var Font = function FontClosure() {
length: font.getUint16(),
offset: font.getUint16()
};
+
if (r.platform === 1 && r.encoding === 0 && r.language === 0 || r.platform === 3 && r.encoding === 1 && r.language === 0x409) {
records.push(r);
}
}
+
for (i = 0, ii = records.length; i < ii; i++) {
var record = records[i];
+
if (record.length <= 0) {
continue;
}
+
var pos = start + stringsStart + record.offset;
+
if (pos + record.length > end) {
continue;
}
+
font.pos = pos;
var nameIndex = record.name;
+
if (record.encoding) {
var str = '';
+
for (var j = 0, jj = record.length; j < jj; j += 2) {
str += String.fromCharCode(font.getUint16());
}
+
names[1][nameIndex] = str;
} else {
names[0][nameIndex] = (0, _util.bytesToString)(font.getBytes(record.length));
}
}
+
return names;
}
+
var TTOpsStackDeltas = [0, 0, 0, 0, 0, 0, 0, 0, -2, -2, -2, -2, 0, 0, -2, -5, -1, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, -1, -1, 1, -1, -999, 0, 1, 0, -1, -2, 0, -1, -2, -1, -1, 0, -1, -1, 0, 0, -999, -999, -1, -1, -1, -1, -2, -999, -2, -2, -999, 0, -2, -2, 0, 0, -2, 0, -2, 0, 0, 0, -2, -1, -1, 1, 1, 0, 0, -1, -1, -1, -1, -1, -1, -1, 0, 0, -1, 0, -1, -1, 0, -999, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2, -999, -999, -999, -999, -999, -1, -1, -2, -2, 0, 0, 0, 0, -1, -1, -999, -2, -2, 0, 0, -1, -2, -2, 0, 0, 0, -1, -1, -1, -2];
+
function sanitizeTTProgram(table, ttContext) {
var data = table.data;
var i = 0,
@@ -29409,10 +35345,13 @@ var Font = function FontClosure() {
var inFDEF = false,
ifLevel = 0,
inELSE = 0;
+
for (var ii = data.length; i < ii;) {
var op = data[i++];
+
if (op === 0x40) {
n = data[i++];
+
if (inFDEF || inELSE) {
i += n;
} else {
@@ -29422,6 +35361,7 @@ var Font = function FontClosure() {
}
} else if (op === 0x41) {
n = data[i++];
+
if (inFDEF || inELSE) {
i += n * 2;
} else {
@@ -29432,6 +35372,7 @@ var Font = function FontClosure() {
}
} else if ((op & 0xF8) === 0xB0) {
n = op - 0xB0 + 1;
+
if (inFDEF || inELSE) {
i += n;
} else {
@@ -29441,6 +35382,7 @@ var Font = function FontClosure() {
}
} else if ((op & 0xF8) === 0xB8) {
n = op - 0xB8 + 1;
+
if (inFDEF || inELSE) {
i += n * 2;
} else {
@@ -29452,17 +35394,21 @@ var Font = function FontClosure() {
} else if (op === 0x2B && !tooComplexToFollowFunctions) {
if (!inFDEF && !inELSE) {
funcId = stack[stack.length - 1];
+
if (isNaN(funcId)) {
(0, _util.info)('TT: CALL empty stack (or invalid entry).');
} else {
ttContext.functionsUsed[funcId] = true;
+
if (funcId in ttContext.functionsStackDeltas) {
var newStackLength = stack.length + ttContext.functionsStackDeltas[funcId];
+
if (newStackLength < 0) {
(0, _util.warn)('TT: CALL invalid functions stack delta.');
ttContext.hintsValid = false;
return;
}
+
stack.length = newStackLength;
} else if (funcId in ttContext.functionsDefined && !functionsCalled.includes(funcId)) {
callstack.push({
@@ -29472,11 +35418,13 @@ var Font = function FontClosure() {
});
functionsCalled.push(funcId);
pc = ttContext.functionsDefined[funcId];
+
if (!pc) {
(0, _util.warn)('TT: CALL non-existent function');
ttContext.hintsValid = false;
return;
}
+
data = pc.data;
i = pc.i;
}
@@ -29487,6 +35435,7 @@ var Font = function FontClosure() {
(0, _util.warn)('TT: nested FDEFs not allowed');
tooComplexToFollowFunctions = true;
}
+
inFDEF = true;
lastDeff = i;
funcId = stack.pop();
@@ -29500,11 +35449,13 @@ var Font = function FontClosure() {
lastEndf = i;
} else {
pc = callstack.pop();
+
if (!pc) {
(0, _util.warn)('TT: ENDF bad stack');
ttContext.hintsValid = false;
return;
}
+
funcId = functionsCalled.pop();
data = pc.data;
i = pc.i;
@@ -29515,6 +35466,7 @@ var Font = function FontClosure() {
(0, _util.warn)('TT: nested IDEFs not allowed');
tooComplexToFollowFunctions = true;
}
+
inFDEF = true;
lastDeff = i;
} else if (op === 0x58) {
@@ -29525,59 +35477,74 @@ var Font = function FontClosure() {
if (inELSE === ifLevel) {
inELSE = 0;
}
+
--ifLevel;
} else if (op === 0x1C) {
if (!inFDEF && !inELSE) {
var offset = stack[stack.length - 1];
+
if (offset > 0) {
i += offset - 1;
}
}
}
+
if (!inFDEF && !inELSE) {
var stackDelta = op <= 0x8E ? TTOpsStackDeltas[op] : op >= 0xC0 && op <= 0xDF ? -1 : op >= 0xE0 ? -2 : 0;
+
if (op >= 0x71 && op <= 0x75) {
n = stack.pop();
+
if (!isNaN(n)) {
stackDelta = -n * 2;
}
}
+
while (stackDelta < 0 && stack.length > 0) {
stack.pop();
stackDelta++;
}
+
while (stackDelta > 0) {
stack.push(NaN);
stackDelta--;
}
}
}
+
ttContext.tooComplexToFollowFunctions = tooComplexToFollowFunctions;
var content = [data];
+
if (i > data.length) {
content.push(new Uint8Array(i - data.length));
}
+
if (lastDeff > lastEndf) {
(0, _util.warn)('TT: complementing a missing function tail');
content.push(new Uint8Array([0x22, 0x2D]));
}
+
foldTTTable(table, content);
}
+
function checkInvalidFunctions(ttContext, maxFunctionDefs) {
if (ttContext.tooComplexToFollowFunctions) {
return;
}
+
if (ttContext.functionsDefined.length > maxFunctionDefs) {
(0, _util.warn)('TT: more functions defined than expected');
ttContext.hintsValid = false;
return;
}
+
for (var j = 0, jj = ttContext.functionsUsed.length; j < jj; j++) {
if (j > maxFunctionDefs) {
(0, _util.warn)('TT: invalid function id: ' + j);
ttContext.hintsValid = false;
return;
}
+
if (ttContext.functionsUsed[j] && !ttContext.functionsDefined[j]) {
(0, _util.warn)('TT: undefined function: ' + j);
ttContext.hintsValid = false;
@@ -29585,24 +35552,30 @@ var Font = function FontClosure() {
}
}
}
+
function foldTTTable(table, content) {
if (content.length > 1) {
var newLength = 0;
var j, jj;
+
for (j = 0, jj = content.length; j < jj; j++) {
newLength += content[j].length;
}
+
newLength = newLength + 3 & ~3;
var result = new Uint8Array(newLength);
var pos = 0;
+
for (j = 0, jj = content.length; j < jj; j++) {
result.set(content[j], pos);
pos += content[j].length;
}
+
table.data = result;
table.length = newLength;
}
}
+
function sanitizeTTPrograms(fpgm, prep, cvt, maxFunctionDefs) {
var ttContext = {
functionsDefined: [],
@@ -29611,25 +35584,31 @@ var Font = function FontClosure() {
tooComplexToFollowFunctions: false,
hintsValid: true
};
+
if (fpgm) {
sanitizeTTProgram(fpgm, ttContext);
}
+
if (prep) {
sanitizeTTProgram(prep, ttContext);
}
+
if (fpgm) {
checkInvalidFunctions(ttContext, maxFunctionDefs);
}
+
if (cvt && cvt.length & 1) {
var cvtData = new Uint8Array(cvt.length + 1);
cvtData.set(cvt.data);
cvt.data = cvtData;
}
+
return ttContext.hintsValid;
}
+
font = new _stream.Stream(new Uint8Array(font.getBytes()));
- var header = void 0,
- tables = void 0;
+ var header, tables;
+
if (isTrueTypeCollectionFile(font)) {
var ttcData = readTrueTypeCollectionData(font, this.name);
header = ttcData.header;
@@ -29638,17 +35617,20 @@ var Font = function FontClosure() {
header = readOpenTypeHeader(font);
tables = readTables(font, header.numTables);
}
- var cff = void 0,
- cffFile = void 0;
+
+ var cff, cffFile;
var isTrueType = !tables['CFF '];
+
if (!isTrueType) {
var isComposite = properties.composite && ((properties.cidToGidMap || []).length > 0 || !(properties.cMap instanceof _cmap.IdentityCMap));
+
if (header.version === 'OTTO' && !isComposite || !tables['head'] || !tables['hhea'] || !tables['maxp'] || !tables['post']) {
cffFile = new _stream.Stream(tables['CFF '].data);
cff = new CFFFont(cffFile, properties);
adjustWidths(properties);
return this.convert(name, cff, properties);
}
+
delete tables['glyf'];
delete tables['loca'];
delete tables['fpgm'];
@@ -29659,6 +35641,7 @@ var Font = function FontClosure() {
if (!tables['loca']) {
throw new _util.FormatError('Required "loca" table is not found');
}
+
if (!tables['glyf']) {
(0, _util.warn)('Required "glyf" table is not found -- trying to recover.');
tables['glyf'] = {
@@ -29666,65 +35649,83 @@ var Font = function FontClosure() {
data: new Uint8Array(0)
};
}
+
this.isOpenType = false;
}
+
if (!tables['maxp']) {
throw new _util.FormatError('Required "maxp" table is not found');
}
+
font.pos = (font.start || 0) + tables['maxp'].offset;
var version = font.getInt32();
var numGlyphs = font.getUint16();
var numGlyphsOut = numGlyphs + 1;
var dupFirstEntry = true;
+
if (numGlyphsOut > 0xFFFF) {
dupFirstEntry = false;
numGlyphsOut = numGlyphs;
(0, _util.warn)('Not enough space in glyfs to duplicate first glyph.');
}
+
var maxFunctionDefs = 0;
var maxSizeOfInstructions = 0;
+
if (version >= 0x00010000 && tables['maxp'].length >= 22) {
font.pos += 8;
var maxZones = font.getUint16();
+
if (maxZones > 2) {
tables['maxp'].data[14] = 0;
tables['maxp'].data[15] = 2;
}
+
font.pos += 4;
maxFunctionDefs = font.getUint16();
font.pos += 4;
maxSizeOfInstructions = font.getUint16();
}
+
tables['maxp'].data[4] = numGlyphsOut >> 8;
tables['maxp'].data[5] = numGlyphsOut & 255;
var hintsValid = sanitizeTTPrograms(tables['fpgm'], tables['prep'], tables['cvt '], maxFunctionDefs);
+
if (!hintsValid) {
delete tables['fpgm'];
delete tables['prep'];
delete tables['cvt '];
}
+
sanitizeMetrics(font, tables['hhea'], tables['hmtx'], numGlyphsOut);
+
if (!tables['head']) {
throw new _util.FormatError('Required "head" table is not found');
}
+
sanitizeHead(tables['head'], numGlyphs, isTrueType ? tables['loca'].length : 0);
var missingGlyphs = Object.create(null);
+
if (isTrueType) {
var isGlyphLocationsLong = int16(tables['head'].data[50], tables['head'].data[51]);
var glyphsInfo = sanitizeGlyphLocations(tables['loca'], tables['glyf'], numGlyphs, isGlyphLocationsLong, hintsValid, dupFirstEntry, maxSizeOfInstructions);
missingGlyphs = glyphsInfo.missingGlyphs;
+
if (version >= 0x00010000 && tables['maxp'].length >= 22) {
tables['maxp'].data[26] = glyphsInfo.maxSizeOfInstructions >> 8;
tables['maxp'].data[27] = glyphsInfo.maxSizeOfInstructions & 255;
}
}
+
if (!tables['hhea']) {
throw new _util.FormatError('Required "hhea" table is not found');
}
+
if (tables['hhea'].data[10] === 0 && tables['hhea'].data[11] === 0) {
tables['hhea'].data[10] = 0xFF;
tables['hhea'].data[11] = 0xFF;
}
+
var metricsOverride = {
unitsPerEm: int16(tables['head'].data[18], tables['head'].data[19]),
yMax: int16(tables['head'].data[42], tables['head'].data[43]),
@@ -29734,18 +35735,22 @@ var Font = function FontClosure() {
};
this.ascent = metricsOverride.ascent / metricsOverride.unitsPerEm;
this.descent = metricsOverride.descent / metricsOverride.unitsPerEm;
+
if (tables['post']) {
readPostScriptTable(tables['post'], properties, numGlyphs);
}
+
tables['post'] = {
tag: 'post',
data: createPostTable(properties)
};
var charCodeToGlyphId = [],
charCode;
+
function hasGlyph(glyphId) {
return !missingGlyphs[glyphId];
}
+
if (properties.composite) {
var cidToGidMap = properties.cidToGidMap || [];
var isCidToGidMapEmpty = cidToGidMap.length === 0;
@@ -29753,12 +35758,15 @@ var Font = function FontClosure() {
if (cid > 0xffff) {
throw new _util.FormatError('Max size of CID is 65,535');
}
+
var glyphId = -1;
+
if (isCidToGidMapEmpty) {
glyphId = cid;
} else if (cidToGidMap[cid] !== undefined) {
glyphId = cidToGidMap[cid];
}
+
if (glyphId >= 0 && glyphId < numGlyphs && hasGlyph(glyphId)) {
charCodeToGlyphId[charCode] = glyphId;
}
@@ -29769,14 +35777,19 @@ var Font = function FontClosure() {
var cmapEncodingId = cmapTable.encodingId;
var cmapMappings = cmapTable.mappings;
var cmapMappingsLength = cmapMappings.length;
+
if (properties.hasEncoding && (cmapPlatformId === 3 && cmapEncodingId === 1 || cmapPlatformId === 1 && cmapEncodingId === 0) || cmapPlatformId === -1 && cmapEncodingId === -1 && !!(0, _encodings.getEncoding)(properties.baseEncodingName)) {
var baseEncoding = [];
+
if (properties.baseEncodingName === 'MacRomanEncoding' || properties.baseEncodingName === 'WinAnsiEncoding') {
baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
}
+
var glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
+
for (charCode = 0; charCode < 256; charCode++) {
var glyphName, standardGlyphName;
+
if (this.differences && charCode in this.differences) {
glyphName = this.differences[charCode];
} else if (charCode in baseEncoding && baseEncoding[charCode] !== '') {
@@ -29784,68 +35797,85 @@ var Font = function FontClosure() {
} else {
glyphName = _encodings.StandardEncoding[charCode];
}
+
if (!glyphName) {
continue;
}
+
standardGlyphName = recoverGlyphName(glyphName, glyphsUnicodeMap);
var unicodeOrCharCode;
+
if (cmapPlatformId === 3 && cmapEncodingId === 1) {
unicodeOrCharCode = glyphsUnicodeMap[standardGlyphName];
} else if (cmapPlatformId === 1 && cmapEncodingId === 0) {
unicodeOrCharCode = _encodings.MacRomanEncoding.indexOf(standardGlyphName);
}
+
var found = false;
+
for (var i = 0; i < cmapMappingsLength; ++i) {
if (cmapMappings[i].charCode !== unicodeOrCharCode) {
continue;
}
+
charCodeToGlyphId[charCode] = cmapMappings[i].glyphId;
found = true;
break;
}
+
if (!found && properties.glyphNames) {
var glyphId = properties.glyphNames.indexOf(glyphName);
+
if (glyphId === -1 && standardGlyphName !== glyphName) {
glyphId = properties.glyphNames.indexOf(standardGlyphName);
}
+
if (glyphId > 0 && hasGlyph(glyphId)) {
charCodeToGlyphId[charCode] = glyphId;
}
}
}
} else if (cmapPlatformId === 0 && cmapEncodingId === 0) {
- for (var _i = 0; _i < cmapMappingsLength; ++_i) {
- charCodeToGlyphId[cmapMappings[_i].charCode] = cmapMappings[_i].glyphId;
+ for (var _i2 = 0; _i2 < cmapMappingsLength; ++_i2) {
+ charCodeToGlyphId[cmapMappings[_i2].charCode] = cmapMappings[_i2].glyphId;
}
} else {
- for (var _i2 = 0; _i2 < cmapMappingsLength; ++_i2) {
- charCode = cmapMappings[_i2].charCode;
+ for (var _i3 = 0; _i3 < cmapMappingsLength; ++_i3) {
+ charCode = cmapMappings[_i3].charCode;
+
if (cmapPlatformId === 3 && charCode >= 0xF000 && charCode <= 0xF0FF) {
charCode &= 0xFF;
}
- charCodeToGlyphId[charCode] = cmapMappings[_i2].glyphId;
+
+ charCodeToGlyphId[charCode] = cmapMappings[_i3].glyphId;
}
}
}
+
if (charCodeToGlyphId.length === 0) {
charCodeToGlyphId[0] = 0;
}
+
var glyphZeroId = numGlyphsOut - 1;
+
if (!dupFirstEntry) {
glyphZeroId = 0;
}
+
var newMapping = adjustMapping(charCodeToGlyphId, hasGlyph, glyphZeroId);
this.toFontChar = newMapping.toFontChar;
tables['cmap'] = {
tag: 'cmap',
data: createCmapTable(newMapping.charCodeToGlyphId, numGlyphsOut)
};
+
if (!tables['OS/2'] || !validateOS2Table(tables['OS/2'])) {
tables['OS/2'] = {
tag: 'OS/2',
data: createOS2Table(properties, newMapping.charCodeToGlyphId, metricsOverride)
};
}
+
if (!isTrueType) {
try {
cffFile = new _stream.Stream(tables['CFF '].data);
@@ -29858,6 +35888,7 @@ var Font = function FontClosure() {
(0, _util.warn)('Failed to compile font ' + properties.loadedName);
}
}
+
if (!tables['name']) {
tables['name'] = {
tag: 'name',
@@ -29867,51 +35898,67 @@ var Font = function FontClosure() {
var namePrototype = readNameTable(tables['name']);
tables['name'].data = createNameTable(name, namePrototype);
}
+
var builder = new OpenTypeFileBuilder(header.version);
+
for (var tableTag in tables) {
builder.addTable(tableTag, tables[tableTag].data);
}
+
return builder.toArray();
},
convert: function Font_convert(fontName, font, properties) {
properties.fixedPitch = false;
+
if (properties.builtInEncoding) {
adjustToUnicode(properties, properties.builtInEncoding);
}
+
var glyphZeroId = 1;
+
if (font instanceof CFFFont) {
glyphZeroId = font.numGlyphs - 1;
}
+
var mapping = font.getGlyphMapping(properties);
var newMapping = adjustMapping(mapping, font.hasGlyphId.bind(font), glyphZeroId);
this.toFontChar = newMapping.toFontChar;
var numGlyphs = font.numGlyphs;
+
function getCharCodes(charCodeToGlyphId, glyphId) {
var charCodes = null;
+
for (var charCode in charCodeToGlyphId) {
if (glyphId === charCodeToGlyphId[charCode]) {
if (!charCodes) {
charCodes = [];
}
+
charCodes.push(charCode | 0);
}
}
+
return charCodes;
}
+
function createCharCode(charCodeToGlyphId, glyphId) {
for (var charCode in charCodeToGlyphId) {
if (glyphId === charCodeToGlyphId[charCode]) {
return charCode | 0;
}
}
+
newMapping.charCodeToGlyphId[newMapping.nextAvailableFontCharCode] = glyphId;
return newMapping.nextAvailableFontCharCode++;
}
+
var seacs = font.seacs;
+
if (SEAC_ANALYSIS_ENABLED && seacs && seacs.length) {
var matrix = properties.fontMatrix || _util.FONT_IDENTITY_MATRIX;
var charset = font.getCharset();
var seacMap = Object.create(null);
+
for (var glyphId in seacs) {
glyphId |= 0;
var seac = seacs[glyphId];
@@ -29919,17 +35966,21 @@ var Font = function FontClosure() {
var accentGlyphName = _encodings.StandardEncoding[seac[3]];
var baseGlyphId = charset.indexOf(baseGlyphName);
var accentGlyphId = charset.indexOf(accentGlyphName);
+
if (baseGlyphId < 0 || accentGlyphId < 0) {
continue;
}
+
var accentOffset = {
x: seac[0] * matrix[0] + seac[1] * matrix[2] + matrix[4],
y: seac[0] * matrix[1] + seac[1] * matrix[3] + matrix[5]
};
var charCodes = getCharCodes(mapping, glyphId);
+
if (!charCodes) {
continue;
}
+
for (var i = 0, ii = charCodes.length; i < ii; i++) {
var charCode = charCodes[i];
var charCodeToGlyphId = newMapping.charCodeToGlyphId;
@@ -29942,8 +35993,10 @@ var Font = function FontClosure() {
};
}
}
+
properties.seacMap = seacMap;
}
+
var unitsPerEm = 1 / (properties.fontMatrix || _util.FONT_IDENTITY_MATRIX)[0];
var builder = new OpenTypeFileBuilder('\x4F\x54\x54\x4F');
builder.addTable('CFF ', font.data);
@@ -29955,16 +36008,20 @@ var Font = function FontClosure() {
var charstrings = font.charstrings;
var cffWidths = font.cff ? font.cff.widths : null;
var hmtx = '\x00\x00\x00\x00';
+
for (var i = 1, ii = numGlyphs; i < ii; i++) {
var width = 0;
+
if (charstrings) {
var charstring = charstrings[i - 1];
width = 'width' in charstring ? charstring.width : 0;
} else if (cffWidths) {
width = Math.ceil(cffWidths[i] || 0);
}
+
hmtx += string16(width) + string16(0);
}
+
return hmtx;
}());
builder.addTable('maxp', '\x00\x00\x50\x00' + string16(numGlyphs));
@@ -29972,63 +36029,83 @@ var Font = function FontClosure() {
builder.addTable('post', createPostTable(properties));
return builder.toArray();
},
+
get spaceWidth() {
if ('_shadowWidth' in this) {
return this._shadowWidth;
}
+
var possibleSpaceReplacements = ['space', 'minus', 'one', 'i', 'I'];
var width;
+
for (var i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
var glyphName = possibleSpaceReplacements[i];
+
if (glyphName in this.widths) {
width = this.widths[glyphName];
break;
}
+
var glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
var glyphUnicode = glyphsUnicodeMap[glyphName];
var charcode = 0;
+
if (this.composite) {
if (this.cMap.contains(glyphUnicode)) {
charcode = this.cMap.lookup(glyphUnicode);
}
}
+
if (!charcode && this.toUnicode) {
charcode = this.toUnicode.charCodeOf(glyphUnicode);
}
+
if (charcode <= 0) {
charcode = glyphUnicode;
}
+
width = this.widths[charcode];
+
if (width) {
break;
}
}
+
width = width || this.defaultWidth;
this._shadowWidth = width;
return width;
},
+
charToGlyph: function Font_charToGlyph(charcode, isSpace) {
var fontCharCode, width, operatorListId;
var widthCode = charcode;
+
if (this.cMap && this.cMap.contains(charcode)) {
widthCode = this.cMap.lookup(charcode);
}
+
width = this.widths[widthCode];
width = (0, _util.isNum)(width) ? width : this.defaultWidth;
var vmetric = this.vmetrics && this.vmetrics[widthCode];
var unicode = this.toUnicode.get(charcode) || this.fallbackToUnicode.get(charcode) || charcode;
+
if (typeof unicode === 'number') {
unicode = String.fromCharCode(unicode);
}
+
var isInFont = charcode in this.toFontChar;
fontCharCode = this.toFontChar[charcode] || charcode;
+
if (this.missingFile) {
fontCharCode = (0, _unicode.mapSpecialUnicodeValues)(fontCharCode);
}
+
if (this.isType3Font) {
operatorListId = fontCharCode;
}
+
var accent = null;
+
if (this.seacMap && this.seacMap[charcode]) {
isInFont = true;
var seac = this.seacMap[charcode];
@@ -30038,32 +36115,41 @@ var Font = function FontClosure() {
offset: seac.accentOffset
};
}
+
var fontChar = typeof fontCharCode === 'number' ? String.fromCodePoint(fontCharCode) : '';
var glyph = this.glyphCache[charcode];
+
if (!glyph || !glyph.matchesForCache(fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont)) {
glyph = new Glyph(fontChar, unicode, accent, width, vmetric, operatorListId, isSpace, isInFont);
this.glyphCache[charcode] = glyph;
}
+
return glyph;
},
charsToGlyphs: function Font_charsToGlyphs(chars) {
var charsCache = this.charsCache;
var glyphs, glyph, charcode;
+
if (charsCache) {
glyphs = charsCache[chars];
+
if (glyphs) {
return glyphs;
}
}
+
if (!charsCache) {
charsCache = this.charsCache = Object.create(null);
}
+
glyphs = [];
var charsCacheKey = chars;
var i = 0,
ii;
+
if (this.cMap) {
var c = Object.create(null);
+
while (i < chars.length) {
this.cMap.readCharCode(chars, i, c);
charcode = c.charcode;
@@ -30080,35 +36166,48 @@ var Font = function FontClosure() {
glyphs.push(glyph);
}
}
+
return charsCache[charsCacheKey] = glyphs;
}
};
return Font;
}();
+
+exports.Font = Font;
+
var ErrorFont = function ErrorFontClosure() {
function ErrorFont(error) {
this.error = error;
this.loadedName = 'g_font_error';
this.missingFile = true;
}
+
ErrorFont.prototype = {
charsToGlyphs: function ErrorFont_charsToGlyphs() {
return [];
},
exportData: function ErrorFont_exportData() {
- return { error: this.error };
+ return {
+ error: this.error
+ };
}
};
return ErrorFont;
}();
+
+exports.ErrorFont = ErrorFont;
+
function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
var charCodeToGlyphId = Object.create(null);
var glyphId, charCode, baseEncoding;
var isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
+
if (properties.baseEncodingName) {
baseEncoding = (0, _encodings.getEncoding)(properties.baseEncodingName);
+
for (charCode = 0; charCode < baseEncoding.length; charCode++) {
glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+
if (glyphId >= 0) {
charCodeToGlyphId[charCode] = glyphId;
} else {
@@ -30121,8 +36220,10 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
}
} else {
baseEncoding = _encodings.StandardEncoding;
+
for (charCode = 0; charCode < baseEncoding.length; charCode++) {
glyphId = glyphNames.indexOf(baseEncoding[charCode]);
+
if (glyphId >= 0) {
charCodeToGlyphId[charCode] = glyphId;
} else {
@@ -30130,21 +36231,27 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
}
}
}
+
var differences = properties.differences,
glyphsUnicodeMap;
+
if (differences) {
for (charCode in differences) {
var glyphName = differences[charCode];
glyphId = glyphNames.indexOf(glyphName);
+
if (glyphId === -1) {
if (!glyphsUnicodeMap) {
glyphsUnicodeMap = (0, _glyphlist.getGlyphsUnicode)();
}
+
var standardGlyphName = recoverGlyphName(glyphName, glyphsUnicodeMap);
+
if (standardGlyphName !== glyphName) {
glyphId = glyphNames.indexOf(standardGlyphName);
}
}
+
if (glyphId >= 0) {
charCodeToGlyphId[charCode] = glyphId;
} else {
@@ -30152,8 +36259,10 @@ function type1FontGlyphMapping(properties, builtInEncoding, glyphNames) {
}
}
}
+
return charCodeToGlyphId;
}
+
var Type1Font = function Type1FontClosure() {
function findBlock(streamBytes, signature, startIndex) {
var streamBytesLength = streamBytes.length;
@@ -30162,30 +36271,39 @@ var Type1Font = function Type1FontClosure() {
var i = startIndex,
j,
found = false;
+
while (i < scanLength) {
j = 0;
+
while (j < signatureLength && streamBytes[i + j] === signature[j]) {
j++;
}
+
if (j >= signatureLength) {
i += j;
+
while (i < streamBytesLength && (0, _util.isSpace)(streamBytes[i])) {
i++;
}
+
found = true;
break;
}
+
i++;
}
+
return {
found: found,
length: i
};
}
+
function getHeaderBlock(stream, suggestedLength) {
var EEXEC_SIGNATURE = [0x65, 0x65, 0x78, 0x65, 0x63];
var streamStartPos = stream.pos;
var headerBytes, headerBytesLength, block;
+
try {
headerBytes = stream.getBytes(suggestedLength);
headerBytesLength = headerBytes.length;
@@ -30194,8 +36312,10 @@ var Type1Font = function Type1FontClosure() {
throw ex;
}
}
+
if (headerBytesLength === suggestedLength) {
block = findBlock(headerBytes, EEXEC_SIGNATURE, suggestedLength - 2 * EEXEC_SIGNATURE.length);
+
if (block.found && block.length === suggestedLength) {
return {
stream: new _stream.Stream(headerBytes),
@@ -30203,35 +36323,44 @@ var Type1Font = function Type1FontClosure() {
};
}
}
+
(0, _util.warn)('Invalid "Length1" property in Type1 font -- trying to recover.');
stream.pos = streamStartPos;
var SCAN_BLOCK_LENGTH = 2048;
var actualLength;
+
while (true) {
var scanBytes = stream.peekBytes(SCAN_BLOCK_LENGTH);
block = findBlock(scanBytes, EEXEC_SIGNATURE, 0);
+
if (block.length === 0) {
break;
}
+
stream.pos += block.length;
+
if (block.found) {
actualLength = stream.pos - streamStartPos;
break;
}
}
+
stream.pos = streamStartPos;
+
if (actualLength) {
return {
stream: new _stream.Stream(stream.getBytes(actualLength)),
length: actualLength
};
}
+
(0, _util.warn)('Unable to recover "Length1" property in Type1 font -- using as is.');
return {
stream: new _stream.Stream(stream.getBytes(suggestedLength)),
length: suggestedLength
};
}
+
function getEexecBlock(stream, suggestedLength) {
var eexecBytes = stream.getBytes();
return {
@@ -30239,29 +36368,36 @@ var Type1Font = function Type1FontClosure() {
length: eexecBytes.length
};
}
+
function Type1Font(name, file, properties) {
var PFB_HEADER_SIZE = 6;
var headerBlockLength = properties.length1;
var eexecBlockLength = properties.length2;
var pfbHeader = file.peekBytes(PFB_HEADER_SIZE);
var pfbHeaderPresent = pfbHeader[0] === 0x80 && pfbHeader[1] === 0x01;
+
if (pfbHeaderPresent) {
file.skip(PFB_HEADER_SIZE);
headerBlockLength = pfbHeader[5] << 24 | pfbHeader[4] << 16 | pfbHeader[3] << 8 | pfbHeader[2];
}
+
var headerBlock = getHeaderBlock(file, headerBlockLength);
var headerBlockParser = new _type1_parser.Type1Parser(headerBlock.stream, false, SEAC_ANALYSIS_ENABLED);
headerBlockParser.extractFontHeader(properties);
+
if (pfbHeaderPresent) {
pfbHeader = file.getBytes(PFB_HEADER_SIZE);
eexecBlockLength = pfbHeader[5] << 24 | pfbHeader[4] << 16 | pfbHeader[3] << 8 | pfbHeader[2];
}
+
var eexecBlock = getEexecBlock(file, eexecBlockLength);
var eexecBlockParser = new _type1_parser.Type1Parser(eexecBlock.stream, true, SEAC_ANALYSIS_ENABLED);
var data = eexecBlockParser.extractFontProgram();
+
for (var info in data.properties) {
properties[info] = data.properties[info];
}
+
var charstrings = data.charstrings;
var type2Charstrings = this.getType2Charstrings(charstrings);
var subrs = this.getType2Subrs(data.subrs);
@@ -30269,68 +36405,86 @@ var Type1Font = function Type1FontClosure() {
this.data = this.wrap(name, type2Charstrings, this.charstrings, subrs, properties);
this.seacs = this.getSeacs(data.charstrings);
}
+
Type1Font.prototype = {
get numGlyphs() {
return this.charstrings.length + 1;
},
+
getCharset: function Type1Font_getCharset() {
var charset = ['.notdef'];
var charstrings = this.charstrings;
+
for (var glyphId = 0; glyphId < charstrings.length; glyphId++) {
charset.push(charstrings[glyphId].glyphName);
}
+
return charset;
},
getGlyphMapping: function Type1Font_getGlyphMapping(properties) {
var charstrings = this.charstrings;
var glyphNames = ['.notdef'],
glyphId;
+
for (glyphId = 0; glyphId < charstrings.length; glyphId++) {
glyphNames.push(charstrings[glyphId].glyphName);
}
+
var encoding = properties.builtInEncoding;
+
if (encoding) {
var builtInEncoding = Object.create(null);
+
for (var charCode in encoding) {
glyphId = glyphNames.indexOf(encoding[charCode]);
+
if (glyphId >= 0) {
builtInEncoding[charCode] = glyphId;
}
}
}
+
return type1FontGlyphMapping(properties, builtInEncoding, glyphNames);
},
hasGlyphId: function Type1Font_hasGlyphID(id) {
if (id < 0 || id >= this.numGlyphs) {
return false;
}
+
if (id === 0) {
return true;
}
+
var glyph = this.charstrings[id - 1];
return glyph.charstring.length > 0;
},
getSeacs: function Type1Font_getSeacs(charstrings) {
var i, ii;
var seacMap = [];
+
for (i = 0, ii = charstrings.length; i < ii; i++) {
var charstring = charstrings[i];
+
if (charstring.seac) {
seacMap[i + 1] = charstring.seac;
}
}
+
return seacMap;
},
getType2Charstrings: function Type1Font_getType2Charstrings(type1Charstrings) {
var type2Charstrings = [];
+
for (var i = 0, ii = type1Charstrings.length; i < ii; i++) {
type2Charstrings.push(type1Charstrings[i].charstring);
}
+
return type2Charstrings;
},
getType2Subrs: function Type1Font_getType2Subrs(type1Subrs) {
var bias = 0;
var count = type1Subrs.length;
+
if (count < 1133) {
bias = 107;
} else if (count < 33769) {
@@ -30338,14 +36492,18 @@ var Type1Font = function Type1FontClosure() {
} else {
bias = 32768;
}
+
var type2Subrs = [];
var i;
+
for (i = 0; i < bias; i++) {
type2Subrs.push([0x0B]);
}
+
for (i = 0; i < count; i++) {
type2Subrs.push(type1Subrs[i]);
}
+
return type2Subrs;
},
wrap: function Type1Font_wrap(name, glyphs, charstrings, subrs, properties) {
@@ -30376,41 +36534,55 @@ var Type1Font = function Type1FontClosure() {
var count = glyphs.length;
var charsetArray = [0];
var i, ii;
+
for (i = 0; i < count; i++) {
var index = _cff_parser.CFFStandardStrings.indexOf(charstrings[i].glyphName);
+
if (index === -1) {
index = 0;
}
+
charsetArray.push(index >> 8 & 0xff, index & 0xff);
}
+
cff.charset = new _cff_parser.CFFCharset(false, 0, [], charsetArray);
var charStringsIndex = new _cff_parser.CFFIndex();
charStringsIndex.add([0x8B, 0x0E]);
+
for (i = 0; i < count; i++) {
charStringsIndex.add(glyphs[i]);
}
+
cff.charStrings = charStringsIndex;
var privateDict = new _cff_parser.CFFPrivateDict();
privateDict.setByName('Subrs', null);
var fields = ['BlueValues', 'OtherBlues', 'FamilyBlues', 'FamilyOtherBlues', 'StemSnapH', 'StemSnapV', 'BlueShift', 'BlueFuzz', 'BlueScale', 'LanguageGroup', 'ExpansionFactor', 'ForceBold', 'StdHW', 'StdVW'];
+
for (i = 0, ii = fields.length; i < ii; i++) {
var field = fields[i];
+
if (!(field in properties.privateData)) {
continue;
}
+
var value = properties.privateData[field];
+
if (Array.isArray(value)) {
for (var j = value.length - 1; j > 0; j--) {
value[j] -= value[j - 1];
}
}
+
privateDict.setByName(field, value);
}
+
cff.topDict.privateDict = privateDict;
var subrIndex = new _cff_parser.CFFIndex();
+
for (i = 0, ii = subrs.length; i < ii; i++) {
subrIndex.add(subrs[i]);
}
+
privateDict.subrsIndex = subrIndex;
var compiler = new _cff_parser.CFFCompiler(cff);
return compiler.compile();
@@ -30418,6 +36590,7 @@ var Type1Font = function Type1FontClosure() {
};
return Type1Font;
}();
+
var CFFFont = function CFFFontClosure() {
function CFFFont(file, properties) {
this.properties = properties;
@@ -30426,6 +36599,7 @@ var CFFFont = function CFFFontClosure() {
this.cff.duplicateFirstGlyph();
var compiler = new _cff_parser.CFFCompiler(this.cff);
this.seacs = this.cff.seacs;
+
try {
this.data = compiler.compile();
} catch (e) {
@@ -30433,10 +36607,12 @@ var CFFFont = function CFFFontClosure() {
this.data = file;
}
}
+
CFFFont.prototype = {
get numGlyphs() {
return this.cff.charStrings.count;
},
+
getCharset: function CFFFont_getCharset() {
return this.cff.charset.charset;
},
@@ -30446,8 +36622,10 @@ var CFFFont = function CFFFontClosure() {
var charsets = cff.charset.charset;
var charCodeToGlyphId;
var glyphId;
+
if (properties.composite) {
charCodeToGlyphId = Object.create(null);
+
if (cff.isCIDFont) {
for (glyphId = 0; glyphId < charsets.length; glyphId++) {
var cid = charsets[glyphId];
@@ -30459,8 +36637,10 @@ var CFFFont = function CFFFontClosure() {
charCodeToGlyphId[glyphId] = glyphId;
}
}
+
return charCodeToGlyphId;
}
+
var encoding = cff.encoding ? cff.encoding.encoding : null;
charCodeToGlyphId = type1FontGlyphMapping(properties, encoding, charsets);
return charCodeToGlyphId;
@@ -30471,13 +36651,6 @@ var CFFFont = function CFFFontClosure() {
};
return CFFFont;
}();
-exports.SEAC_ANALYSIS_ENABLED = SEAC_ANALYSIS_ENABLED;
-exports.ErrorFont = ErrorFont;
-exports.Font = Font;
-exports.FontFlags = FontFlags;
-exports.ToUnicodeMap = ToUnicodeMap;
-exports.IdentityToUnicodeMap = IdentityToUnicodeMap;
-exports.getFontType = getFontType;
/***/ }),
/* 161 */
@@ -30489,7 +36662,7 @@ exports.getFontType = getFontType;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.CFFFDSelect = exports.CFFCompiler = exports.CFFPrivateDict = exports.CFFTopDict = exports.CFFCharset = exports.CFFIndex = exports.CFFStrings = exports.CFFHeader = exports.CFF = exports.CFFParser = exports.CFFStandardStrings = undefined;
+exports.CFFFDSelect = exports.CFFCompiler = exports.CFFPrivateDict = exports.CFFTopDict = exports.CFFCharset = exports.CFFIndex = exports.CFFStrings = exports.CFFHeader = exports.CFF = exports.CFFParser = exports.CFFStandardStrings = void 0;
var _util = __w_pdfjs_require__(2);
@@ -30499,6 +36672,8 @@ var _encodings = __w_pdfjs_require__(163);
var MAX_SUBR_NESTING = 10;
var CFFStandardStrings = ['.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency', 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl', 'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003', 'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'];
+exports.CFFStandardStrings = CFFStandardStrings;
+
var CFFParser = function CFFParserClosure() {
var CharstringValidationData = [null, {
id: 'hstem',
@@ -30709,11 +36884,13 @@ var CFFParser = function CFFParserClosure() {
min: 11,
resetStack: true
}];
+
function CFFParser(file, properties, seacAnalysisEnabled) {
this.bytes = file.getBytes();
this.properties = properties;
this.seacAnalysisEnabled = !!seacAnalysisEnabled;
}
+
CFFParser.prototype = {
parse: function CFFParser_parse() {
var properties = this.properties;
@@ -30736,24 +36913,31 @@ var CFFParser = function CFFParserClosure() {
var charStringOffset = topDict.getByName('CharStrings');
var charStringIndex = this.parseIndex(charStringOffset).obj;
var fontMatrix = topDict.getByName('FontMatrix');
+
if (fontMatrix) {
properties.fontMatrix = fontMatrix;
}
+
var fontBBox = topDict.getByName('FontBBox');
+
if (fontBBox) {
properties.ascent = Math.max(fontBBox[3], fontBBox[1]);
properties.descent = Math.min(fontBBox[1], fontBBox[3]);
properties.ascentScaled = true;
}
+
var charset, encoding;
+
if (cff.isCIDFont) {
var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;
+
for (var i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
var dictRaw = fdArrayIndex.get(i);
var fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw), cff.strings);
this.parsePrivateDict(fontDict);
cff.fdArray.push(fontDict);
}
+
encoding = null;
charset = this.parseCharsets(topDict.getByName('charset'), charStringIndex.count, cff.strings, true);
cff.fdSelect = this.parseFDSelect(topDict.getByName('FDSelect'), charStringIndex.count);
@@ -30761,6 +36945,7 @@ var CFFParser = function CFFParserClosure() {
charset = this.parseCharsets(topDict.getByName('charset'), charStringIndex.count, cff.strings, false);
encoding = this.parseEncoding(topDict.getByName('Encoding'), properties, cff.strings, charset.charset);
}
+
cff.charset = charset;
cff.encoding = encoding;
var charStringsAndSeacs = this.parseCharStrings({
@@ -30780,17 +36965,21 @@ var CFFParser = function CFFParserClosure() {
var bytes = this.bytes;
var bytesLength = bytes.length;
var offset = 0;
+
while (offset < bytesLength && bytes[offset] !== 1) {
++offset;
}
+
if (offset >= bytesLength) {
throw new _util.FormatError('Invalid CFF header');
}
+
if (offset !== 0) {
(0, _util.info)('cff data is shifted');
bytes = bytes.subarray(offset);
this.bytes = bytes;
}
+
var major = bytes[0];
var minor = bytes[1];
var hdrSize = bytes[2];
@@ -30803,8 +36992,10 @@ var CFFParser = function CFFParserClosure() {
},
parseDict: function CFFParser_parseDict(dict) {
var pos = 0;
+
function parseOperand() {
var value = dict[pos++];
+
if (value === 30) {
return parseFloatOperand();
} else if (value === 28) {
@@ -30824,39 +37015,51 @@ var CFFParser = function CFFParserClosure() {
} else if (value >= 251 && value <= 254) {
return -((value - 251) * 256) - dict[pos++] - 108;
}
+
(0, _util.warn)('CFFParser_parseDict: "' + value + '" is a reserved command.');
return NaN;
}
+
function parseFloatOperand() {
var str = '';
var eof = 15;
var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', 'E', 'E-', null, '-'];
var length = dict.length;
+
while (pos < length) {
var b = dict[pos++];
var b1 = b >> 4;
var b2 = b & 15;
+
if (b1 === eof) {
break;
}
+
str += lookup[b1];
+
if (b2 === eof) {
break;
}
+
str += lookup[b2];
}
+
return parseFloat(str);
}
+
var operands = [];
var entries = [];
pos = 0;
var end = dict.length;
+
while (pos < end) {
var b = dict[pos];
+
if (b <= 21) {
if (b === 12) {
b = b << 8 | dict[++pos];
}
+
entries.push([b, operands]);
operands = [];
++pos;
@@ -30864,6 +37067,7 @@ var CFFParser = function CFFParserClosure() {
operands.push(parseOperand());
}
}
+
return entries;
},
parseIndex: function CFFParser_parseIndex(pos) {
@@ -30873,24 +37077,31 @@ var CFFParser = function CFFParserClosure() {
var offsets = [];
var end = pos;
var i, ii;
+
if (count !== 0) {
var offsetSize = bytes[pos++];
var startPos = pos + (count + 1) * offsetSize - 1;
+
for (i = 0, ii = count + 1; i < ii; ++i) {
var offset = 0;
+
for (var j = 0; j < offsetSize; ++j) {
offset <<= 8;
offset += bytes[pos++];
}
+
offsets.push(startPos + offset);
}
+
end = offsets[count];
}
+
for (i = 0, ii = offsets.length - 1; i < ii; ++i) {
var offsetStart = offsets[i];
var offsetEnd = offsets[i + 1];
cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
}
+
return {
obj: cffIndex,
endPos: end
@@ -30898,42 +37109,52 @@ var CFFParser = function CFFParserClosure() {
},
parseNameIndex: function CFFParser_parseNameIndex(index) {
var names = [];
+
for (var i = 0, ii = index.count; i < ii; ++i) {
var name = index.get(i);
names.push((0, _util.bytesToString)(name));
}
+
return names;
},
parseStringIndex: function CFFParser_parseStringIndex(index) {
var strings = new CFFStrings();
+
for (var i = 0, ii = index.count; i < ii; ++i) {
var data = index.get(i);
strings.add((0, _util.bytesToString)(data));
}
+
return strings;
},
createDict: function CFFParser_createDict(Type, dict, strings) {
var cffDict = new Type(strings);
+
for (var i = 0, ii = dict.length; i < ii; ++i) {
var pair = dict[i];
var key = pair[0];
var value = pair[1];
cffDict.setByKey(key, value);
}
+
return cffDict;
},
parseCharString: function CFFParser_parseCharString(state, data, localSubrIndex, globalSubrIndex) {
if (!data || state.callDepth > MAX_SUBR_NESTING) {
return false;
}
+
var stackSize = state.stackSize;
var stack = state.stack;
var length = data.length;
+
for (var j = 0; j < length;) {
var value = data[j++];
var validationCommand = null;
+
if (value === 12) {
var q = data[j++];
+
if (q === 0) {
data[j - 2] = 139;
data[j - 1] = 22;
@@ -30948,11 +37169,13 @@ var CFFParser = function CFFParserClosure() {
} else if (value === 14) {
if (stackSize >= 4) {
stackSize -= 4;
+
if (this.seacAnalysisEnabled) {
state.seac = stack.slice(stackSize, stackSize + 4);
return false;
}
}
+
validationCommand = CharstringValidationData[value];
} else if (value >= 32 && value <= 246) {
stack[stackSize] = value - 139;
@@ -30972,34 +37195,43 @@ var CFFParser = function CFFParserClosure() {
validationCommand = CharstringValidationData[value];
} else if (value === 10 || value === 29) {
var subrsIndex;
+
if (value === 10) {
subrsIndex = localSubrIndex;
} else {
subrsIndex = globalSubrIndex;
}
+
if (!subrsIndex) {
validationCommand = CharstringValidationData[value];
(0, _util.warn)('Missing subrsIndex for ' + validationCommand.id);
return false;
}
+
var bias = 32768;
+
if (subrsIndex.count < 1240) {
bias = 107;
} else if (subrsIndex.count < 33900) {
bias = 1131;
}
+
var subrNumber = stack[--stackSize] + bias;
+
if (subrNumber < 0 || subrNumber >= subrsIndex.count || isNaN(subrNumber)) {
validationCommand = CharstringValidationData[value];
(0, _util.warn)('Out of bounds subrIndex for ' + validationCommand.id);
return false;
}
+
state.stackSize = stackSize;
state.callDepth++;
var valid = this.parseCharString(state, subrsIndex.get(subrNumber), localSubrIndex, globalSubrIndex);
+
if (!valid) {
return false;
}
+
state.callDepth--;
stackSize = state.stackSize;
continue;
@@ -31009,32 +37241,39 @@ var CFFParser = function CFFParserClosure() {
} else {
validationCommand = CharstringValidationData[value];
}
+
if (validationCommand) {
if (validationCommand.stem) {
state.hints += stackSize >> 1;
}
+
if ('min' in validationCommand) {
if (!state.undefStack && stackSize < validationCommand.min) {
(0, _util.warn)('Not enough parameters for ' + validationCommand.id + '; actual: ' + stackSize + ', expected: ' + validationCommand.min);
return false;
}
}
+
if (state.firstStackClearing && validationCommand.stackClearing) {
state.firstStackClearing = false;
stackSize -= validationCommand.min;
+
if (stackSize >= 2 && validationCommand.stem) {
stackSize %= 2;
} else if (stackSize > 1) {
(0, _util.warn)('Found too many parameters for stack-clearing command');
}
+
if (stackSize > 0 && stack[stackSize - 1] >= 0) {
state.width = stack[stackSize - 1];
}
}
+
if ('stackDelta' in validationCommand) {
if ('stackFn' in validationCommand) {
validationCommand.stackFn(stack, stackSize);
}
+
stackSize += validationCommand.stackDelta;
} else if (validationCommand.stackClearing) {
stackSize = 0;
@@ -31048,6 +37287,7 @@ var CFFParser = function CFFParserClosure() {
}
}
}
+
state.stackSize = stackSize;
return true;
},
@@ -31058,10 +37298,10 @@ var CFFParser = function CFFParserClosure() {
fdSelect = _ref.fdSelect,
fdArray = _ref.fdArray,
privateDict = _ref.privateDict;
-
var seacs = [];
var widths = [];
var count = charStrings.count;
+
for (var i = 0; i < count; i++) {
var charstring = charStrings.get(i);
var state = {
@@ -31077,16 +37317,20 @@ var CFFParser = function CFFParserClosure() {
var valid = true;
var localSubrToUse = null;
var privateDictToUse = privateDict;
+
if (fdSelect && fdArray.length) {
var fdIndex = fdSelect.getFDIndex(i);
+
if (fdIndex === -1) {
(0, _util.warn)('Glyph index is not in fd select.');
valid = false;
}
+
if (fdIndex >= fdArray.length) {
(0, _util.warn)('Invalid fd index for glyph index.');
valid = false;
}
+
if (valid) {
privateDictToUse = fdArray[fdIndex].privateDict;
localSubrToUse = privateDictToUse.subrsIndex;
@@ -31094,9 +37338,11 @@ var CFFParser = function CFFParserClosure() {
} else if (localSubrIndex) {
localSubrToUse = localSubrIndex;
}
+
if (valid) {
valid = this.parseCharString(state, charstring, localSubrToUse, globalSubrIndex);
}
+
if (state.width !== null) {
var nominalWidth = privateDictToUse.getByName('nominalWidthX');
widths[i] = nominalWidth + state.width;
@@ -31104,20 +37350,22 @@ var CFFParser = function CFFParserClosure() {
var defaultWidth = privateDictToUse.getByName('defaultWidthX');
widths[i] = defaultWidth;
}
+
if (state.seac !== null) {
seacs[i] = state.seac;
}
+
if (!valid) {
charStrings.set(i, new Uint8Array([14]));
}
}
+
return {
charStrings: charStrings,
seacs: seacs,
widths: widths
};
},
-
emptyPrivateDictionary: function CFFParser_emptyPrivateDictionary(parentDict) {
var privateDict = this.createDict(CFFPrivateDict, [], parentDict.strings);
parentDict.setByKey(18, [0, 0]);
@@ -31128,31 +37376,40 @@ var CFFParser = function CFFParserClosure() {
this.emptyPrivateDictionary(parentDict);
return;
}
+
var privateOffset = parentDict.getByName('Private');
+
if (!Array.isArray(privateOffset) || privateOffset.length !== 2) {
parentDict.removeByName('Private');
return;
}
+
var size = privateOffset[0];
var offset = privateOffset[1];
+
if (size === 0 || offset >= this.bytes.length) {
this.emptyPrivateDictionary(parentDict);
return;
}
+
var privateDictEnd = offset + size;
var dictData = this.bytes.subarray(offset, privateDictEnd);
var dict = this.parseDict(dictData);
var privateDict = this.createDict(CFFPrivateDict, dict, parentDict.strings);
parentDict.privateDict = privateDict;
+
if (!privateDict.getByName('Subrs')) {
return;
}
+
var subrsOffset = privateDict.getByName('Subrs');
var relativeOffset = offset + subrsOffset;
+
if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
this.emptyPrivateDictionary(parentDict);
return;
}
+
var subrsIndex = this.parseIndex(relativeOffset);
privateDict.subrsIndex = subrsIndex.obj;
},
@@ -31164,40 +37421,51 @@ var CFFParser = function CFFParserClosure() {
} else if (pos === 2) {
return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET, _charsets.ExpertSubsetCharset);
}
+
var bytes = this.bytes;
var start = pos;
var format = bytes[pos++];
var charset = ['.notdef'];
var id, count, i;
length -= 1;
+
switch (format) {
case 0:
for (i = 0; i < length; i++) {
id = bytes[pos++] << 8 | bytes[pos++];
charset.push(cid ? id : strings.get(id));
}
+
break;
+
case 1:
while (charset.length <= length) {
id = bytes[pos++] << 8 | bytes[pos++];
count = bytes[pos++];
+
for (i = 0; i <= count; i++) {
charset.push(cid ? id++ : strings.get(id++));
}
}
+
break;
+
case 2:
while (charset.length <= length) {
id = bytes[pos++] << 8 | bytes[pos++];
count = bytes[pos++] << 8 | bytes[pos++];
+
for (i = 0; i <= count; i++) {
charset.push(cid ? id++ : strings.get(id++));
}
}
+
break;
+
default:
throw new _util.FormatError('Unknown charset format');
}
+
var end = pos;
var raw = bytes.subarray(start, end);
return new CFFCharset(false, format, charset, raw);
@@ -31208,20 +37476,25 @@ var CFFParser = function CFFParserClosure() {
var predefined = false;
var format, i, ii;
var raw = null;
+
function readSupplement() {
var supplementsCount = bytes[pos++];
+
for (i = 0; i < supplementsCount; i++) {
var code = bytes[pos++];
var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
encoding[code] = charset.indexOf(strings.get(sid));
}
}
+
if (pos === 0 || pos === 1) {
predefined = true;
format = pos;
var baseEncoding = pos ? _encodings.ExpertEncoding : _encodings.StandardEncoding;
+
for (i = 0, ii = charset.length; i < ii; i++) {
var index = baseEncoding.indexOf(charset[i]);
+
if (index !== -1) {
encoding[index] = i;
}
@@ -31229,34 +37502,46 @@ var CFFParser = function CFFParserClosure() {
} else {
var dataStart = pos;
format = bytes[pos++];
+
switch (format & 0x7f) {
case 0:
var glyphsCount = bytes[pos++];
+
for (i = 1; i <= glyphsCount; i++) {
encoding[bytes[pos++]] = i;
}
+
break;
+
case 1:
var rangesCount = bytes[pos++];
var gid = 1;
+
for (i = 0; i < rangesCount; i++) {
var start = bytes[pos++];
var left = bytes[pos++];
+
for (var j = start; j <= start + left; j++) {
encoding[j] = gid++;
}
}
+
break;
+
default:
- throw new _util.FormatError('Unknown encoding format: ' + format + ' in CFF');
+ throw new _util.FormatError("Unknown encoding format: ".concat(format, " in CFF"));
}
+
var dataEnd = pos;
+
if (format & 0x80) {
bytes[dataStart] &= 0x7f;
readSupplement();
}
+
raw = bytes.subarray(dataStart, dataEnd);
}
+
format = format & 0x7f;
return new CFFEncoding(predefined, format, encoding, raw);
},
@@ -31265,40 +37550,54 @@ var CFFParser = function CFFParserClosure() {
var format = bytes[pos++];
var fdSelect = [];
var i;
+
switch (format) {
case 0:
for (i = 0; i < length; ++i) {
var id = bytes[pos++];
fdSelect.push(id);
}
+
break;
+
case 3:
var rangesCount = bytes[pos++] << 8 | bytes[pos++];
+
for (i = 0; i < rangesCount; ++i) {
var first = bytes[pos++] << 8 | bytes[pos++];
+
if (i === 0 && first !== 0) {
(0, _util.warn)('parseFDSelect: The first range must have a first GID of 0' + ' -- trying to recover.');
first = 0;
}
+
var fdIndex = bytes[pos++];
var next = bytes[pos] << 8 | bytes[pos + 1];
+
for (var j = first; j < next; ++j) {
fdSelect.push(fdIndex);
}
}
+
pos += 2;
break;
+
default:
- throw new _util.FormatError('parseFDSelect: Unknown format "' + format + '".');
+ throw new _util.FormatError("parseFDSelect: Unknown format \"".concat(format, "\"."));
}
+
if (fdSelect.length !== length) {
throw new _util.FormatError('parseFDSelect: Invalid font data.');
}
+
return new CFFFDSelect(format, fdSelect);
}
};
return CFFParser;
}();
+
+exports.CFFParser = CFFParser;
+
var CFF = function CFFClosure() {
function CFF() {
this.header = null;
@@ -31313,14 +37612,17 @@ var CFF = function CFFClosure() {
this.fdSelect = null;
this.isCIDFont = false;
}
+
CFF.prototype = {
duplicateFirstGlyph: function CFF_duplicateFirstGlyph() {
if (this.charStrings.count >= 65535) {
(0, _util.warn)('Not enough space in charstrings to duplicate first glyph.');
return;
}
+
var glyphZero = this.charStrings.get(0);
this.charStrings.add(glyphZero);
+
if (this.isCIDFont) {
this.fdSelect.fdSelect.push(this.fdSelect.fdSelect[0]);
}
@@ -31329,12 +37631,16 @@ var CFF = function CFFClosure() {
if (id < 0 || id >= this.charStrings.count) {
return false;
}
+
var glyph = this.charStrings.get(id);
return glyph.length > 0;
}
};
return CFF;
}();
+
+exports.CFF = CFF;
+
var CFFHeader = function CFFHeaderClosure() {
function CFFHeader(major, minor, hdrSize, offSize) {
this.major = major;
@@ -31342,36 +37648,49 @@ var CFFHeader = function CFFHeaderClosure() {
this.hdrSize = hdrSize;
this.offSize = offSize;
}
+
return CFFHeader;
}();
+
+exports.CFFHeader = CFFHeader;
+
var CFFStrings = function CFFStringsClosure() {
function CFFStrings() {
this.strings = [];
}
+
CFFStrings.prototype = {
get: function CFFStrings_get(index) {
if (index >= 0 && index <= 390) {
return CFFStandardStrings[index];
}
+
if (index - 391 <= this.strings.length) {
return this.strings[index - 391];
}
+
return CFFStandardStrings[0];
},
add: function CFFStrings_add(value) {
this.strings.push(value);
},
+
get count() {
return this.strings.length;
}
+
};
return CFFStrings;
}();
+
+exports.CFFStrings = CFFStrings;
+
var CFFIndex = function CFFIndexClosure() {
function CFFIndex() {
this.objects = [];
this.length = 0;
}
+
CFFIndex.prototype = {
add: function CFFIndex_add(data) {
this.length += data.length;
@@ -31384,12 +37703,17 @@ var CFFIndex = function CFFIndexClosure() {
get: function CFFIndex_get(index) {
return this.objects[index];
},
+
get count() {
return this.objects.length;
}
+
};
return CFFIndex;
}();
+
+exports.CFFIndex = CFFIndex;
+
var CFFDict = function CFFDictClosure() {
function CFFDict(tables, strings) {
this.keyToNameMap = tables.keyToNameMap;
@@ -31401,32 +37725,40 @@ var CFFDict = function CFFDictClosure() {
this.strings = strings;
this.values = Object.create(null);
}
+
CFFDict.prototype = {
setByKey: function CFFDict_setByKey(key, value) {
if (!(key in this.keyToNameMap)) {
return false;
}
+
var valueLength = value.length;
+
if (valueLength === 0) {
return true;
}
+
for (var i = 0; i < valueLength; i++) {
if (isNaN(value[i])) {
(0, _util.warn)('Invalid CFFDict value: "' + value + '" for key "' + key + '".');
return true;
}
}
+
var type = this.types[key];
+
if (type === 'num' || type === 'sid' || type === 'offset') {
value = value[0];
}
+
this.values[key] = value;
return true;
},
setByName: function CFFDict_setByName(name, value) {
if (!(name in this.nameToKeyMap)) {
- throw new _util.FormatError('Invalid dictionary name "' + name + '"');
+ throw new _util.FormatError("Invalid dictionary name \"".concat(name, "\""));
}
+
this.values[this.nameToKeyMap[name]] = value;
},
hasName: function CFFDict_hasName(name) {
@@ -31434,18 +37766,22 @@ var CFFDict = function CFFDictClosure() {
},
getByName: function CFFDict_getByName(name) {
if (!(name in this.nameToKeyMap)) {
- throw new _util.FormatError('Invalid dictionary name ' + name + '"');
+ throw new _util.FormatError("Invalid dictionary name ".concat(name, "\""));
}
+
var key = this.nameToKeyMap[name];
+
if (!(key in this.values)) {
return this.defaults[key];
}
+
return this.values[key];
},
removeByName: function CFFDict_removeByName(name) {
delete this.values[this.nameToKeyMap[name]];
}
};
+
CFFDict.createTables = function CFFDict_createTables(layout) {
var tables = {
keyToNameMap: {},
@@ -31455,6 +37791,7 @@ var CFFDict = function CFFDictClosure() {
opcodes: {},
order: []
};
+
for (var i = 0, ii = layout.length; i < ii; ++i) {
var entry = layout[i];
var key = Array.isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
@@ -31465,41 +37802,56 @@ var CFFDict = function CFFDictClosure() {
tables.opcodes[key] = Array.isArray(entry[0]) ? entry[0] : [entry[0]];
tables.order.push(key);
}
+
return tables;
};
+
return CFFDict;
}();
+
var CFFTopDict = function CFFTopDictClosure() {
var layout = [[[12, 30], 'ROS', ['sid', 'sid', 'num'], null], [[12, 20], 'SyntheticBase', 'num', null], [0, 'version', 'sid', null], [1, 'Notice', 'sid', null], [[12, 0], 'Copyright', 'sid', null], [2, 'FullName', 'sid', null], [3, 'FamilyName', 'sid', null], [4, 'Weight', 'sid', null], [[12, 1], 'isFixedPitch', 'num', 0], [[12, 2], 'ItalicAngle', 'num', 0], [[12, 3], 'UnderlinePosition', 'num', -100], [[12, 4], 'UnderlineThickness', 'num', 50], [[12, 5], 'PaintType', 'num', 0], [[12, 6], 'CharstringType', 'num', 2], [[12, 7], 'FontMatrix', ['num', 'num', 'num', 'num', 'num', 'num'], [0.001, 0, 0, 0.001, 0, 0]], [13, 'UniqueID', 'num', null], [5, 'FontBBox', ['num', 'num', 'num', 'num'], [0, 0, 0, 0]], [[12, 8], 'StrokeWidth', 'num', 0], [14, 'XUID', 'array', null], [15, 'charset', 'offset', 0], [16, 'Encoding', 'offset', 0], [17, 'CharStrings', 'offset', 0], [18, 'Private', ['offset', 'offset'], null], [[12, 21], 'PostScript', 'sid', null], [[12, 22], 'BaseFontName', 'sid', null], [[12, 23], 'BaseFontBlend', 'delta', null], [[12, 31], 'CIDFontVersion', 'num', 0], [[12, 32], 'CIDFontRevision', 'num', 0], [[12, 33], 'CIDFontType', 'num', 0], [[12, 34], 'CIDCount', 'num', 8720], [[12, 35], 'UIDBase', 'num', null], [[12, 37], 'FDSelect', 'offset', null], [[12, 36], 'FDArray', 'offset', null], [[12, 38], 'FontName', 'sid', null]];
var tables = null;
+
function CFFTopDict(strings) {
if (tables === null) {
tables = CFFDict.createTables(layout);
}
+
CFFDict.call(this, tables, strings);
this.privateDict = null;
}
+
CFFTopDict.prototype = Object.create(CFFDict.prototype);
return CFFTopDict;
}();
+
+exports.CFFTopDict = CFFTopDict;
+
var CFFPrivateDict = function CFFPrivateDictClosure() {
var layout = [[6, 'BlueValues', 'delta', null], [7, 'OtherBlues', 'delta', null], [8, 'FamilyBlues', 'delta', null], [9, 'FamilyOtherBlues', 'delta', null], [[12, 9], 'BlueScale', 'num', 0.039625], [[12, 10], 'BlueShift', 'num', 7], [[12, 11], 'BlueFuzz', 'num', 1], [10, 'StdHW', 'num', null], [11, 'StdVW', 'num', null], [[12, 12], 'StemSnapH', 'delta', null], [[12, 13], 'StemSnapV', 'delta', null], [[12, 14], 'ForceBold', 'num', 0], [[12, 17], 'LanguageGroup', 'num', 0], [[12, 18], 'ExpansionFactor', 'num', 0.06], [[12, 19], 'initialRandomSeed', 'num', 0], [20, 'defaultWidthX', 'num', 0], [21, 'nominalWidthX', 'num', 0], [19, 'Subrs', 'offset', null]];
var tables = null;
+
function CFFPrivateDict(strings) {
if (tables === null) {
tables = CFFDict.createTables(layout);
}
+
CFFDict.call(this, tables, strings);
this.subrsIndex = null;
}
+
CFFPrivateDict.prototype = Object.create(CFFDict.prototype);
return CFFPrivateDict;
}();
+
+exports.CFFPrivateDict = CFFPrivateDict;
var CFFCharsetPredefinedTypes = {
ISO_ADOBE: 0,
EXPERT: 1,
EXPERT_SUBSET: 2
};
+
var CFFCharset = function CFFCharsetClosure() {
function CFFCharset(predefined, format, charset, raw) {
this.predefined = predefined;
@@ -31507,8 +37859,12 @@ var CFFCharset = function CFFCharsetClosure() {
this.charset = charset;
this.raw = raw;
}
+
return CFFCharset;
}();
+
+exports.CFFCharset = CFFCharset;
+
var CFFEncoding = function CFFEncodingClosure() {
function CFFEncoding(predefined, format, encoding, raw) {
this.predefined = predefined;
@@ -31516,35 +37872,44 @@ var CFFEncoding = function CFFEncodingClosure() {
this.encoding = encoding;
this.raw = raw;
}
+
return CFFEncoding;
}();
+
var CFFFDSelect = function CFFFDSelectClosure() {
function CFFFDSelect(format, fdSelect) {
this.format = format;
this.fdSelect = fdSelect;
}
+
CFFFDSelect.prototype = {
getFDIndex: function CFFFDSelect_get(glyphIndex) {
if (glyphIndex < 0 || glyphIndex >= this.fdSelect.length) {
return -1;
}
+
return this.fdSelect[glyphIndex];
}
};
return CFFFDSelect;
}();
+
+exports.CFFFDSelect = CFFFDSelect;
+
var CFFOffsetTracker = function CFFOffsetTrackerClosure() {
function CFFOffsetTracker() {
this.offsets = Object.create(null);
}
+
CFFOffsetTracker.prototype = {
isTracking: function CFFOffsetTracker_isTracking(key) {
return key in this.offsets;
},
track: function CFFOffsetTracker_track(key, location) {
if (key in this.offsets) {
- throw new _util.FormatError('Already tracking location of ' + key);
+ throw new _util.FormatError("Already tracking location of ".concat(key));
}
+
this.offsets[key] = location;
},
offset: function CFFOffsetTracker_offset(value) {
@@ -31554,20 +37919,24 @@ var CFFOffsetTracker = function CFFOffsetTrackerClosure() {
},
setEntryLocation: function CFFOffsetTracker_setEntryLocation(key, values, output) {
if (!(key in this.offsets)) {
- throw new _util.FormatError('Not tracking location of ' + key);
+ throw new _util.FormatError("Not tracking location of ".concat(key));
}
+
var data = output.data;
var dataOffset = this.offsets[key];
var size = 5;
+
for (var i = 0, ii = values.length; i < ii; ++i) {
var offset0 = i * size + dataOffset;
var offset1 = offset0 + 1;
var offset2 = offset0 + 2;
var offset3 = offset0 + 3;
var offset4 = offset0 + 4;
+
if (data[offset0] !== 0x1d || data[offset1] !== 0 || data[offset2] !== 0 || data[offset3] !== 0 || data[offset4] !== 0) {
throw new _util.FormatError('writing to an offset that is not empty');
}
+
var value = values[i];
data[offset0] = 0x1d;
data[offset1] = value >> 24 & 0xFF;
@@ -31579,10 +37948,12 @@ var CFFOffsetTracker = function CFFOffsetTrackerClosure() {
};
return CFFOffsetTracker;
}();
+
var CFFCompiler = function CFFCompilerClosure() {
function CFFCompiler(cff) {
this.cff = cff;
}
+
CFFCompiler.prototype = {
compile: function CFFCompiler_compile() {
var cff = this.cff;
@@ -31598,20 +37969,25 @@ var CFFCompiler = function CFFCompilerClosure() {
output.add(header);
var nameIndex = this.compileNameIndex(cff.names);
output.add(nameIndex);
+
if (cff.isCIDFont) {
if (cff.topDict.hasName('FontMatrix')) {
var base = cff.topDict.getByName('FontMatrix');
cff.topDict.removeByName('FontMatrix');
+
for (var i = 0, ii = cff.fdArray.length; i < ii; i++) {
var subDict = cff.fdArray[i];
var matrix = base.slice(0);
+
if (subDict.hasName('FontMatrix')) {
matrix = _util.Util.transform(matrix, subDict.getByName('FontMatrix'));
}
+
subDict.setByName('FontMatrix', matrix);
}
}
}
+
cff.topDict.setByName('charset', 0);
var compiled = this.compileTopDicts([cff.topDict], output.length, cff.isCIDFont);
output.add(compiled.output);
@@ -31620,6 +37996,7 @@ var CFFCompiler = function CFFCompilerClosure() {
output.add(stringIndex);
var globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
output.add(globalSubrIndex);
+
if (cff.encoding && cff.topDict.hasName('Encoding')) {
if (cff.encoding.predefined) {
topDictTracker.setEntryLocation('Encoding', [cff.encoding.format], output);
@@ -31629,12 +38006,14 @@ var CFFCompiler = function CFFCompilerClosure() {
output.add(encoding);
}
}
+
var charset = this.compileCharset(cff.charset);
topDictTracker.setEntryLocation('charset', [output.length], output);
output.add(charset);
var charStrings = this.compileCharStrings(cff.charStrings);
topDictTracker.setEntryLocation('CharStrings', [output.length], output);
output.add(charStrings);
+
if (cff.isCIDFont) {
topDictTracker.setEntryLocation('FDSelect', [output.length], output);
var fdSelect = this.compileFDSelect(cff.fdSelect);
@@ -31645,6 +38024,7 @@ var CFFCompiler = function CFFCompilerClosure() {
var fontDictTrackers = compiled.trackers;
this.compilePrivateDicts(cff.fdArray, fontDictTrackers, output);
}
+
this.compilePrivateDicts([cff.topDict], [topDictTracker], output);
output.add([0]);
return output.data;
@@ -31653,19 +38033,24 @@ var CFFCompiler = function CFFCompilerClosure() {
if (parseFloat(value) === parseInt(value, 10) && !isNaN(value)) {
return this.encodeInteger(value);
}
+
return this.encodeFloat(value);
},
encodeFloat: function CFFCompiler_encodeFloat(num) {
var value = num.toString();
var m = /\.(\d*?)(?:9{5,20}|0{5,20})\d{0,2}(?:e(.+)|$)/.exec(value);
+
if (m) {
var epsilon = parseFloat('1e' + ((m[2] ? +m[2] : 0) + m[1].length));
value = (Math.round(num * epsilon) / epsilon).toString();
}
+
var nibbles = '';
var i, ii;
+
for (i = 0, ii = value.length; i < ii; ++i) {
var a = value[i];
+
if (a === 'e') {
nibbles += value[++i] === '-' ? 'c' : 'b';
} else if (a === '.') {
@@ -31676,15 +38061,19 @@ var CFFCompiler = function CFFCompilerClosure() {
nibbles += a;
}
}
+
nibbles += nibbles.length & 1 ? 'f' : 'ff';
var out = [30];
+
for (i = 0, ii = nibbles.length; i < ii; i += 2) {
out.push(parseInt(nibbles.substring(i, i + 2), 16));
}
+
return out;
},
encodeInteger: function CFFCompiler_encodeInteger(value) {
var code;
+
if (value >= -107 && value <= 107) {
code = [value + 139];
} else if (value >= 108 && value <= 1131) {
@@ -31698,6 +38087,7 @@ var CFFCompiler = function CFFCompilerClosure() {
} else {
code = [0x1d, value >> 24 & 0xFF, value >> 16 & 0xFF, value >> 8 & 0xFF, value & 0xFF];
}
+
return code;
},
compileHeader: function CFFCompiler_compileHeader(header) {
@@ -31705,30 +38095,40 @@ var CFFCompiler = function CFFCompilerClosure() {
},
compileNameIndex: function CFFCompiler_compileNameIndex(names) {
var nameIndex = new CFFIndex();
+
for (var i = 0, ii = names.length; i < ii; ++i) {
var name = names[i];
var length = Math.min(name.length, 127);
var sanitizedName = new Array(length);
+
for (var j = 0; j < length; j++) {
var char = name[j];
+
if (char < '!' || char > '~' || char === '[' || char === ']' || char === '(' || char === ')' || char === '{' || char === '}' || char === '<' || char === '>' || char === '/' || char === '%') {
char = '_';
}
+
sanitizedName[j] = char;
}
+
sanitizedName = sanitizedName.join('');
+
if (sanitizedName === '') {
sanitizedName = 'Bad_Font_Name';
}
+
nameIndex.add((0, _util.stringToBytes)(sanitizedName));
}
+
return this.compileIndex(nameIndex);
},
compileTopDicts: function CFFCompiler_compileTopDicts(dicts, length, removeCidKeys) {
var fontDictTrackers = [];
var fdArrayIndex = new CFFIndex();
+
for (var i = 0, ii = dicts.length; i < ii; ++i) {
var fontDict = dicts[i];
+
if (removeCidKeys) {
fontDict.removeByName('CIDFontVersion');
fontDict.removeByName('CIDFontRevision');
@@ -31736,12 +38136,14 @@ var CFFCompiler = function CFFCompilerClosure() {
fontDict.removeByName('CIDCount');
fontDict.removeByName('UIDBase');
}
+
var fontDictTracker = new CFFOffsetTracker();
var fontDictData = this.compileDict(fontDict, fontDictTracker);
fontDictTrackers.push(fontDictTracker);
fdArrayIndex.add(fontDictData);
fontDictTracker.offset(length);
}
+
fdArrayIndex = this.compileIndex(fdArrayIndex, fontDictTrackers);
return {
trackers: fontDictTrackers,
@@ -31752,18 +38154,23 @@ var CFFCompiler = function CFFCompilerClosure() {
for (var i = 0, ii = dicts.length; i < ii; ++i) {
var fontDict = dicts[i];
var privateDict = fontDict.privateDict;
+
if (!privateDict || !fontDict.hasName('Private')) {
throw new _util.FormatError('There must be a private dictionary.');
}
+
var privateDictTracker = new CFFOffsetTracker();
var privateDictData = this.compileDict(privateDict, privateDictTracker);
var outputLength = output.length;
privateDictTracker.offset(outputLength);
+
if (!privateDictData.length) {
outputLength = 0;
}
+
trackers[i].setEntryLocation('Private', [privateDictData.length, outputLength], output);
output.add(privateDictData);
+
if (privateDict.subrsIndex && privateDict.hasName('Subrs')) {
var subrs = this.compileIndex(privateDict.subrsIndex);
privateDictTracker.setEntryLocation('Subrs', [privateDictData.length], output);
@@ -31774,57 +38181,76 @@ var CFFCompiler = function CFFCompilerClosure() {
compileDict: function CFFCompiler_compileDict(dict, offsetTracker) {
var out = [];
var order = dict.order;
+
for (var i = 0; i < order.length; ++i) {
var key = order[i];
+
if (!(key in dict.values)) {
continue;
}
+
var values = dict.values[key];
var types = dict.types[key];
+
if (!Array.isArray(types)) {
types = [types];
}
+
if (!Array.isArray(values)) {
values = [values];
}
+
if (values.length === 0) {
continue;
}
+
for (var j = 0, jj = types.length; j < jj; ++j) {
var type = types[j];
var value = values[j];
+
switch (type) {
case 'num':
case 'sid':
out = out.concat(this.encodeNumber(value));
break;
+
case 'offset':
var name = dict.keyToNameMap[key];
+
if (!offsetTracker.isTracking(name)) {
offsetTracker.track(name, out.length);
}
+
out = out.concat([0x1d, 0, 0, 0, 0]);
break;
+
case 'array':
case 'delta':
out = out.concat(this.encodeNumber(value));
+
for (var k = 1, kk = values.length; k < kk; ++k) {
out = out.concat(this.encodeNumber(values[k]));
}
+
break;
+
default:
- throw new _util.FormatError('Unknown data type of ' + type);
+ throw new _util.FormatError("Unknown data type of ".concat(type));
}
}
+
out = out.concat(dict.opcodes[key]);
}
+
return out;
},
compileStringIndex: function CFFCompiler_compileStringIndex(strings) {
var stringIndex = new CFFIndex();
+
for (var i = 0, ii = strings.length; i < ii; ++i) {
stringIndex.add((0, _util.stringToBytes)(strings[i]));
}
+
return this.compileIndex(stringIndex);
},
compileGlobalSubrIndex: function CFFCompiler_compileGlobalSubrIndex() {
@@ -31833,14 +38259,18 @@ var CFFCompiler = function CFFCompilerClosure() {
},
compileCharStrings: function CFFCompiler_compileCharStrings(charStrings) {
var charStringsIndex = new CFFIndex();
+
for (var i = 0; i < charStrings.count; i++) {
var glyph = charStrings.get(i);
+
if (glyph.length === 0) {
charStringsIndex.add(new Uint8Array([0x8B, 0x0E]));
continue;
}
+
charStringsIndex.add(glyph);
}
+
return this.compileIndex(charStringsIndex);
},
compileCharset: function CFFCompiler_compileCharset(charset) {
@@ -31853,27 +38283,33 @@ var CFFCompiler = function CFFCompilerClosure() {
},
compileFDSelect: function CFFCompiler_compileFDSelect(fdSelect) {
var format = fdSelect.format;
- var out = void 0,
- i = void 0;
+ var out, i;
+
switch (format) {
case 0:
out = new Uint8Array(1 + fdSelect.fdSelect.length);
out[0] = format;
+
for (i = 0; i < fdSelect.fdSelect.length; i++) {
out[i + 1] = fdSelect.fdSelect[i];
}
+
break;
+
case 3:
var start = 0;
var lastFD = fdSelect.fdSelect[0];
var ranges = [format, 0, 0, start >> 8 & 0xFF, start & 0xFF, lastFD];
+
for (i = 1; i < fdSelect.fdSelect.length; i++) {
var currentFD = fdSelect.fdSelect[i];
+
if (currentFD !== lastFD) {
ranges.push(i >> 8 & 0xFF, i & 0xFF, currentFD);
lastFD = currentFD;
}
}
+
var numRanges = (ranges.length - 3) / 3;
ranges[1] = numRanges >> 8 & 0xFF;
ranges[2] = numRanges & 0xFF;
@@ -31881,29 +38317,37 @@ var CFFCompiler = function CFFCompilerClosure() {
out = new Uint8Array(ranges);
break;
}
+
return this.compileTypedArray(out);
},
compileTypedArray: function CFFCompiler_compileTypedArray(data) {
var out = [];
+
for (var i = 0, ii = data.length; i < ii; ++i) {
out[i] = data[i];
}
+
return out;
},
compileIndex: function CFFCompiler_compileIndex(index, trackers) {
trackers = trackers || [];
var objects = index.objects;
var count = objects.length;
+
if (count === 0) {
return [0, 0, 0];
}
+
var data = [count >> 8 & 0xFF, count & 0xff];
var lastOffset = 1,
i;
+
for (i = 0; i < count; ++i) {
lastOffset += objects[i].length;
}
+
var offsetSize;
+
if (lastOffset < 0x100) {
offsetSize = 1;
} else if (lastOffset < 0x10000) {
@@ -31913,8 +38357,10 @@ var CFFCompiler = function CFFCompilerClosure() {
} else {
offsetSize = 4;
}
+
data.push(offsetSize);
var relativeOffset = 1;
+
for (i = 0; i < count + 1; i++) {
if (offsetSize === 1) {
data.push(relativeOffset & 0xFF);
@@ -31925,34 +38371,29 @@ var CFFCompiler = function CFFCompilerClosure() {
} else {
data.push(relativeOffset >>> 24 & 0xFF, relativeOffset >> 16 & 0xFF, relativeOffset >> 8 & 0xFF, relativeOffset & 0xFF);
}
+
if (objects[i]) {
relativeOffset += objects[i].length;
}
}
+
for (i = 0; i < count; i++) {
if (trackers[i]) {
trackers[i].offset(data.length);
}
+
for (var j = 0, jj = objects[i].length; j < jj; j++) {
data.push(objects[i][j]);
}
}
+
return data;
}
};
return CFFCompiler;
}();
-exports.CFFStandardStrings = CFFStandardStrings;
-exports.CFFParser = CFFParser;
-exports.CFF = CFF;
-exports.CFFHeader = CFFHeader;
-exports.CFFStrings = CFFStrings;
-exports.CFFIndex = CFFIndex;
-exports.CFFCharset = CFFCharset;
-exports.CFFTopDict = CFFTopDict;
-exports.CFFPrivateDict = CFFPrivateDict;
+
exports.CFFCompiler = CFFCompiler;
-exports.CFFFDSelect = CFFFDSelect;
/***/ }),
/* 162 */
@@ -31964,11 +38405,12 @@ exports.CFFFDSelect = CFFFDSelect;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.ExpertSubsetCharset = exports.ExpertCharset = exports.ISOAdobeCharset = void 0;
var ISOAdobeCharset = ['.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency', 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl', 'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron'];
-var ExpertCharset = ['.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'onequarter', 'onehalf', 'threequarters', 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall', 'Ydieresissmall'];
-var ExpertSubsetCharset = ['.notdef', 'space', 'dollaroldstyle', 'dollarsuperior', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted', 'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter', 'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior'];
exports.ISOAdobeCharset = ISOAdobeCharset;
+var ExpertCharset = ['.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'onequarter', 'onehalf', 'threequarters', 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall', 'Ydieresissmall'];
exports.ExpertCharset = ExpertCharset;
+var ExpertSubsetCharset = ['.notdef', 'space', 'dollaroldstyle', 'dollarsuperior', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior', 'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted', 'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter', 'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior'];
exports.ExpertSubsetCharset = ExpertSubsetCharset;
/***/ }),
@@ -31981,40 +38423,49 @@ exports.ExpertSubsetCharset = ExpertSubsetCharset;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.getEncoding = getEncoding;
+exports.ExpertEncoding = exports.ZapfDingbatsEncoding = exports.SymbolSetEncoding = exports.MacRomanEncoding = exports.StandardEncoding = exports.WinAnsiEncoding = void 0;
var ExpertEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'exclamsmall', 'Hungarumlautsmall', '', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior', 'questionsmall', '', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', '', '', '', 'isuperior', '', '', 'lsuperior', 'msuperior', 'nsuperior', 'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior', '', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall', '', '', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '', 'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall', 'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters', 'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior', 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall', 'Ydieresissmall'];
+exports.ExpertEncoding = ExpertEncoding;
var MacExpertEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'exclamsmall', 'Hungarumlautsmall', 'centoldstyle', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', '', 'threequartersemdash', '', 'questionsmall', '', '', '', '', 'Ethsmall', '', '', 'onequarter', 'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds', '', '', '', '', '', '', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior', 'Circumflexsmall', 'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah', 'Tildesmall', '', '', 'asuperior', 'centsuperior', '', '', '', '', 'Aacutesmall', 'Agravesmall', 'Acircumflexsmall', 'Adieresissmall', 'Atildesmall', 'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall', 'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall', 'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall', 'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall', 'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '', 'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior', 'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior', 'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior', 'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '', 'dollarinferior', '', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior', 'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall', 'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '', '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '', '', 'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior', 'sevensuperior', 'ninesuperior', 'zerosuperior', '', 'esuperior', 'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior', 'dsuperior', '', '', '', '', '', 'lsuperior', 'Ogoneksmall', 'Brevesmall', 'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior', 'commasuperior', 'periodsuperior', 'Dotaccentsmall', 'Ringsmall', '', '', '', ''];
var MacRomanEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', '', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis', 'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis', 'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve', 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex', 'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet', 'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute', 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin', 'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis', 'space', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash', 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright', 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron'];
+exports.MacRomanEncoding = MacRomanEncoding;
var StandardEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'exclamdown', 'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency', 'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl', 'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring', 'cedilla', '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'AE', '', 'ordfeminine', '', '', '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine', '', '', '', '', '', 'ae', '', '', '', 'dotlessi', '', '', 'lslash', 'oslash', 'oe', 'germandbls', '', '', '', ''];
+exports.StandardEncoding = StandardEncoding;
var WinAnsiEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'bullet', 'Euro', 'bullet', 'quotesinglbase', 'florin', 'quotedblbase', 'ellipsis', 'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron', 'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet', 'quoteleft', 'quoteright', 'quotedblleft', 'quotedblright', 'bullet', 'endash', 'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright', 'oe', 'bullet', 'zcaron', 'Ydieresis', 'space', 'exclamdown', 'cent', 'sterling', 'currency', 'yen', 'brokenbar', 'section', 'dieresis', 'copyright', 'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen', 'registered', 'macron', 'degree', 'plusminus', 'twosuperior', 'threesuperior', 'acute', 'mu', 'paragraph', 'periodcentered', 'cedilla', 'onesuperior', 'ordmasculine', 'guillemotright', 'onequarter', 'onehalf', 'threequarters', 'questiondown', 'Agrave', 'Aacute', 'Acircumflex', 'Atilde', 'Adieresis', 'Aring', 'AE', 'Ccedilla', 'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis', 'Igrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve', 'Oacute', 'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash', 'Ugrave', 'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn', 'germandbls', 'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis', 'aring', 'ae', 'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis', 'igrave', 'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve', 'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash', 'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn', 'ydieresis'];
+exports.WinAnsiEncoding = WinAnsiEncoding;
var SymbolSetEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'exclam', 'universal', 'numbersign', 'existential', 'percent', 'ampersand', 'suchthat', 'parenleft', 'parenright', 'asteriskmath', 'plus', 'comma', 'minus', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'congruent', 'Alpha', 'Beta', 'Chi', 'Delta', 'Epsilon', 'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa', 'Lambda', 'Mu', 'Nu', 'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau', 'Upsilon', 'sigma1', 'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft', 'therefore', 'bracketright', 'perpendicular', 'underscore', 'radicalex', 'alpha', 'beta', 'chi', 'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota', 'phi1', 'kappa', 'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho', 'sigma', 'tau', 'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta', 'braceleft', 'bar', 'braceright', 'similar', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal', 'fraction', 'infinity', 'florin', 'club', 'diamond', 'heart', 'spade', 'arrowboth', 'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree', 'plusminus', 'second', 'greaterequal', 'multiply', 'proportional', 'partialdiff', 'bullet', 'divide', 'notequal', 'equivalence', 'approxequal', 'ellipsis', 'arrowvertex', 'arrowhorizex', 'carriagereturn', 'aleph', 'Ifraktur', 'Rfraktur', 'weierstrass', 'circlemultiply', 'circleplus', 'emptyset', 'intersection', 'union', 'propersuperset', 'reflexsuperset', 'notsubset', 'propersubset', 'reflexsubset', 'element', 'notelement', 'angle', 'gradient', 'registerserif', 'copyrightserif', 'trademarkserif', 'product', 'radical', 'dotmath', 'logicalnot', 'logicaland', 'logicalor', 'arrowdblboth', 'arrowdblleft', 'arrowdblup', 'arrowdblright', 'arrowdbldown', 'lozenge', 'angleleft', 'registersans', 'copyrightsans', 'trademarksans', 'summation', 'parenlefttp', 'parenleftex', 'parenleftbt', 'bracketlefttp', 'bracketleftex', 'bracketleftbt', 'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex', '', 'angleright', 'integral', 'integraltp', 'integralex', 'integralbt', 'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp', 'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid', 'bracerightbt', ''];
+exports.SymbolSetEncoding = SymbolSetEncoding;
var ZapfDingbatsEncoding = ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'space', 'a1', 'a2', 'a202', 'a3', 'a4', 'a5', 'a119', 'a118', 'a117', 'a11', 'a12', 'a13', 'a14', 'a15', 'a16', 'a105', 'a17', 'a18', 'a19', 'a20', 'a21', 'a22', 'a23', 'a24', 'a25', 'a26', 'a27', 'a28', 'a6', 'a7', 'a8', 'a9', 'a10', 'a29', 'a30', 'a31', 'a32', 'a33', 'a34', 'a35', 'a36', 'a37', 'a38', 'a39', 'a40', 'a41', 'a42', 'a43', 'a44', 'a45', 'a46', 'a47', 'a48', 'a49', 'a50', 'a51', 'a52', 'a53', 'a54', 'a55', 'a56', 'a57', 'a58', 'a59', 'a60', 'a61', 'a62', 'a63', 'a64', 'a65', 'a66', 'a67', 'a68', 'a69', 'a70', 'a71', 'a72', 'a73', 'a74', 'a203', 'a75', 'a204', 'a76', 'a77', 'a78', 'a79', 'a81', 'a82', 'a83', 'a84', 'a97', 'a98', 'a99', 'a100', '', 'a89', 'a90', 'a93', 'a94', 'a91', 'a92', 'a205', 'a85', 'a206', 'a86', 'a87', 'a88', 'a95', 'a96', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'a101', 'a102', 'a103', 'a104', 'a106', 'a107', 'a108', 'a112', 'a111', 'a110', 'a109', 'a120', 'a121', 'a122', 'a123', 'a124', 'a125', 'a126', 'a127', 'a128', 'a129', 'a130', 'a131', 'a132', 'a133', 'a134', 'a135', 'a136', 'a137', 'a138', 'a139', 'a140', 'a141', 'a142', 'a143', 'a144', 'a145', 'a146', 'a147', 'a148', 'a149', 'a150', 'a151', 'a152', 'a153', 'a154', 'a155', 'a156', 'a157', 'a158', 'a159', 'a160', 'a161', 'a163', 'a164', 'a196', 'a165', 'a192', 'a166', 'a167', 'a168', 'a169', 'a170', 'a171', 'a172', 'a173', 'a162', 'a174', 'a175', 'a176', 'a177', 'a178', 'a179', 'a193', 'a180', 'a199', 'a181', 'a200', 'a182', '', 'a201', 'a183', 'a184', 'a197', 'a185', 'a194', 'a198', 'a186', 'a195', 'a187', 'a188', 'a189', 'a190', 'a191', ''];
+exports.ZapfDingbatsEncoding = ZapfDingbatsEncoding;
+
function getEncoding(encodingName) {
switch (encodingName) {
case 'WinAnsiEncoding':
return WinAnsiEncoding;
+
case 'StandardEncoding':
return StandardEncoding;
+
case 'MacRomanEncoding':
return MacRomanEncoding;
+
case 'SymbolSetEncoding':
return SymbolSetEncoding;
+
case 'ZapfDingbatsEncoding':
return ZapfDingbatsEncoding;
+
case 'ExpertEncoding':
return ExpertEncoding;
+
case 'MacExpertEncoding':
return MacExpertEncoding;
+
default:
return null;
}
}
-exports.WinAnsiEncoding = WinAnsiEncoding;
-exports.StandardEncoding = StandardEncoding;
-exports.MacRomanEncoding = MacRomanEncoding;
-exports.SymbolSetEncoding = SymbolSetEncoding;
-exports.ZapfDingbatsEncoding = ZapfDingbatsEncoding;
-exports.ExpertEncoding = ExpertEncoding;
-exports.getEncoding = getEncoding;
/***/ }),
/* 164 */
@@ -36562,7 +43013,7 @@ exports.getDingbatsGlyphsUnicode = getDingbatsGlyphsUnicode;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.getSupplementalGlyphMapForCalibri = exports.getSupplementalGlyphMapForArialBlack = exports.getGlyphMapForStandardFonts = exports.getSymbolsFonts = exports.getSerifFonts = exports.getNonStdFontMap = exports.getStdFontMap = undefined;
+exports.getSupplementalGlyphMapForCalibri = exports.getSupplementalGlyphMapForArialBlack = exports.getGlyphMapForStandardFonts = exports.getSymbolsFonts = exports.getSerifFonts = exports.getNonStdFontMap = exports.getStdFontMap = void 0;
var _util = __w_pdfjs_require__(2);
@@ -36624,6 +43075,7 @@ var getStdFontMap = (0, _util.getLookupTableFactory)(function (t) {
t['TimesNewRomanPSMT-BoldItalic'] = 'Times-BoldItalic';
t['TimesNewRomanPSMT-Italic'] = 'Times-Italic';
});
+exports.getStdFontMap = getStdFontMap;
var getNonStdFontMap = (0, _util.getLookupTableFactory)(function (t) {
t['Calibri'] = 'Helvetica';
t['Calibri-Bold'] = 'Helvetica-Bold';
@@ -36661,6 +43113,7 @@ var getNonStdFontMap = (0, _util.getLookupTableFactory)(function (t) {
t['NuptialScript'] = 'Times-Italic';
t['Wingdings'] = 'ZapfDingbats';
});
+exports.getNonStdFontMap = getNonStdFontMap;
var getSerifFonts = (0, _util.getLookupTableFactory)(function (t) {
t['Adobe Jenson'] = true;
t['Adobe Text'] = true;
@@ -36796,11 +43249,13 @@ var getSerifFonts = (0, _util.getLookupTableFactory)(function (t) {
t['Windsor'] = true;
t['XITS'] = true;
});
+exports.getSerifFonts = getSerifFonts;
var getSymbolsFonts = (0, _util.getLookupTableFactory)(function (t) {
t['Dingbats'] = true;
t['Symbol'] = true;
t['ZapfDingbats'] = true;
});
+exports.getSymbolsFonts = getSymbolsFonts;
var getGlyphMapForStandardFonts = (0, _util.getLookupTableFactory)(function (t) {
t[2] = 10;
t[3] = 32;
@@ -37196,11 +43651,13 @@ var getGlyphMapForStandardFonts = (0, _util.getLookupTableFactory)(function (t)
t[3393] = 1159;
t[3416] = 8377;
});
+exports.getGlyphMapForStandardFonts = getGlyphMapForStandardFonts;
var getSupplementalGlyphMapForArialBlack = (0, _util.getLookupTableFactory)(function (t) {
t[227] = 322;
t[264] = 261;
t[291] = 346;
});
+exports.getSupplementalGlyphMapForArialBlack = getSupplementalGlyphMapForArialBlack;
var getSupplementalGlyphMapForCalibri = (0, _util.getLookupTableFactory)(function (t) {
t[1] = 32;
t[4] = 65;
@@ -37287,12 +43744,6 @@ var getSupplementalGlyphMapForCalibri = (0, _util.getLookupTableFactory)(functio
t[1085] = 43;
t[1086] = 45;
});
-exports.getStdFontMap = getStdFontMap;
-exports.getNonStdFontMap = getNonStdFontMap;
-exports.getSerifFonts = getSerifFonts;
-exports.getSymbolsFonts = getSymbolsFonts;
-exports.getGlyphMapForStandardFonts = getGlyphMapForStandardFonts;
-exports.getSupplementalGlyphMapForArialBlack = getSupplementalGlyphMapForArialBlack;
exports.getSupplementalGlyphMapForCalibri = getSupplementalGlyphMapForCalibri;
/***/ }),
@@ -39282,9 +45733,7 @@ exports.getUnicodeForGlyph = getUnicodeForGlyph;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.FontRendererFactory = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.FontRendererFactory = void 0;
var _util = __w_pdfjs_require__(2);
@@ -39296,55 +45745,82 @@ var _encodings = __w_pdfjs_require__(163);
var _stream = __w_pdfjs_require__(144);
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var FontRendererFactory = function FontRendererFactoryClosure() {
function getLong(data, offset) {
return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
}
+
function getUshort(data, offset) {
return data[offset] << 8 | data[offset + 1];
}
+
function parseCmap(data, start, end) {
var offset = getUshort(data, start + 2) === 1 ? getLong(data, start + 8) : getLong(data, start + 16);
var format = getUshort(data, start + offset);
var ranges, p, i;
+
if (format === 4) {
getUshort(data, start + offset + 2);
var segCount = getUshort(data, start + offset + 6) >> 1;
p = start + offset + 14;
ranges = [];
+
for (i = 0; i < segCount; i++, p += 2) {
- ranges[i] = { end: getUshort(data, p) };
+ ranges[i] = {
+ end: getUshort(data, p)
+ };
}
+
p += 2;
+
for (i = 0; i < segCount; i++, p += 2) {
ranges[i].start = getUshort(data, p);
}
+
for (i = 0; i < segCount; i++, p += 2) {
ranges[i].idDelta = getUshort(data, p);
}
+
for (i = 0; i < segCount; i++, p += 2) {
var idOffset = getUshort(data, p);
+
if (idOffset === 0) {
continue;
}
+
ranges[i].ids = [];
+
for (var j = 0, jj = ranges[i].end - ranges[i].start + 1; j < jj; j++) {
ranges[i].ids[j] = getUshort(data, p + idOffset);
idOffset += 2;
}
}
+
return ranges;
} else if (format === 12) {
getLong(data, start + offset + 4);
var groups = getLong(data, start + offset + 12);
p = start + offset + 16;
ranges = [];
+
for (i = 0; i < groups; i++) {
ranges.push({
start: getLong(data, p),
@@ -39353,10 +45829,13 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
});
p += 12;
}
+
return ranges;
}
- throw new _util.FormatError('unsupported cmap: ' + format);
+
+ throw new _util.FormatError("unsupported cmap: ".concat(format));
}
+
function parseCff(data, start, end, seacAnalysisEnabled) {
var properties = {};
var parser = new _cff_parser.CFFParser(new _stream.Stream(data, start, end - start), properties, seacAnalysisEnabled);
@@ -39370,49 +45849,62 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
fdArray: cff.fdArray
};
}
+
function parseGlyfTable(glyf, loca, isGlyphLocationsLong) {
var itemSize, itemDecode;
+
if (isGlyphLocationsLong) {
itemSize = 4;
+
itemDecode = function fontItemDecodeLong(data, offset) {
return data[offset] << 24 | data[offset + 1] << 16 | data[offset + 2] << 8 | data[offset + 3];
};
} else {
itemSize = 2;
+
itemDecode = function fontItemDecode(data, offset) {
return data[offset] << 9 | data[offset + 1] << 1;
};
}
+
var glyphs = [];
var startOffset = itemDecode(loca, 0);
+
for (var j = itemSize; j < loca.length; j += itemSize) {
var endOffset = itemDecode(loca, j);
glyphs.push(glyf.subarray(startOffset, endOffset));
startOffset = endOffset;
}
+
return glyphs;
}
+
function lookupCmap(ranges, unicode) {
var code = unicode.codePointAt(0),
gid = 0;
var l = 0,
r = ranges.length - 1;
+
while (l < r) {
var c = l + r + 1 >> 1;
+
if (code < ranges[c].start) {
r = c - 1;
} else {
l = c;
}
}
+
if (ranges[l].start <= code && code <= ranges[l].end) {
gid = ranges[l].idDelta + (ranges[l].ids ? ranges[l].ids[code - ranges[l].start] : code) & 0xFFFF;
}
+
return {
charCode: code,
glyphId: gid
};
}
+
function compileGlyf(code, cmds, font) {
function moveTo(x, y) {
cmds.push({
@@ -39420,30 +45912,35 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
args: [x, y]
});
}
+
function lineTo(x, y) {
cmds.push({
cmd: 'lineTo',
args: [x, y]
});
}
+
function quadraticCurveTo(xa, ya, x, y) {
cmds.push({
cmd: 'quadraticCurveTo',
args: [xa, ya, x, y]
});
}
+
var i = 0;
var numberOfContours = (code[i] << 24 | code[i + 1] << 16) >> 16;
var flags;
var x = 0,
y = 0;
i += 10;
+
if (numberOfContours < 0) {
do {
flags = code[i] << 8 | code[i + 1];
var glyphIndex = code[i + 2] << 8 | code[i + 3];
i += 4;
var arg1, arg2;
+
if (flags & 0x01) {
arg1 = (code[i] << 24 | code[i + 1] << 16) >> 16;
arg2 = (code[i + 2] << 24 | code[i + 3] << 16) >> 16;
@@ -39452,6 +45949,7 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
arg1 = code[i++];
arg2 = code[i++];
}
+
if (flags & 0x02) {
x = arg1;
y = arg2;
@@ -39459,10 +45957,12 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
x = 0;
y = 0;
}
+
var scaleX = 1,
scaleY = 1,
scale01 = 0,
scale10 = 0;
+
if (flags & 0x08) {
scaleX = scaleY = (code[i] << 24 | code[i + 1] << 16) / 1073741824;
i += 2;
@@ -39477,72 +45977,96 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
scaleY = (code[i + 6] << 24 | code[i + 7] << 16) / 1073741824;
i += 8;
}
+
var subglyph = font.glyphs[glyphIndex];
+
if (subglyph) {
- cmds.push({ cmd: 'save' });
+ cmds.push({
+ cmd: 'save'
+ });
cmds.push({
cmd: 'transform',
args: [scaleX, scale01, scale10, scaleY, x, y]
});
compileGlyf(subglyph, cmds, font);
- cmds.push({ cmd: 'restore' });
+ cmds.push({
+ cmd: 'restore'
+ });
}
} while (flags & 0x20);
} else {
var endPtsOfContours = [];
var j, jj;
+
for (j = 0; j < numberOfContours; j++) {
endPtsOfContours.push(code[i] << 8 | code[i + 1]);
i += 2;
}
+
var instructionLength = code[i] << 8 | code[i + 1];
i += 2 + instructionLength;
var numberOfPoints = endPtsOfContours[endPtsOfContours.length - 1] + 1;
var points = [];
+
while (points.length < numberOfPoints) {
flags = code[i++];
var repeat = 1;
+
if (flags & 0x08) {
repeat += code[i++];
}
+
while (repeat-- > 0) {
- points.push({ flags: flags });
+ points.push({
+ flags: flags
+ });
}
}
+
for (j = 0; j < numberOfPoints; j++) {
switch (points[j].flags & 0x12) {
case 0x00:
x += (code[i] << 24 | code[i + 1] << 16) >> 16;
i += 2;
break;
+
case 0x02:
x -= code[i++];
break;
+
case 0x12:
x += code[i++];
break;
}
+
points[j].x = x;
}
+
for (j = 0; j < numberOfPoints; j++) {
switch (points[j].flags & 0x24) {
case 0x00:
y += (code[i] << 24 | code[i + 1] << 16) >> 16;
i += 2;
break;
+
case 0x04:
y -= code[i++];
break;
+
case 0x24:
y += code[i++];
break;
}
+
points[j].y = y;
}
+
var startPoint = 0;
+
for (i = 0; i < numberOfContours; i++) {
var endPoint = endPtsOfContours[i];
var contour = points.slice(startPoint, endPoint + 1);
+
if (contour[0].flags & 1) {
contour.push(contour[0]);
} else if (contour[contour.length - 1].flags & 1) {
@@ -39556,7 +46080,9 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
contour.unshift(p);
contour.push(p);
}
+
moveTo(contour[0].x, contour[0].y);
+
for (j = 1, jj = contour.length; j < jj; j++) {
if (contour[j].flags & 1) {
lineTo(contour[j].x, contour[j].y);
@@ -39567,82 +46093,103 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
quadraticCurveTo(contour[j].x, contour[j].y, (contour[j].x + contour[j + 1].x) / 2, (contour[j].y + contour[j + 1].y) / 2);
}
}
+
startPoint = endPoint + 1;
}
}
}
+
function compileCharString(code, cmds, font, glyphId) {
var stack = [];
var x = 0,
y = 0;
var stems = 0;
+
function moveTo(x, y) {
cmds.push({
cmd: 'moveTo',
args: [x, y]
});
}
+
function lineTo(x, y) {
cmds.push({
cmd: 'lineTo',
args: [x, y]
});
}
+
function bezierCurveTo(x1, y1, x2, y2, x, y) {
cmds.push({
cmd: 'bezierCurveTo',
args: [x1, y1, x2, y2, x, y]
});
}
+
function parse(code) {
var i = 0;
+
while (i < code.length) {
var stackClean = false;
var v = code[i++];
var xa, xb, ya, yb, y1, y2, y3, n, subrCode;
+
switch (v) {
case 1:
stems += stack.length >> 1;
stackClean = true;
break;
+
case 3:
stems += stack.length >> 1;
stackClean = true;
break;
+
case 4:
y += stack.pop();
moveTo(x, y);
stackClean = true;
break;
+
case 5:
while (stack.length > 0) {
x += stack.shift();
y += stack.shift();
lineTo(x, y);
}
+
break;
+
case 6:
while (stack.length > 0) {
x += stack.shift();
lineTo(x, y);
+
if (stack.length === 0) {
break;
}
+
y += stack.shift();
lineTo(x, y);
}
+
break;
+
case 7:
while (stack.length > 0) {
y += stack.shift();
lineTo(x, y);
+
if (stack.length === 0) {
break;
}
+
x += stack.shift();
lineTo(x, y);
}
+
break;
+
case 8:
while (stack.length > 0) {
xa = x + stack.shift();
@@ -39653,18 +46200,24 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb + stack.shift();
bezierCurveTo(xa, ya, xb, yb, x, y);
}
+
break;
+
case 10:
n = stack.pop();
subrCode = null;
+
if (font.isCFFCIDFont) {
var fdIndex = font.fdSelect.getFDIndex(glyphId);
+
if (fdIndex >= 0 && fdIndex < font.fdArray.length) {
var fontDict = font.fdArray[fdIndex],
subrs = void 0;
+
if (fontDict.privateDict && fontDict.privateDict.subrsIndex) {
subrs = fontDict.privateDict.subrsIndex.objects;
}
+
if (subrs) {
var numSubrs = subrs.length;
n += numSubrs < 1240 ? 107 : numSubrs < 33900 ? 1131 : 32768;
@@ -39676,14 +46229,19 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
} else {
subrCode = font.subrs[n + font.subrsBias];
}
+
if (subrCode) {
parse(subrCode);
}
+
break;
+
case 11:
return;
+
case 12:
v = code[i++];
+
switch (v) {
case 34:
xa = x + stack.shift();
@@ -39696,6 +46254,7 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
x = xb + stack.shift();
bezierCurveTo(xa, y1, xb, y, x, y);
break;
+
case 35:
xa = x + stack.shift();
ya = y + stack.shift();
@@ -39713,6 +46272,7 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
bezierCurveTo(xa, ya, xb, yb, x, y);
stack.pop();
break;
+
case 36:
xa = x + stack.shift();
y1 = y + stack.shift();
@@ -39726,6 +46286,7 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
x = xb + stack.shift();
bezierCurveTo(xa, y2, xb, y3, x, y);
break;
+
case 37:
var x0 = x,
y0 = y;
@@ -39742,64 +46303,81 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
yb = ya + stack.shift();
x = xb;
y = yb;
+
if (Math.abs(x - x0) > Math.abs(y - y0)) {
x += stack.shift();
} else {
y += stack.shift();
}
+
bezierCurveTo(xa, ya, xb, yb, x, y);
break;
+
default:
- throw new _util.FormatError('unknown operator: 12 ' + v);
+ throw new _util.FormatError("unknown operator: 12 ".concat(v));
}
+
break;
+
case 14:
if (stack.length >= 4) {
var achar = stack.pop();
var bchar = stack.pop();
y = stack.pop();
x = stack.pop();
- cmds.push({ cmd: 'save' });
+ cmds.push({
+ cmd: 'save'
+ });
cmds.push({
cmd: 'translate',
args: [x, y]
});
var cmap = lookupCmap(font.cmap, String.fromCharCode(font.glyphNameMap[_encodings.StandardEncoding[achar]]));
compileCharString(font.glyphs[cmap.glyphId], cmds, font, cmap.glyphId);
- cmds.push({ cmd: 'restore' });
+ cmds.push({
+ cmd: 'restore'
+ });
cmap = lookupCmap(font.cmap, String.fromCharCode(font.glyphNameMap[_encodings.StandardEncoding[bchar]]));
compileCharString(font.glyphs[cmap.glyphId], cmds, font, cmap.glyphId);
}
+
return;
+
case 18:
stems += stack.length >> 1;
stackClean = true;
break;
+
case 19:
stems += stack.length >> 1;
i += stems + 7 >> 3;
stackClean = true;
break;
+
case 20:
stems += stack.length >> 1;
i += stems + 7 >> 3;
stackClean = true;
break;
+
case 21:
y += stack.pop();
x += stack.pop();
moveTo(x, y);
stackClean = true;
break;
+
case 22:
x += stack.pop();
moveTo(x, y);
stackClean = true;
break;
+
case 23:
stems += stack.length >> 1;
stackClean = true;
break;
+
case 24:
while (stack.length > 2) {
xa = x + stack.shift();
@@ -39810,16 +46388,19 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb + stack.shift();
bezierCurveTo(xa, ya, xb, yb, x, y);
}
+
x += stack.shift();
y += stack.shift();
lineTo(x, y);
break;
+
case 25:
while (stack.length > 6) {
x += stack.shift();
y += stack.shift();
lineTo(x, y);
}
+
xa = x + stack.shift();
ya = y + stack.shift();
xb = xa + stack.shift();
@@ -39828,10 +46409,12 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb + stack.shift();
bezierCurveTo(xa, ya, xb, yb, x, y);
break;
+
case 26:
if (stack.length % 2) {
x += stack.shift();
}
+
while (stack.length > 0) {
xa = x;
ya = y + stack.shift();
@@ -39841,11 +46424,14 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb + stack.shift();
bezierCurveTo(xa, ya, xb, yb, x, y);
}
+
break;
+
case 27:
if (stack.length % 2) {
y += stack.shift();
}
+
while (stack.length > 0) {
xa = x + stack.shift();
ya = y;
@@ -39855,18 +46441,24 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb;
bezierCurveTo(xa, ya, xb, yb, x, y);
}
+
break;
+
case 28:
stack.push((code[i] << 24 | code[i + 1] << 16) >> 16);
i += 2;
break;
+
case 29:
n = stack.pop() + font.gsubrsBias;
subrCode = font.gsubrs[n];
+
if (subrCode) {
parse(subrCode);
}
+
break;
+
case 30:
while (stack.length > 0) {
xa = x;
@@ -39876,9 +46468,11 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
x = xb + stack.shift();
y = yb + (stack.length === 1 ? stack.shift() : 0);
bezierCurveTo(xa, ya, xb, yb, x, y);
+
if (stack.length === 0) {
break;
}
+
xa = x + stack.shift();
ya = y;
xb = xa + stack.shift();
@@ -39887,7 +46481,9 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
x = xb + (stack.length === 1 ? stack.shift() : 0);
bezierCurveTo(xa, ya, xb, yb, x, y);
}
+
break;
+
case 31:
while (stack.length > 0) {
xa = x + stack.shift();
@@ -39897,9 +46493,11 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb + stack.shift();
x = xb + (stack.length === 1 ? stack.shift() : 0);
bezierCurveTo(xa, ya, xb, yb, x, y);
+
if (stack.length === 0) {
break;
}
+
xa = x;
ya = y + stack.shift();
xb = xa + stack.shift();
@@ -39908,11 +46506,14 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
y = yb + (stack.length === 1 ? stack.shift() : 0);
bezierCurveTo(xa, ya, xb, yb, x, y);
}
+
break;
+
default:
if (v < 32) {
- throw new _util.FormatError('unknown operator: ' + v);
+ throw new _util.FormatError("unknown operator: ".concat(v));
}
+
if (v < 247) {
stack.push(v - 139);
} else if (v < 251) {
@@ -39923,52 +46524,65 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
stack.push((code[i] << 24 | code[i + 1] << 16 | code[i + 2] << 8 | code[i + 3]) / 65536);
i += 4;
}
+
break;
}
+
if (stackClean) {
stack.length = 0;
}
}
}
+
parse(code);
}
+
var NOOP = [];
- var CompiledFont = function () {
+ var CompiledFont =
+ /*#__PURE__*/
+ function () {
function CompiledFont(fontMatrix) {
_classCallCheck(this, CompiledFont);
if (this.constructor === CompiledFont) {
(0, _util.unreachable)('Cannot initialize CompiledFont.');
}
+
this.fontMatrix = fontMatrix;
this.compiledGlyphs = Object.create(null);
this.compiledCharCodeToGlyphId = Object.create(null);
}
_createClass(CompiledFont, [{
- key: 'getPathJs',
+ key: "getPathJs",
value: function getPathJs(unicode) {
var cmap = lookupCmap(this.cmap, unicode);
var fn = this.compiledGlyphs[cmap.glyphId];
+
if (!fn) {
fn = this.compileGlyph(this.glyphs[cmap.glyphId], cmap.glyphId);
this.compiledGlyphs[cmap.glyphId] = fn;
}
+
if (this.compiledCharCodeToGlyphId[cmap.charCode] === undefined) {
this.compiledCharCodeToGlyphId[cmap.charCode] = cmap.glyphId;
}
+
return fn;
}
}, {
- key: 'compileGlyph',
+ key: "compileGlyph",
value: function compileGlyph(code, glyphId) {
if (!code || code.length === 0 || code[0] === 14) {
return NOOP;
}
+
var fontMatrix = this.fontMatrix;
+
if (this.isCFFCIDFont) {
var fdIndex = this.fdSelect.getFDIndex(glyphId);
+
if (fdIndex >= 0 && fdIndex < this.fdArray.length) {
var fontDict = this.fdArray[fdIndex];
fontMatrix = fontDict.getByName('FontMatrix') || _util.FONT_IDENTITY_MATRIX;
@@ -39976,8 +46590,11 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
(0, _util.warn)('Invalid fd index for glyph index.');
}
}
+
var cmds = [];
- cmds.push({ cmd: 'save' });
+ cmds.push({
+ cmd: 'save'
+ });
cmds.push({
cmd: 'transform',
args: fontMatrix.slice()
@@ -39987,16 +46604,18 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
args: ['size', '-size']
});
this.compileGlyphImpl(code, cmds, glyphId);
- cmds.push({ cmd: 'restore' });
+ cmds.push({
+ cmd: 'restore'
+ });
return cmds;
}
}, {
- key: 'compileGlyphImpl',
+ key: "compileGlyphImpl",
value: function compileGlyphImpl() {
(0, _util.unreachable)('Children classes should implement this.');
}
}, {
- key: 'hasBuiltPath',
+ key: "hasBuiltPath",
value: function hasBuiltPath(unicode) {
var cmap = lookupCmap(this.cmap, unicode);
return this.compiledGlyphs[cmap.glyphId] !== undefined && this.compiledCharCodeToGlyphId[cmap.charCode] !== undefined;
@@ -40006,21 +46625,24 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
return CompiledFont;
}();
- var TrueTypeCompiled = function (_CompiledFont) {
+ var TrueTypeCompiled =
+ /*#__PURE__*/
+ function (_CompiledFont) {
_inherits(TrueTypeCompiled, _CompiledFont);
function TrueTypeCompiled(glyphs, cmap, fontMatrix) {
- _classCallCheck(this, TrueTypeCompiled);
+ var _this;
- var _this = _possibleConstructorReturn(this, (TrueTypeCompiled.__proto__ || Object.getPrototypeOf(TrueTypeCompiled)).call(this, fontMatrix || [0.000488, 0, 0, 0.000488, 0, 0]));
+ _classCallCheck(this, TrueTypeCompiled);
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(TrueTypeCompiled).call(this, fontMatrix || [0.000488, 0, 0, 0.000488, 0, 0]));
_this.glyphs = glyphs;
_this.cmap = cmap;
return _this;
}
_createClass(TrueTypeCompiled, [{
- key: 'compileGlyphImpl',
+ key: "compileGlyphImpl",
value: function compileGlyphImpl(code, cmds) {
compileGlyf(code, cmds, this);
}
@@ -40029,14 +46651,17 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
return TrueTypeCompiled;
}(CompiledFont);
- var Type2Compiled = function (_CompiledFont2) {
+ var Type2Compiled =
+ /*#__PURE__*/
+ function (_CompiledFont2) {
_inherits(Type2Compiled, _CompiledFont2);
function Type2Compiled(cffInfo, cmap, fontMatrix, glyphNameMap) {
- _classCallCheck(this, Type2Compiled);
+ var _this2;
- var _this2 = _possibleConstructorReturn(this, (Type2Compiled.__proto__ || Object.getPrototypeOf(Type2Compiled)).call(this, fontMatrix || [0.001, 0, 0, 0.001, 0, 0]));
+ _classCallCheck(this, Type2Compiled);
+ _this2 = _possibleConstructorReturn(this, _getPrototypeOf(Type2Compiled).call(this, fontMatrix || [0.001, 0, 0, 0.001, 0, 0]));
_this2.glyphs = cffInfo.glyphs;
_this2.gsubrs = cffInfo.gsubrs || [];
_this2.subrs = cffInfo.subrs || [];
@@ -40051,7 +46676,7 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
}
_createClass(Type2Compiled, [{
- key: 'compileGlyphImpl',
+ key: "compileGlyphImpl",
value: function compileGlyphImpl(code, cmds, glyphId) {
compileCharString(code, cmds, this, glyphId);
}
@@ -40065,37 +46690,46 @@ var FontRendererFactory = function FontRendererFactoryClosure() {
var data = new Uint8Array(font.data);
var cmap, glyf, loca, cff, indexToLocFormat, unitsPerEm;
var numTables = getUshort(data, 4);
+
for (var i = 0, p = 12; i < numTables; i++, p += 16) {
var tag = (0, _util.bytesToString)(data.subarray(p, p + 4));
var offset = getLong(data, p + 8);
var length = getLong(data, p + 12);
+
switch (tag) {
case 'cmap':
cmap = parseCmap(data, offset, offset + length);
break;
+
case 'glyf':
glyf = data.subarray(offset, offset + length);
break;
+
case 'loca':
loca = data.subarray(offset, offset + length);
break;
+
case 'head':
unitsPerEm = getUshort(data, offset + 18);
indexToLocFormat = getUshort(data, offset + 50);
break;
+
case 'CFF ':
cff = parseCff(data, offset, offset + length, seacAnalysisEnabled);
break;
}
}
+
if (glyf) {
var fontMatrix = !unitsPerEm ? font.fontMatrix : [1 / unitsPerEm, 0, 0, 1 / unitsPerEm, 0, 0];
return new TrueTypeCompiled(parseGlyfTable(glyf, loca, indexToLocFormat), cmap, fontMatrix);
}
+
return new Type2Compiled(cff, cmap, font.fontMatrix, font.glyphNameMap);
}
};
}();
+
exports.FontRendererFactory = FontRendererFactory;
/***/ }),
@@ -40108,7 +46742,7 @@ exports.FontRendererFactory = FontRendererFactory;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.Type1Parser = undefined;
+exports.Type1Parser = void 0;
var _util = __w_pdfjs_require__(2);
@@ -40117,6 +46751,7 @@ var _encodings = __w_pdfjs_require__(163);
var _stream = __w_pdfjs_require__(144);
var HINTING_ENABLED = false;
+
var Type1CharString = function Type1CharStringClosure() {
var COMMAND_MAP = {
'hstem': [1],
@@ -40135,6 +46770,7 @@ var Type1CharString = function Type1CharStringClosure() {
'vhcurveto': [30],
'hvcurveto': [31]
};
+
function Type1CharString() {
this.width = 0;
this.lsb = 0;
@@ -40142,78 +46778,100 @@ var Type1CharString = function Type1CharStringClosure() {
this.output = [];
this.stack = [];
}
+
Type1CharString.prototype = {
convert: function Type1CharString_convert(encoded, subrs, seacAnalysisEnabled) {
var count = encoded.length;
var error = false;
var wx, sbx, subrNumber;
+
for (var i = 0; i < count; i++) {
var value = encoded[i];
+
if (value < 32) {
if (value === 12) {
value = (value << 8) + encoded[++i];
}
+
switch (value) {
case 1:
if (!HINTING_ENABLED) {
this.stack = [];
break;
}
+
error = this.executeCommand(2, COMMAND_MAP.hstem);
break;
+
case 3:
if (!HINTING_ENABLED) {
this.stack = [];
break;
}
+
error = this.executeCommand(2, COMMAND_MAP.vstem);
break;
+
case 4:
if (this.flexing) {
if (this.stack.length < 1) {
error = true;
break;
}
+
var dy = this.stack.pop();
this.stack.push(0, dy);
break;
}
+
error = this.executeCommand(1, COMMAND_MAP.vmoveto);
break;
+
case 5:
error = this.executeCommand(2, COMMAND_MAP.rlineto);
break;
+
case 6:
error = this.executeCommand(1, COMMAND_MAP.hlineto);
break;
+
case 7:
error = this.executeCommand(1, COMMAND_MAP.vlineto);
break;
+
case 8:
error = this.executeCommand(6, COMMAND_MAP.rrcurveto);
break;
+
case 9:
this.stack = [];
break;
+
case 10:
if (this.stack.length < 1) {
error = true;
break;
}
+
subrNumber = this.stack.pop();
+
if (!subrs[subrNumber]) {
error = true;
break;
}
+
error = this.convert(subrs[subrNumber], subrs, seacAnalysisEnabled);
break;
+
case 11:
return error;
+
case 13:
if (this.stack.length < 2) {
error = true;
break;
}
+
wx = this.stack.pop();
sbx = this.stack.pop();
this.lsb = sbx;
@@ -40221,45 +46879,58 @@ var Type1CharString = function Type1CharStringClosure() {
this.stack.push(wx, sbx);
error = this.executeCommand(2, COMMAND_MAP.hmoveto);
break;
+
case 14:
this.output.push(COMMAND_MAP.endchar[0]);
break;
+
case 21:
if (this.flexing) {
break;
}
+
error = this.executeCommand(2, COMMAND_MAP.rmoveto);
break;
+
case 22:
if (this.flexing) {
this.stack.push(0);
break;
}
+
error = this.executeCommand(1, COMMAND_MAP.hmoveto);
break;
+
case 30:
error = this.executeCommand(4, COMMAND_MAP.vhcurveto);
break;
+
case 31:
error = this.executeCommand(4, COMMAND_MAP.hvcurveto);
break;
+
case (12 << 8) + 0:
this.stack = [];
break;
+
case (12 << 8) + 1:
if (!HINTING_ENABLED) {
this.stack = [];
break;
}
+
error = this.executeCommand(2, COMMAND_MAP.vstem);
break;
+
case (12 << 8) + 2:
if (!HINTING_ENABLED) {
this.stack = [];
break;
}
+
error = this.executeCommand(2, COMMAND_MAP.hstem);
break;
+
case (12 << 8) + 6:
if (seacAnalysisEnabled) {
this.seac = this.stack.splice(-4, 4);
@@ -40267,12 +46938,15 @@ var Type1CharString = function Type1CharStringClosure() {
} else {
error = this.executeCommand(4, COMMAND_MAP.endchar);
}
+
break;
+
case (12 << 8) + 7:
if (this.stack.length < 4) {
error = true;
break;
}
+
this.stack.pop();
wx = this.stack.pop();
var sby = this.stack.pop();
@@ -40282,22 +46956,27 @@ var Type1CharString = function Type1CharStringClosure() {
this.stack.push(wx, sbx, sby);
error = this.executeCommand(3, COMMAND_MAP.rmoveto);
break;
+
case (12 << 8) + 12:
if (this.stack.length < 2) {
error = true;
break;
}
+
var num2 = this.stack.pop();
var num1 = this.stack.pop();
this.stack.push(num1 / num2);
break;
+
case (12 << 8) + 16:
if (this.stack.length < 2) {
error = true;
break;
}
+
subrNumber = this.stack.pop();
var numArgs = this.stack.pop();
+
if (subrNumber === 0 && numArgs === 3) {
var flexArgs = this.stack.splice(this.stack.length - 17, 17);
this.stack.push(flexArgs[2] + flexArgs[0], flexArgs[3] + flexArgs[1], flexArgs[4], flexArgs[5], flexArgs[6], flexArgs[7], flexArgs[8], flexArgs[9], flexArgs[10], flexArgs[11], flexArgs[12], flexArgs[13], flexArgs[14]);
@@ -40307,19 +46986,25 @@ var Type1CharString = function Type1CharStringClosure() {
} else if (subrNumber === 1 && numArgs === 0) {
this.flexing = true;
}
+
break;
+
case (12 << 8) + 17:
break;
+
case (12 << 8) + 33:
this.stack = [];
break;
+
default:
(0, _util.warn)('Unknown type 1 charstring command of "' + value + '"');
break;
}
+
if (error) {
break;
}
+
continue;
} else if (value <= 246) {
value = value - 139;
@@ -40330,18 +47015,24 @@ var Type1CharString = function Type1CharStringClosure() {
} else {
value = (encoded[++i] & 0xff) << 24 | (encoded[++i] & 0xff) << 16 | (encoded[++i] & 0xff) << 8 | (encoded[++i] & 0xff) << 0;
}
+
this.stack.push(value);
}
+
return error;
},
executeCommand: function executeCommand(howManyArgs, command, keepStack) {
var stackLength = this.stack.length;
+
if (howManyArgs > stackLength) {
return true;
}
+
var start = stackLength - howManyArgs;
+
for (var i = start; i < stackLength; i++) {
var value = this.stack[i];
+
if (Number.isInteger(value)) {
this.output.push(28, value >> 8 & 0xff, value & 0xff);
} else {
@@ -40349,44 +47040,56 @@ var Type1CharString = function Type1CharStringClosure() {
this.output.push(255, value >> 24 & 0xFF, value >> 16 & 0xFF, value >> 8 & 0xFF, value & 0xFF);
}
}
+
this.output.push.apply(this.output, command);
+
if (keepStack) {
this.stack.splice(start, howManyArgs);
} else {
this.stack.length = 0;
}
+
return false;
}
};
return Type1CharString;
}();
+
var Type1Parser = function Type1ParserClosure() {
var EEXEC_ENCRYPT_KEY = 55665;
var CHAR_STRS_ENCRYPT_KEY = 4330;
+
function isHexDigit(code) {
return code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102;
}
+
function decrypt(data, key, discardNumber) {
if (discardNumber >= data.length) {
return new Uint8Array(0);
}
+
var r = key | 0,
c1 = 52845,
c2 = 22719,
i,
j;
+
for (i = 0; i < discardNumber; i++) {
r = (data[i] + r) * c1 + c2 & (1 << 16) - 1;
}
+
var count = data.length - discardNumber;
var decrypted = new Uint8Array(count);
+
for (i = discardNumber, j = 0; j < count; i++, j++) {
var value = data[i];
decrypted[j] = value ^ r >> 8;
r = (value + r) * c1 + c2 & (1 << 16) - 1;
}
+
return decrypted;
}
+
function decryptAscii(data, key, discardNumber) {
var r = key | 0,
c1 = 52845,
@@ -40395,48 +47098,62 @@ var Type1Parser = function Type1ParserClosure() {
maybeLength = count >>> 1;
var decrypted = new Uint8Array(maybeLength);
var i, j;
+
for (i = 0, j = 0; i < count; i++) {
var digit1 = data[i];
+
if (!isHexDigit(digit1)) {
continue;
}
+
i++;
var digit2;
+
while (i < count && !isHexDigit(digit2 = data[i])) {
i++;
}
+
if (i < count) {
var value = parseInt(String.fromCharCode(digit1, digit2), 16);
decrypted[j++] = value ^ r >> 8;
r = (value + r) * c1 + c2 & (1 << 16) - 1;
}
}
+
return Array.prototype.slice.call(decrypted, discardNumber, j);
}
+
function isSpecial(c) {
return c === 0x2F || c === 0x5B || c === 0x5D || c === 0x7B || c === 0x7D || c === 0x28 || c === 0x29;
}
+
function Type1Parser(stream, encrypted, seacAnalysisEnabled) {
if (encrypted) {
var data = stream.getBytes();
var isBinary = !(isHexDigit(data[0]) && isHexDigit(data[1]) && isHexDigit(data[2]) && isHexDigit(data[3]));
stream = new _stream.Stream(isBinary ? decrypt(data, EEXEC_ENCRYPT_KEY, 4) : decryptAscii(data, EEXEC_ENCRYPT_KEY, 4));
}
+
this.seacAnalysisEnabled = !!seacAnalysisEnabled;
this.stream = stream;
this.nextChar();
}
+
Type1Parser.prototype = {
readNumberArray: function Type1Parser_readNumberArray() {
this.getToken();
var array = [];
+
while (true) {
var token = this.getToken();
+
if (token === null || token === ']' || token === '}') {
break;
}
+
array.push(parseFloat(token || 0));
}
+
return array;
},
readNumber: function Type1Parser_readNumber() {
@@ -40457,10 +47174,12 @@ var Type1Parser = function Type1ParserClosure() {
getToken: function Type1Parser_getToken() {
var comment = false;
var ch = this.currentChar;
+
while (true) {
if (ch === -1) {
return null;
}
+
if (comment) {
if (ch === 0x0A || ch === 0x0D) {
comment = false;
@@ -40470,23 +47189,29 @@ var Type1Parser = function Type1ParserClosure() {
} else if (!(0, _util.isSpace)(ch)) {
break;
}
+
ch = this.nextChar();
}
+
if (isSpecial(ch)) {
this.nextChar();
return String.fromCharCode(ch);
}
+
var token = '';
+
do {
token += String.fromCharCode(ch);
ch = this.nextChar();
} while (ch >= 0 && !(0, _util.isSpace)(ch) && !isSpecial(ch));
+
return token;
},
readCharStrings: function Type1Parser_readCharStrings(bytes, lenIV) {
if (lenIV === -1) {
return bytes;
}
+
return decrypt(bytes, CHAR_STRS_ENCRYPT_KEY, lenIV);
},
extractFontProgram: function Type1Parser_extractFontProgram() {
@@ -40498,28 +47223,37 @@ var Type1Parser = function Type1ParserClosure() {
var program = {
subrs: [],
charstrings: [],
- properties: { 'privateData': privateData }
+ properties: {
+ 'privateData': privateData
+ }
};
var token, length, data, lenIV, encoded;
+
while ((token = this.getToken()) !== null) {
if (token !== '/') {
continue;
}
+
token = this.getToken();
+
switch (token) {
case 'CharStrings':
this.getToken();
this.getToken();
this.getToken();
this.getToken();
+
while (true) {
token = this.getToken();
+
if (token === null || token === 'end') {
break;
}
+
if (token !== '/') {
continue;
}
+
var glyph = this.getToken();
length = this.readInt();
this.getToken();
@@ -40528,18 +47262,23 @@ var Type1Parser = function Type1ParserClosure() {
encoded = this.readCharStrings(data, lenIV);
this.nextChar();
token = this.getToken();
+
if (token === 'noaccess') {
this.getToken();
}
+
charstrings.push({
glyph: glyph,
encoded: encoded
});
}
+
break;
+
case 'Subrs':
this.readInt();
this.getToken();
+
while (this.getToken() === 'dup') {
var index = this.readInt();
length = this.readInt();
@@ -40549,29 +47288,38 @@ var Type1Parser = function Type1ParserClosure() {
encoded = this.readCharStrings(data, lenIV);
this.nextChar();
token = this.getToken();
+
if (token === 'noaccess') {
this.getToken();
}
+
subrs[index] = encoded;
}
+
break;
+
case 'BlueValues':
case 'OtherBlues':
case 'FamilyBlues':
case 'FamilyOtherBlues':
var blueArray = this.readNumberArray();
+
if (blueArray.length > 0 && blueArray.length % 2 === 0 && HINTING_ENABLED) {
program.properties.privateData[token] = blueArray;
}
+
break;
+
case 'StemSnapH':
case 'StemSnapV':
program.properties.privateData[token] = this.readNumberArray();
break;
+
case 'StdHW':
case 'StdVW':
program.properties.privateData[token] = this.readNumberArray()[0];
break;
+
case 'BlueShift':
case 'lenIV':
case 'BlueFuzz':
@@ -40580,20 +47328,24 @@ var Type1Parser = function Type1ParserClosure() {
case 'ExpansionFactor':
program.properties.privateData[token] = this.readNumber();
break;
+
case 'ForceBold':
program.properties.privateData[token] = this.readBoolean();
break;
}
}
+
for (var i = 0; i < charstrings.length; i++) {
glyph = charstrings[i].glyph;
encoded = charstrings[i].encoded;
var charString = new Type1CharString();
var error = charString.convert(encoded, subrs, this.seacAnalysisEnabled);
var output = charString.output;
+
if (error) {
output = [14];
}
+
program.charstrings.push({
glyphName: glyph,
charstring: output,
@@ -40602,40 +47354,51 @@ var Type1Parser = function Type1ParserClosure() {
seac: charString.seac
});
}
+
return program;
},
extractFontHeader: function Type1Parser_extractFontHeader(properties) {
var token;
+
while ((token = this.getToken()) !== null) {
if (token !== '/') {
continue;
}
+
token = this.getToken();
+
switch (token) {
case 'FontMatrix':
var matrix = this.readNumberArray();
properties.fontMatrix = matrix;
break;
+
case 'Encoding':
var encodingArg = this.getToken();
var encoding;
+
if (!/^\d+$/.test(encodingArg)) {
encoding = (0, _encodings.getEncoding)(encodingArg);
} else {
encoding = [];
var size = parseInt(encodingArg, 10) | 0;
this.getToken();
+
for (var j = 0; j < size; j++) {
token = this.getToken();
+
while (token !== 'dup' && token !== 'def') {
token = this.getToken();
+
if (token === null) {
return;
}
}
+
if (token === 'def') {
break;
}
+
var index = this.readInt();
this.getToken();
var glyph = this.getToken();
@@ -40643,8 +47406,10 @@ var Type1Parser = function Type1ParserClosure() {
this.getToken();
}
}
+
properties.builtInEncoding = encoding;
break;
+
case 'FontBBox':
var fontBBox = this.readNumberArray();
properties.ascent = Math.max(fontBBox[3], fontBBox[1]);
@@ -40657,6 +47422,7 @@ var Type1Parser = function Type1ParserClosure() {
};
return Type1Parser;
}();
+
exports.Type1Parser = Type1Parser;
/***/ }),
@@ -40669,7 +47435,8 @@ exports.Type1Parser = Type1Parser;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.getTilingPatternIR = exports.Pattern = undefined;
+exports.getTilingPatternIR = getTilingPatternIR;
+exports.Pattern = void 0;
var _util = __w_pdfjs_require__(2);
@@ -40686,28 +47453,34 @@ var ShadingType = {
COONS_PATCH_MESH: 6,
TENSOR_PATCH_MESH: 7
};
+
var Pattern = function PatternClosure() {
function Pattern() {
(0, _util.unreachable)('should not call Pattern constructor');
}
+
Pattern.prototype = {
getPattern: function Pattern_getPattern(ctx) {
- (0, _util.unreachable)('Should not call Pattern.getStyle: ' + ctx);
+ (0, _util.unreachable)("Should not call Pattern.getStyle: ".concat(ctx));
}
};
+
Pattern.parseShading = function (shading, matrix, xref, res, handler, pdfFunctionFactory) {
var dict = (0, _primitives.isStream)(shading) ? shading.dict : shading;
var type = dict.get('ShadingType');
+
try {
switch (type) {
case ShadingType.AXIAL:
case ShadingType.RADIAL:
return new Shadings.RadialAxial(dict, matrix, xref, res, pdfFunctionFactory);
+
case ShadingType.FREE_FORM_MESH:
case ShadingType.LATTICE_FORM_MESH:
case ShadingType.COONS_PATCH_MESH:
case ShadingType.TENSOR_PATCH_MESH:
return new Shadings.Mesh(shading, matrix, xref, res, pdfFunctionFactory);
+
default:
throw new _util.FormatError('Unsupported ShadingType: ' + type);
}
@@ -40715,15 +47488,22 @@ var Pattern = function PatternClosure() {
if (ex instanceof _util.MissingDataException) {
throw ex;
}
- handler.send('UnsupportedFeature', { featureId: _util.UNSUPPORTED_FEATURES.shadingPattern });
+
+ handler.send('UnsupportedFeature', {
+ featureId: _util.UNSUPPORTED_FEATURES.shadingPattern
+ });
(0, _util.warn)(ex);
return new Shadings.Dummy();
}
};
+
return Pattern;
}();
+
+exports.Pattern = Pattern;
var Shadings = {};
Shadings.SMALL_NUMBER = 1e-6;
+
Shadings.RadialAxial = function RadialAxialClosure() {
function RadialAxial(dict, matrix, xref, res, pdfFunctionFactory) {
this.matrix = matrix;
@@ -40735,18 +47515,22 @@ Shadings.RadialAxial = function RadialAxialClosure() {
this.cs = cs;
var t0 = 0.0,
t1 = 1.0;
+
if (dict.has('Domain')) {
var domainArr = dict.getArray('Domain');
t0 = domainArr[0];
t1 = domainArr[1];
}
+
var extendStart = false,
extendEnd = false;
+
if (dict.has('Extend')) {
var extendArr = dict.getArray('Extend');
extendStart = extendArr[0];
extendEnd = extendArr[1];
}
+
if (this.shadingType === ShadingType.RADIAL && (!extendStart || !extendEnd)) {
var x1 = this.coordsArr[0];
var y1 = this.coordsArr[1];
@@ -40755,10 +47539,12 @@ Shadings.RadialAxial = function RadialAxialClosure() {
var y2 = this.coordsArr[4];
var r2 = this.coordsArr[5];
var distance = Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2));
+
if (r1 <= r2 + distance && r2 <= r1 + distance) {
(0, _util.warn)('Unsupported radial gradient.');
}
}
+
this.extendStart = extendStart;
this.extendEnd = extendEnd;
var fnObj = dict.get('Function');
@@ -40766,40 +47552,52 @@ Shadings.RadialAxial = function RadialAxialClosure() {
var diff = t1 - t0;
var step = diff / 10;
var colorStops = this.colorStops = [];
+
if (t0 >= t1 || step <= 0) {
(0, _util.info)('Bad shading domain.');
return;
}
+
var color = new Float32Array(cs.numComps),
ratio = new Float32Array(1);
var rgbColor;
+
for (var i = t0; i <= t1; i += step) {
ratio[0] = i;
fn(ratio, 0, color, 0);
rgbColor = cs.getRgb(color, 0);
+
var cssColor = _util.Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
+
colorStops.push([(i - t0) / diff, cssColor]);
}
+
var background = 'transparent';
+
if (dict.has('Background')) {
rgbColor = cs.getRgb(dict.get('Background'), 0);
background = _util.Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
}
+
if (!extendStart) {
colorStops.unshift([0, background]);
colorStops[1][0] += Shadings.SMALL_NUMBER;
}
+
if (!extendEnd) {
colorStops[colorStops.length - 1][0] -= Shadings.SMALL_NUMBER;
colorStops.push([1, background]);
}
+
this.colorStops = colorStops;
}
+
RadialAxial.prototype = {
getIR: function RadialAxial_getIR() {
var coordsArr = this.coordsArr;
var shadingType = this.shadingType;
var type, p0, p1, r0, r1;
+
if (shadingType === ShadingType.AXIAL) {
p0 = [coordsArr[0], coordsArr[1]];
p1 = [coordsArr[2], coordsArr[3]];
@@ -40813,23 +47611,29 @@ Shadings.RadialAxial = function RadialAxialClosure() {
r1 = coordsArr[5];
type = 'radial';
} else {
- (0, _util.unreachable)('getPattern type unknown: ' + shadingType);
+ (0, _util.unreachable)("getPattern type unknown: ".concat(shadingType));
}
+
var matrix = this.matrix;
+
if (matrix) {
p0 = _util.Util.applyTransform(p0, matrix);
p1 = _util.Util.applyTransform(p1, matrix);
+
if (shadingType === ShadingType.RADIAL) {
var scale = _util.Util.singularValueDecompose2dScale(matrix);
+
r0 *= scale[0];
r1 *= scale[1];
}
}
+
return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
}
};
return RadialAxial;
}();
+
Shadings.Mesh = function MeshClosure() {
function MeshStreamReader(stream, context) {
this.stream = stream;
@@ -40841,41 +47645,52 @@ Shadings.Mesh = function MeshClosure() {
var csNumComps = context.colorSpace.numComps;
this.tmpCsCompsBuf = context.colorFn ? new Float32Array(csNumComps) : this.tmpCompsBuf;
}
+
MeshStreamReader.prototype = {
get hasData() {
if (this.stream.end) {
return this.stream.pos < this.stream.end;
}
+
if (this.bufferLength > 0) {
return true;
}
+
var nextByte = this.stream.getByte();
+
if (nextByte < 0) {
return false;
}
+
this.buffer = nextByte;
this.bufferLength = 8;
return true;
},
+
readBits: function MeshStreamReader_readBits(n) {
var buffer = this.buffer;
var bufferLength = this.bufferLength;
+
if (n === 32) {
if (bufferLength === 0) {
return (this.stream.getByte() << 24 | this.stream.getByte() << 16 | this.stream.getByte() << 8 | this.stream.getByte()) >>> 0;
}
+
buffer = buffer << 24 | this.stream.getByte() << 16 | this.stream.getByte() << 8 | this.stream.getByte();
var nextByte = this.stream.getByte();
this.buffer = nextByte & (1 << bufferLength) - 1;
return (buffer << 8 - bufferLength | (nextByte & 0xFF) >> bufferLength) >>> 0;
}
+
if (n === 8 && bufferLength === 0) {
return this.stream.getByte();
}
+
while (bufferLength < n) {
buffer = buffer << 8 | this.stream.getByte();
bufferLength += 8;
}
+
bufferLength -= n;
this.bufferLength = bufferLength;
this.buffer = buffer & (1 << bufferLength) - 1;
@@ -40902,62 +47717,77 @@ Shadings.Mesh = function MeshClosure() {
var scale = bitsPerComponent < 32 ? 1 / ((1 << bitsPerComponent) - 1) : 2.3283064365386963e-10;
var decode = this.context.decode;
var components = this.tmpCompsBuf;
+
for (var i = 0, j = 4; i < numComps; i++, j += 2) {
var ci = this.readBits(bitsPerComponent);
components[i] = ci * scale * (decode[j + 1] - decode[j]) + decode[j];
}
+
var color = this.tmpCsCompsBuf;
+
if (this.context.colorFn) {
this.context.colorFn(components, 0, color, 0);
}
+
return this.context.colorSpace.getRgb(color, 0);
}
};
+
function decodeType4Shading(mesh, reader) {
var coords = mesh.coords;
var colors = mesh.colors;
var operators = [];
var ps = [];
var verticesLeft = 0;
+
while (reader.hasData) {
var f = reader.readFlag();
var coord = reader.readCoordinate();
var color = reader.readComponents();
+
if (verticesLeft === 0) {
if (!(0 <= f && f <= 2)) {
throw new _util.FormatError('Unknown type4 flag');
}
+
switch (f) {
case 0:
verticesLeft = 3;
break;
+
case 1:
ps.push(ps[ps.length - 2], ps[ps.length - 1]);
verticesLeft = 1;
break;
+
case 2:
ps.push(ps[ps.length - 3], ps[ps.length - 1]);
verticesLeft = 1;
break;
}
+
operators.push(f);
}
+
ps.push(coords.length);
coords.push(coord);
colors.push(color);
verticesLeft--;
reader.align();
}
+
mesh.figures.push({
type: 'triangles',
coords: new Int32Array(ps),
colors: new Int32Array(ps)
});
}
+
function decodeType5Shading(mesh, reader, verticesPerRow) {
var coords = mesh.coords;
var colors = mesh.colors;
var ps = [];
+
while (reader.hasData) {
var coord = reader.readCoordinate();
var color = reader.readComponents();
@@ -40965,6 +47795,7 @@ Shadings.Mesh = function MeshClosure() {
coords.push(coord);
colors.push(color);
}
+
mesh.figures.push({
type: 'lattice',
coords: new Int32Array(ps),
@@ -40972,27 +47803,34 @@ Shadings.Mesh = function MeshClosure() {
verticesPerRow: verticesPerRow
});
}
+
var MIN_SPLIT_PATCH_CHUNKS_AMOUNT = 3;
var MAX_SPLIT_PATCH_CHUNKS_AMOUNT = 20;
var TRIANGLE_DENSITY = 20;
+
var getB = function getBClosure() {
function buildB(count) {
var lut = [];
+
for (var i = 0; i <= count; i++) {
var t = i / count,
t_ = 1 - t;
lut.push(new Float32Array([t_ * t_ * t_, 3 * t * t_ * t_, 3 * t * t * t_, t * t * t]));
}
+
return lut;
}
+
var cache = [];
return function getB(count) {
if (!cache[count]) {
cache[count] = buildB(count);
}
+
return cache[count];
};
}();
+
function buildFigureFromPatch(mesh, index) {
var figure = mesh.figures[index];
(0, _util.assert)(figure.type === 'patch', 'Unexpected patch mesh figure');
@@ -41020,6 +47858,7 @@ Shadings.Mesh = function MeshClosure() {
c3 = colors[ci[3]];
var bRow = getB(splitYBy),
bCol = getB(splitXBy);
+
for (var row = 0; row <= splitYBy; row++) {
cl[0] = (c0[0] * (splitYBy - row) + c2[0] * row) / splitYBy | 0;
cl[1] = (c0[1] * (splitYBy - row) + c2[1] * row) / splitYBy | 0;
@@ -41027,13 +47866,16 @@ Shadings.Mesh = function MeshClosure() {
cr[0] = (c1[0] * (splitYBy - row) + c3[0] * row) / splitYBy | 0;
cr[1] = (c1[1] * (splitYBy - row) + c3[1] * row) / splitYBy | 0;
cr[2] = (c1[2] * (splitYBy - row) + c3[2] * row) / splitYBy | 0;
+
for (var col = 0; col <= splitXBy; col++, k++) {
if ((row === 0 || row === splitYBy) && (col === 0 || col === splitXBy)) {
continue;
}
+
var x = 0,
y = 0;
var q = 0;
+
for (var i = 0; i <= 3; i++) {
for (var j = 0; j <= 3; j++, q++) {
var m = bRow[row][i] * bCol[col][j];
@@ -41041,6 +47883,7 @@ Shadings.Mesh = function MeshClosure() {
y += coords[pi[q]][1] * m;
}
}
+
figureCoords[k] = coords.length;
coords.push([x, y]);
figureColors[k] = colors.length;
@@ -41051,6 +47894,7 @@ Shadings.Mesh = function MeshClosure() {
colors.push(newColor);
}
}
+
figureCoords[0] = pi[0];
figureColors[0] = ci[0];
figureCoords[splitXBy] = pi[3];
@@ -41066,26 +47910,35 @@ Shadings.Mesh = function MeshClosure() {
verticesPerRow: verticesPerRow
};
}
+
function decodeType6Shading(mesh, reader) {
var coords = mesh.coords;
var colors = mesh.colors;
var ps = new Int32Array(16);
var cs = new Int32Array(4);
+
while (reader.hasData) {
var f = reader.readFlag();
+
if (!(0 <= f && f <= 3)) {
throw new _util.FormatError('Unknown type6 flag');
}
+
var i, ii;
var pi = coords.length;
+
for (i = 0, ii = f !== 0 ? 8 : 12; i < ii; i++) {
coords.push(reader.readCoordinate());
}
+
var ci = colors.length;
+
for (i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) {
colors.push(reader.readComponents());
}
+
var tmp1, tmp2, tmp3, tmp4;
+
switch (f) {
case 0:
ps[12] = pi + 3;
@@ -41105,6 +47958,7 @@ Shadings.Mesh = function MeshClosure() {
cs[0] = ci;
cs[1] = ci + 3;
break;
+
case 1:
tmp1 = ps[12];
tmp2 = ps[13];
@@ -41129,6 +47983,7 @@ Shadings.Mesh = function MeshClosure() {
cs[0] = tmp1;
cs[1] = ci + 1;
break;
+
case 2:
tmp1 = ps[15];
tmp2 = ps[11];
@@ -41150,6 +48005,7 @@ Shadings.Mesh = function MeshClosure() {
cs[0] = tmp1;
cs[1] = ci + 1;
break;
+
case 3:
ps[12] = ps[0];
ps[13] = pi + 0;
@@ -41169,6 +48025,7 @@ Shadings.Mesh = function MeshClosure() {
cs[1] = ci + 1;
break;
}
+
ps[5] = coords.length;
coords.push([(-4 * coords[ps[0]][0] - coords[ps[15]][0] + 6 * (coords[ps[4]][0] + coords[ps[1]][0]) - 2 * (coords[ps[12]][0] + coords[ps[3]][0]) + 3 * (coords[ps[13]][0] + coords[ps[7]][0])) / 9, (-4 * coords[ps[0]][1] - coords[ps[15]][1] + 6 * (coords[ps[4]][1] + coords[ps[1]][1]) - 2 * (coords[ps[12]][1] + coords[ps[3]][1]) + 3 * (coords[ps[13]][1] + coords[ps[7]][1])) / 9]);
ps[6] = coords.length;
@@ -41184,26 +48041,35 @@ Shadings.Mesh = function MeshClosure() {
});
}
}
+
function decodeType7Shading(mesh, reader) {
var coords = mesh.coords;
var colors = mesh.colors;
var ps = new Int32Array(16);
var cs = new Int32Array(4);
+
while (reader.hasData) {
var f = reader.readFlag();
+
if (!(0 <= f && f <= 3)) {
throw new _util.FormatError('Unknown type7 flag');
}
+
var i, ii;
var pi = coords.length;
+
for (i = 0, ii = f !== 0 ? 12 : 16; i < ii; i++) {
coords.push(reader.readCoordinate());
}
+
var ci = colors.length;
+
for (i = 0, ii = f !== 0 ? 2 : 4; i < ii; i++) {
colors.push(reader.readComponents());
}
+
var tmp1, tmp2, tmp3, tmp4;
+
switch (f) {
case 0:
ps[12] = pi + 3;
@@ -41227,6 +48093,7 @@ Shadings.Mesh = function MeshClosure() {
cs[0] = ci;
cs[1] = ci + 3;
break;
+
case 1:
tmp1 = ps[12];
tmp2 = ps[13];
@@ -41255,6 +48122,7 @@ Shadings.Mesh = function MeshClosure() {
cs[0] = tmp1;
cs[1] = ci + 1;
break;
+
case 2:
tmp1 = ps[15];
tmp2 = ps[11];
@@ -41280,6 +48148,7 @@ Shadings.Mesh = function MeshClosure() {
cs[0] = tmp1;
cs[1] = ci + 1;
break;
+
case 3:
ps[12] = ps[0];
ps[13] = pi + 0;
@@ -41303,6 +48172,7 @@ Shadings.Mesh = function MeshClosure() {
cs[1] = ci + 1;
break;
}
+
mesh.figures.push({
type: 'patch',
coords: new Int32Array(ps),
@@ -41310,11 +48180,13 @@ Shadings.Mesh = function MeshClosure() {
});
}
}
+
function updateBounds(mesh) {
var minX = mesh.coords[0][0],
minY = mesh.coords[0][1],
maxX = minX,
maxY = minY;
+
for (var i = 1, ii = mesh.coords.length; i < ii; i++) {
var x = mesh.coords[i][0],
y = mesh.coords[i][1];
@@ -41323,42 +48195,52 @@ Shadings.Mesh = function MeshClosure() {
maxX = maxX < x ? x : maxX;
maxY = maxY < y ? y : maxY;
}
+
mesh.bounds = [minX, minY, maxX, maxY];
}
+
function packData(mesh) {
var i, ii, j, jj;
var coords = mesh.coords;
var coordsPacked = new Float32Array(coords.length * 2);
+
for (i = 0, j = 0, ii = coords.length; i < ii; i++) {
var xy = coords[i];
coordsPacked[j++] = xy[0];
coordsPacked[j++] = xy[1];
}
+
mesh.coords = coordsPacked;
var colors = mesh.colors;
var colorsPacked = new Uint8Array(colors.length * 3);
+
for (i = 0, j = 0, ii = colors.length; i < ii; i++) {
var c = colors[i];
colorsPacked[j++] = c[0];
colorsPacked[j++] = c[1];
colorsPacked[j++] = c[2];
}
+
mesh.colors = colorsPacked;
var figures = mesh.figures;
+
for (i = 0, ii = figures.length; i < ii; i++) {
var figure = figures[i],
ps = figure.coords,
cs = figure.colors;
+
for (j = 0, jj = ps.length; j < jj; j++) {
ps[j] *= 2;
cs[j] *= 3;
}
}
}
+
function Mesh(stream, matrix, xref, res, pdfFunctionFactory) {
if (!(0, _primitives.isStream)(stream)) {
throw new _util.FormatError('Mesh data is not a stream');
}
+
var dict = stream.dict;
this.matrix = matrix;
this.shadingType = dict.get('ShadingType');
@@ -41384,38 +48266,49 @@ Shadings.Mesh = function MeshClosure() {
};
var reader = new MeshStreamReader(stream, decodeContext);
var patchMesh = false;
+
switch (this.shadingType) {
case ShadingType.FREE_FORM_MESH:
decodeType4Shading(this, reader);
break;
+
case ShadingType.LATTICE_FORM_MESH:
var verticesPerRow = dict.get('VerticesPerRow') | 0;
+
if (verticesPerRow < 2) {
throw new _util.FormatError('Invalid VerticesPerRow');
}
+
decodeType5Shading(this, reader, verticesPerRow);
break;
+
case ShadingType.COONS_PATCH_MESH:
decodeType6Shading(this, reader);
patchMesh = true;
break;
+
case ShadingType.TENSOR_PATCH_MESH:
decodeType7Shading(this, reader);
patchMesh = true;
break;
+
default:
(0, _util.unreachable)('Unsupported mesh type.');
break;
}
+
if (patchMesh) {
updateBounds(this);
+
for (var i = 0, ii = this.figures.length; i < ii; i++) {
buildFigureFromPatch(this, i);
}
}
+
updateBounds(this);
packData(this);
}
+
Mesh.prototype = {
getIR: function Mesh_getIR() {
return ['Mesh', this.shadingType, this.coords, this.colors, this.figures, this.bounds, this.matrix, this.bbox, this.background];
@@ -41423,10 +48316,12 @@ Shadings.Mesh = function MeshClosure() {
};
return Mesh;
}();
+
Shadings.Dummy = function DummyClosure() {
function Dummy() {
this.type = 'Pattern';
}
+
Dummy.prototype = {
getIR: function Dummy_getIR() {
return ['Dummy'];
@@ -41434,20 +48329,23 @@ Shadings.Dummy = function DummyClosure() {
};
return Dummy;
}();
+
function getTilingPatternIR(operatorList, dict, args) {
var matrix = dict.getArray('Matrix');
+
var bbox = _util.Util.normalizeRect(dict.getArray('BBox'));
+
var xstep = dict.get('XStep');
var ystep = dict.get('YStep');
var paintType = dict.get('PaintType');
var tilingType = dict.get('TilingType');
+
if (bbox[2] - bbox[0] === 0 || bbox[3] - bbox[1] === 0) {
- throw new _util.FormatError('Invalid getTilingPatternIR /BBox array: [' + bbox + '].');
+ throw new _util.FormatError("Invalid getTilingPatternIR /BBox array: [".concat(bbox, "]."));
}
+
return ['TilingPattern', args, operatorList, matrix, bbox, xstep, ystep, paintType, tilingType];
}
-exports.Pattern = Pattern;
-exports.getTilingPatternIR = getTilingPatternIR;
/***/ }),
/* 170 */
@@ -41459,31 +48357,37 @@ exports.getTilingPatternIR = getTilingPatternIR;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.bidi = undefined;
+exports.bidi = bidi;
var _util = __w_pdfjs_require__(2);
var baseTypes = ['BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'S', 'B', 'S', 'WS', 'B', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'B', 'B', 'B', 'S', 'WS', 'ON', 'ON', 'ET', 'ET', 'ET', 'ON', 'ON', 'ON', 'ON', 'ON', 'ES', 'CS', 'ES', 'CS', 'CS', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'CS', 'ON', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'ON', 'ON', 'ON', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'B', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'CS', 'ON', 'ET', 'ET', 'ET', 'ET', 'ON', 'ON', 'ON', 'ON', 'L', 'ON', 'ON', 'BN', 'ON', 'ON', 'ET', 'ET', 'EN', 'EN', 'ON', 'L', 'ON', 'ON', 'ON', 'EN', 'L', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L'];
var arabicTypes = ['AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'ON', 'ON', 'AL', 'ET', 'ET', 'AL', 'CS', 'AL', 'ON', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', '', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'ET', 'AN', 'AN', 'AL', 'AL', 'AL', 'NSM', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AN', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'NSM', 'NSM', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL'];
+
function isOdd(i) {
return (i & 1) !== 0;
}
+
function isEven(i) {
return (i & 1) === 0;
}
+
function findUnequal(arr, start, value) {
for (var j = start, jj = arr.length; j < jj; ++j) {
if (arr[j] !== value) {
return j;
}
}
+
return j;
}
+
function setValues(arr, start, end, value) {
for (var j = start; j < end; ++j) {
arr[j] = value;
}
}
+
function reverseValues(arr, start, end) {
for (var i = start, j = end - 1; i < j; ++i, --j) {
var temp = arr[i];
@@ -41491,49 +48395,61 @@ function reverseValues(arr, start, end) {
arr[j] = temp;
}
}
+
function createBidiText(str, isLTR, vertical) {
return {
str: str,
dir: vertical ? 'ttb' : isLTR ? 'ltr' : 'rtl'
};
}
+
var chars = [];
var types = [];
+
function bidi(str, startLevel, vertical) {
var isLTR = true;
var strLength = str.length;
+
if (strLength === 0 || vertical) {
return createBidiText(str, isLTR, vertical);
}
+
chars.length = strLength;
types.length = strLength;
var numBidi = 0;
var i, ii;
+
for (i = 0; i < strLength; ++i) {
chars[i] = str.charAt(i);
var charCode = str.charCodeAt(i);
var charType = 'L';
+
if (charCode <= 0x00ff) {
charType = baseTypes[charCode];
} else if (0x0590 <= charCode && charCode <= 0x05f4) {
charType = 'R';
} else if (0x0600 <= charCode && charCode <= 0x06ff) {
charType = arabicTypes[charCode & 0xff];
+
if (!charType) {
(0, _util.warn)('Bidi: invalid Unicode character ' + charCode.toString(16));
}
} else if (0x0700 <= charCode && charCode <= 0x08AC) {
charType = 'AL';
}
+
if (charType === 'R' || charType === 'AL' || charType === 'AN') {
numBidi++;
}
+
types[i] = charType;
}
+
if (numBidi === 0) {
isLTR = true;
return createBidiText(str, isLTR);
}
+
if (startLevel === -1) {
if (numBidi / strLength < 0.3) {
isLTR = true;
@@ -41543,14 +48459,18 @@ function bidi(str, startLevel, vertical) {
startLevel = 1;
}
}
+
var levels = [];
+
for (i = 0; i < strLength; ++i) {
levels[i] = startLevel;
}
+
var e = isOdd(startLevel) ? 'R' : 'L';
var sor = e;
var eor = sor;
var lastType = sor;
+
for (i = 0; i < strLength; ++i) {
if (types[i] === 'NSM') {
types[i] = lastType;
@@ -41558,92 +48478,120 @@ function bidi(str, startLevel, vertical) {
lastType = types[i];
}
}
+
lastType = sor;
var t;
+
for (i = 0; i < strLength; ++i) {
t = types[i];
+
if (t === 'EN') {
types[i] = lastType === 'AL' ? 'AN' : 'EN';
} else if (t === 'R' || t === 'L' || t === 'AL') {
lastType = t;
}
}
+
for (i = 0; i < strLength; ++i) {
t = types[i];
+
if (t === 'AL') {
types[i] = 'R';
}
}
+
for (i = 1; i < strLength - 1; ++i) {
if (types[i] === 'ES' && types[i - 1] === 'EN' && types[i + 1] === 'EN') {
types[i] = 'EN';
}
+
if (types[i] === 'CS' && (types[i - 1] === 'EN' || types[i - 1] === 'AN') && types[i + 1] === types[i - 1]) {
types[i] = types[i - 1];
}
}
+
for (i = 0; i < strLength; ++i) {
if (types[i] === 'EN') {
var j;
+
for (j = i - 1; j >= 0; --j) {
if (types[j] !== 'ET') {
break;
}
+
types[j] = 'EN';
}
+
for (j = i + 1; j < strLength; ++j) {
if (types[j] !== 'ET') {
break;
}
+
types[j] = 'EN';
}
}
}
+
for (i = 0; i < strLength; ++i) {
t = types[i];
+
if (t === 'WS' || t === 'ES' || t === 'ET' || t === 'CS') {
types[i] = 'ON';
}
}
+
lastType = sor;
+
for (i = 0; i < strLength; ++i) {
t = types[i];
+
if (t === 'EN') {
types[i] = lastType === 'L' ? 'L' : 'EN';
} else if (t === 'R' || t === 'L') {
lastType = t;
}
}
+
for (i = 0; i < strLength; ++i) {
if (types[i] === 'ON') {
var end = findUnequal(types, i + 1, 'ON');
var before = sor;
+
if (i > 0) {
before = types[i - 1];
}
+
var after = eor;
+
if (end + 1 < strLength) {
after = types[end + 1];
}
+
if (before !== 'L') {
before = 'R';
}
+
if (after !== 'L') {
after = 'R';
}
+
if (before === after) {
setValues(types, i, end, before);
}
+
i = end - 1;
}
}
+
for (i = 0; i < strLength; ++i) {
if (types[i] === 'ON') {
types[i] = e;
}
}
+
for (i = 0; i < strLength; ++i) {
t = types[i];
+
if (isEven(levels[i])) {
if (t === 'R') {
levels[i] += 1;
@@ -41656,20 +48604,26 @@ function bidi(str, startLevel, vertical) {
}
}
}
+
var highestLevel = -1;
var lowestOddLevel = 99;
var level;
+
for (i = 0, ii = levels.length; i < ii; ++i) {
level = levels[i];
+
if (highestLevel < level) {
highestLevel = level;
}
+
if (lowestOddLevel > level && isOdd(level)) {
lowestOddLevel = level;
}
}
+
for (level = highestLevel; level >= lowestOddLevel; --level) {
var start = -1;
+
for (i = 0, ii = levels.length; i < ii; ++i) {
if (levels[i] < level) {
if (start >= 0) {
@@ -41680,19 +48634,22 @@ function bidi(str, startLevel, vertical) {
start = i;
}
}
+
if (start >= 0) {
reverseValues(chars, start, levels.length);
}
}
+
for (i = 0, ii = chars.length; i < ii; ++i) {
var ch = chars[i];
+
if (ch === '<' || ch === '>') {
chars[i] = '';
}
}
+
return createBidiText(chars.join(''), isLTR);
}
-exports.bidi = bidi;
/***/ }),
/* 171 */
@@ -41704,7 +48661,7 @@ exports.bidi = bidi;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.getMetrics = undefined;
+exports.getMetrics = void 0;
var _util = __w_pdfjs_require__(2);
@@ -44658,11 +51615,8 @@ exports.getMetrics = getMetrics;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PostScriptCompiler = exports.PostScriptEvaluator = exports.PDFFunctionFactory = exports.isPDFFunction = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.isPDFFunction = isPDFFunction;
+exports.PostScriptCompiler = exports.PostScriptEvaluator = exports.PDFFunctionFactory = void 0;
var _util = __w_pdfjs_require__(2);
@@ -44670,19 +51624,28 @@ var _primitives = __w_pdfjs_require__(142);
var _ps_parser = __w_pdfjs_require__(173);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var IsEvalSupportedCached = {
get value() {
return (0, _util.shadow)(this, 'value', (0, _util.isEvalSupported)());
}
+
};
-var PDFFunctionFactory = function () {
+var PDFFunctionFactory =
+/*#__PURE__*/
+function () {
function PDFFunctionFactory(_ref) {
var xref = _ref.xref,
_ref$isEvalSupported = _ref.isEvalSupported,
- isEvalSupported = _ref$isEvalSupported === undefined ? true : _ref$isEvalSupported;
+ isEvalSupported = _ref$isEvalSupported === void 0 ? true : _ref$isEvalSupported;
_classCallCheck(this, PDFFunctionFactory);
@@ -44691,7 +51654,7 @@ var PDFFunctionFactory = function () {
}
_createClass(PDFFunctionFactory, [{
- key: 'create',
+ key: "create",
value: function create(fn) {
return PDFFunction.parse({
xref: this.xref,
@@ -44700,7 +51663,7 @@ var PDFFunctionFactory = function () {
});
}
}, {
- key: 'createFromArray',
+ key: "createFromArray",
value: function createFromArray(fnObj) {
return PDFFunction.parseArray({
xref: this.xref,
@@ -44713,22 +51676,30 @@ var PDFFunctionFactory = function () {
return PDFFunctionFactory;
}();
+exports.PDFFunctionFactory = PDFFunctionFactory;
+
function toNumberArray(arr) {
if (!Array.isArray(arr)) {
return null;
}
+
var length = arr.length;
+
for (var i = 0; i < length; i++) {
if (typeof arr[i] !== 'number') {
var result = new Array(length);
+
for (var _i = 0; _i < length; _i++) {
result[_i] = +arr[_i];
}
+
return result;
}
}
+
return arr;
}
+
var PDFFunction = function PDFFunctionClosure() {
var CONSTRUCT_SAMPLED = 0;
var CONSTRUCT_INTERPOLATED = 2;
@@ -44738,9 +51709,11 @@ var PDFFunction = function PDFFunctionClosure() {
getSampleArray: function getSampleArray(size, outputSize, bps, stream) {
var i, ii;
var length = 1;
+
for (i = 0, ii = size.length; i < ii; i++) {
length *= size[i];
}
+
length *= outputSize;
var array = new Array(length);
var codeSize = 0;
@@ -44748,33 +51721,39 @@ var PDFFunction = function PDFFunctionClosure() {
var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
var strBytes = stream.getBytes((length * bps + 7) / 8);
var strIdx = 0;
+
for (i = 0; i < length; i++) {
while (codeSize < bps) {
codeBuf <<= 8;
codeBuf |= strBytes[strIdx++];
codeSize += 8;
}
+
codeSize -= bps;
array[i] = (codeBuf >> codeSize) * sampleMul;
codeBuf &= (1 << codeSize) - 1;
}
+
return array;
},
getIR: function getIR(_ref2) {
var xref = _ref2.xref,
isEvalSupported = _ref2.isEvalSupported,
fn = _ref2.fn;
-
var dict = fn.dict;
+
if (!dict) {
dict = fn;
}
+
var types = [this.constructSampled, null, this.constructInterpolated, this.constructStiched, this.constructPostScript];
var typeNum = dict.get('FunctionType');
var typeFn = types[typeNum];
+
if (!typeFn) {
throw new _util.FormatError('Unknown type of function');
}
+
return typeFn.call(this, {
xref: xref,
isEvalSupported: isEvalSupported,
@@ -44786,8 +51765,8 @@ var PDFFunction = function PDFFunctionClosure() {
var xref = _ref3.xref,
isEvalSupported = _ref3.isEvalSupported,
IR = _ref3.IR;
-
var type = IR[0];
+
switch (type) {
case CONSTRUCT_SAMPLED:
return this.constructSampledFromIR({
@@ -44795,18 +51774,21 @@ var PDFFunction = function PDFFunctionClosure() {
isEvalSupported: isEvalSupported,
IR: IR
});
+
case CONSTRUCT_INTERPOLATED:
return this.constructInterpolatedFromIR({
xref: xref,
isEvalSupported: isEvalSupported,
IR: IR
});
+
case CONSTRUCT_STICHED:
return this.constructStichedFromIR({
xref: xref,
isEvalSupported: isEvalSupported,
IR: IR
});
+
default:
return this.constructPostScriptFromIR({
xref: xref,
@@ -44819,7 +51801,6 @@ var PDFFunction = function PDFFunctionClosure() {
var xref = _ref4.xref,
isEvalSupported = _ref4.isEvalSupported,
fn = _ref4.fn;
-
var IR = this.getIR({
xref: xref,
isEvalSupported: isEvalSupported,
@@ -44843,7 +51824,9 @@ var PDFFunction = function PDFFunctionClosure() {
fn: fnObj
});
}
+
var fnArray = [];
+
for (var j = 0, jj = fnObj.length; j < jj; j++) {
fnArray.push(this.parse({
xref: xref,
@@ -44851,6 +51834,7 @@ var PDFFunction = function PDFFunctionClosure() {
fn: xref.fetchIfRef(fnObj[j])
}));
}
+
return function (src, srcOffset, dest, destOffset) {
for (var i = 0, ii = fnArray.length; i < ii; i++) {
fnArray[i](src, srcOffset, dest, destOffset + i);
@@ -44867,17 +51851,22 @@ var PDFFunction = function PDFFunctionClosure() {
var inputLength = arr.length;
var out = [];
var index = 0;
+
for (var i = 0; i < inputLength; i += 2) {
out[index] = [arr[i], arr[i + 1]];
++index;
}
+
return out;
}
+
var domain = toNumberArray(dict.getArray('Domain'));
var range = toNumberArray(dict.getArray('Range'));
+
if (!domain || !range) {
throw new _util.FormatError('No domain or range');
}
+
var inputSize = domain.length / 2;
var outputSize = range.length / 2;
domain = toMultiArray(domain);
@@ -44885,24 +51874,31 @@ var PDFFunction = function PDFFunctionClosure() {
var size = toNumberArray(dict.getArray('Size'));
var bps = dict.get('BitsPerSample');
var order = dict.get('Order') || 1;
+
if (order !== 1) {
(0, _util.info)('No support for cubic spline interpolation: ' + order);
}
+
var encode = toNumberArray(dict.getArray('Encode'));
+
if (!encode) {
encode = [];
+
for (var i = 0; i < inputSize; ++i) {
encode.push([0, size[i] - 1]);
}
} else {
encode = toMultiArray(encode);
}
+
var decode = toNumberArray(dict.getArray('Decode'));
+
if (!decode) {
decode = range;
} else {
decode = toMultiArray(decode);
}
+
var samples = this.getSampleArray(size, outputSize, bps, fn);
return [CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size, outputSize, Math.pow(2, bps) - 1, range];
},
@@ -44914,6 +51910,7 @@ var PDFFunction = function PDFFunctionClosure() {
function interpolate(x, xmin, xmax, ymin, ymax) {
return ymin + (x - xmin) * ((ymax - ymin) / (xmax - xmin));
}
+
return function constructSampledFromIRResult(src, srcOffset, dest, destOffset) {
var m = IR[1];
var domain = IR[2];
@@ -44927,11 +51924,14 @@ var PDFFunction = function PDFFunctionClosure() {
var cubeN = new Float64Array(cubeVertices);
var cubeVertex = new Uint32Array(cubeVertices);
var i, j;
+
for (j = 0; j < cubeVertices; j++) {
cubeN[j] = 1;
}
+
var k = n,
pos = 1;
+
for (i = 0; i < m; ++i) {
var domain_2i = domain[i][0];
var domain_2i_1 = domain[i][1];
@@ -44944,6 +51944,7 @@ var PDFFunction = function PDFFunctionClosure() {
var n1 = e - e0;
var offset0 = e0 * k;
var offset1 = offset0 + k;
+
for (j = 0; j < cubeVertices; j++) {
if (j & pos) {
cubeN[j] *= n1;
@@ -44953,14 +51954,18 @@ var PDFFunction = function PDFFunctionClosure() {
cubeVertex[j] += offset0;
}
}
+
k *= size_i;
pos <<= 1;
}
+
for (j = 0; j < n; ++j) {
var rj = 0;
+
for (i = 0; i < cubeVertices; i++) {
rj += samples[cubeVertex[i] + j] * cubeN[i];
}
+
rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
dest[destOffset + j] = Math.min(Math.max(rj, range[j][0]), range[j][1]);
}
@@ -44971,28 +51976,29 @@ var PDFFunction = function PDFFunctionClosure() {
isEvalSupported = _ref8.isEvalSupported,
fn = _ref8.fn,
dict = _ref8.dict;
-
var c0 = toNumberArray(dict.getArray('C0')) || [0];
var c1 = toNumberArray(dict.getArray('C1')) || [1];
var n = dict.get('N');
var length = c0.length;
var diff = [];
+
for (var i = 0; i < length; ++i) {
diff.push(c1[i] - c0[i]);
}
+
return [CONSTRUCT_INTERPOLATED, c0, diff, n];
},
constructInterpolatedFromIR: function constructInterpolatedFromIR(_ref9) {
var xref = _ref9.xref,
isEvalSupported = _ref9.isEvalSupported,
IR = _ref9.IR;
-
var c0 = IR[1];
var diff = IR[2];
var n = IR[3];
var length = diff.length;
return function constructInterpolatedFromIRResult(src, srcOffset, dest, destOffset) {
var x = n === 1 ? src[srcOffset] : Math.pow(src[srcOffset], n);
+
for (var j = 0; j < length; ++j) {
dest[destOffset + j] = c0[j] + x * diff[j];
}
@@ -45003,17 +52009,21 @@ var PDFFunction = function PDFFunctionClosure() {
isEvalSupported = _ref10.isEvalSupported,
fn = _ref10.fn,
dict = _ref10.dict;
-
var domain = toNumberArray(dict.getArray('Domain'));
+
if (!domain) {
throw new _util.FormatError('No domain');
}
+
var inputSize = domain.length / 2;
+
if (inputSize !== 1) {
throw new _util.FormatError('Bad domain for stiched function');
}
+
var fnRefs = dict.get('Functions');
var fns = [];
+
for (var i = 0, ii = fnRefs.length; i < ii; ++i) {
fns.push(this.parse({
xref: xref,
@@ -45021,6 +52031,7 @@ var PDFFunction = function PDFFunctionClosure() {
fn: xref.fetchIfRef(fnRefs[i])
}));
}
+
var bounds = toNumberArray(dict.getArray('Bounds'));
var encode = toNumberArray(dict.getArray('Encode'));
return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
@@ -45029,7 +52040,6 @@ var PDFFunction = function PDFFunctionClosure() {
var xref = _ref11.xref,
isEvalSupported = _ref11.isEvalSupported,
IR = _ref11.IR;
-
var domain = IR[1];
var bounds = IR[2];
var encode = IR[3];
@@ -45042,22 +52052,30 @@ var PDFFunction = function PDFFunctionClosure() {
} else if (v < min) {
v = min;
}
+
return v;
};
+
var v = clip(src[srcOffset], domain[0], domain[1]);
+
for (var i = 0, ii = bounds.length; i < ii; ++i) {
if (v < bounds[i]) {
break;
}
}
+
var dmin = domain[0];
+
if (i > 0) {
dmin = bounds[i - 1];
}
+
var dmax = domain[1];
+
if (i < bounds.length) {
dmax = bounds[i];
}
+
var rmin = encode[2 * i];
var rmax = encode[2 * i + 1];
tmpBuf[0] = dmin === dmax ? rmin : rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
@@ -45069,15 +52087,17 @@ var PDFFunction = function PDFFunctionClosure() {
isEvalSupported = _ref12.isEvalSupported,
fn = _ref12.fn,
dict = _ref12.dict;
-
var domain = toNumberArray(dict.getArray('Domain'));
var range = toNumberArray(dict.getArray('Range'));
+
if (!domain) {
throw new _util.FormatError('No domain.');
}
+
if (!range) {
throw new _util.FormatError('No range.');
}
+
var lexer = new _ps_parser.PostScriptLexer(fn);
var parser = new _ps_parser.PostScriptParser(lexer);
var code = parser.parse();
@@ -45087,16 +52107,18 @@ var PDFFunction = function PDFFunctionClosure() {
var xref = _ref13.xref,
isEvalSupported = _ref13.isEvalSupported,
IR = _ref13.IR;
-
var domain = IR[1];
var range = IR[2];
var code = IR[3];
+
if (isEvalSupported && IsEvalSupportedCached.value) {
var compiled = new PostScriptCompiler().compile(code, domain, range);
+
if (compiled) {
return new Function('src', 'srcOffset', 'dest', 'destOffset', compiled);
}
}
+
(0, _util.info)('Unable to compile PS function');
var numOutputs = range.length >> 1;
var numInputs = domain.length >> 1;
@@ -45109,44 +52131,56 @@ var PDFFunction = function PDFFunctionClosure() {
var i, value;
var key = '';
var input = tmpBuf;
+
for (i = 0; i < numInputs; i++) {
value = src[srcOffset + i];
input[i] = value;
key += value + '_';
}
+
var cachedValue = cache[key];
+
if (cachedValue !== undefined) {
dest.set(cachedValue, destOffset);
return;
}
+
var output = new Float32Array(numOutputs);
var stack = evaluator.execute(input);
var stackIndex = stack.length - numOutputs;
+
for (i = 0; i < numOutputs; i++) {
value = stack[stackIndex + i];
var bound = range[i * 2];
+
if (value < bound) {
value = bound;
} else {
bound = range[i * 2 + 1];
+
if (value > bound) {
value = bound;
}
}
+
output[i] = value;
}
+
if (cache_available > 0) {
cache_available--;
cache[key] = output;
}
+
dest.set(output, destOffset);
};
}
};
}();
+
function isPDFFunction(v) {
var fnDict;
- if ((typeof v === 'undefined' ? 'undefined' : _typeof(v)) !== 'object') {
+
+ if (_typeof(v) !== 'object') {
return false;
} else if ((0, _primitives.isDict)(v)) {
fnDict = v;
@@ -45155,31 +52189,39 @@ function isPDFFunction(v) {
} else {
return false;
}
+
return fnDict.has('FunctionType');
}
+
var PostScriptStack = function PostScriptStackClosure() {
var MAX_STACK_SIZE = 100;
+
function PostScriptStack(initialStack) {
this.stack = !initialStack ? [] : Array.prototype.slice.call(initialStack, 0);
}
+
PostScriptStack.prototype = {
push: function PostScriptStack_push(value) {
if (this.stack.length >= MAX_STACK_SIZE) {
throw new Error('PostScript function stack overflow.');
}
+
this.stack.push(value);
},
pop: function PostScriptStack_pop() {
if (this.stack.length <= 0) {
throw new Error('PostScript function stack underflow.');
}
+
return this.stack.pop();
},
copy: function PostScriptStack_copy(n) {
if (this.stack.length + n >= MAX_STACK_SIZE) {
throw new Error('PostScript function stack overflow.');
}
+
var stack = this.stack;
+
for (var i = stack.length - n, j = n - 1; j >= 0; j--, i++) {
stack.push(stack[i]);
}
@@ -45195,16 +52237,19 @@ var PostScriptStack = function PostScriptStackClosure() {
i,
j,
t;
+
for (i = l, j = r; i < j; i++, j--) {
t = stack[i];
stack[i] = stack[j];
stack[j] = t;
}
+
for (i = l, j = c - 1; i < j; i++, j--) {
t = stack[i];
stack[i] = stack[j];
stack[j] = t;
}
+
for (i = c, j = r; i < j; i++, j--) {
t = stack[i];
stack[i] = stack[j];
@@ -45214,10 +52259,12 @@ var PostScriptStack = function PostScriptStackClosure() {
};
return PostScriptStack;
}();
+
var PostScriptEvaluator = function PostScriptEvaluatorClosure() {
function PostScriptEvaluator(operators) {
this.operators = operators;
}
+
PostScriptEvaluator.prototype = {
execute: function PostScriptEvaluator_execute(initialStack) {
var stack = new PostScriptStack(initialStack);
@@ -45225,252 +52272,321 @@ var PostScriptEvaluator = function PostScriptEvaluatorClosure() {
var operators = this.operators;
var length = operators.length;
var operator, a, b;
+
while (counter < length) {
operator = operators[counter++];
+
if (typeof operator === 'number') {
stack.push(operator);
continue;
}
+
switch (operator) {
case 'jz':
b = stack.pop();
a = stack.pop();
+
if (!a) {
counter = b;
}
+
break;
+
case 'j':
a = stack.pop();
counter = a;
break;
+
case 'abs':
a = stack.pop();
stack.push(Math.abs(a));
break;
+
case 'add':
b = stack.pop();
a = stack.pop();
stack.push(a + b);
break;
+
case 'and':
b = stack.pop();
a = stack.pop();
+
if ((0, _util.isBool)(a) && (0, _util.isBool)(b)) {
stack.push(a && b);
} else {
stack.push(a & b);
}
+
break;
+
case 'atan':
a = stack.pop();
stack.push(Math.atan(a));
break;
+
case 'bitshift':
b = stack.pop();
a = stack.pop();
+
if (a > 0) {
stack.push(a << b);
} else {
stack.push(a >> b);
}
+
break;
+
case 'ceiling':
a = stack.pop();
stack.push(Math.ceil(a));
break;
+
case 'copy':
a = stack.pop();
stack.copy(a);
break;
+
case 'cos':
a = stack.pop();
stack.push(Math.cos(a));
break;
+
case 'cvi':
a = stack.pop() | 0;
stack.push(a);
break;
+
case 'cvr':
break;
+
case 'div':
b = stack.pop();
a = stack.pop();
stack.push(a / b);
break;
+
case 'dup':
stack.copy(1);
break;
+
case 'eq':
b = stack.pop();
a = stack.pop();
stack.push(a === b);
break;
+
case 'exch':
stack.roll(2, 1);
break;
+
case 'exp':
b = stack.pop();
a = stack.pop();
stack.push(Math.pow(a, b));
break;
+
case 'false':
stack.push(false);
break;
+
case 'floor':
a = stack.pop();
stack.push(Math.floor(a));
break;
+
case 'ge':
b = stack.pop();
a = stack.pop();
stack.push(a >= b);
break;
+
case 'gt':
b = stack.pop();
a = stack.pop();
stack.push(a > b);
break;
+
case 'idiv':
b = stack.pop();
a = stack.pop();
stack.push(a / b | 0);
break;
+
case 'index':
a = stack.pop();
stack.index(a);
break;
+
case 'le':
b = stack.pop();
a = stack.pop();
stack.push(a <= b);
break;
+
case 'ln':
a = stack.pop();
stack.push(Math.log(a));
break;
+
case 'log':
a = stack.pop();
stack.push(Math.log(a) / Math.LN10);
break;
+
case 'lt':
b = stack.pop();
a = stack.pop();
stack.push(a < b);
break;
+
case 'mod':
b = stack.pop();
a = stack.pop();
stack.push(a % b);
break;
+
case 'mul':
b = stack.pop();
a = stack.pop();
stack.push(a * b);
break;
+
case 'ne':
b = stack.pop();
a = stack.pop();
stack.push(a !== b);
break;
+
case 'neg':
a = stack.pop();
stack.push(-a);
break;
+
case 'not':
a = stack.pop();
+
if ((0, _util.isBool)(a)) {
stack.push(!a);
} else {
stack.push(~a);
}
+
break;
+
case 'or':
b = stack.pop();
a = stack.pop();
+
if ((0, _util.isBool)(a) && (0, _util.isBool)(b)) {
stack.push(a || b);
} else {
stack.push(a | b);
}
+
break;
+
case 'pop':
stack.pop();
break;
+
case 'roll':
b = stack.pop();
a = stack.pop();
stack.roll(a, b);
break;
+
case 'round':
a = stack.pop();
stack.push(Math.round(a));
break;
+
case 'sin':
a = stack.pop();
stack.push(Math.sin(a));
break;
+
case 'sqrt':
a = stack.pop();
stack.push(Math.sqrt(a));
break;
+
case 'sub':
b = stack.pop();
a = stack.pop();
stack.push(a - b);
break;
+
case 'true':
stack.push(true);
break;
+
case 'truncate':
a = stack.pop();
a = a < 0 ? Math.ceil(a) : Math.floor(a);
stack.push(a);
break;
+
case 'xor':
b = stack.pop();
a = stack.pop();
+
if ((0, _util.isBool)(a) && (0, _util.isBool)(b)) {
stack.push(a !== b);
} else {
stack.push(a ^ b);
}
+
break;
+
default:
- throw new _util.FormatError('Unknown operator ' + operator);
+ throw new _util.FormatError("Unknown operator ".concat(operator));
}
}
+
return stack.stack;
}
};
return PostScriptEvaluator;
}();
+
+exports.PostScriptEvaluator = PostScriptEvaluator;
+
var PostScriptCompiler = function PostScriptCompilerClosure() {
function AstNode(type) {
this.type = type;
}
+
AstNode.prototype.visit = function (visitor) {
(0, _util.unreachable)('abstract method');
};
+
function AstArgument(index, min, max) {
AstNode.call(this, 'args');
this.index = index;
this.min = min;
this.max = max;
}
+
AstArgument.prototype = Object.create(AstNode.prototype);
+
AstArgument.prototype.visit = function (visitor) {
visitor.visitArgument(this);
};
+
function AstLiteral(number) {
AstNode.call(this, 'literal');
this.number = number;
this.min = number;
this.max = number;
}
+
AstLiteral.prototype = Object.create(AstNode.prototype);
+
AstLiteral.prototype.visit = function (visitor) {
visitor.visitLiteral(this);
};
+
function AstBinaryOperation(op, arg1, arg2, min, max) {
AstNode.call(this, 'binary');
this.op = op;
@@ -45479,42 +52595,55 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
this.min = min;
this.max = max;
}
+
AstBinaryOperation.prototype = Object.create(AstNode.prototype);
+
AstBinaryOperation.prototype.visit = function (visitor) {
visitor.visitBinaryOperation(this);
};
+
function AstMin(arg, max) {
AstNode.call(this, 'max');
this.arg = arg;
this.min = arg.min;
this.max = max;
}
+
AstMin.prototype = Object.create(AstNode.prototype);
+
AstMin.prototype.visit = function (visitor) {
visitor.visitMin(this);
};
+
function AstVariable(index, min, max) {
AstNode.call(this, 'var');
this.index = index;
this.min = min;
this.max = max;
}
+
AstVariable.prototype = Object.create(AstNode.prototype);
+
AstVariable.prototype.visit = function (visitor) {
visitor.visitVariable(this);
};
+
function AstVariableDefinition(variable, arg) {
AstNode.call(this, 'definition');
this.variable = variable;
this.arg = arg;
}
+
AstVariableDefinition.prototype = Object.create(AstNode.prototype);
+
AstVariableDefinition.prototype.visit = function (visitor) {
visitor.visitVariableDefinition(this);
};
+
function ExpressionBuilderVisitor() {
this.parts = [];
}
+
ExpressionBuilderVisitor.prototype = {
visitArgument: function visitArgument(arg) {
this.parts.push('Math.max(', arg.min, ', Math.min(', arg.max, ', src[srcOffset + ', arg.index, ']))');
@@ -45548,18 +52677,23 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
return this.parts.join('');
}
};
+
function buildAddOperation(num1, num2) {
if (num2.type === 'literal' && num2.number === 0) {
return num1;
}
+
if (num1.type === 'literal' && num1.number === 0) {
return num2;
}
+
if (num2.type === 'literal' && num1.type === 'literal') {
return new AstLiteral(num1.number + num2.number);
}
+
return new AstBinaryOperation('+', num1, num2, num1.min + num2.min, num1.max + num2.max);
}
+
function buildMulOperation(num1, num2) {
if (num2.type === 'literal') {
if (num2.number === 0) {
@@ -45570,6 +52704,7 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
return new AstLiteral(num1.number * num2.number);
}
}
+
if (num1.type === 'literal') {
if (num1.number === 0) {
return new AstLiteral(0);
@@ -45577,10 +52712,12 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
return num2;
}
}
+
var min = Math.min(num1.min * num2.min, num1.min * num2.max, num1.max * num2.min, num1.max * num2.max);
var max = Math.max(num1.min * num2.min, num1.min * num2.max, num1.max * num2.min, num1.max * num2.max);
return new AstBinaryOperation('*', num1, num2, min, max);
}
+
function buildSubOperation(num1, num2) {
if (num2.type === 'literal') {
if (num2.number === 0) {
@@ -45589,20 +52726,26 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
return new AstLiteral(num1.number - num2.number);
}
}
+
if (num2.type === 'binary' && num2.op === '-' && num1.type === 'literal' && num1.number === 1 && num2.arg1.type === 'literal' && num2.arg1.number === 1) {
return num2.arg2;
}
+
return new AstBinaryOperation('-', num1, num2, num1.min - num2.max, num1.max - num2.min);
}
+
function buildMinOperation(num1, max) {
if (num1.min >= max) {
return new AstLiteral(max);
} else if (num1.max <= max) {
return num1;
}
+
return new AstMin(num1, max);
}
+
function PostScriptCompiler() {}
+
PostScriptCompiler.prototype = {
compile: function PostScriptCompiler_compile(code, domain, range) {
var stack = [];
@@ -45613,128 +52756,167 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
var lastRegister = 0;
var n, j;
var num1, num2, ast1, ast2, tmpVar, item;
+
for (i = 0; i < inputSize; i++) {
stack.push(new AstArgument(i, domain[i * 2], domain[i * 2 + 1]));
}
+
for (i = 0, ii = code.length; i < ii; i++) {
item = code[i];
+
if (typeof item === 'number') {
stack.push(new AstLiteral(item));
continue;
}
+
switch (item) {
case 'add':
if (stack.length < 2) {
return null;
}
+
num2 = stack.pop();
num1 = stack.pop();
stack.push(buildAddOperation(num1, num2));
break;
+
case 'cvr':
if (stack.length < 1) {
return null;
}
+
break;
+
case 'mul':
if (stack.length < 2) {
return null;
}
+
num2 = stack.pop();
num1 = stack.pop();
stack.push(buildMulOperation(num1, num2));
break;
+
case 'sub':
if (stack.length < 2) {
return null;
}
+
num2 = stack.pop();
num1 = stack.pop();
stack.push(buildSubOperation(num1, num2));
break;
+
case 'exch':
if (stack.length < 2) {
return null;
}
+
ast1 = stack.pop();
ast2 = stack.pop();
stack.push(ast1, ast2);
break;
+
case 'pop':
if (stack.length < 1) {
return null;
}
+
stack.pop();
break;
+
case 'index':
if (stack.length < 1) {
return null;
}
+
num1 = stack.pop();
+
if (num1.type !== 'literal') {
return null;
}
+
n = num1.number;
+
if (n < 0 || !Number.isInteger(n) || stack.length < n) {
return null;
}
+
ast1 = stack[stack.length - n - 1];
+
if (ast1.type === 'literal' || ast1.type === 'var') {
stack.push(ast1);
break;
}
+
tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
stack[stack.length - n - 1] = tmpVar;
stack.push(tmpVar);
instructions.push(new AstVariableDefinition(tmpVar, ast1));
break;
+
case 'dup':
if (stack.length < 1) {
return null;
}
+
if (typeof code[i + 1] === 'number' && code[i + 2] === 'gt' && code[i + 3] === i + 7 && code[i + 4] === 'jz' && code[i + 5] === 'pop' && code[i + 6] === code[i + 1]) {
num1 = stack.pop();
stack.push(buildMinOperation(num1, code[i + 1]));
i += 6;
break;
}
+
ast1 = stack[stack.length - 1];
+
if (ast1.type === 'literal' || ast1.type === 'var') {
stack.push(ast1);
break;
}
+
tmpVar = new AstVariable(lastRegister++, ast1.min, ast1.max);
stack[stack.length - 1] = tmpVar;
stack.push(tmpVar);
instructions.push(new AstVariableDefinition(tmpVar, ast1));
break;
+
case 'roll':
if (stack.length < 2) {
return null;
}
+
num2 = stack.pop();
num1 = stack.pop();
+
if (num2.type !== 'literal' || num1.type !== 'literal') {
return null;
}
+
j = num2.number;
n = num1.number;
+
if (n <= 0 || !Number.isInteger(n) || !Number.isInteger(j) || stack.length < n) {
return null;
}
+
j = (j % n + n) % n;
+
if (j === 0) {
break;
}
+
Array.prototype.push.apply(stack, stack.splice(stack.length - n, n - j));
break;
+
default:
return null;
}
}
+
if (stack.length !== outputSize) {
return null;
}
+
var result = [];
instructions.forEach(function (instruction) {
var statementBuilder = new ExpressionBuilderVisitor();
@@ -45747,14 +52929,17 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
var min = range[i * 2],
max = range[i * 2 + 1];
var out = [statementBuilder.toString()];
+
if (min > expr.min) {
out.unshift('Math.max(', min, ', ');
out.push(')');
}
+
if (max < expr.max) {
out.unshift('Math.min(', max, ', ');
out.push(')');
}
+
out.unshift('dest[destOffset + ', i, '] = ');
out.push(';');
result.push(out.join(''));
@@ -45764,9 +52949,7 @@ var PostScriptCompiler = function PostScriptCompilerClosure() {
};
return PostScriptCompiler;
}();
-exports.isPDFFunction = isPDFFunction;
-exports.PDFFunctionFactory = PDFFunctionFactory;
-exports.PostScriptEvaluator = PostScriptEvaluator;
+
exports.PostScriptCompiler = PostScriptCompiler;
/***/ }),
@@ -45779,45 +52962,67 @@ exports.PostScriptCompiler = PostScriptCompiler;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PostScriptParser = exports.PostScriptLexer = undefined;
+exports.PostScriptParser = exports.PostScriptLexer = void 0;
var _util = __w_pdfjs_require__(2);
var _primitives = __w_pdfjs_require__(142);
-var PostScriptParser = function PostScriptParserClosure() {
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var PostScriptParser =
+/*#__PURE__*/
+function () {
function PostScriptParser(lexer) {
+ _classCallCheck(this, PostScriptParser);
+
this.lexer = lexer;
this.operators = [];
this.token = null;
this.prev = null;
}
- PostScriptParser.prototype = {
- nextToken: function PostScriptParser_nextToken() {
+
+ _createClass(PostScriptParser, [{
+ key: "nextToken",
+ value: function nextToken() {
this.prev = this.token;
this.token = this.lexer.getToken();
- },
- accept: function PostScriptParser_accept(type) {
+ }
+ }, {
+ key: "accept",
+ value: function accept(type) {
if (this.token.type === type) {
this.nextToken();
return true;
}
+
return false;
- },
- expect: function PostScriptParser_expect(type) {
+ }
+ }, {
+ key: "expect",
+ value: function expect(type) {
if (this.accept(type)) {
return true;
}
- throw new _util.FormatError('Unexpected symbol: found ' + this.token.type + ' expected ' + type + '.');
- },
- parse: function PostScriptParser_parse() {
+
+ throw new _util.FormatError("Unexpected symbol: found ".concat(this.token.type, " expected ").concat(type, "."));
+ }
+ }, {
+ key: "parse",
+ value: function parse() {
this.nextToken();
this.expect(PostScriptTokenTypes.LBRACE);
this.parseBlock();
this.expect(PostScriptTokenTypes.RBRACE);
return this.operators;
- },
- parseBlock: function PostScriptParser_parseBlock() {
+ }
+ }, {
+ key: "parseBlock",
+ value: function parseBlock() {
while (true) {
if (this.accept(PostScriptTokenTypes.NUMBER)) {
this.operators.push(this.prev.value);
@@ -45829,12 +53034,15 @@ var PostScriptParser = function PostScriptParserClosure() {
return;
}
}
- },
- parseCondition: function PostScriptParser_parseCondition() {
+ }
+ }, {
+ key: "parseCondition",
+ value: function parseCondition() {
var conditionLocation = this.operators.length;
this.operators.push(null, null);
this.parseBlock();
this.expect(PostScriptTokenTypes.RBRACE);
+
if (this.accept(PostScriptTokenTypes.IF)) {
this.operators[conditionLocation] = this.operators.length;
this.operators[conditionLocation + 1] = 'jz';
@@ -45853,9 +53061,12 @@ var PostScriptParser = function PostScriptParserClosure() {
throw new _util.FormatError('PS Function: error parsing conditional.');
}
}
- };
+ }]);
+
return PostScriptParser;
}();
+
+exports.PostScriptParser = PostScriptParser;
var PostScriptTokenTypes = {
LBRACE: 0,
RBRACE: 1,
@@ -45864,42 +53075,86 @@ var PostScriptTokenTypes = {
IF: 4,
IFELSE: 5
};
+
var PostScriptToken = function PostScriptTokenClosure() {
- function PostScriptToken(type, value) {
- this.type = type;
- this.value = value;
- }
var opCache = Object.create(null);
- PostScriptToken.getOperator = function PostScriptToken_getOperator(op) {
- var opValue = opCache[op];
- if (opValue) {
- return opValue;
+
+ var PostScriptToken =
+ /*#__PURE__*/
+ function () {
+ function PostScriptToken(type, value) {
+ _classCallCheck(this, PostScriptToken);
+
+ this.type = type;
+ this.value = value;
}
- return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
- };
- PostScriptToken.LBRACE = new PostScriptToken(PostScriptTokenTypes.LBRACE, '{');
- PostScriptToken.RBRACE = new PostScriptToken(PostScriptTokenTypes.RBRACE, '}');
- PostScriptToken.IF = new PostScriptToken(PostScriptTokenTypes.IF, 'IF');
- PostScriptToken.IFELSE = new PostScriptToken(PostScriptTokenTypes.IFELSE, 'IFELSE');
+
+ _createClass(PostScriptToken, null, [{
+ key: "getOperator",
+ value: function getOperator(op) {
+ var opValue = opCache[op];
+
+ if (opValue) {
+ return opValue;
+ }
+
+ return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
+ }
+ }, {
+ key: "LBRACE",
+ get: function get() {
+ return (0, _util.shadow)(this, 'LBRACE', new PostScriptToken(PostScriptTokenTypes.LBRACE, '{'));
+ }
+ }, {
+ key: "RBRACE",
+ get: function get() {
+ return (0, _util.shadow)(this, 'RBRACE', new PostScriptToken(PostScriptTokenTypes.RBRACE, '}'));
+ }
+ }, {
+ key: "IF",
+ get: function get() {
+ return (0, _util.shadow)(this, 'IF', new PostScriptToken(PostScriptTokenTypes.IF, 'IF'));
+ }
+ }, {
+ key: "IFELSE",
+ get: function get() {
+ return (0, _util.shadow)(this, 'IFELSE', new PostScriptToken(PostScriptTokenTypes.IFELSE, 'IFELSE'));
+ }
+ }]);
+
+ return PostScriptToken;
+ }();
+
return PostScriptToken;
}();
-var PostScriptLexer = function PostScriptLexerClosure() {
+
+var PostScriptLexer =
+/*#__PURE__*/
+function () {
function PostScriptLexer(stream) {
+ _classCallCheck(this, PostScriptLexer);
+
this.stream = stream;
this.nextChar();
this.strBuf = [];
}
- PostScriptLexer.prototype = {
- nextChar: function PostScriptLexer_nextChar() {
+
+ _createClass(PostScriptLexer, [{
+ key: "nextChar",
+ value: function nextChar() {
return this.currentChar = this.stream.getByte();
- },
- getToken: function PostScriptLexer_getToken() {
+ }
+ }, {
+ key: "getToken",
+ value: function getToken() {
var comment = false;
var ch = this.currentChar;
+
while (true) {
if (ch < 0) {
return _primitives.EOF;
}
+
if (comment) {
if (ch === 0x0A || ch === 0x0D) {
comment = false;
@@ -45909,8 +53164,10 @@ var PostScriptLexer = function PostScriptLexerClosure() {
} else if (!(0, _util.isSpace)(ch)) {
break;
}
+
ch = this.nextChar();
}
+
switch (ch | 0) {
case 0x30:
case 0x31:
@@ -45926,34 +53183,45 @@ var PostScriptLexer = function PostScriptLexerClosure() {
case 0x2D:
case 0x2E:
return new PostScriptToken(PostScriptTokenTypes.NUMBER, this.getNumber());
+
case 0x7B:
this.nextChar();
return PostScriptToken.LBRACE;
+
case 0x7D:
this.nextChar();
return PostScriptToken.RBRACE;
}
+
var strBuf = this.strBuf;
strBuf.length = 0;
strBuf[0] = String.fromCharCode(ch);
+
while ((ch = this.nextChar()) >= 0 && (ch >= 0x41 && ch <= 0x5A || ch >= 0x61 && ch <= 0x7A)) {
strBuf.push(String.fromCharCode(ch));
}
+
var str = strBuf.join('');
+
switch (str.toLowerCase()) {
case 'if':
return PostScriptToken.IF;
+
case 'ifelse':
return PostScriptToken.IFELSE;
+
default:
return PostScriptToken.getOperator(str);
}
- },
- getNumber: function PostScriptLexer_getNumber() {
+ }
+ }, {
+ key: "getNumber",
+ value: function getNumber() {
var ch = this.currentChar;
var strBuf = this.strBuf;
strBuf.length = 0;
strBuf[0] = String.fromCharCode(ch);
+
while ((ch = this.nextChar()) >= 0) {
if (ch >= 0x30 && ch <= 0x39 || ch === 0x2D || ch === 0x2E) {
strBuf.push(String.fromCharCode(ch));
@@ -45961,17 +53229,21 @@ var PostScriptLexer = function PostScriptLexerClosure() {
break;
}
}
+
var value = parseFloat(strBuf.join(''));
+
if (isNaN(value)) {
- throw new _util.FormatError('Invalid floating point number: ' + value);
+ throw new _util.FormatError("Invalid floating point number: ".concat(value));
}
+
return value;
}
- };
+ }]);
+
return PostScriptLexer;
}();
+
exports.PostScriptLexer = PostScriptLexer;
-exports.PostScriptParser = PostScriptParser;
/***/ }),
/* 174 */
@@ -45983,27 +53255,31 @@ exports.PostScriptParser = PostScriptParser;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.MurmurHash3_64 = undefined;
+exports.MurmurHash3_64 = void 0;
var _util = __w_pdfjs_require__(2);
var MurmurHash3_64 = function MurmurHash3_64Closure(seed) {
var MASK_HIGH = 0xffff0000;
var MASK_LOW = 0xffff;
+
function MurmurHash3_64(seed) {
var SEED = 0xc3d2e1f0;
this.h1 = seed ? seed & 0xffffffff : SEED;
this.h2 = seed ? seed & 0xffffffff : SEED;
}
+
MurmurHash3_64.prototype = {
update: function MurmurHash3_64_update(input) {
- var data = void 0,
- length = void 0;
+ var data, length;
+
if ((0, _util.isString)(input)) {
data = new Uint8Array(input.length * 2);
length = 0;
+
for (var i = 0, ii = input.length; i < ii; i++) {
var code = input.charCodeAt(i);
+
if (code <= 0xff) {
data[length++] = code;
} else {
@@ -46017,6 +53293,7 @@ var MurmurHash3_64 = function MurmurHash3_64Closure(seed) {
} else {
throw new Error('Wrong data format in MurmurHash3_64_update. ' + 'Input must be a string or array.');
}
+
var blockCounts = length >> 2;
var tailLength = length - blockCounts * 4;
var dataUint32 = new Uint32Array(data.buffer, 0, blockCounts);
@@ -46028,6 +53305,7 @@ var MurmurHash3_64 = function MurmurHash3_64Closure(seed) {
var C2 = 0x1b873593;
var C1_LOW = C1 & MASK_LOW;
var C2_LOW = C2 & MASK_LOW;
+
for (var _i = 0; _i < blockCounts; _i++) {
if (_i & 1) {
k1 = dataUint32[_i];
@@ -46047,23 +53325,30 @@ var MurmurHash3_64 = function MurmurHash3_64Closure(seed) {
h2 = h2 * 5 + 0xe6546b64;
}
}
+
k1 = 0;
+
switch (tailLength) {
case 3:
k1 ^= data[blockCounts * 4 + 2] << 16;
+
case 2:
k1 ^= data[blockCounts * 4 + 1] << 8;
+
case 1:
k1 ^= data[blockCounts * 4];
k1 = k1 * C1 & MASK_HIGH | k1 * C1_LOW & MASK_LOW;
k1 = k1 << 15 | k1 >>> 17;
k1 = k1 * C2 & MASK_HIGH | k1 * C2_LOW & MASK_LOW;
+
if (blockCounts & 1) {
h1 ^= k1;
} else {
h2 ^= k1;
}
+
}
+
this.h1 = h1;
this.h2 = h2;
return this;
@@ -46078,18 +53363,23 @@ var MurmurHash3_64 = function MurmurHash3_64Closure(seed) {
h1 = h1 * 0x1a85ec53 & MASK_HIGH | h1 * 0xec53 & MASK_LOW;
h2 = h2 * 0xc4ceb9fe & MASK_HIGH | ((h2 << 16 | h1 >>> 16) * 0xb9fe1a85 & MASK_HIGH) >>> 16;
h1 ^= h2 >>> 1;
+
for (var i = 0, arr = [h1, h2], str = ''; i < arr.length; i++) {
var hex = (arr[i] >>> 0).toString(16);
+
while (hex.length < 8) {
hex = '0' + hex;
}
+
str += hex;
}
+
return str;
}
};
return MurmurHash3_64;
}();
+
exports.MurmurHash3_64 = MurmurHash3_64;
/***/ }),
@@ -46102,9 +53392,7 @@ exports.MurmurHash3_64 = MurmurHash3_64;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFImage = undefined;
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+exports.PDFImage = void 0;
var _util = __w_pdfjs_require__(2);
@@ -46118,6 +53406,14 @@ var _jpeg_stream = __w_pdfjs_require__(150);
var _jpx = __w_pdfjs_require__(153);
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
var PDFImage = function PDFImageClosure() {
function handleImageData(image, nativeDecoder) {
if (nativeDecoder && nativeDecoder.canDecode(image)) {
@@ -46126,12 +53422,15 @@ var PDFImage = function PDFImageClosure() {
return image;
});
}
+
return Promise.resolve(image);
}
+
function decodeAndClamp(value, addend, coefficient, max) {
value = addend + value * coefficient;
return value < 0 ? 0 : value > max ? max : value;
}
+
function resizeImageMask(src, bpc, w1, h1, w2, h2) {
var length = w2 * h2;
var dest = bpc <= 8 ? new Uint8Array(length) : bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
@@ -46144,35 +53443,40 @@ var PDFImage = function PDFImageClosure() {
oldIndex;
var xScaled = new Uint16Array(w2);
var w1Scanline = w1;
+
for (i = 0; i < w2; i++) {
xScaled[i] = Math.floor(i * xRatio);
}
+
for (i = 0; i < h2; i++) {
py = Math.floor(i * yRatio) * w1Scanline;
+
for (j = 0; j < w2; j++) {
oldIndex = py + xScaled[j];
dest[newIndex++] = src[oldIndex];
}
}
+
return dest;
}
+
function PDFImage(_ref) {
var xref = _ref.xref,
res = _ref.res,
image = _ref.image,
_ref$isInline = _ref.isInline,
- isInline = _ref$isInline === undefined ? false : _ref$isInline,
+ isInline = _ref$isInline === void 0 ? false : _ref$isInline,
_ref$smask = _ref.smask,
- smask = _ref$smask === undefined ? null : _ref$smask,
+ smask = _ref$smask === void 0 ? null : _ref$smask,
_ref$mask = _ref.mask,
- mask = _ref$mask === undefined ? null : _ref$mask,
+ mask = _ref$mask === void 0 ? null : _ref$mask,
_ref$isMask = _ref.isMask,
- isMask = _ref$isMask === undefined ? false : _ref$isMask,
+ isMask = _ref$isMask === void 0 ? false : _ref$isMask,
pdfFunctionFactory = _ref.pdfFunctionFactory;
-
this.image = image;
var dict = image.dict;
var filter = dict.get('Filter');
+
if ((0, _primitives.isName)(filter)) {
switch (filter.name) {
case 'JPXDecode':
@@ -46184,68 +53488,86 @@ var PDFImage = function PDFImageClosure() {
image.bitsPerComponent = jpxImage.bitsPerComponent;
image.numComps = jpxImage.componentsCount;
break;
+
case 'JBIG2Decode':
image.bitsPerComponent = 1;
image.numComps = 1;
break;
}
}
+
var width = dict.get('Width', 'W');
var height = dict.get('Height', 'H');
+
if (Number.isInteger(image.width) && image.width > 0 && Number.isInteger(image.height) && image.height > 0 && (image.width !== width || image.height !== height)) {
(0, _util.warn)('PDFImage - using the Width/Height of the image data, ' + 'rather than the image dictionary.');
width = image.width;
height = image.height;
}
+
if (width < 1 || height < 1) {
- throw new _util.FormatError('Invalid image width: ' + width + ' or ' + ('height: ' + height));
+ throw new _util.FormatError("Invalid image width: ".concat(width, " or ") + "height: ".concat(height));
}
+
this.width = width;
this.height = height;
this.interpolate = dict.get('Interpolate', 'I') || false;
this.imageMask = dict.get('ImageMask', 'IM') || false;
this.matte = dict.get('Matte') || false;
var bitsPerComponent = image.bitsPerComponent;
+
if (!bitsPerComponent) {
bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
+
if (!bitsPerComponent) {
if (this.imageMask) {
bitsPerComponent = 1;
} else {
- throw new _util.FormatError('Bits per component missing in image: ' + this.imageMask);
+ throw new _util.FormatError("Bits per component missing in image: ".concat(this.imageMask));
}
}
}
+
this.bpc = bitsPerComponent;
+
if (!this.imageMask) {
var colorSpace = dict.get('ColorSpace', 'CS');
+
if (!colorSpace) {
(0, _util.info)('JPX images (which do not require color spaces)');
+
switch (image.numComps) {
case 1:
colorSpace = _primitives.Name.get('DeviceGray');
break;
+
case 3:
colorSpace = _primitives.Name.get('DeviceRGB');
break;
+
case 4:
colorSpace = _primitives.Name.get('DeviceCMYK');
break;
+
default:
- throw new Error('JPX images with ' + image.numComps + ' ' + 'color components not supported.');
+ throw new Error("JPX images with ".concat(image.numComps, " ") + 'color components not supported.');
}
}
+
var resources = isInline ? res : null;
this.colorSpace = _colorspace.ColorSpace.parse(colorSpace, xref, resources, pdfFunctionFactory);
this.numComps = this.colorSpace.numComps;
}
+
this.decode = dict.getArray('Decode', 'D');
this.needsDecode = false;
+
if (this.decode && (this.colorSpace && !this.colorSpace.isDefaultDecode(this.decode) || isMask && !_colorspace.ColorSpace.isDefaultDecode(this.decode, 1))) {
this.needsDecode = true;
var max = (1 << bitsPerComponent) - 1;
this.decodeCoefficients = [];
this.decodeAddends = [];
+
for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
var dmin = this.decode[i];
var dmax = this.decode[i + 1];
@@ -46253,6 +53575,7 @@ var PDFImage = function PDFImageClosure() {
this.decodeAddends[j] = max * dmin;
}
}
+
if (smask) {
this.smask = new PDFImage({
xref: xref,
@@ -46265,6 +53588,7 @@ var PDFImage = function PDFImageClosure() {
if ((0, _primitives.isStream)(mask)) {
var maskDict = mask.dict,
imageMask = maskDict.get('ImageMask', 'IM');
+
if (!imageMask) {
(0, _util.warn)('Ignoring /Mask in image without /ImageMask.');
} else {
@@ -46282,27 +53606,29 @@ var PDFImage = function PDFImageClosure() {
}
}
}
+
PDFImage.buildImage = function (_ref2) {
var handler = _ref2.handler,
xref = _ref2.xref,
res = _ref2.res,
image = _ref2.image,
_ref2$isInline = _ref2.isInline,
- isInline = _ref2$isInline === undefined ? false : _ref2$isInline,
+ isInline = _ref2$isInline === void 0 ? false : _ref2$isInline,
_ref2$nativeDecoder = _ref2.nativeDecoder,
- nativeDecoder = _ref2$nativeDecoder === undefined ? null : _ref2$nativeDecoder,
+ nativeDecoder = _ref2$nativeDecoder === void 0 ? null : _ref2$nativeDecoder,
pdfFunctionFactory = _ref2.pdfFunctionFactory;
-
var imagePromise = handleImageData(image, nativeDecoder);
var smaskPromise;
var maskPromise;
var smask = image.dict.get('SMask');
var mask = image.dict.get('Mask');
+
if (smask) {
smaskPromise = handleImageData(smask, nativeDecoder);
maskPromise = Promise.resolve(null);
} else {
smaskPromise = Promise.resolve(null);
+
if (mask) {
if ((0, _primitives.isStream)(mask)) {
maskPromise = handleImageData(mask, nativeDecoder);
@@ -46316,6 +53642,7 @@ var PDFImage = function PDFImageClosure() {
maskPromise = Promise.resolve(null);
}
}
+
return Promise.all([imagePromise, smaskPromise, maskPromise]).then(function (_ref3) {
var _ref4 = _slicedToArray(_ref3, 3),
imageData = _ref4[0],
@@ -46333,17 +53660,18 @@ var PDFImage = function PDFImageClosure() {
});
});
};
+
PDFImage.createMask = function (_ref5) {
var imgArray = _ref5.imgArray,
width = _ref5.width,
height = _ref5.height,
imageIsFromDecodeStream = _ref5.imageIsFromDecodeStream,
inverseDecode = _ref5.inverseDecode;
-
var computedLength = (width + 7 >> 3) * height;
var actualLength = imgArray.byteLength;
var haveFullData = computedLength === actualLength;
var data, i;
+
if (imageIsFromDecodeStream && (!inverseDecode || haveFullData)) {
data = imgArray;
} else if (!inverseDecode) {
@@ -46352,28 +53680,34 @@ var PDFImage = function PDFImageClosure() {
} else {
data = new Uint8ClampedArray(computedLength);
data.set(imgArray);
+
for (i = actualLength; i < computedLength; i++) {
data[i] = 0xff;
}
}
+
if (inverseDecode) {
for (i = 0; i < actualLength; i++) {
data[i] ^= 0xFF;
}
}
+
return {
data: data,
width: width,
height: height
};
};
+
PDFImage.prototype = {
get drawWidth() {
return Math.max(this.width, this.smask && this.smask.width || 0, this.mask && this.mask.width || 0);
},
+
get drawHeight() {
return Math.max(this.height, this.smask && this.smask.height || 0, this.mask && this.mask.height || 0);
},
+
decodeBuffer: function decodeBuffer(buffer) {
var bpc = this.bpc;
var numComps = this.numComps;
@@ -46381,13 +53715,17 @@ var PDFImage = function PDFImageClosure() {
var decodeCoefficients = this.decodeCoefficients;
var max = (1 << bpc) - 1;
var i, ii;
+
if (bpc === 1) {
for (i = 0, ii = buffer.length; i < ii; i++) {
buffer[i] = +!buffer[i];
}
+
return;
}
+
var index = 0;
+
for (i = 0, ii = this.width * this.height; i < ii; i++) {
for (var j = 0; j < numComps; j++) {
buffer[index] = decodeAndClamp(buffer[index], decodeAddends[j], decodeCoefficients[j], max);
@@ -46397,9 +53735,11 @@ var PDFImage = function PDFImageClosure() {
},
getComponents: function getComponents(buffer) {
var bpc = this.bpc;
+
if (bpc === 8) {
return buffer;
}
+
var width = this.width;
var height = this.height;
var numComps = this.numComps;
@@ -46411,11 +53751,14 @@ var PDFImage = function PDFImageClosure() {
var i = 0,
ii,
buf;
+
if (bpc === 1) {
var mask, loop1End, loop2End;
+
for (var j = 0; j < height; j++) {
loop1End = i + (rowComps & ~7);
loop2End = i + rowComps;
+
while (i < loop1End) {
buf = buffer[bufferPos++];
output[i] = buf >> 7 & 1;
@@ -46428,9 +53771,11 @@ var PDFImage = function PDFImageClosure() {
output[i + 7] = buf & 1;
i += 8;
}
+
if (i < loop2End) {
buf = buffer[bufferPos++];
mask = 128;
+
while (i < loop2End) {
output[i++] = +!!(buf & mask);
mask >>= 1;
@@ -46440,15 +53785,18 @@ var PDFImage = function PDFImageClosure() {
} else {
var bits = 0;
buf = 0;
+
for (i = 0, ii = length; i < ii; ++i) {
if (i % rowComps === 0) {
buf = 0;
bits = 0;
}
+
while (bits < bpc) {
buf = buf << 8 | buffer[bufferPos++];
bits += 8;
}
+
var remainingBits = bits - bpc;
var value = buf >> remainingBits;
output[i] = value < 0 ? 0 : value > max ? max : value;
@@ -46456,17 +53804,20 @@ var PDFImage = function PDFImageClosure() {
bits = remainingBits;
}
}
+
return output;
},
fillOpacity: function fillOpacity(rgbaBuf, width, height, actualHeight, image) {
var smask = this.smask;
var mask = this.mask;
var alphaBuf, sw, sh, i, ii, j;
+
if (smask) {
sw = smask.width;
sh = smask.height;
alphaBuf = new Uint8ClampedArray(sw * sh);
smask.fillGrayBuffer(alphaBuf);
+
if (sw !== width || sh !== height) {
alphaBuf = resizeImageMask(alphaBuf, smask.bpc, sw, sh, width, height);
}
@@ -46477,32 +53828,39 @@ var PDFImage = function PDFImageClosure() {
alphaBuf = new Uint8ClampedArray(sw * sh);
mask.numComps = 1;
mask.fillGrayBuffer(alphaBuf);
+
for (i = 0, ii = sw * sh; i < ii; ++i) {
alphaBuf[i] = 255 - alphaBuf[i];
}
+
if (sw !== width || sh !== height) {
alphaBuf = resizeImageMask(alphaBuf, mask.bpc, sw, sh, width, height);
}
} else if (Array.isArray(mask)) {
alphaBuf = new Uint8ClampedArray(width * height);
var numComps = this.numComps;
+
for (i = 0, ii = width * height; i < ii; ++i) {
var opacity = 0;
var imageOffset = i * numComps;
+
for (j = 0; j < numComps; ++j) {
var color = image[imageOffset + j];
var maskOffset = j * 2;
+
if (color < mask[maskOffset] || color > mask[maskOffset + 1]) {
opacity = 255;
break;
}
}
+
alphaBuf[i] = opacity;
}
} else {
throw new _util.FormatError('Unknown mask format.');
}
}
+
if (alphaBuf) {
for (i = 0, j = 3, ii = width * actualHeight; i < ii; ++i, j += 4) {
rgbaBuf[j] = alphaBuf[i];
@@ -46515,22 +53873,27 @@ var PDFImage = function PDFImageClosure() {
},
undoPreblend: function undoPreblend(buffer, width, height) {
var matte = this.smask && this.smask.matte;
+
if (!matte) {
return;
}
+
var matteRgb = this.colorSpace.getRgb(matte, 0);
var matteR = matteRgb[0];
var matteG = matteRgb[1];
var matteB = matteRgb[2];
var length = width * height * 4;
+
for (var i = 0; i < length; i += 4) {
var alpha = buffer[i + 3];
+
if (alpha === 0) {
buffer[i] = 255;
buffer[i + 1] = 255;
buffer[i + 2] = 255;
continue;
}
+
var k = 255 / alpha;
buffer[i] = (buffer[i] - matteR) * k + matteR;
buffer[i + 1] = (buffer[i + 1] - matteG) * k + matteG;
@@ -46539,7 +53902,6 @@ var PDFImage = function PDFImageClosure() {
},
createImageData: function createImageData() {
var forceRGBA = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
var drawWidth = this.drawWidth;
var drawHeight = this.drawHeight;
var imgData = {
@@ -46554,16 +53916,20 @@ var PDFImage = function PDFImageClosure() {
var bpc = this.bpc;
var rowBytes = originalWidth * numComps * bpc + 7 >> 3;
var imgArray;
+
if (!forceRGBA) {
var kind;
+
if (this.colorSpace.name === 'DeviceGray' && bpc === 1) {
kind = _util.ImageKind.GRAYSCALE_1BPP;
} else if (this.colorSpace.name === 'DeviceRGB' && bpc === 8 && !this.needsDecode) {
kind = _util.ImageKind.RGB_24BPP;
}
+
if (kind && !this.smask && !this.mask && drawWidth === originalWidth && drawHeight === originalHeight) {
imgData.kind = kind;
imgArray = this.getImageBytes(originalHeight * rowBytes);
+
if (this.image instanceof _stream.DecodeStream) {
imgData.data = imgArray;
} else {
@@ -46571,20 +53937,26 @@ var PDFImage = function PDFImageClosure() {
newArray.set(imgArray);
imgData.data = newArray;
}
+
if (this.needsDecode) {
(0, _util.assert)(kind === _util.ImageKind.GRAYSCALE_1BPP, 'PDFImage.createImageData: The image must be grayscale.');
var buffer = imgData.data;
+
for (var i = 0, ii = buffer.length; i < ii; i++) {
buffer[i] ^= 0xff;
}
}
+
return imgData;
}
+
if (this.image instanceof _jpeg_stream.JpegStream && !this.smask && !this.mask) {
var imageLength = originalHeight * rowBytes;
+
switch (this.colorSpace.name) {
case 'DeviceGray':
imageLength *= 3;
+
case 'DeviceRGB':
case 'DeviceCMYK':
imgData.kind = _util.ImageKind.RGB_24BPP;
@@ -46593,10 +53965,12 @@ var PDFImage = function PDFImageClosure() {
}
}
}
+
imgArray = this.getImageBytes(originalHeight * rowBytes);
var actualHeight = 0 | imgArray.length / rowBytes * drawHeight / originalHeight;
var comps = this.getComponents(imgArray);
var alpha01, maybeUndoPreblend;
+
if (!forceRGBA && !this.smask && !this.mask) {
imgData.kind = _util.ImageKind.RGB_24BPP;
imgData.data = new Uint8ClampedArray(drawWidth * drawHeight * 3);
@@ -46609,20 +53983,26 @@ var PDFImage = function PDFImageClosure() {
maybeUndoPreblend = true;
this.fillOpacity(imgData.data, drawWidth, drawHeight, actualHeight, comps);
}
+
if (this.needsDecode) {
this.decodeBuffer(comps);
}
+
this.colorSpace.fillRgb(imgData.data, originalWidth, originalHeight, drawWidth, drawHeight, actualHeight, bpc, comps, alpha01);
+
if (maybeUndoPreblend) {
this.undoPreblend(imgData.data, drawWidth, actualHeight);
}
+
return imgData;
},
fillGrayBuffer: function fillGrayBuffer(buffer) {
var numComps = this.numComps;
+
if (numComps !== 1) {
- throw new _util.FormatError('Reading gray scale from a color image: ' + numComps);
+ throw new _util.FormatError("Reading gray scale from a color image: ".concat(numComps));
}
+
var width = this.width;
var height = this.height;
var bpc = this.bpc;
@@ -46630,8 +54010,10 @@ var PDFImage = function PDFImageClosure() {
var imgArray = this.getImageBytes(height * rowBytes);
var comps = this.getComponents(imgArray);
var i, length;
+
if (bpc === 1) {
length = width * height;
+
if (this.needsDecode) {
for (i = 0; i < length; ++i) {
buffer[i] = comps[i] - 1 & 255;
@@ -46641,20 +54023,23 @@ var PDFImage = function PDFImageClosure() {
buffer[i] = -comps[i] & 255;
}
}
+
return;
}
+
if (this.needsDecode) {
this.decodeBuffer(comps);
}
+
length = width * height;
var scale = 255 / ((1 << bpc) - 1);
+
for (i = 0; i < length; ++i) {
buffer[i] = scale * comps[i];
}
},
getImageBytes: function getImageBytes(length, drawWidth, drawHeight) {
var forceRGB = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-
this.image.reset();
this.image.drawWidth = drawWidth || this.width;
this.image.drawHeight = drawHeight || this.height;
@@ -46664,6 +54049,7 @@ var PDFImage = function PDFImageClosure() {
};
return PDFImage;
}();
+
exports.PDFImage = PDFImage;
/***/ }),
@@ -46676,71 +54062,84 @@ exports.PDFImage = PDFImage;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.MessageHandler = undefined;
+exports.MessageHandler = MessageHandler;
+
+var _regenerator = _interopRequireDefault(__w_pdfjs_require__(135));
+
+var _util = __w_pdfjs_require__(2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-var _regenerator = __w_pdfjs_require__(135);
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-var _regenerator2 = _interopRequireDefault(_regenerator);
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function resolveCall(_x, _x2) {
+ return _resolveCall.apply(this, arguments);
+}
-var resolveCall = function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(fn, args) {
- var thisArg = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
- return _regenerator2.default.wrap(function _callee$(_context) {
+function _resolveCall() {
+ _resolveCall = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(fn, args) {
+ var thisArg,
+ _args = arguments;
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
+ thisArg = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+
if (fn) {
- _context.next = 2;
+ _context.next = 3;
break;
}
- return _context.abrupt('return');
-
- case 2:
- return _context.abrupt('return', fn.apply(thisArg, args));
+ return _context.abrupt("return");
case 3:
- case 'end':
+ return _context.abrupt("return", fn.apply(thisArg, args));
+
+ case 4:
+ case "end":
return _context.stop();
}
}
}, _callee, this);
}));
-
- return function resolveCall(_x2, _x3) {
- return _ref.apply(this, arguments);
- };
-}();
-
-var _util = __w_pdfjs_require__(2);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+ return _resolveCall.apply(this, arguments);
+}
function wrapReason(reason) {
- if ((typeof reason === 'undefined' ? 'undefined' : _typeof(reason)) !== 'object') {
+ if (_typeof(reason) !== 'object') {
return reason;
}
+
switch (reason.name) {
case 'AbortException':
return new _util.AbortException(reason.message);
+
case 'MissingPDFException':
return new _util.MissingPDFException(reason.message);
+
case 'UnexpectedResponseException':
return new _util.UnexpectedResponseException(reason.message, reason.status);
+
default:
return new _util.UnknownErrorException(reason.message, reason.details);
}
}
+
function makeReasonSerializable(reason) {
if (!(reason instanceof Error) || reason instanceof _util.AbortException || reason instanceof _util.MissingPDFException || reason instanceof _util.UnexpectedResponseException || reason instanceof _util.UnknownErrorException) {
return reason;
}
+
return new _util.UnknownErrorException(reason.message, reason.toString());
}
+
function resolveOrReject(capability, success, reason) {
if (success) {
capability.resolve();
@@ -46748,9 +54147,11 @@ function resolveOrReject(capability, success, reason) {
capability.reject(reason);
}
}
+
function finalize(promise) {
return Promise.resolve(promise).catch(function () {});
}
+
function MessageHandler(sourceName, targetName, comObj) {
var _this = this;
@@ -46764,28 +54165,34 @@ function MessageHandler(sourceName, targetName, comObj) {
this.streamControllers = Object.create(null);
var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
var ah = this.actionHandler = Object.create(null);
+
this._onComObjOnMessage = function (event) {
var data = event.data;
+
if (data.targetName !== _this.sourceName) {
return;
}
+
if (data.stream) {
_this._processStreamMessage(data);
} else if (data.isReply) {
var callbackId = data.callbackId;
+
if (data.callbackId in callbacksCapabilities) {
var callback = callbacksCapabilities[callbackId];
delete callbacksCapabilities[callbackId];
+
if ('error' in data) {
callback.reject(wrapReason(data.error));
} else {
callback.resolve(data.data);
}
} else {
- throw new Error('Cannot resolve callback ' + callbackId);
+ throw new Error("Cannot resolve callback ".concat(callbackId));
}
} else if (data.action in ah) {
var action = ah[data.action];
+
if (data.callbackId) {
var _sourceName = _this.sourceName;
var _targetName = data.sourceName;
@@ -46814,17 +54221,21 @@ function MessageHandler(sourceName, targetName, comObj) {
action[0].call(action[1], data.data);
}
} else {
- throw new Error('Unknown action from worker: ' + data.action);
+ throw new Error("Unknown action from worker: ".concat(data.action));
}
};
+
comObj.addEventListener('message', this._onComObjOnMessage);
}
+
MessageHandler.prototype = {
on: function on(actionName, handler, scope) {
var ah = this.actionHandler;
+
if (ah[actionName]) {
- throw new Error('There is already an actionName called "' + actionName + '"');
+ throw new Error("There is already an actionName called \"".concat(actionName, "\""));
}
+
ah[actionName] = [handler, scope];
},
send: function send(actionName, data, transfers) {
@@ -46847,11 +54258,13 @@ MessageHandler.prototype = {
};
var capability = (0, _util.createPromiseCapability)();
this.callbacksCapabilities[callbackId] = capability;
+
try {
this.postMessage(message, transfers);
} catch (e) {
capability.reject(e);
}
+
return capability.promise;
},
sendWithStream: function sendWithStream(actionName, data, queueingStrategy, transfers) {
@@ -46868,6 +54281,7 @@ MessageHandler.prototype = {
startCall: startCapability,
isClosed: false
};
+
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@@ -46876,11 +54290,13 @@ MessageHandler.prototype = {
data: data,
desiredSize: controller.desiredSize
});
+
return startCapability.promise;
},
pull: function pull(controller) {
var pullCapability = (0, _util.createPromiseCapability)();
_this2.streamControllers[streamId].pullCall = pullCapability;
+
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@@ -46888,12 +54304,14 @@ MessageHandler.prototype = {
streamId: streamId,
desiredSize: controller.desiredSize
});
+
return pullCapability.promise;
},
cancel: function cancel(reason) {
var cancelCapability = (0, _util.createPromiseCapability)();
_this2.streamControllers[streamId].cancelCall = cancelCapability;
_this2.streamControllers[streamId].isClosed = true;
+
_this2.postMessage({
sourceName: sourceName,
targetName: targetName,
@@ -46901,6 +54319,7 @@ MessageHandler.prototype = {
reason: reason,
streamId: streamId
});
+
return cancelCapability.promise;
}
}, queueingStrategy);
@@ -46915,12 +54334,13 @@ MessageHandler.prototype = {
var sourceName = this.sourceName;
var targetName = data.sourceName;
var capability = (0, _util.createPromiseCapability)();
- var sendStreamRequest = function sendStreamRequest(_ref2) {
- var stream = _ref2.stream,
- chunk = _ref2.chunk,
- transfers = _ref2.transfers,
- success = _ref2.success,
- reason = _ref2.reason;
+
+ var sendStreamRequest = function sendStreamRequest(_ref) {
+ var stream = _ref.stream,
+ chunk = _ref.chunk,
+ transfers = _ref.transfers,
+ success = _ref.success,
+ reason = _ref.reason;
_this3.postMessage({
sourceName: sourceName,
@@ -46932,20 +54352,24 @@ MessageHandler.prototype = {
reason: reason
}, transfers);
};
+
var streamSink = {
enqueue: function enqueue(chunk) {
var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
- var transfers = arguments[2];
+ var transfers = arguments.length > 2 ? arguments[2] : undefined;
if (this.isCancelled) {
return;
}
+
var lastDesiredSize = this.desiredSize;
this.desiredSize -= size;
+
if (lastDesiredSize > 0 && this.desiredSize <= 0) {
this.sinkCapability = (0, _util.createPromiseCapability)();
this.ready = this.sinkCapability.promise;
}
+
sendStreamRequest({
stream: 'enqueue',
chunk: chunk,
@@ -46956,21 +54380,24 @@ MessageHandler.prototype = {
if (this.isCancelled) {
return;
}
+
this.isCancelled = true;
- sendStreamRequest({ stream: 'close' });
+ sendStreamRequest({
+ stream: 'close'
+ });
delete self.streamSinks[streamId];
},
error: function error(reason) {
if (this.isCancelled) {
return;
}
+
this.isCancelled = true;
sendStreamRequest({
stream: 'error',
reason: reason
});
},
-
sinkCapability: capability,
onPull: null,
onCancel: null,
@@ -47000,10 +54427,11 @@ MessageHandler.prototype = {
var sourceName = this.sourceName;
var targetName = data.sourceName;
var streamId = data.streamId;
- var sendStreamResponse = function sendStreamResponse(_ref3) {
- var stream = _ref3.stream,
- success = _ref3.success,
- reason = _ref3.reason;
+
+ var sendStreamResponse = function sendStreamResponse(_ref2) {
+ var stream = _ref2.stream,
+ success = _ref2.success,
+ reason = _ref2.reason;
_this4.comObj.postMessage({
sourceName: sourceName,
@@ -47014,6 +54442,7 @@ MessageHandler.prototype = {
reason: reason
});
};
+
var deleteStreamController = function deleteStreamController() {
Promise.all([_this4.streamControllers[data.streamId].startCall, _this4.streamControllers[data.streamId].pullCall, _this4.streamControllers[data.streamId].cancelCall].map(function (capability) {
return capability && finalize(capability.promise);
@@ -47021,13 +54450,16 @@ MessageHandler.prototype = {
delete _this4.streamControllers[data.streamId];
});
};
+
switch (data.stream) {
case 'start_complete':
resolveOrReject(this.streamControllers[data.streamId].startCall, data.success, wrapReason(data.reason));
break;
+
case 'pull_complete':
resolveOrReject(this.streamControllers[data.streamId].pullCall, data.success, wrapReason(data.reason));
break;
+
case 'pull':
if (!this.streamSinks[data.streamId]) {
sendStreamResponse({
@@ -47036,9 +54468,11 @@ MessageHandler.prototype = {
});
break;
}
+
if (this.streamSinks[data.streamId].desiredSize <= 0 && data.desiredSize > 0) {
this.streamSinks[data.streamId].sinkCapability.resolve();
}
+
this.streamSinks[data.streamId].desiredSize = data.desiredSize;
resolveCall(this.streamSinks[data.streamId].onPull).then(function () {
sendStreamResponse({
@@ -47053,34 +54487,44 @@ MessageHandler.prototype = {
});
});
break;
+
case 'enqueue':
(0, _util.assert)(this.streamControllers[data.streamId], 'enqueue should have stream controller');
+
if (!this.streamControllers[data.streamId].isClosed) {
this.streamControllers[data.streamId].controller.enqueue(data.chunk);
}
+
break;
+
case 'close':
(0, _util.assert)(this.streamControllers[data.streamId], 'close should have stream controller');
+
if (this.streamControllers[data.streamId].isClosed) {
break;
}
+
this.streamControllers[data.streamId].isClosed = true;
this.streamControllers[data.streamId].controller.close();
deleteStreamController();
break;
+
case 'error':
(0, _util.assert)(this.streamControllers[data.streamId], 'error should have stream controller');
this.streamControllers[data.streamId].controller.error(wrapReason(data.reason));
deleteStreamController();
break;
+
case 'cancel_complete':
resolveOrReject(this.streamControllers[data.streamId].cancelCall, data.success, wrapReason(data.reason));
deleteStreamController();
break;
+
case 'cancel':
if (!this.streamSinks[data.streamId]) {
break;
}
+
resolveCall(this.streamSinks[data.streamId].onCancel, [wrapReason(data.reason)]).then(function () {
sendStreamResponse({
stream: 'cancel_complete',
@@ -47097,6 +54541,7 @@ MessageHandler.prototype = {
this.streamSinks[data.streamId].isCancelled = true;
delete this.streamSinks[data.streamId];
break;
+
default:
throw new Error('Unexpected stream case');
}
@@ -47112,7 +54557,6 @@ MessageHandler.prototype = {
this.comObj.removeEventListener('message', this._onComObjOnMessage);
}
};
-exports.MessageHandler = MessageHandler;
/***/ })
/******/ ]);
diff --git a/public/static/pdf/web/locale/ast/viewer.properties b/public/static/pdf/web/locale/ast/viewer.properties
index fdfd6da01..f973a9b22 100644
--- a/public/static/pdf/web/locale/ast/viewer.properties
+++ b/public/static/pdf/web/locale/ast/viewer.properties
@@ -33,8 +33,6 @@ zoom_out_label=Reducir
zoom_in.title=Aumentar
zoom_in_label=Aumentar
zoom.title=Tamañu
-presentation_mode.title=
-presentation_mode_label=
open_file.title=Abrir ficheru
open_file_label=Abrir
print.title=Imprentar
@@ -54,10 +52,8 @@ last_page.title=Dir a la postrer páxina
last_page.label=Dir a la cabera páxina
last_page_label=Dir a la postrer páxina
page_rotate_cw.title=Xirar en sen horariu
-page_rotate_cw.label=
page_rotate_cw_label=Xirar en sen horariu
page_rotate_ccw.title=Xirar en sen antihorariu
-page_rotate_ccw.label=
page_rotate_ccw_label=Xirar en sen antihorariu
@@ -144,6 +140,14 @@ find_highlight=Remarcar toos
find_match_case_label=Coincidencia de mayús./minús.
find_reached_top=Algamóse'l principiu del documentu, siguir dende'l final
find_reached_bottom=Algamóse'l final del documentu, siguir dende'l principiu
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
find_not_found=Frase non atopada
# Error panel labels
diff --git a/public/static/pdf/web/locale/bn-BD/viewer.properties b/public/static/pdf/web/locale/bn-BD/viewer.properties
index 0e2f8fc12..9fc785d63 100644
--- a/public/static/pdf/web/locale/bn-BD/viewer.properties
+++ b/public/static/pdf/web/locale/bn-BD/viewer.properties
@@ -65,6 +65,10 @@ cursor_text_select_tool_label=লেখা নির্বাচক টুল
cursor_hand_tool.title=হ্যান্ড টুল সক্রিয় করুন
cursor_hand_tool_label=হ্যান্ড টুল
+scroll_vertical.title=উলম্ব স্ক্রলিং ব্যবহার করুন
+scroll_vertical_label=উলম্ব স্ক্রলিং
+scroll_horizontal.title=অনুভূমিক স্ক্রলিং ব্যবহার করুন
+scroll_horizontal_label=অনুভূমিক স্ক্রলিং
# Document properties dialog box
@@ -159,9 +163,22 @@ find_reached_bottom=পাতার শেষে পৌছে গেছে, উ
# "{{current}}" and "{{total}}" will be replaced by a number representing the
# index of the currently active find result, respectively a number representing
# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{total}} এর {{current}} মিল
+find_match_count[two]={{total}} এর {{current}} মিল
+find_match_count[few]={{total}} এর {{current}} মিল
+find_match_count[many]={{total}} এর {{current}} মিল
+find_match_count[other]={{total}} এর {{current}} মিল
# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
# [zero|one|two|few|many|other], with [other] as the default value.
# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]={{limit}} এর বেশি মিল
+find_match_count_limit[one]={{limit}} এর বেশি মিল
+find_match_count_limit[two]={{limit}} এর বেশি মিল
+find_match_count_limit[few]={{limit}} এর বেশি মিল
+find_match_count_limit[many]={{limit}} এর বেশি মিল
+find_match_count_limit[other]={{limit}} এর বেশি মিল
find_not_found=বাক্যাংশ পাওয়া যায়নি
# Error panel labels
diff --git a/public/static/pdf/web/locale/bn-IN/viewer.properties b/public/static/pdf/web/locale/bn-IN/viewer.properties
index 4e229239a..550cefff3 100644
--- a/public/static/pdf/web/locale/bn-IN/viewer.properties
+++ b/public/static/pdf/web/locale/bn-IN/viewer.properties
@@ -60,6 +60,24 @@ page_rotate_ccw.title=বাঁদিকে ঘোরানো হবে
page_rotate_ccw.label=বাঁদিকে ঘোরানো হবে
page_rotate_ccw_label=বাঁদিকে ঘোরানো হবে
+cursor_text_select_tool.title=টেক্সট নির্বাচন সরঞ্জাম সক্রিয় করুন
+cursor_text_select_tool_label=টেক্সট নির্বাচনের সরঞ্জাম
+cursor_hand_tool.title=হ্যান্ড টুল সক্রিয় করুন
+cursor_hand_tool_label=হ্যান্ড টুল
+
+scroll_vertical.title=উল্লম্ব স্ক্রোলিং ব্যবহার করুন
+scroll_vertical_label=উল্লম্ব স্ক্রোলিং
+scroll_horizontal.title=অনুভূমিক স্ক্রোলিং ব্যবহার করুন
+scroll_horizontal_label=অনুভূমিক স্ক্রোলিং
+scroll_wrapped.title=আবৃত স্ক্রোলিং ব্যবহার করুন
+scroll_wrapped_label=আবৃত স্ক্রোলিং
+
+spread_none.title=ছড়িয়ে পরা পাতাকে যোগ করবেন না
+spread_none_label=ছড়ানো নয়
+spread_odd.title=বিজোড়-সংখ্যার পৃষ্ঠাগুলির সাথে শুরু হওয়া পৃষ্ঠা স্প্রেডগুলিতে যোগদান করুন
+spread_odd_label=বিজোড় স্প্রেডস
+spread_even.title=জোড়-সংখ্যার পৃষ্ঠাগুলির সাথে শুরু হওয়া পৃষ্ঠা স্প্রেডগুলিতে যোগদান করুন
+spread_even_label=জোড় স্প্রেড
# Document properties dialog box
document_properties.title=নথির বৈশিষ্ট্য…
@@ -85,6 +103,28 @@ document_properties_creator=নির্মাতা:
document_properties_producer=PDF নির্মাতা:
document_properties_version=PDF সংস্করণ:
document_properties_page_count=মোট পৃষ্ঠা:
+document_properties_page_size=পৃষ্ঠার সাইজ:
+document_properties_page_size_unit_inches=in
+document_properties_page_size_unit_millimeters=mm
+document_properties_page_size_orientation_portrait=উলম্ব
+document_properties_page_size_orientation_landscape=আড়াআড়ি
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=লেটার
+document_properties_page_size_name_legal=লিগাল
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=দ্রুত ওয়েব প্রদর্শন:
+document_properties_linearized_yes=হ্যাঁ
+document_properties_linearized_no=না
document_properties_close=বন্ধ করুন
print_progress_message=ডকুমেন্ট প্রিন্টিং-র জন্য তৈরি করা হচ্ছে...
@@ -97,6 +137,7 @@ print_progress_close=বাতিল
# (the _label strings are alt text for the buttons, the .title strings are
# tooltips)
toggle_sidebar.title=সাইডবার টগল করুন
+toggle_sidebar_notification.title=সাইডবার টগল করুন (নথিতে রয়েছে আউটলাইন/সংযুক্তি)
toggle_sidebar_label=সাইডবার টগল করুন
document_outline.title=ডকুমেন্ট আউটলাইন দেখান (দুবার ক্লিক করুন বাড়াতে//collapse সমস্ত আইটেম)
document_outline_label=ডকুমেন্ট আউটলাইন
@@ -116,14 +157,38 @@ thumb_page_title=পৃষ্ঠা {{page}}
thumb_page_canvas=পৃষ্ঠা {{page}}-র থাম্ব-নেইল
# Find panel button title and messages
+find_input.title=খুঁজুন
+find_input.placeholder=নথির মধ্যে খুঁজুন…
find_previous.title=চিহ্নিত পংক্তির পূর্ববর্তী উপস্থিতি অনুসন্ধান করুন
find_previous_label=পূর্ববর্তী
find_next.title=চিহ্নিত পংক্তির পরবর্তী উপস্থিতি অনুসন্ধান করুন
find_next_label=পরবর্তী
find_highlight=সমগ্র উজ্জ্বল করুন
find_match_case_label=হরফের ছাঁদ মেলানো হবে
+find_entire_word_label=সম্পূর্ণ শব্দগুলি
find_reached_top=পৃষ্ঠার প্রারম্ভে পৌছে গেছে, নীচের অংশ থেকে আরম্ভ করা হবে
find_reached_bottom=পৃষ্ঠার অন্তিম প্রান্তে পৌছে গেছে, প্রথম অংশ থেকে আরম্ভ করা হবে
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{total}} এর {{current}} এ মিল
+find_match_count[two]={{total}} এর {{current}} মিলছে
+find_match_count[few]={{total}} এর {{current}} মিলছে
+find_match_count[many]={{total}} এর {{current}} মিলছে
+find_match_count[other]={{total}} এর {{current}} মিলছে
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]={{limit}} এর বেশি মিলছে
+find_match_count_limit[one]={{limit}} এর থেকে বেশি মিলছে
+find_match_count_limit[two]={{limit}} এর থেকে বেশি মিলছে
+find_match_count_limit[few]={{limit}} এর থেকে বেশি মিলছে
+find_match_count_limit[many]={{limit}} এর থেকে বেশি মিলছে
+find_match_count_limit[other]={{limit}} এর থেকে বেশি মিলছে
find_not_found=পংক্তি পাওয়া যায়নি
# Error panel labels
diff --git a/public/static/pdf/web/locale/ca/viewer.properties b/public/static/pdf/web/locale/ca/viewer.properties
index 582325695..a91e54f60 100644
--- a/public/static/pdf/web/locale/ca/viewer.properties
+++ b/public/static/pdf/web/locale/ca/viewer.properties
@@ -69,6 +69,8 @@ scroll_vertical.title=Utilitza el desplaçament vertical
scroll_vertical_label=Desplaçament vertical
scroll_horizontal.title=Utilitza el desplaçament horitzontal
scroll_horizontal_label=Desplaçament horitzontal
+scroll_wrapped.title=Activa el desplaçament continu
+scroll_wrapped_label=Desplaçament continu
# Document properties dialog box
@@ -112,6 +114,11 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Vista web ràpida:
+document_properties_linearized_yes=Sí
+document_properties_linearized_no=No
document_properties_close=Tanca
print_progress_message=S'està preparant la impressió del document…
@@ -152,8 +159,17 @@ find_next.title=Cerca la següent coincidència de l'expressió
find_next_label=Següent
find_highlight=Ressalta-ho tot
find_match_case_label=Distingeix entre majúscules i minúscules
+find_entire_word_label=Paraules senceres
find_reached_top=S'ha arribat al principi del document, es continua pel final
find_reached_bottom=S'ha arribat al final del document, es continua pel principi
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
find_not_found=No s'ha trobat l'expressió
# Error panel labels
diff --git a/public/static/pdf/web/locale/crh/viewer.properties b/public/static/pdf/web/locale/crh/viewer.properties
index dcdaafeec..c6ba334d2 100644
--- a/public/static/pdf/web/locale/crh/viewer.properties
+++ b/public/static/pdf/web/locale/crh/viewer.properties
@@ -122,6 +122,9 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Tez Ağ Körünimi:
+document_properties_linearized_yes=Ebet
+document_properties_linearized_no=Hayır
document_properties_close=Qapat
print_progress_message=Vesiqa bastırılmağa azırlanıla…
@@ -162,8 +165,30 @@ find_next.title=İbareniñ soñraki rastkelişini tap
find_next_label=Soñraki
find_highlight=Episini ışıqlandır
find_match_case_label=Büyük-ufaq hassasiyeti
+find_entire_word_label=Bütün sözler
find_reached_top=Saifeniñ töpesi irişildi, tüpten devam etildi
find_reached_bottom=Saifeniñ soñu irişildi, töpeden devam etildi
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{total}} eşleşmeden {{current}} eşleşme
+find_match_count[two]={{total}} eşleşmeden {{current}}. eşleşme
+find_match_count[few]={{total}} eşleşmeden {{current}}. eşleşme
+find_match_count[many]={{total}} eşleşmeden {{current}}. eşleşme
+find_match_count[other]={{total}} eşleşmeden {{current}}. eşleşme
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]={{limit}} eşleşmeden fazla
+find_match_count_limit[one]={{limit}} eşleşmeden fazla
+find_match_count_limit[two]={{limit}} eşleşmeden fazla
+find_match_count_limit[few]={{limit}} eşleşmeden fazla
+find_match_count_limit[many]={{limit}} eşleşmeden fazla
+find_match_count_limit[other]={{limit}} eşleşmeden fazla
find_not_found=İbare tapılmadı
# Error panel labels
diff --git a/public/static/pdf/web/locale/de/viewer.properties b/public/static/pdf/web/locale/de/viewer.properties
index da4c809b9..50464d868 100644
--- a/public/static/pdf/web/locale/de/viewer.properties
+++ b/public/static/pdf/web/locale/de/viewer.properties
@@ -173,9 +173,22 @@ find_reached_bottom=Ende des Dokuments erreicht, fahre am Anfang fort
# "{{current}}" and "{{total}}" will be replaced by a number representing the
# index of the currently active find result, respectively a number representing
# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} von {{total}} Übereinstimmung
+find_match_count[two]={{current}} von {{total}} Übereinstimmungen
+find_match_count[few]={{current}} von {{total}} Übereinstimmungen
+find_match_count[many]={{current}} von {{total}} Übereinstimmungen
+find_match_count[other]={{current}} von {{total}} Übereinstimmungen
# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
# [zero|one|two|few|many|other], with [other] as the default value.
# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Mehr als {{limit}} Übereinstimmungen
+find_match_count_limit[one]=Mehr als {{limit}} Übereinstimmung
+find_match_count_limit[two]=Mehr als {{limit}} Übereinstimmungen
+find_match_count_limit[few]=Mehr als {{limit}} Übereinstimmungen
+find_match_count_limit[many]=Mehr als {{limit}} Übereinstimmungen
+find_match_count_limit[other]=Mehr als {{limit}} Übereinstimmungen
find_not_found=Suchbegriff nicht gefunden
# Error panel labels
diff --git a/public/static/pdf/web/locale/fa/viewer.properties b/public/static/pdf/web/locale/fa/viewer.properties
index 8d001d4eb..e95738c6e 100644
--- a/public/static/pdf/web/locale/fa/viewer.properties
+++ b/public/static/pdf/web/locale/fa/viewer.properties
@@ -65,6 +65,10 @@ cursor_text_select_tool_label=ابزارِ انتخابِ متن
cursor_hand_tool.title=فعال کردن ابزارِ دست
cursor_hand_tool_label=ابزار دست
+scroll_vertical.title=استفاده از پیمایش عمودی
+scroll_vertical_label=پیمایش عمودی
+scroll_horizontal.title=استفاده از پیمایش افقی
+scroll_horizontal_label=پیمایش افقی
# Document properties dialog box
@@ -106,6 +110,10 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=بله
+document_properties_linearized_no=خیر
document_properties_close=بستن
print_progress_message=آماده سازی مدارک برای چاپ کردن…
@@ -146,8 +154,22 @@ find_next.title=پیدا کردن رخداد بعدی عبارت
find_next_label=بعدی
find_highlight=برجسته و هایلایت کردن همه موارد
find_match_case_label=تطبیق کوچکی و بزرگی حروف
+find_entire_word_label=تمام کلمهها
find_reached_top=به بالای صفحه رسیدیم، از پایین ادامه میدهیم
find_reached_bottom=به آخر صفحه رسیدیم، از بالا ادامه میدهیم
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count[one]={{current}} از {{total}} مطابقت دارد
+find_match_count[two]={{current}} از {{total}} مطابقت دارد
+find_match_count[few]={{current}} از {{total}} مطابقت دارد
+find_match_count[many]={{current}} از {{total}} مطابقت دارد
+find_match_count[other]={{current}} از {{total}} مطابقت دارد
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
find_not_found=عبارت پیدا نشد
# Error panel labels
diff --git a/public/static/pdf/web/locale/ff/viewer.properties b/public/static/pdf/web/locale/ff/viewer.properties
index d368529d6..2e94346aa 100644
--- a/public/static/pdf/web/locale/ff/viewer.properties
+++ b/public/static/pdf/web/locale/ff/viewer.properties
@@ -65,6 +65,20 @@ cursor_text_select_tool_label=Kaɓirgel cuɓirgel binndi
cursor_hand_tool.title=Hurmin kuutorgal junngo
cursor_hand_tool_label=Kaɓirgel junngo
+scroll_vertical.title=Huutoro gorwitol daringol
+scroll_vertical_label=Gorwitol daringol
+scroll_horizontal.title=Huutoro gorwitol lelingol
+scroll_horizontal_label=Gorwitol daringol
+scroll_wrapped.title=Huutoro gorwitol coomingol
+scroll_wrapped_label=Gorwitol coomingol
+
+spread_none.title=Hoto tawtu kelle kelle
+spread_none_label=Alaa Spreads
+spread_odd.title=Tawtu kelle puɗɗortooɗe kelle teelɗe
+spread_odd_label=Kelle teelɗe
+spread_even.title=Tawtu ɗereeji kelle puɗɗoriiɗi kelle teeltuɗe
+spread_even_label=Kelle teeltuɗe
+
# Document properties dialog box
document_properties.title=Keeroraaɗi Winndannde…
document_properties_label=Keeroraaɗi Winndannde…
@@ -106,6 +120,11 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Ɗisngo geese yaawngo:
+document_properties_linearized_yes=Eey
+document_properties_linearized_no=Alaa
document_properties_close=Uddu
print_progress_message=Nana heboo winnditaade fiilannde…
@@ -146,8 +165,30 @@ find_next.title=Yiylo cilol garowol konngol ngol
find_next_label=Yeeso
find_highlight=Jalbin fof
find_match_case_label=Jaaɓnu darnde
+find_entire_word_label=Kelme timmuɗe tan
find_reached_top=Heɓii fuɗɗorde fiilannde, jokku faya les
find_reached_bottom=Heɓii hoore fiilannde, jokku faya les
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} wonande laabi {{total}}
+find_match_count[two]={{current}} wonande laabi {{total}}
+find_match_count[few]={{current}} wonande laabi {{total}}
+find_match_count[many]={{current}} wonande laabi {{total}}
+find_match_count[other]={{current}} wonande laabi {{total}}
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Ko ɓuri laabi {{limit}}
+find_match_count_limit[one]=Ko ɓuri laani {{limit}}
+find_match_count_limit[two]=Ko ɓuri laabi {{limit}}
+find_match_count_limit[few]=Ko ɓuri laabi {{limit}}
+find_match_count_limit[many]=Ko ɓuri laabi {{limit}}
+find_match_count_limit[other]=Ko ɓuri laabi {{limit}}
find_not_found=Konngi njiyataa
# Error panel labels
diff --git a/public/static/pdf/web/locale/gd/viewer.properties b/public/static/pdf/web/locale/gd/viewer.properties
index e5a01c508..2712568e8 100644
--- a/public/static/pdf/web/locale/gd/viewer.properties
+++ b/public/static/pdf/web/locale/gd/viewer.properties
@@ -120,6 +120,11 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Grad shealladh-lìn:
+document_properties_linearized_yes=Tha
+document_properties_linearized_no=Chan eil
document_properties_close=Dùin
print_progress_message=Ag ullachadh na sgrìobhainn airson clò-bhualadh…
@@ -160,8 +165,30 @@ find_next.title=Lorg ath-làthair na h-abairt seo
find_next_label=Air adhart
find_highlight=Soillsich a h-uile
find_match_case_label=Aire do litrichean mòra is beaga
+find_entire_word_label=Faclan-slàna
find_reached_top=Ràinig sinn barr na duilleige, a' leantainn air adhart o bhonn na duilleige
find_reached_bottom=Ràinig sinn bonn na duilleige, a' leantainn air adhart o bharr na duilleige
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} à {{total}} mhaids
+find_match_count[two]={{current}} à {{total}} mhaids
+find_match_count[few]={{current}} à {{total}} maidsichean
+find_match_count[many]={{current}} à {{total}} maids
+find_match_count[other]={{current}} à {{total}} maids
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Barrachd air {{limit}} maids
+find_match_count_limit[one]=Barrachd air {{limit}} mhaids
+find_match_count_limit[two]=Barrachd air {{limit}} mhaids
+find_match_count_limit[few]=Barrachd air {{limit}} maidsichean
+find_match_count_limit[many]=Barrachd air {{limit}} maids
+find_match_count_limit[other]=Barrachd air {{limit}} maids
find_not_found=Cha deach an abairt a lorg
# Error panel labels
diff --git a/public/static/pdf/web/locale/gl/viewer.properties b/public/static/pdf/web/locale/gl/viewer.properties
index f393fcad0..187dbf155 100644
--- a/public/static/pdf/web/locale/gl/viewer.properties
+++ b/public/static/pdf/web/locale/gl/viewer.properties
@@ -19,11 +19,14 @@ next.title=Seguinte páxina
next_label=Seguinte
# LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=Páxina
# LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
# representing the total number of pages in the document.
+of_pages=de {{pagesCount}}
# LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
# will be replaced by a number representing the currently visible page,
# respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} de {{pagesCount}})
zoom_out.title=Reducir
zoom_out_label=Reducir
@@ -57,6 +60,24 @@ page_rotate_ccw.title=Rotar no sentido contrario ás agullas do reloxo
page_rotate_ccw.label=Rotar no sentido contrario ás agullas do reloxo
page_rotate_ccw_label=Rotar no sentido contrario ás agullas do reloxo
+cursor_text_select_tool.title=Activar a ferramenta de selección de texto
+cursor_text_select_tool_label=Ferramenta de selección de texto
+cursor_hand_tool.title=Activar a ferramenta man
+cursor_hand_tool_label=Ferramenta man
+
+scroll_vertical.title=Usar o desprazamento vertical
+scroll_vertical_label=Desprazamento vertical
+scroll_horizontal.title=Usar o desprazamento horizontal
+scroll_horizontal_label=Desprazamento horizontal
+scroll_wrapped.title=Usar desprazamento en bloque
+scroll_wrapped_label=Desprazamento en bloque
+
+spread_none.title=Non agrupar páxinas
+spread_none_label=Ningún agrupamento
+spread_odd.title=Crea grupo de páxinas que comezan con números de páxina impares
+spread_odd_label=Agrupamento impar
+spread_even.title=Crea grupo de páxinas que comezan con números de páxina pares
+spread_even_label=Agrupamento par
# Document properties dialog box
document_properties.title=Propiedades do documento…
@@ -71,7 +92,7 @@ document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
document_properties_title=Título:
document_properties_author=Autor:
-document_properties_subject=Asunto:
+document_properties_subject=Asunto:
document_properties_keywords=Palabras clave:
document_properties_creation_date=Data de creación:
document_properties_modification_date=Data de modificación:
@@ -82,16 +103,44 @@ document_properties_creator=Creado por:
document_properties_producer=Xenerador do PDF:
document_properties_version=Versión de PDF:
document_properties_page_count=Número de páxinas:
+document_properties_page_size=Tamaño da páxina:
+document_properties_page_size_unit_inches=in
+document_properties_page_size_unit_millimeters=mm
+document_properties_page_size_orientation_portrait=Vertical
+document_properties_page_size_orientation_landscape=Horizontal
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+document_properties_page_size_name_letter=Carta
+document_properties_page_size_name_legal=Legal
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Visualización rápida das páxinas web:
+document_properties_linearized_yes=Si
+document_properties_linearized_no=Non
document_properties_close=Pechar
+print_progress_message=Preparando documento para imprimir…
# LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
# a numerical per cent value.
+print_progress_percent={{progress}}%
+print_progress_close=Cancelar
# Tooltips and alt text for side panel toolbar buttons
# (the _label strings are alt text for the buttons, the .title strings are
# tooltips)
toggle_sidebar.title=Amosar/agochar a barra lateral
+toggle_sidebar_notification.title=Amosar/agochar a barra lateral (o documento contén un esquema ou anexos)
toggle_sidebar_label=Amosar/agochar a barra lateral
+document_outline.title=Amosar o esquema do documento (prema dúas veces para expandir/contraer todos os elementos)
+document_outline_label=Esquema do documento
attachments.title=Amosar anexos
attachments_label=Anexos
thumbs.title=Amosar miniaturas
@@ -108,14 +157,38 @@ thumb_page_title=Páxina {{page}}
thumb_page_canvas=Miniatura da páxina {{page}}
# Find panel button title and messages
+find_input.title=Atopar
+find_input.placeholder=Atopar no documento…
find_previous.title=Atopar a anterior aparición da frase
find_previous_label=Anterior
find_next.title=Atopar a seguinte aparición da frase
find_next_label=Seguinte
find_highlight=Realzar todo
find_match_case_label=Diferenciar maiúsculas de minúsculas
+find_entire_word_label=Palabras completas
find_reached_top=Chegouse ao inicio do documento, continuar desde o final
find_reached_bottom=Chegouse ao final do documento, continuar desde o inicio
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} de {{total}} coincidencia
+find_match_count[two]={{current}} de {{total}} coincidencias
+find_match_count[few]={{current}} de {{total}} coincidencias
+find_match_count[many]={{current}} de {{total}} coincidencias
+find_match_count[other]={{current}} de {{total}} coincidencias
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Máis de {{limit}} coincidencias
+find_match_count_limit[one]=Máis de {{limit}} coincidencia
+find_match_count_limit[two]=Máis de {{limit}} coincidencias
+find_match_count_limit[few]=Máis de {{limit}} coincidencias
+find_match_count_limit[many]=Máis de {{limit}} coincidencias
+find_match_count_limit[other]=Máis de {{limit}} coincidencias
find_not_found=Non se atopou a frase
# Error panel labels
@@ -149,7 +222,7 @@ page_scale_percent={{scale}}%
# Loading indicator messages
loading_error_indicator=Erro
loading_error=Produciuse un erro ao cargar o PDF.
-invalid_file_error=Ficheiro PDF danado ou incorrecto.
+invalid_file_error=Ficheiro PDF danado ou non válido.
missing_file_error=Falta o ficheiro PDF.
unexpected_response_error=Resposta inesperada do servidor.
@@ -166,3 +239,4 @@ password_cancel=Cancelar
printing_not_supported=Aviso: A impresión non é compatíbel de todo con este navegador.
printing_not_ready=Aviso: O PDF non se cargou completamente para imprimirse.
web_fonts_disabled=Desactiváronse as fontes web: foi imposíbel usar as fontes incrustadas no PDF.
+document_colors_not_allowed=Os documentos PDF non poden usar as súas propias cores: «Permitir que as páxinas escollan as súas propias cores» está desactivado no navegador.
diff --git a/public/static/pdf/web/locale/gu-IN/viewer.properties b/public/static/pdf/web/locale/gu-IN/viewer.properties
index 9a1339295..cce4bec11 100644
--- a/public/static/pdf/web/locale/gu-IN/viewer.properties
+++ b/public/static/pdf/web/locale/gu-IN/viewer.properties
@@ -115,7 +115,7 @@ document_properties_page_size_name_legal=કાયદાકીય
# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement and orientation, of the (current) page.
-document_properties_page_size_dimension_string=
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
diff --git a/public/static/pdf/web/locale/hr/viewer.properties b/public/static/pdf/web/locale/hr/viewer.properties
index ca39552c6..07d19b2d6 100644
--- a/public/static/pdf/web/locale/hr/viewer.properties
+++ b/public/static/pdf/web/locale/hr/viewer.properties
@@ -65,6 +65,8 @@ cursor_text_select_tool_label=Alat za označavanje teksta
cursor_hand_tool.title=Omogući ručni alat
cursor_hand_tool_label=Ručni alat
+
+
# Document properties dialog box
document_properties.title=Svojstva dokumenta...
document_properties_label=Svojstva dokumenta...
@@ -89,6 +91,20 @@ document_properties_creator=Stvaratelj:
document_properties_producer=PDF stvaratelj:
document_properties_version=PDF inačica:
document_properties_page_count=Broj stranica:
+document_properties_page_size_name_a3=A3
+document_properties_page_size_name_a4=A4
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}} ({{orientation}})
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=Da
+document_properties_linearized_no=Ne
document_properties_close=Zatvori
print_progress_message=Pripremanje dokumenta za ispis…
@@ -131,6 +147,14 @@ find_highlight=Istankni sve
find_match_case_label=Slučaj podudaranja
find_reached_top=Dosegnut vrh dokumenta, nastavak od dna
find_reached_bottom=Dosegnut vrh dokumenta, nastavak od vrha
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
find_not_found=Izraz nije pronađen
# Error panel labels
diff --git a/public/static/pdf/web/locale/hu/viewer.properties b/public/static/pdf/web/locale/hu/viewer.properties
index fbe653136..9c9ec846b 100644
--- a/public/static/pdf/web/locale/hu/viewer.properties
+++ b/public/static/pdf/web/locale/hu/viewer.properties
@@ -111,7 +111,7 @@ document_properties_page_size_orientation_landscape=fekvő
document_properties_page_size_name_a3=A3
document_properties_page_size_name_a4=A4
document_properties_page_size_name_letter=Letter
-document_properties_page_size_name_legal=Legal
+document_properties_page_size_name_legal=Jogi információk
# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement and orientation, of the (current) page.
diff --git a/public/static/pdf/web/locale/ia/viewer.properties b/public/static/pdf/web/locale/ia/viewer.properties
index 41d45f1b9..4a5b005ca 100644
--- a/public/static/pdf/web/locale/ia/viewer.properties
+++ b/public/static/pdf/web/locale/ia/viewer.properties
@@ -35,7 +35,7 @@ zoom_in_label=Approximar
zoom.title=Zoom
presentation_mode.title=Excambiar a modo presentation
presentation_mode_label=Modo presentation
-open_file.title=Aperir file
+open_file.title=Aperir le file
open_file_label=Aperir
print.title=Imprimer
print_label=Imprimer
@@ -187,7 +187,7 @@ find_match_count_limit[zero]=Plus de {{limit}} concordantias
find_match_count_limit[one]=Plus de {{limit}} concordantia
find_match_count_limit[two]=Plus de {{limit}} concordantias
find_match_count_limit[few]=Plus de {{limit}} concordantias
-find_match_count_limit[many]=
+find_match_count_limit[many]=Plus de {{limit}} concordantias
find_match_count_limit[other]=Plus de {{limit}} concordantias
find_not_found=Phrase non trovate
diff --git a/public/static/pdf/web/locale/it/viewer.properties b/public/static/pdf/web/locale/it/viewer.properties
index a44c3fdf9..754ea18aa 100644
--- a/public/static/pdf/web/locale/it/viewer.properties
+++ b/public/static/pdf/web/locale/it/viewer.properties
@@ -92,7 +92,7 @@ print_progress_close = Annulla
toggle_sidebar.title = Attiva/disattiva barra laterale
toggle_sidebar_notification.title = Attiva/disattiva barra laterale (il documento contiene struttura/allegati)
toggle_sidebar_label = Attiva/disattiva barra laterale
-document_outline.title = Visualizza la struttura del documento (doppio clic per visualizzare/nascondere tutti gli elementi)
+document_outline.title = Visualizza la struttura del documento (doppio clic per visualizzare/comprimere tutti gli elementi)
document_outline_label = Struttura documento
attachments.title = Visualizza allegati
attachments_label = Allegati
diff --git a/public/static/pdf/web/locale/ja/viewer.properties b/public/static/pdf/web/locale/ja/viewer.properties
index 3ab20ad9b..d2fe56bdb 100644
--- a/public/static/pdf/web/locale/ja/viewer.properties
+++ b/public/static/pdf/web/locale/ja/viewer.properties
@@ -165,8 +165,30 @@ find_next.title=現在より後の位置で指定文字列が現れる部分を
find_next_label=次へ
find_highlight=すべて強調表示
find_match_case_label=大文字/小文字を区別
+find_entire_word_label=単語一致
find_reached_top=文書先頭に到達したので末尾から続けて検索します
find_reached_bottom=文書末尾に到達したので先頭から続けて検索します
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{total}} 件中 {{current}} 件目
+find_match_count[two]={{total}} 件中 {{current}} 件目
+find_match_count[few]={{total}} 件中 {{current}} 件目
+find_match_count[many]={{total}} 件中 {{current}} 件目
+find_match_count[other]={{total}} 件中 {{current}} 件目
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]={{limit}} 件以上一致
+find_match_count_limit[one]={{limit}} 件以上一致
+find_match_count_limit[two]={{limit}} 件以上一致
+find_match_count_limit[few]={{limit}} 件以上一致
+find_match_count_limit[many]={{limit}} 件以上一致
+find_match_count_limit[other]={{limit}} 件以上一致
find_not_found=見つかりませんでした
# Error panel labels
diff --git a/public/static/pdf/web/locale/ka/viewer.properties b/public/static/pdf/web/locale/ka/viewer.properties
index b20609d18..e13213746 100644
--- a/public/static/pdf/web/locale/ka/viewer.properties
+++ b/public/static/pdf/web/locale/ka/viewer.properties
@@ -41,7 +41,7 @@ print.title=ამობეჭდვა
print_label=ამობეჭდვა
download.title=ჩამოტვირთვა
download_label=ჩამოტვირთვა
-bookmark.title=მიმდინარე ხედი (დაკოპირება ან გახსნა ახალ ფანჯარაში)
+bookmark.title=მიმდინარე ხედი (ასლის აღება ან გახსნა ახალ ფანჯარაში)
bookmark_label=მიმდინარე ხედი
# Secondary toolbar and context menu
diff --git a/public/static/pdf/web/locale/my/viewer.properties b/public/static/pdf/web/locale/my/viewer.properties
index 991fb174e..f5676198f 100644
--- a/public/static/pdf/web/locale/my/viewer.properties
+++ b/public/static/pdf/web/locale/my/viewer.properties
@@ -61,6 +61,8 @@ page_rotate_ccw.label=နာရီလက်တံ ပြောင်းပြန
page_rotate_ccw_label=နာရီလက်တံ ပြောင်းပြန်
+
+
# Document properties dialog box
document_properties.title=မှတ်တမ်းမှတ်ရာ ဂုဏ်သတ္တိများ
document_properties_label=မှတ်တမ်းမှတ်ရာ ဂုဏ်သတ္တိများ
@@ -85,6 +87,14 @@ document_properties_creator=ဖန်တီးသူ:
document_properties_producer=PDF ထုတ်လုပ်သူ:
document_properties_version=PDF ဗားရှင်း:
document_properties_page_count=စာမျက်နှာအရေအတွက်:
+# LOCALIZATION NOTE (document_properties_page_size_dimension_string):
+# "{{width}}", "{{height}}", {{unit}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_page_size_dimension_name_string):
+# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
+# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
document_properties_close=ပိတ်
print_progress_message=Preparing document for printing…
@@ -127,6 +137,14 @@ find_highlight=အားလုံးကို မျဉ်းသားပါ
find_match_case_label=စာလုံး တိုက်ဆိုင်ပါ
find_reached_top=စာမျက်နှာထိပ် ရောက်နေပြီ၊ အဆုံးကနေ ပြန်စပါ
find_reached_bottom=စာမျက်နှာအဆုံး ရောက်နေပြီ၊ ထိပ်ကနေ ပြန်စပါ
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
find_not_found=စကားစု မတွေ့ရဘူး
# Error panel labels
@@ -169,7 +187,7 @@ unexpected_response_error=မမျှော်လင့်ထားသော
# the PDF spec (32000-1:2008 Table 169 – Annotation types).
# Some common types are e.g.: "Check", "Text", "Comment", "Note"
text_annotation_type.alt=[{{type}} အဓိပ္ပာယ်ဖွင့်ဆိုချက်]
-password_label=PDF အားဖွင့်ရန် ပတ်စ်ဝတ်အားထည့်ပါ
+password_label=ယခု PDF ကို ဖွင့်ရန် စကားဝှက်ကို ရိုက်ပါ။
password_invalid=စာဝှက် မှားသည်။ ထပ်ကြိုးစားကြည့်ပါ။
password_ok=OK
password_cancel=ပယ်ဖျက်ပါ
diff --git a/public/static/pdf/web/locale/pa-IN/viewer.properties b/public/static/pdf/web/locale/pa-IN/viewer.properties
index ac02b9d0e..01f729c98 100644
--- a/public/static/pdf/web/locale/pa-IN/viewer.properties
+++ b/public/static/pdf/web/locale/pa-IN/viewer.properties
@@ -114,6 +114,10 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
# "{{width}}", "{{height}}", {{unit}}, {{name}}, and {{orientation}} will be replaced by
# the size, respectively their unit of measurement, name, and orientation, of the (current) page.
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
+# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
+# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized_yes=ਹਾਂ
+document_properties_linearized_no=ਨਹੀਂ
document_properties_close=ਬੰਦ ਕਰੋ
print_progress_message=…ਪਰਿੰਟ ਕਰਨ ਲਈ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ
@@ -154,8 +158,19 @@ find_next.title=ਵਾਕ ਦੀ ਅਗਲੀ ਮੌਜੂਦਗੀ ਲੱਭੋ
find_next_label=ਅੱਗੇ
find_highlight=ਸਭ ਉਭਾਰੋ
find_match_case_label=ਅੱਖਰ ਆਕਾਰ ਨੂੰ ਮਿਲਾਉ
+find_entire_word_label=ਪੂਰੇ ਸ਼ਬਦ
find_reached_top=ਦਸਤਾਵੇਜ਼ ਦੇ ਉੱਤੇ ਆ ਗਏ ਹਾਂ, ਥੱਲੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ ਹੈ
find_reached_bottom=ਦਸਤਾਵੇਜ਼ ਦੇ ਅੰਤ ਉੱਤੇ ਆ ਗਏ ਹਾਂ, ਉੱਤੇ ਤੋਂ ਜਾਰੀ ਰੱਖਿਆ ਹੈ
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
find_not_found=ਵਾਕ ਨਹੀਂ ਲੱਭਿਆ
# Error panel labels
diff --git a/public/static/pdf/web/locale/pl/viewer.properties b/public/static/pdf/web/locale/pl/viewer.properties
index 27cda10d3..50faadf27 100644
--- a/public/static/pdf/web/locale/pl/viewer.properties
+++ b/public/static/pdf/web/locale/pl/viewer.properties
@@ -57,6 +57,10 @@ cursor_text_select_tool_label=Narzędzie zaznaczania tekstu
cursor_hand_tool.title=Włącza narzędzie rączka
cursor_hand_tool_label=Narzędzie rączka
+scroll_vertical.title=Przewijaj dokument w pionie
+scroll_vertical_label=Przewijanie pionowe
+scroll_horizontal_label=Przewijanie poziome
+scroll_horizontal.title=Przewijaj dokument w poziomie
scroll_wrapped_label=Widok dwóch stron
scroll_wrapped.title=Strony dokumentu wyświetlaj i przewijaj w kolumnach
diff --git a/public/static/pdf/web/locale/pt-BR/viewer.properties b/public/static/pdf/web/locale/pt-BR/viewer.properties
index 638e7d369..e946b21ba 100644
--- a/public/static/pdf/web/locale/pt-BR/viewer.properties
+++ b/public/static/pdf/web/locale/pt-BR/viewer.properties
@@ -174,10 +174,21 @@ find_reached_bottom=Fim do documento alcançado, continuando do início
# index of the currently active find result, respectively a number representing
# the total number of matches in the document.
find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} de {{total}} ocorrência
+find_match_count[two]={{current}} de {{total}} ocorrências
+find_match_count[few]={{current}} de {{total}} ocorrências
+find_match_count[many]={{current}} de {{total}} ocorrências
+find_match_count[other]={{current}} de {{total}} ocorrências
# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
# [zero|one|two|few|many|other], with [other] as the default value.
# "{{limit}}" will be replaced by a numerical value.
find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Mais de {{limit}} ocorrências
+find_match_count_limit[one]=Mais de {{limit}} ocorrência
+find_match_count_limit[two]=Mais de {{limit}} ocorrências
+find_match_count_limit[few]=Mais de {{limit}} ocorrências
+find_match_count_limit[many]=Mais de {{limit}} ocorrências
+find_match_count_limit[other]=Mais de {{limit}} ocorrências
find_not_found=Frase não encontrada
# Error panel labels
diff --git a/public/static/pdf/web/locale/ro/viewer.properties b/public/static/pdf/web/locale/ro/viewer.properties
index 67a47c4f0..c92bbacb7 100644
--- a/public/static/pdf/web/locale/ro/viewer.properties
+++ b/public/static/pdf/web/locale/ro/viewer.properties
@@ -164,7 +164,7 @@ find_previous_label=Anterior
find_next.title=Găsește instanța următoare în frază
find_next_label=Următor
find_highlight=Evidențiază toate aparițiile
-find_match_case_label=Potrivește literele mari și mici
+find_match_case_label=Corelează literele mari și mici
find_entire_word_label=Cuvinte întregi
find_reached_top=Am ajuns la începutul documentului, continuă de la sfârșit
find_reached_bottom=Am ajuns la sfârșitul documentului, continuă de la început
diff --git a/public/static/pdf/web/locale/te/viewer.properties b/public/static/pdf/web/locale/te/viewer.properties
index 7b269a118..e93564556 100644
--- a/public/static/pdf/web/locale/te/viewer.properties
+++ b/public/static/pdf/web/locale/te/viewer.properties
@@ -155,11 +155,15 @@ find_match_case_label=అక్షరముల తేడాతో పోల్
find_entire_word_label=పూర్తి పదాలు
find_reached_top=పేజీ పైకి చేరుకున్నది, క్రింది నుండి కొనసాగించండి
find_reached_bottom=పేజీ చివరకు చేరుకున్నది, పైనుండి కొనసాగించండి
-# LOCALIZATION NOTE (find_matches_count): "{{current}}" and "{{total}}" will be
-# replaced by a number representing the index of the currently active find result,
-# respectively a number representing the total number of matches in the document.
-# LOCALIZATION NOTE (find_matches_count_limit): "{{limit}}" will be replaced by
-# a numerical value.
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
find_not_found=పదబంధం కనబడలేదు
# Error panel labels
diff --git a/public/static/pdf/web/locale/tl/viewer.properties b/public/static/pdf/web/locale/tl/viewer.properties
index b7243420c..a3583a9c6 100644
--- a/public/static/pdf/web/locale/tl/viewer.properties
+++ b/public/static/pdf/web/locale/tl/viewer.properties
@@ -28,11 +28,13 @@ of_pages=ng {{pagesCount}}
# respectively a number representing the total number of pages in the document.
page_of_pages=({{pageNumber}} ng {{pagesCount}})
-zoom_out.title=Mag-zom Out
+zoom_out.title=Mag-zoom Out
zoom_out_label=Paliitin
zoom_in.title=Palakihin
zoom_in_label=Palakihin
zoom.title=Mag-zoom
+presentation_mode.title=Switch to Presentation Mode
+presentation_mode_label=Presentation Mode
open_file.title=Magbukas ng file
open_file_label=Buksan
print.title=i-Print
@@ -58,10 +60,30 @@ page_rotate_ccw.title=Paikutin ang Counterclockwise
page_rotate_ccw.label=Paikutin ang Counterclockwise
page_rotate_ccw_label=Paikutin ang Counterclockwise
-
-
+cursor_text_select_tool.title=Enable Text Selection Tool
+cursor_text_select_tool_label=Text Selection Tool
+cursor_hand_tool.title=Enable Hand Tool
+cursor_hand_tool_label=Hand Tool
+
+scroll_vertical.title=Use Vertical Scrolling
+scroll_vertical_label=Vertical Scrolling
+scroll_horizontal.title=Use Horizontal Scrolling
+scroll_horizontal_label=Horizontal Scrolling
+scroll_wrapped.title=Use Wrapped Scrolling
+scroll_wrapped_label=Wrapped Scrolling
+
+spread_none.title=Do not join page spreads
+spread_none_label=No Spreads
+spread_odd.title=Join page spreads starting with odd-numbered pages
+spread_odd_label=Odd Spreads
+spread_even.title=Join page spreads starting with even-numbered pages
+spread_even_label=Even Spreads
# Document properties dialog box
+document_properties.title=Document Properties…
+document_properties_label=Document Properties…
+document_properties_file_name=File name:
+document_properties_file_size=File size:
# LOCALIZATION NOTE (document_properties_kb): "{{size_kb}}" and "{{size_b}}"
# will be replaced by the PDF file size in kilobytes, respectively in bytes.
document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
@@ -69,10 +91,19 @@ document_properties_kb={{size_kb}} KB ({{size_b}} bytes)
# will be replaced by the PDF file size in megabytes, respectively in bytes.
document_properties_mb={{size_mb}} MB ({{size_b}} bytes)
document_properties_title=Pamagat:
+document_properties_author=May Akda:
+document_properties_subject=Subject:
document_properties_keywords=Mga keyword:
+document_properties_creation_date=Creation Date:
+document_properties_modification_date=Modification Date:
# LOCALIZATION NOTE (document_properties_date_string): "{{date}}" and "{{time}}"
# will be replaced by the creation/modification date, and time, of the PDF file.
document_properties_date_string={{date}}, {{time}}
+document_properties_creator=Creator:
+document_properties_producer=PDF Producer:
+document_properties_version=PDF Version:
+document_properties_page_count=Page Count:
+document_properties_page_size=Page Size:
document_properties_page_size_unit_inches=in
document_properties_page_size_unit_millimeters=mm
document_properties_page_size_orientation_portrait=portrait
@@ -91,10 +122,12 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Fast Web View:
document_properties_linearized_yes=Oo
document_properties_linearized_no=Hindi
document_properties_close=Isara
+print_progress_message=Preparing document for printing…
# LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
# a numerical per cent value.
print_progress_percent={{progress}}%
@@ -103,7 +136,16 @@ print_progress_close=Kanselahin
# Tooltips and alt text for side panel toolbar buttons
# (the _label strings are alt text for the buttons, the .title strings are
# tooltips)
+toggle_sidebar.title=Toggle Sidebar
+toggle_sidebar_notification.title=Toggle Sidebar (document contains outline/attachments)
+toggle_sidebar_label=Toggle Sidebar
+document_outline.title=Show Document Outline (double-click to expand/collapse all items)
+document_outline_label=Document Outline
+attachments.title=Show Attachments
+attachments_label=Attachments
thumbs.title=Ipakita ang mga Thumbnails
+thumbs_label=Thumbnails
+findbar.title=Find in Document
findbar_label=Hanapin
# Thumbnails panel item (tooltip and alt text for images)
@@ -116,19 +158,37 @@ thumb_page_canvas=Thumbnail ng Pahina {{page}}
# Find panel button title and messages
find_input.title=Hanapin
+find_input.placeholder=Find in document…
find_previous.title=Hanapin ang nakaraang pangyayari ng parirala
find_previous_label=Nakaraang
find_next.title=Hanapin ang susunod na pangyayari ng parirala
find_next_label=Susunod
find_highlight=I-highlight lahat
+find_match_case_label=Match case
+find_entire_word_label=Whole words
+find_reached_top=Reached top of document, continued from bottom
+find_reached_bottom=Reached end of document, continued from top
# LOCALIZATION NOTE (find_match_count): The supported plural forms are
# [one|two|few|many|other], with [other] as the default value.
# "{{current}}" and "{{total}}" will be replaced by a number representing the
# index of the currently active find result, respectively a number representing
# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} of {{total}} match
+find_match_count[two]={{current}} of {{total}} matches
+find_match_count[few]={{current}} of {{total}} matches
+find_match_count[many]={{current}} of {{total}} matches
+find_match_count[other]={{current}} of {{total}} matches
# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
# [zero|one|two|few|many|other], with [other] as the default value.
# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=More than {{limit}} matches
+find_match_count_limit[one]=More than {{limit}} match
+find_match_count_limit[two]=More than {{limit}} matches
+find_match_count_limit[few]=More than {{limit}} matches
+find_match_count_limit[many]=More than {{limit}} matches
+find_match_count_limit[other]=More than {{limit}} matches
find_not_found=Hindi nakita ang prasko
# Error panel labels
@@ -172,6 +232,11 @@ unexpected_response_error=Hindi inaasahang tugon ng server.
# Some common types are e.g.: "Check", "Text", "Comment", "Note"
text_annotation_type.alt=[{{type}} Annotation]
password_label=Ipasok ang password upang buksan ang PDF file na ito.
+password_invalid=Invalid password. Please try again.
password_ok=OK
password_cancel=Kanselahin
+printing_not_supported=Warning: Printing is not fully supported by this browser.
+printing_not_ready=Warning: The PDF is not fully loaded for printing.
+web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
+document_colors_not_allowed=PDF documents are not allowed to use their own colors: “Allow pages to choose their own colors” is deactivated in the browser.
diff --git a/public/static/pdf/web/locale/vi/viewer.properties b/public/static/pdf/web/locale/vi/viewer.properties
index 598eaa8ec..1c6cf1fab 100644
--- a/public/static/pdf/web/locale/vi/viewer.properties
+++ b/public/static/pdf/web/locale/vi/viewer.properties
@@ -32,7 +32,7 @@ zoom_out.title=Thu nhỏ
zoom_out_label=Thu nhỏ
zoom_in.title=Phóng to
zoom_in_label=Phóng to
-zoom.title=Chỉnh kích thước
+zoom.title=Thu phóng
presentation_mode.title=Chuyển sang chế độ trình chiếu
presentation_mode_label=Chế độ trình chiếu
open_file.title=Mở tập tin
@@ -41,7 +41,7 @@ print.title=In
print_label=In
download.title=Tải xuống
download_label=Tải xuống
-bookmark.title=Góc nhìn hiện tại (copy hoặc mở trong cửa sổ mới)
+bookmark.title=Chế độ xem hiện tại (sao chép hoặc mở trong cửa sổ mới)
bookmark_label=Chế độ xem hiện tại
# Secondary toolbar and context menu
@@ -65,6 +65,10 @@ cursor_text_select_tool_label=Công cụ chọn vùng văn bản
cursor_hand_tool.title=Bật công cụ con trỏ
cursor_hand_tool_label=Công cụ con trỏ
+scroll_vertical.title=Sử dụng cuộn dọc
+scroll_vertical_label=Cuộn dọc
+scroll_horizontal.title=Sử dụng cuộn ngang
+scroll_horizontal_label=Cuộn ngang
# Document properties dialog box
@@ -91,6 +95,7 @@ document_properties_creator=Người tạo:
document_properties_producer=Phần mềm tạo PDF:
document_properties_version=Phiên bản PDF:
document_properties_page_count=Tổng số trang:
+document_properties_page_size=Kích thước trang:
document_properties_page_size_unit_inches=in
document_properties_page_size_unit_millimeters=mm
document_properties_page_size_orientation_portrait=khổ dọc
@@ -108,6 +113,7 @@ document_properties_page_size_dimension_string={{width}} × {{height}} {{unit}}
document_properties_page_size_dimension_name_string={{width}} × {{height}} {{unit}} ({{name}}, {{orientation}})
# LOCALIZATION NOTE (document_properties_linearized): The linearization status of
# the document; usually called "Fast Web View" in English locales of Adobe software.
+document_properties_linearized=Xem nhanh trên web:
document_properties_linearized_yes=Có
document_properties_linearized_no=Không
document_properties_close=Ðóng
@@ -150,8 +156,30 @@ find_next.title=Tìm cụm từ ở phần sau
find_next_label=Tiếp
find_highlight=Tô sáng tất cả
find_match_case_label=Phân biệt hoa, thường
+find_entire_word_label=Toàn bộ từ
find_reached_top=Đã đến phần đầu tài liệu, quay trở lại từ cuối
find_reached_bottom=Đã đến phần cuối của tài liệu, quay trở lại từ đầu
+# LOCALIZATION NOTE (find_match_count): The supported plural forms are
+# [one|two|few|many|other], with [other] as the default value.
+# "{{current}}" and "{{total}}" will be replaced by a number representing the
+# index of the currently active find result, respectively a number representing
+# the total number of matches in the document.
+find_match_count={[ plural(total) ]}
+find_match_count[one]={{current}} của {{total}} đã trùng
+find_match_count[two]={{current}} của {{total}} đã trùng
+find_match_count[few]={{current}} của {{total}} đã trùng
+find_match_count[many]={{current}} của {{total}} đã trùng
+find_match_count[other]={{current}} của {{total}} đã trùng
+# LOCALIZATION NOTE (find_match_count_limit): The supported plural forms are
+# [zero|one|two|few|many|other], with [other] as the default value.
+# "{{limit}}" will be replaced by a numerical value.
+find_match_count_limit={[ plural(limit) ]}
+find_match_count_limit[zero]=Nhiều hơn {{limit}} đã trùng
+find_match_count_limit[one]=Nhiều hơn {{limit}} đã trùng
+find_match_count_limit[two]=Nhiều hơn {{limit}} đã trùng
+find_match_count_limit[few]=Nhiều hơn {{limit}} đã trùng
+find_match_count_limit[many]=Nhiều hơn {{limit}} đã trùng
+find_match_count_limit[other]=Nhiều hơn {{limit}} đã trùng
find_not_found=Không tìm thấy cụm từ này
# Error panel labels
diff --git a/public/static/pdf/web/viewer.css b/public/static/pdf/web/viewer.css
index 347e01fbf..82766d66e 100644
--- a/public/static/pdf/web/viewer.css
+++ b/public/static/pdf/web/viewer.css
@@ -24,7 +24,7 @@
line-height: 1.0;
}
-.textLayer > div {
+.textLayer > span {
color: transparent;
position: absolute;
white-space: pre;
@@ -505,24 +505,24 @@ select {
display: none;
}
-.pdfPresentationMode:-webkit-full-screen .textLayer > div {
+.pdfPresentationMode:-webkit-full-screen .textLayer > span {
cursor: none;
}
-.pdfPresentationMode:-moz-full-screen .textLayer > div {
+.pdfPresentationMode:-moz-full-screen .textLayer > span {
cursor: none;
}
-.pdfPresentationMode:-ms-fullscreen .textLayer > div {
+.pdfPresentationMode:-ms-fullscreen .textLayer > span {
cursor: none;
}
-.pdfPresentationMode:fullscreen .textLayer > div {
+.pdfPresentationMode:fullscreen .textLayer > span {
cursor: none;
}
.pdfPresentationMode.pdfPresentationModeControls > *,
-.pdfPresentationMode.pdfPresentationModeControls .textLayer > div {
+.pdfPresentationMode.pdfPresentationModeControls .textLayer > span {
cursor: default;
}
@@ -1569,6 +1569,11 @@ html[dir='rtl'] .verticalToolbarSeparator {
-webkit-overflow-scrolling: touch;
}
+#thumbnailView > a:active,
+#thumbnailView > a:focus {
+ outline: 0;
+}
+
.thumbnail {
margin: 0 10px 5px 10px;
}
@@ -1991,19 +1996,19 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
mix-blend-mode: screen;
}
-#viewer.textLayer-visible .textLayer > div {
+#viewer.textLayer-visible .textLayer > span {
background-color: rgba(255, 255, 0, 0.1);
color: black;
border: solid 1px rgba(255, 0, 0, 0.5);
box-sizing: border-box;
}
-#viewer.textLayer-hover .textLayer > div:hover {
+#viewer.textLayer-hover .textLayer > span:hover {
background-color: white;
color: black;
}
-#viewer.textLayer-shadow .textLayer > div {
+#viewer.textLayer-shadow .textLayer > span {
background-color: rgba(255,255,255, .6);
color: black;
}
@@ -2041,7 +2046,7 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * {
display: none;
}
-@media screen and (-webkit-min-device-pixel-ratio: 2), screen and (min-resolution: 2dppx) {
+@media screen and (-webkit-min-device-pixel-ratio: 1.1), screen and (min-resolution: 1.1dppx) {
/* Rules for Retina screens */
.toolbarButton::before {
-webkit-transform: scale(0.5);
diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js
index c6ad223c9..42e02fe3d 100644
--- a/public/static/pdf/web/viewer.js
+++ b/public/static/pdf/web/viewer.js
@@ -115,8 +115,7 @@
;
-var pdfjsWebApp = void 0,
- pdfjsWebAppOptions = void 0;
+var pdfjsWebApp, pdfjsWebAppOptions;
{
pdfjsWebApp = __webpack_require__(1);
pdfjsWebAppOptions = __webpack_require__(12);
@@ -129,6 +128,7 @@ var pdfjsWebApp = void 0,
{
__webpack_require__(42);
}
+
function getViewerConfiguration() {
return {
appContainer: document.body,
@@ -251,12 +251,17 @@ function getViewerConfiguration() {
debuggerScriptPath: './debugger.js'
};
}
+
function webViewerLoad() {
var config = getViewerConfiguration();
window.PDFViewerApplication = pdfjsWebApp.PDFViewerApplication;
window.PDFViewerApplicationOptions = pdfjsWebAppOptions.AppOptions;
+ var event = document.createEvent('CustomEvent');
+ event.initCustomEvent('webviewerloaded', true, true, {});
+ document.dispatchEvent(event);
pdfjsWebApp.PDFViewerApplication.run(config);
}
+
if (document.readyState === 'interactive' || document.readyState === 'complete') {
webViewerLoad();
} else {
@@ -273,13 +278,9 @@ if (document.readyState === 'interactive' || document.readyState === 'complete')
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFPrintServiceFactory = exports.DefaultExternalServices = exports.PDFViewerApplication = undefined;
+exports.PDFPrintServiceFactory = exports.DefaultExternalServices = exports.PDFViewerApplication = void 0;
-var _regenerator = __webpack_require__(2);
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
var _ui_utils = __webpack_require__(6);
@@ -327,11 +328,22 @@ var _view_history = __webpack_require__(36);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
var DEFAULT_SCALE_DELTA = 1.1;
var DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
var FORCE_PAGES_LOADED_TIMEOUT = 10000;
+var WHEEL_ZOOM_DISABLED_TIMEOUT = 1000;
var DefaultExternalServices = {
updateFindControlState: function updateFindControlState(data) {},
updateFindMatchesCount: function updateFindMatchesCount(data) {},
@@ -347,7 +359,6 @@ var DefaultExternalServices = {
createL10n: function createL10n(options) {
throw new Error('Not implemented: createL10n');
},
-
supportsIntegratedFind: false,
supportsDocumentFonts: true,
supportsDocumentColors: true,
@@ -356,6 +367,7 @@ var DefaultExternalServices = {
metaKey: true
}
};
+exports.DefaultExternalServices = DefaultExternalServices;
var PDFViewerApplication = {
initialBookmark: document.location.hash.substring(1),
initialized: false,
@@ -393,11 +405,13 @@ var PDFViewerApplication = {
_boundEvents: {},
contentDispositionFilename: null,
initialize: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(appConfig) {
+ var _initialize = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(appConfig) {
var _this = this;
var appContainer;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -418,6 +432,7 @@ var PDFViewerApplication = {
if (this.isViewerEmbedded && _app_options.AppOptions.get('externalLinkTarget') === _pdfjsLib.LinkTarget.NONE) {
_app_options.AppOptions.set('externalLinkTarget', _pdfjsLib.LinkTarget.TOP);
}
+
_context.next = 11;
return this._initializeViewerComponents();
@@ -425,14 +440,15 @@ var PDFViewerApplication = {
this.bindEvents();
this.bindWindowEvents();
appContainer = appConfig.appContainer || document.documentElement;
-
this.l10n.translate(appContainer).then(function () {
- _this.eventBus.dispatch('localized', { source: _this });
+ _this.eventBus.dispatch('localized', {
+ source: _this
+ });
});
this.initialized = true;
case 16:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -440,78 +456,66 @@ var PDFViewerApplication = {
}));
function initialize(_x) {
- return _ref.apply(this, arguments);
+ return _initialize.apply(this, arguments);
}
return initialize;
}(),
_readPreferences: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
- var OVERRIDES, prefs, name;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _readPreferences2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
+ var prefs, name;
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
- OVERRIDES = {
- disableFontFace: true,
- disableRange: true,
- disableStream: true,
- textLayerMode: _ui_utils.TextLayerMode.DISABLE
- };
- _context2.prev = 1;
- _context2.next = 4;
- return this.preferences.getAll();
-
- case 4:
- prefs = _context2.sent;
- _context2.t0 = _regenerator2.default.keys(prefs);
-
- case 6:
- if ((_context2.t1 = _context2.t0()).done) {
- _context2.next = 13;
+ if (!(_app_options.AppOptions.get('disablePreferences') === true)) {
+ _context2.next = 2;
break;
}
- name = _context2.t1.value;
+ return _context2.abrupt("return");
- if (!(name in OVERRIDES && _app_options.AppOptions.get(name) === OVERRIDES[name])) {
- _context2.next = 10;
- break;
- }
+ case 2:
+ _context2.prev = 2;
+ _context2.next = 5;
+ return this.preferences.getAll();
- return _context2.abrupt('continue', 6);
+ case 5:
+ prefs = _context2.sent;
- case 10:
- _app_options.AppOptions.set(name, prefs[name]);
- _context2.next = 6;
- break;
+ for (name in prefs) {
+ _app_options.AppOptions.set(name, prefs[name]);
+ }
- case 13:
- _context2.next = 17;
+ _context2.next = 11;
break;
- case 15:
- _context2.prev = 15;
- _context2.t2 = _context2['catch'](1);
+ case 9:
+ _context2.prev = 9;
+ _context2.t0 = _context2["catch"](2);
- case 17:
- case 'end':
+ case 11:
+ case "end":
return _context2.stop();
}
}
- }, _callee2, this, [[1, 15]]);
+ }, _callee2, this, [[2, 9]]);
}));
function _readPreferences() {
- return _ref2.apply(this, arguments);
+ return _readPreferences2.apply(this, arguments);
}
return _readPreferences;
}(),
_parseHashParameters: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+ var _parseHashParameters2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3() {
var waitOn, hash, hashParams, viewer, enabled;
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
@@ -520,7 +524,7 @@ var PDFViewerApplication = {
break;
}
- return _context3.abrupt('return');
+ return _context3.abrupt("return");
case 2:
waitOn = [];
@@ -530,27 +534,35 @@ var PDFViewerApplication = {
if ('disableworker' in hashParams && hashParams['disableworker'] === 'true') {
waitOn.push(loadFakeWorker());
}
+
if ('disablerange' in hashParams) {
_app_options.AppOptions.set('disableRange', hashParams['disablerange'] === 'true');
}
+
if ('disablestream' in hashParams) {
_app_options.AppOptions.set('disableStream', hashParams['disablestream'] === 'true');
}
+
if ('disableautofetch' in hashParams) {
_app_options.AppOptions.set('disableAutoFetch', hashParams['disableautofetch'] === 'true');
}
+
if ('disablefontface' in hashParams) {
_app_options.AppOptions.set('disableFontFace', hashParams['disablefontface'] === 'true');
}
+
if ('disablehistory' in hashParams) {
_app_options.AppOptions.set('disableHistory', hashParams['disablehistory'] === 'true');
}
+
if ('webgl' in hashParams) {
_app_options.AppOptions.set('enableWebGL', hashParams['webgl'] === 'true');
}
+
if ('useonlycsszoom' in hashParams) {
_app_options.AppOptions.set('useOnlyCssZoom', hashParams['useonlycsszoom'] === 'true');
}
+
if ('verbosity' in hashParams) {
_app_options.AppOptions.set('verbosity', hashParams['verbosity'] | 0);
}
@@ -566,30 +578,32 @@ var PDFViewerApplication = {
case 18:
_app_options.AppOptions.set('textLayerMode', _ui_utils.TextLayerMode.DISABLE);
- return _context3.abrupt('break', 23);
+
+ return _context3.abrupt("break", 23);
case 20:
viewer = this.appConfig.viewerContainer;
-
viewer.classList.add('textLayer-' + hashParams['textlayer']);
- return _context3.abrupt('break', 23);
+ return _context3.abrupt("break", 23);
case 23:
if ('pdfbug' in hashParams) {
_app_options.AppOptions.set('pdfBug', true);
- enabled = hashParams['pdfbug'].split(',');
+ enabled = hashParams['pdfbug'].split(',');
waitOn.push(loadAndEnablePDFBug(enabled));
}
+
if ('locale' in hashParams) {
_app_options.AppOptions.set('locale', hashParams['locale']);
}
- return _context3.abrupt('return', Promise.all(waitOn).catch(function (reason) {
- console.error('_parseHashParameters: "' + reason.message + '".');
+
+ return _context3.abrupt("return", Promise.all(waitOn).catch(function (reason) {
+ console.error("_parseHashParameters: \"".concat(reason.message, "\"."));
}));
case 26:
- case 'end':
+ case "end":
return _context3.stop();
}
}
@@ -597,29 +611,32 @@ var PDFViewerApplication = {
}));
function _parseHashParameters() {
- return _ref3.apply(this, arguments);
+ return _parseHashParameters2.apply(this, arguments);
}
return _parseHashParameters;
}(),
_initializeL10n: function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+ var _initializeL10n2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee4() {
var dir;
- return _regenerator2.default.wrap(function _callee4$(_context4) {
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
- this.l10n = this.externalServices.createL10n({ locale: _app_options.AppOptions.get('locale') });
+ this.l10n = this.externalServices.createL10n({
+ locale: _app_options.AppOptions.get('locale')
+ });
_context4.next = 3;
return this.l10n.getDirection();
case 3:
dir = _context4.sent;
-
document.getElementsByTagName('html')[0].dir = dir;
case 5:
- case 'end':
+ case "end":
return _context4.stop();
}
}
@@ -627,27 +644,26 @@ var PDFViewerApplication = {
}));
function _initializeL10n() {
- return _ref4.apply(this, arguments);
+ return _initializeL10n2.apply(this, arguments);
}
return _initializeL10n;
}(),
_initializeViewerComponents: function () {
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+ var _initializeViewerComponents2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee5() {
var appConfig, dispatchToDOM, eventBus, pdfRenderingQueue, pdfLinkService, downloadManager, findController, container, viewer, thumbnailContainer, sidebarConfig;
- return _regenerator2.default.wrap(function _callee5$(_context5) {
+ return _regenerator.default.wrap(function _callee5$(_context5) {
while (1) {
switch (_context5.prev = _context5.next) {
case 0:
appConfig = this.appConfig;
-
this.overlayManager = new _overlay_manager.OverlayManager();
dispatchToDOM = _app_options.AppOptions.get('eventBusDispatchToDOM');
eventBus = appConfig.eventBus || (0, _ui_utils.getGlobalEventBus)(dispatchToDOM);
-
this.eventBus = eventBus;
pdfRenderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
-
pdfRenderingQueue.onIdle = this.cleanup.bind(this);
this.pdfRenderingQueue = pdfRenderingQueue;
pdfLinkService = new _pdf_link_service.PDFLinkService({
@@ -655,20 +671,18 @@ var PDFViewerApplication = {
externalLinkTarget: _app_options.AppOptions.get('externalLinkTarget'),
externalLinkRel: _app_options.AppOptions.get('externalLinkRel')
});
-
this.pdfLinkService = pdfLinkService;
- downloadManager = this.externalServices.createDownloadManager({ disableCreateObjectURL: _app_options.AppOptions.get('disableCreateObjectURL') });
-
+ downloadManager = this.externalServices.createDownloadManager({
+ disableCreateObjectURL: _app_options.AppOptions.get('disableCreateObjectURL')
+ });
this.downloadManager = downloadManager;
findController = new _pdf_find_controller.PDFFindController({
linkService: pdfLinkService,
eventBus: eventBus
});
-
this.findController = findController;
container = appConfig.mainContainer;
viewer = appConfig.viewerContainer;
-
this.pdfViewer = new _pdf_viewer.PDFViewer({
container: container,
viewer: viewer,
@@ -690,7 +704,6 @@ var PDFViewerApplication = {
pdfRenderingQueue.setViewer(this.pdfViewer);
pdfLinkService.setViewer(this.pdfViewer);
thumbnailContainer = appConfig.sidebar.thumbnailView;
-
this.pdfThumbnailViewer = new _pdf_thumbnail_viewer.PDFThumbnailViewer({
container: thumbnailContainer,
renderingQueue: pdfRenderingQueue,
@@ -712,6 +725,7 @@ var PDFViewerApplication = {
});
this.toolbar = new _toolbar.Toolbar(appConfig.toolbar, eventBus, this.l10n);
this.secondaryToolbar = new _secondary_toolbar.SecondaryToolbar(appConfig.secondaryToolbar, container, eventBus);
+
if (this.supportsFullscreen) {
this.pdfPresentationMode = new _pdf_presentation_mode.PDFPresentationMode({
container: container,
@@ -721,6 +735,7 @@ var PDFViewerApplication = {
contextMenuItems: appConfig.fullscreen
});
}
+
this.passwordPrompt = new _password_prompt.PasswordPrompt(appConfig.passwordOverlay, this.overlayManager, this.l10n);
this.pdfOutlineViewer = new _pdf_outline_viewer.PDFOutlineViewer({
container: appConfig.sidebar.outlineView,
@@ -733,7 +748,6 @@ var PDFViewerApplication = {
downloadManager: downloadManager
});
sidebarConfig = Object.create(appConfig.sidebar);
-
sidebarConfig.pdfViewer = this.pdfViewer;
sidebarConfig.pdfThumbnailViewer = this.pdfThumbnailViewer;
this.pdfSidebar = new _pdf_sidebar.PDFSidebar(sidebarConfig, eventBus, this.l10n);
@@ -741,7 +755,7 @@ var PDFViewerApplication = {
this.pdfSidebarResizer = new _pdf_sidebar_resizer.PDFSidebarResizer(appConfig.sidebarResizer, eventBus, this.l10n);
case 39:
- case 'end':
+ case "end":
return _context5.stop();
}
}
@@ -749,7 +763,7 @@ var PDFViewerApplication = {
}));
function _initializeViewerComponents() {
- return _ref5.apply(this, arguments);
+ return _initializeViewerComponents2.apply(this, arguments);
}
return _initializeViewerComponents;
@@ -759,72 +773,89 @@ var PDFViewerApplication = {
},
zoomIn: function zoomIn(ticks) {
var newScale = this.pdfViewer.currentScale;
+
do {
newScale = (newScale * DEFAULT_SCALE_DELTA).toFixed(2);
newScale = Math.ceil(newScale * 10) / 10;
newScale = Math.min(_ui_utils.MAX_SCALE, newScale);
} while (--ticks > 0 && newScale < _ui_utils.MAX_SCALE);
+
this.pdfViewer.currentScaleValue = newScale;
},
zoomOut: function zoomOut(ticks) {
var newScale = this.pdfViewer.currentScale;
+
do {
newScale = (newScale / DEFAULT_SCALE_DELTA).toFixed(2);
newScale = Math.floor(newScale * 10) / 10;
newScale = Math.max(_ui_utils.MIN_SCALE, newScale);
} while (--ticks > 0 && newScale > _ui_utils.MIN_SCALE);
+
this.pdfViewer.currentScaleValue = newScale;
},
get pagesCount() {
return this.pdfDocument ? this.pdfDocument.numPages : 0;
},
+
set page(val) {
this.pdfViewer.currentPageNumber = val;
},
+
get page() {
return this.pdfViewer.currentPageNumber;
},
+
get printing() {
return !!this.printService;
},
+
get supportsPrinting() {
return PDFPrintServiceFactory.instance.supportsPrinting;
},
+
get supportsFullscreen() {
- var support = void 0;
+ var support;
var doc = document.documentElement;
support = !!(doc.requestFullscreen || doc.mozRequestFullScreen || doc.webkitRequestFullScreen || doc.msRequestFullscreen);
+
if (document.fullscreenEnabled === false || document.mozFullScreenEnabled === false || document.webkitFullscreenEnabled === false || document.msFullscreenEnabled === false) {
support = false;
}
+
return (0, _pdfjsLib.shadow)(this, 'supportsFullscreen', support);
},
+
get supportsIntegratedFind() {
return this.externalServices.supportsIntegratedFind;
},
+
get supportsDocumentFonts() {
return this.externalServices.supportsDocumentFonts;
},
+
get supportsDocumentColors() {
return this.externalServices.supportsDocumentColors;
},
+
get loadingBar() {
var bar = new _ui_utils.ProgressBar('#loadingBar');
return (0, _pdfjsLib.shadow)(this, 'loadingBar', bar);
},
+
get supportedMouseWheelZoomModifierKeys() {
return this.externalServices.supportedMouseWheelZoomModifierKeys;
},
+
initPassiveLoading: function initPassiveLoading() {
throw new Error('Not implemented: initPassiveLoading');
},
setTitleUsingUrl: function setTitleUsingUrl() {
var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-
this.url = url;
this.baseUrl = url.split('#')[0];
var title = (0, _ui_utils.getPDFFileNameFromURL)(url, '');
+
if (!title) {
try {
title = decodeURIComponent((0, _pdfjsLib.getFilenameFromUrl)(url)) || url;
@@ -832,23 +863,26 @@ var PDFViewerApplication = {
title = url;
}
}
+
this.setTitle(title);
},
setTitle: function setTitle(title) {
if (this.isViewerEmbedded) {
return;
}
+
document.title = title;
},
close: function () {
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+ var _close = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee6() {
var errorWrapper, promise;
- return _regenerator2.default.wrap(function _callee6$(_context6) {
+ return _regenerator.default.wrap(function _callee6$(_context6) {
while (1) {
switch (_context6.prev = _context6.next) {
case 0:
errorWrapper = this.appConfig.errorWrapper.container;
-
errorWrapper.setAttribute('hidden', 'true');
if (this.pdfLoadingTask) {
@@ -856,12 +890,12 @@ var PDFViewerApplication = {
break;
}
- return _context6.abrupt('return');
+ return _context6.abrupt("return");
case 4:
promise = this.pdfLoadingTask.destroy();
-
this.pdfLoadingTask = null;
+
if (this.pdfDocument) {
this.pdfDocument = null;
this.pdfThumbnailViewer.setDocument(null);
@@ -869,6 +903,7 @@ var PDFViewerApplication = {
this.pdfLinkService.setDocument(null);
this.pdfDocumentProperties.setDocument(null);
}
+
this.store = null;
this.isInitialViewSet = false;
this.downloadComplete = false;
@@ -881,13 +916,15 @@ var PDFViewerApplication = {
this.findBar.reset();
this.toolbar.reset();
this.secondaryToolbar.reset();
+
if (typeof PDFBug !== 'undefined') {
PDFBug.cleanup();
}
- return _context6.abrupt('return', promise);
+
+ return _context6.abrupt("return", promise);
case 21:
- case 'end':
+ case "end":
return _context6.stop();
}
}
@@ -895,18 +932,20 @@ var PDFViewerApplication = {
}));
function close() {
- return _ref6.apply(this, arguments);
+ return _close.apply(this, arguments);
}
return close;
}(),
open: function () {
- var _ref7 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee7(file, args) {
+ var _open = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee7(file, args) {
var _this2 = this;
var workerParameters, key, parameters, apiParameters, _key, prop, loadingTask;
- return _regenerator2.default.wrap(function _callee7$(_context7) {
+ return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
switch (_context7.prev = _context7.next) {
case 0:
@@ -924,6 +963,7 @@ var PDFViewerApplication = {
for (key in workerParameters) {
_pdfjsLib.GlobalWorkerOptions[key] = workerParameters[key];
}
+
parameters = Object.create(null);
if (typeof file === 'string') {
@@ -935,41 +975,50 @@ var PDFViewerApplication = {
this.setTitleUsingUrl(file.originalUrl);
parameters.url = file.url;
}
+
apiParameters = _app_options.AppOptions.getAll('api');
for (_key in apiParameters) {
parameters[_key] = apiParameters[_key];
}
+
if (args) {
for (prop in args) {
if (prop === 'length') {
this.pdfDocumentProperties.setFileSize(args[prop]);
}
+
parameters[prop] = args[prop];
}
}
- loadingTask = (0, _pdfjsLib.getDocument)(parameters);
+ loadingTask = (0, _pdfjsLib.getDocument)(parameters);
this.pdfLoadingTask = loadingTask;
+
loadingTask.onPassword = function (updateCallback, reason) {
_this2.passwordPrompt.setUpdateCallback(updateCallback, reason);
+
_this2.passwordPrompt.open();
};
- loadingTask.onProgress = function (_ref8) {
- var loaded = _ref8.loaded,
- total = _ref8.total;
+
+ loadingTask.onProgress = function (_ref) {
+ var loaded = _ref.loaded,
+ total = _ref.total;
_this2.progress(loaded / total);
};
+
loadingTask.onUnsupportedFeature = this.fallback.bind(this);
- return _context7.abrupt('return', loadingTask.promise.then(function (pdfDocument) {
+ return _context7.abrupt("return", loadingTask.promise.then(function (pdfDocument) {
_this2.load(pdfDocument);
}, function (exception) {
if (loadingTask !== _this2.pdfLoadingTask) {
return;
}
+
var message = exception && exception.message;
- var loadingErrorMessage = void 0;
+ var loadingErrorMessage;
+
if (exception instanceof _pdfjsLib.InvalidPDFException) {
loadingErrorMessage = _this2.l10n.get('invalid_file_error', null, 'Invalid or corrupted PDF file.');
} else if (exception instanceof _pdfjsLib.MissingPDFException) {
@@ -979,22 +1028,26 @@ var PDFViewerApplication = {
} else {
loadingErrorMessage = _this2.l10n.get('loading_error', null, 'An error occurred while loading the PDF.');
}
+
return loadingErrorMessage.then(function (msg) {
- _this2.error(msg, { message: message });
+ _this2.error(msg, {
+ message: message
+ });
+
throw new Error(msg);
});
}));
case 16:
- case 'end':
+ case "end":
return _context7.stop();
}
}
}, _callee7, this);
}));
- function open(_x3, _x4) {
- return _ref7.apply(this, arguments);
+ function open(_x2, _x3) {
+ return _open.apply(this, arguments);
}
return open;
@@ -1005,18 +1058,24 @@ var PDFViewerApplication = {
function downloadByUrl() {
downloadManager.downloadUrl(url, filename);
}
+
var url = this.baseUrl;
var filename = this.contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(this.url);
var downloadManager = this.downloadManager;
+
downloadManager.onerror = function (err) {
- _this3.error('PDF failed to download: ' + err);
+ _this3.error("PDF failed to download: ".concat(err));
};
+
if (!this.pdfDocument || !this.downloadComplete) {
downloadByUrl();
return;
}
+
this.pdfDocument.getData().then(function (data) {
- var blob = new Blob([data], { type: 'application/pdf' });
+ var blob = new Blob([data], {
+ type: 'application/pdf'
+ });
downloadManager.download(blob, url, filename);
}).catch(downloadByUrl);
},
@@ -1026,42 +1085,59 @@ var PDFViewerApplication = {
version: _pdfjsLib.version || '?',
build: _pdfjsLib.build || '?'
}, 'PDF.js v{{version}} (build: {{build}})')];
+
if (moreInfo) {
- moreInfoText.push(this.l10n.get('error_message', { message: moreInfo.message }, 'Message: {{message}}'));
+ moreInfoText.push(this.l10n.get('error_message', {
+ message: moreInfo.message
+ }, 'Message: {{message}}'));
+
if (moreInfo.stack) {
- moreInfoText.push(this.l10n.get('error_stack', { stack: moreInfo.stack }, 'Stack: {{stack}}'));
+ moreInfoText.push(this.l10n.get('error_stack', {
+ stack: moreInfo.stack
+ }, 'Stack: {{stack}}'));
} else {
if (moreInfo.filename) {
- moreInfoText.push(this.l10n.get('error_file', { file: moreInfo.filename }, 'File: {{file}}'));
+ moreInfoText.push(this.l10n.get('error_file', {
+ file: moreInfo.filename
+ }, 'File: {{file}}'));
}
+
if (moreInfo.lineNumber) {
- moreInfoText.push(this.l10n.get('error_line', { line: moreInfo.lineNumber }, 'Line: {{line}}'));
+ moreInfoText.push(this.l10n.get('error_line', {
+ line: moreInfo.lineNumber
+ }, 'Line: {{line}}'));
}
}
}
+
var errorWrapperConfig = this.appConfig.errorWrapper;
var errorWrapper = errorWrapperConfig.container;
errorWrapper.removeAttribute('hidden');
var errorMessage = errorWrapperConfig.errorMessage;
errorMessage.textContent = message;
var closeButton = errorWrapperConfig.closeButton;
+
closeButton.onclick = function () {
errorWrapper.setAttribute('hidden', 'true');
};
+
var errorMoreInfo = errorWrapperConfig.errorMoreInfo;
var moreInfoButton = errorWrapperConfig.moreInfoButton;
var lessInfoButton = errorWrapperConfig.lessInfoButton;
+
moreInfoButton.onclick = function () {
errorMoreInfo.removeAttribute('hidden');
moreInfoButton.setAttribute('hidden', 'true');
lessInfoButton.removeAttribute('hidden');
errorMoreInfo.style.height = errorMoreInfo.scrollHeight + 'px';
};
+
lessInfoButton.onclick = function () {
errorMoreInfo.setAttribute('hidden', 'true');
moreInfoButton.removeAttribute('hidden');
lessInfoButton.setAttribute('hidden', 'true');
};
+
moreInfoButton.oncontextmenu = _ui_utils.noContextMenuHandler;
lessInfoButton.oncontextmenu = _ui_utils.noContextMenuHandler;
closeButton.oncontextmenu = _ui_utils.noContextMenuHandler;
@@ -1077,18 +1153,23 @@ var PDFViewerApplication = {
if (this.downloadComplete) {
return;
}
+
var percent = Math.round(level * 100);
+
if (percent > this.loadingBar.percent || isNaN(percent)) {
this.loadingBar.percent = percent;
var disableAutoFetch = this.pdfDocument ? this.pdfDocument.loadingParams['disableAutoFetch'] : _app_options.AppOptions.get('disableAutoFetch');
+
if (disableAutoFetch && percent) {
if (this.disableAutoFetchLoadingBarTimeout) {
clearTimeout(this.disableAutoFetchLoadingBarTimeout);
this.disableAutoFetchLoadingBarTimeout = null;
}
+
this.loadingBar.show();
this.disableAutoFetchLoadingBarTimeout = setTimeout(function () {
_this4.loadingBar.hide();
+
_this4.disableAutoFetchLoadingBarTimeout = null;
}, DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT);
}
@@ -1100,16 +1181,20 @@ var PDFViewerApplication = {
this.pdfDocument = pdfDocument;
pdfDocument.getDownloadInfo().then(function () {
_this5.downloadComplete = true;
+
_this5.loadingBar.hide();
+
firstPagePromise.then(function () {
- _this5.eventBus.dispatch('documentloaded', { source: _this5 });
+ _this5.eventBus.dispatch('documentloaded', {
+ source: _this5
+ });
});
});
var pageModePromise = pdfDocument.getPageMode().catch(function () {});
this.toolbar.setPagesCount(pdfDocument.numPages, false);
this.secondaryToolbar.setPagesCount(pdfDocument.numPages);
var store = this.store = new _view_history.ViewHistory(pdfDocument.fingerprint);
- var baseDocumentUrl = void 0;
+ var baseDocumentUrl;
baseDocumentUrl = null;
this.pdfLinkService.setDocument(pdfDocument, baseDocumentUrl);
this.pdfDocumentProperties.setDocument(pdfDocument, this.url);
@@ -1122,14 +1207,18 @@ var PDFViewerApplication = {
pdfThumbnailViewer.setDocument(pdfDocument);
firstPagePromise.then(function (pdfPage) {
_this5.loadingBar.setWidth(_this5.appConfig.viewerContainer);
+
if (!_app_options.AppOptions.get('disableHistory') && !_this5.isViewerEmbedded) {
var resetHistory = !_app_options.AppOptions.get('showPreviousViewOnLoad');
+
_this5.pdfHistory.initialize(pdfDocument.fingerprint, resetHistory);
+
if (_this5.pdfHistory.initialBookmark) {
_this5.initialBookmark = _this5.pdfHistory.initialBookmark;
_this5.initialRotation = _this5.pdfHistory.initialRotation;
}
}
+
var storePromise = store.getMultiple({
page: null,
zoom: _ui_utils.DEFAULT_SCALE_VALUE,
@@ -1140,21 +1229,22 @@ var PDFViewerApplication = {
scrollMode: null,
spreadMode: null
}).catch(function () {});
- Promise.all([storePromise, pageModePromise]).then(function () {
- var _ref10 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee8(_ref9) {
- var _ref11 = _slicedToArray(_ref9, 2),
- _ref11$ = _ref11[0],
- values = _ref11$ === undefined ? {} : _ref11$,
- pageMode = _ref11[1];
-
- var initialBookmark, zoom, hash, rotation, sidebarView, scrollMode, spreadMode;
- return _regenerator2.default.wrap(function _callee8$(_context8) {
+ Promise.all([storePromise, pageModePromise]).then(
+ /*#__PURE__*/
+ function () {
+ var _ref3 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee8(_ref2) {
+ var _ref4, _ref4$, values, pageMode, initialBookmark, zoom, hash, rotation, sidebarView, scrollMode, spreadMode;
+
+ return _regenerator.default.wrap(function _callee8$(_context8) {
while (1) {
switch (_context8.prev = _context8.next) {
case 0:
+ _ref4 = _slicedToArray(_ref2, 2), _ref4$ = _ref4[0], values = _ref4$ === void 0 ? {} : _ref4$, pageMode = _ref4[1];
initialBookmark = _this5.initialBookmark;
zoom = _app_options.AppOptions.get('defaultZoomValue');
- hash = zoom ? 'zoom=' + zoom : null;
+ hash = zoom ? "zoom=".concat(zoom) : null;
rotation = null;
sidebarView = _app_options.AppOptions.get('sidebarViewOnLoad');
scrollMode = _app_options.AppOptions.get('scrollModeOnLoad');
@@ -1167,55 +1257,63 @@ var PDFViewerApplication = {
scrollMode = scrollMode || values.scrollMode | 0;
spreadMode = spreadMode || values.spreadMode | 0;
}
+
if (pageMode && !_app_options.AppOptions.get('disablePageMode')) {
sidebarView = sidebarView || apiPageModeToSidebarView(pageMode);
}
+
_this5.setInitialView(hash, {
rotation: rotation,
sidebarView: sidebarView,
scrollMode: scrollMode,
spreadMode: spreadMode
});
- _this5.eventBus.dispatch('documentinit', { source: _this5 });
+
+ _this5.eventBus.dispatch('documentinit', {
+ source: _this5
+ });
+
if (!_this5.isViewerEmbedded) {
pdfViewer.focus();
}
- _context8.next = 14;
+
+ _context8.next = 15;
return Promise.race([pagesPromise, new Promise(function (resolve) {
setTimeout(resolve, FORCE_PAGES_LOADED_TIMEOUT);
})]);
- case 14:
+ case 15:
if (!(!initialBookmark && !hash)) {
- _context8.next = 16;
+ _context8.next = 17;
break;
}
- return _context8.abrupt('return');
+ return _context8.abrupt("return");
- case 16:
+ case 17:
if (!pdfViewer.hasEqualPageSizes) {
- _context8.next = 18;
+ _context8.next = 19;
break;
}
- return _context8.abrupt('return');
+ return _context8.abrupt("return");
- case 18:
+ case 19:
_this5.initialBookmark = initialBookmark;
pdfViewer.currentScaleValue = pdfViewer.currentScaleValue;
+
_this5.setInitialView(hash);
- case 21:
- case 'end':
+ case 22:
+ case "end":
return _context8.stop();
}
}
- }, _callee8, _this5);
+ }, _callee8, this);
}));
- return function (_x5) {
- return _ref10.apply(this, arguments);
+ return function (_x4) {
+ return _ref3.apply(this, arguments);
};
}()).then(function () {
pdfViewer.update();
@@ -1225,42 +1323,56 @@ var PDFViewerApplication = {
if (!labels || _app_options.AppOptions.get('disablePageLabels')) {
return;
}
+
var i = 0,
numLabels = labels.length;
+
if (numLabels !== _this5.pagesCount) {
console.error('The number of Page Labels does not match ' + 'the number of pages in the document.');
return;
}
+
while (i < numLabels && labels[i] === (i + 1).toString()) {
i++;
}
+
if (i === numLabels) {
return;
}
+
pdfViewer.setPageLabels(labels);
pdfThumbnailViewer.setPageLabels(labels);
+
_this5.toolbar.setPagesCount(pdfDocument.numPages, true);
+
_this5.toolbar.setPageNumber(pdfViewer.currentPageNumber, pdfViewer.currentPageLabel);
});
pagesPromise.then(function () {
if (!_this5.supportsPrinting) {
return;
}
+
pdfDocument.getJavaScript().then(function (javaScript) {
if (!javaScript) {
return;
}
+
javaScript.some(function (js) {
if (!js) {
return false;
}
+
console.warn('Warning: JavaScript is not supported');
+
_this5.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.javaScript);
+
return true;
});
var regex = /\bprint\s*\(/;
+
for (var i = 0, ii = javaScript.length; i < ii; i++) {
var js = javaScript[i];
+
if (js && regex.test(js)) {
setTimeout(function () {
window.print();
@@ -1272,38 +1384,47 @@ var PDFViewerApplication = {
});
Promise.all([onePageRendered, _ui_utils.animationStarted]).then(function () {
pdfDocument.getOutline().then(function (outline) {
- _this5.pdfOutlineViewer.render({ outline: outline });
+ _this5.pdfOutlineViewer.render({
+ outline: outline
+ });
});
pdfDocument.getAttachments().then(function (attachments) {
- _this5.pdfAttachmentViewer.render({ attachments: attachments });
+ _this5.pdfAttachmentViewer.render({
+ attachments: attachments
+ });
});
});
- pdfDocument.getMetadata().then(function (_ref12) {
- var info = _ref12.info,
- metadata = _ref12.metadata,
- contentDispositionFilename = _ref12.contentDispositionFilename;
-
+ pdfDocument.getMetadata().then(function (_ref5) {
+ var info = _ref5.info,
+ metadata = _ref5.metadata,
+ contentDispositionFilename = _ref5.contentDispositionFilename;
_this5.documentInfo = info;
_this5.metadata = metadata;
_this5.contentDispositionFilename = contentDispositionFilename;
console.log('PDF ' + pdfDocument.fingerprint + ' [' + info.PDFFormatVersion + ' ' + (info.Producer || '-').trim() + ' / ' + (info.Creator || '-').trim() + ']' + ' (PDF.js: ' + (_pdfjsLib.version || '-') + (_app_options.AppOptions.get('enableWebGL') ? ' [WebGL]' : '') + ')');
- var pdfTitle = void 0;
+ var pdfTitle;
+
if (metadata && metadata.has('dc:title')) {
var title = metadata.get('dc:title');
+
if (title !== 'Untitled') {
pdfTitle = title;
}
}
+
if (!pdfTitle && info && info['Title']) {
pdfTitle = info['Title'];
}
+
if (pdfTitle) {
- _this5.setTitle(pdfTitle + ' - ' + (contentDispositionFilename || document.title));
+ _this5.setTitle("".concat(pdfTitle, " - ").concat(contentDispositionFilename || document.title));
} else if (contentDispositionFilename) {
_this5.setTitle(contentDispositionFilename);
}
+
if (info.IsAcroFormPresent) {
console.warn('Warning: AcroForm/XFA is not supported');
+
_this5.fallback(_pdfjsLib.UNSUPPORTED_FEATURES.forms);
}
});
@@ -1311,28 +1432,32 @@ var PDFViewerApplication = {
setInitialView: function setInitialView(storedHash) {
var _this6 = this;
- var _ref13 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
- rotation = _ref13.rotation,
- sidebarView = _ref13.sidebarView,
- scrollMode = _ref13.scrollMode,
- spreadMode = _ref13.spreadMode;
+ var _ref6 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+ rotation = _ref6.rotation,
+ sidebarView = _ref6.sidebarView,
+ scrollMode = _ref6.scrollMode,
+ spreadMode = _ref6.spreadMode;
var setRotation = function setRotation(angle) {
if ((0, _ui_utils.isValidRotation)(angle)) {
_this6.pdfViewer.pagesRotation = angle;
}
};
+
var setViewerModes = function setViewerModes(scroll, spread) {
if (Number.isInteger(scroll)) {
_this6.pdfViewer.scrollMode = scroll;
}
+
if (Number.isInteger(spread)) {
_this6.pdfViewer.spreadMode = spread;
}
};
+
setViewerModes(scrollMode, spreadMode);
this.isInitialViewSet = true;
this.pdfSidebar.setInitialView(sidebarView);
+
if (this.initialBookmark) {
setRotation(this.initialRotation);
delete this.initialRotation;
@@ -1342,8 +1467,10 @@ var PDFViewerApplication = {
setRotation(rotation);
this.pdfLinkService.setHash(storedHash);
}
+
this.toolbar.setPageNumber(this.pdfViewer.currentPageNumber, this.pdfViewer.currentPageLabel);
this.secondaryToolbar.setPageNumber(this.pdfViewer.currentPageNumber);
+
if (!this.pdfViewer.currentScaleValue) {
this.pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
}
@@ -1352,8 +1479,10 @@ var PDFViewerApplication = {
if (!this.pdfDocument) {
return;
}
+
this.pdfViewer.cleanup();
this.pdfThumbnailViewer.cleanup();
+
if (this.pdfViewer.renderer !== _ui_utils.RendererType.SVG) {
this.pdfDocument.cleanup();
}
@@ -1369,18 +1498,21 @@ var PDFViewerApplication = {
if (this.printService) {
return;
}
+
if (!this.supportsPrinting) {
this.l10n.get('printing_not_supported', null, 'Warning: Printing is not fully supported by ' + 'this browser.').then(function (printMessage) {
_this7.error(printMessage);
});
return;
}
+
if (!this.pdfViewer.pageViewsReady) {
this.l10n.get('printing_not_ready', null, 'Warning: The PDF is not fully loaded for printing.').then(function (notReadyMessage) {
window.alert(notReadyMessage);
});
return;
}
+
var pagesOverview = this.pdfViewer.getPagesOverview();
var printContainer = this.appConfig.printContainer;
var printService = PDFPrintServiceFactory.instance.createPrintService(this.pdfDocument, pagesOverview, printContainer, this.l10n);
@@ -1388,18 +1520,19 @@ var PDFViewerApplication = {
this.forceRendering();
printService.layout();
},
-
afterPrint: function pdfViewSetupAfterPrint() {
if (this.printService) {
this.printService.destroy();
this.printService = null;
}
+
this.forceRendering();
},
rotatePages: function rotatePages(delta) {
if (!this.pdfDocument) {
return;
}
+
var newRotation = (this.pdfViewer.pagesRotation + 360 + delta) % 360;
this.pdfViewer.pagesRotation = newRotation;
},
@@ -1407,12 +1540,12 @@ var PDFViewerApplication = {
if (!this.pdfPresentationMode) {
return;
}
+
this.pdfPresentationMode.request();
},
bindEvents: function bindEvents() {
var eventBus = this.eventBus,
_boundEvents = this._boundEvents;
-
_boundEvents.beforePrint = this.beforePrint.bind(this);
_boundEvents.afterPrint = this.afterPrint.bind(this);
eventBus.on('resize', webViewerResize);
@@ -1459,20 +1592,31 @@ var PDFViewerApplication = {
_boundEvents = this._boundEvents;
_boundEvents.windowResize = function () {
- eventBus.dispatch('resize', { source: window });
+ eventBus.dispatch('resize', {
+ source: window
+ });
};
+
_boundEvents.windowHashChange = function () {
eventBus.dispatch('hashchange', {
source: window,
hash: document.location.hash.substring(1)
});
};
+
_boundEvents.windowBeforePrint = function () {
- eventBus.dispatch('beforeprint', { source: window });
+ eventBus.dispatch('beforeprint', {
+ source: window
+ });
};
+
_boundEvents.windowAfterPrint = function () {
- eventBus.dispatch('afterprint', { source: window });
+ eventBus.dispatch('afterprint', {
+ source: window
+ });
};
+
+ window.addEventListener('visibilitychange', webViewerVisibilityChange);
window.addEventListener('wheel', webViewerWheel);
window.addEventListener('click', webViewerClick);
window.addEventListener('keydown', webViewerKeyDown);
@@ -1484,7 +1628,6 @@ var PDFViewerApplication = {
unbindEvents: function unbindEvents() {
var eventBus = this.eventBus,
_boundEvents = this._boundEvents;
-
eventBus.off('resize', webViewerResize);
eventBus.off('hashchange', webViewerHashchange);
eventBus.off('beforeprint', _boundEvents.beforePrint);
@@ -1528,7 +1671,7 @@ var PDFViewerApplication = {
},
unbindWindowEvents: function unbindWindowEvents() {
var _boundEvents = this._boundEvents;
-
+ window.removeEventListener('visibilitychange', webViewerVisibilityChange);
window.removeEventListener('wheel', webViewerWheel);
window.removeEventListener('click', webViewerClick);
window.removeEventListener('keydown', webViewerKeyDown);
@@ -1542,13 +1685,17 @@ var PDFViewerApplication = {
_boundEvents.windowAfterPrint = null;
}
};
+exports.PDFViewerApplication = PDFViewerApplication;
/* saladict */var validateFileURL = () => {};
+
function loadFakeWorker() {
if (!_pdfjsLib.GlobalWorkerOptions.workerSrc) {
_pdfjsLib.GlobalWorkerOptions.workerSrc = _app_options.AppOptions.get('workerSrc');
}
+
return (0, _pdfjsLib.loadScript)(_pdfjsLib.PDFWorker.getWorkerSrc());
}
+
function loadAndEnablePDFBug(enabledTabs) {
var appConfig = PDFViewerApplication.appConfig;
return (0, _pdfjsLib.loadScript)(appConfig.debuggerScriptPath).then(function () {
@@ -1559,9 +1706,10 @@ function loadAndEnablePDFBug(enabledTabs) {
}, appConfig.mainContainer);
});
}
+
function webViewerInitialized() {
var appConfig = PDFViewerApplication.appConfig;
- var file = void 0;
+ var file;
var queryString = document.location.search.substring(1);
var params = (0, _ui_utils.parseQueryString)(queryString);
file = 'file' in params ? params.file : _app_options.AppOptions.get('defaultUrl');
@@ -1572,17 +1720,21 @@ function webViewerInitialized() {
fileInput.setAttribute('type', 'file');
fileInput.oncontextmenu = _ui_utils.noContextMenuHandler;
document.body.appendChild(fileInput);
+
if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
appConfig.toolbar.openFile.setAttribute('hidden', 'true');
appConfig.secondaryToolbar.openFileButton.setAttribute('hidden', 'true');
} else {
fileInput.value = null;
}
+
fileInput.addEventListener('change', function (evt) {
var files = evt.target.files;
+
if (!files || files.length === 0) {
return;
}
+
PDFViewerApplication.eventBus.dispatch('fileinputchange', {
source: this,
fileInput: evt.target
@@ -1595,33 +1747,42 @@ function webViewerInitialized() {
appConfig.mainContainer.addEventListener('drop', function (evt) {
evt.preventDefault();
var files = evt.dataTransfer.files;
+
if (!files || files.length === 0) {
return;
}
+
PDFViewerApplication.eventBus.dispatch('fileinputchange', {
source: this,
fileInput: evt.dataTransfer
});
});
+
if (!PDFViewerApplication.supportsPrinting) {
appConfig.toolbar.print.classList.add('hidden');
appConfig.secondaryToolbar.printButton.classList.add('hidden');
}
+
if (!PDFViewerApplication.supportsFullscreen) {
appConfig.toolbar.presentationModeButton.classList.add('hidden');
appConfig.secondaryToolbar.presentationModeButton.classList.add('hidden');
}
+
if (PDFViewerApplication.supportsIntegratedFind) {
appConfig.toolbar.viewFind.classList.add('hidden');
}
+
appConfig.mainContainer.addEventListener('transitionend', function (evt) {
if (evt.target === this) {
- PDFViewerApplication.eventBus.dispatch('resize', { source: this });
+ PDFViewerApplication.eventBus.dispatch('resize', {
+ source: this
+ });
}
}, true);
appConfig.sidebar.toggleButton.addEventListener('click', function () {
PDFViewerApplication.pdfSidebar.toggle();
});
+
try {
webViewerOpenFileViaURL(file);
} catch (reason) {
@@ -1630,15 +1791,18 @@ function webViewerInitialized() {
});
}
}
-var webViewerOpenFileViaURL = void 0;
+
+var webViewerOpenFileViaURL;
{
webViewerOpenFileViaURL = function webViewerOpenFileViaURL(file) {
if (file && file.lastIndexOf('file:', 0) === 0) {
PDFViewerApplication.setTitleUsingUrl(file);
var xhr = new XMLHttpRequest();
+
xhr.onload = function () {
PDFViewerApplication.open(new Uint8Array(xhr.response));
};
+
try {
xhr.open('GET', file);
xhr.responseType = 'arraybuffer';
@@ -1646,89 +1810,113 @@ var webViewerOpenFileViaURL = void 0;
} catch (ex) {
throw ex;
}
+
return;
}
+
if (file) {
PDFViewerApplication.open(file);
}
};
}
+
function webViewerPageRendered(evt) {
var pageNumber = evt.pageNumber;
var pageIndex = pageNumber - 1;
var pageView = PDFViewerApplication.pdfViewer.getPageView(pageIndex);
+
if (pageNumber === PDFViewerApplication.page) {
PDFViewerApplication.toolbar.updateLoadingIndicatorState(false);
}
+
if (!pageView) {
return;
}
+
if (PDFViewerApplication.pdfSidebar.isThumbnailViewVisible) {
var thumbnailView = PDFViewerApplication.pdfThumbnailViewer.getThumbnail(pageIndex);
thumbnailView.setImage(pageView);
}
+
if (typeof Stats !== 'undefined' && Stats.enabled && pageView.stats) {
Stats.add(pageNumber, pageView.stats);
}
+
if (pageView.error) {
PDFViewerApplication.l10n.get('rendering_error', null, 'An error occurred while rendering the page.').then(function (msg) {
PDFViewerApplication.error(msg, pageView.error);
});
}
}
+
function webViewerTextLayerRendered(evt) {}
+
function webViewerPageMode(evt) {
var mode = evt.mode,
- view = void 0;
+ view;
+
switch (mode) {
case 'thumbs':
view = _pdf_sidebar.SidebarView.THUMBS;
break;
+
case 'bookmarks':
case 'outline':
view = _pdf_sidebar.SidebarView.OUTLINE;
break;
+
case 'attachments':
view = _pdf_sidebar.SidebarView.ATTACHMENTS;
break;
+
case 'none':
view = _pdf_sidebar.SidebarView.NONE;
break;
+
default:
console.error('Invalid "pagemode" hash parameter: ' + mode);
return;
}
+
PDFViewerApplication.pdfSidebar.switchView(view, true);
}
+
function webViewerNamedAction(evt) {
var action = evt.action;
+
switch (action) {
case 'GoToPage':
PDFViewerApplication.appConfig.toolbar.pageNumber.select();
break;
+
case 'Find':
if (!PDFViewerApplication.supportsIntegratedFind) {
PDFViewerApplication.findBar.toggle();
}
+
break;
}
}
+
function webViewerPresentationModeChanged(evt) {
var active = evt.active,
switchInProgress = evt.switchInProgress;
-
PDFViewerApplication.pdfViewer.presentationModeState = switchInProgress ? _ui_utils.PresentationModeState.CHANGING : active ? _ui_utils.PresentationModeState.FULLSCREEN : _ui_utils.PresentationModeState.NORMAL;
}
+
function webViewerSidebarViewChanged(evt) {
PDFViewerApplication.pdfRenderingQueue.isThumbnailViewEnabled = PDFViewerApplication.pdfSidebar.isThumbnailViewVisible;
var store = PDFViewerApplication.store;
+
if (store && PDFViewerApplication.isInitialViewSet) {
store.set('sidebarView', evt.view).catch(function () {});
}
}
+
function webViewerUpdateViewarea(evt) {
var location = evt.location,
store = PDFViewerApplication.store;
+
if (store && PDFViewerApplication.isInitialViewSet) {
store.setMultiple({
'page': location.pageNumber,
@@ -1738,6 +1926,7 @@ function webViewerUpdateViewarea(evt) {
'rotation': location.rotation
}).catch(function () {});
}
+
var href = PDFViewerApplication.pdfLinkService.getAnchorUrl(location.pdfOpenParams);
PDFViewerApplication.appConfig.toolbar.viewBookmark.href = href;
PDFViewerApplication.appConfig.secondaryToolbar.viewBookmarkButton.href = href;
@@ -1745,18 +1934,23 @@ function webViewerUpdateViewarea(evt) {
var loading = currentPage.renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED;
PDFViewerApplication.toolbar.updateLoadingIndicatorState(loading);
}
+
function webViewerScrollModeChanged(evt) {
var store = PDFViewerApplication.store;
+
if (store && PDFViewerApplication.isInitialViewSet) {
store.set('scrollMode', evt.mode).catch(function () {});
}
}
+
function webViewerSpreadModeChanged(evt) {
var store = PDFViewerApplication.store;
+
if (store && PDFViewerApplication.isInitialViewSet) {
store.set('spreadMode', evt.mode).catch(function () {});
}
}
+
function webViewerResize() {
var pdfDocument = PDFViewerApplication.pdfDocument,
pdfViewer = PDFViewerApplication.pdfViewer;
@@ -1764,48 +1958,62 @@ function webViewerResize() {
if (!pdfDocument) {
return;
}
+
var currentScaleValue = pdfViewer.currentScaleValue;
+
if (currentScaleValue === 'auto' || currentScaleValue === 'page-fit' || currentScaleValue === 'page-width') {
pdfViewer.currentScaleValue = currentScaleValue;
}
+
pdfViewer.update();
}
+
function webViewerHashchange(evt) {
var hash = evt.hash;
+
if (!hash) {
return;
}
+
if (!PDFViewerApplication.isInitialViewSet) {
PDFViewerApplication.initialBookmark = hash;
} else if (!PDFViewerApplication.pdfHistory.popStateInProgress) {
PDFViewerApplication.pdfLinkService.setHash(hash);
}
}
-var webViewerFileInputChange = void 0;
+
+var webViewerFileInputChange;
{
webViewerFileInputChange = function webViewerFileInputChange(evt) {
if (PDFViewerApplication.pdfViewer && PDFViewerApplication.pdfViewer.isInPresentationMode) {
return;
}
+
var file = evt.fileInput.files[0];
+
if (_pdfjsLib.URL.createObjectURL && !_app_options.AppOptions.get('disableCreateObjectURL')) {
- var _url = _pdfjsLib.URL.createObjectURL(file);
+ var url = _pdfjsLib.URL.createObjectURL(file);
+
if (file.name) {
- _url = {
- url: _url,
+ url = {
+ url: url,
originalUrl: file.name
};
}
- PDFViewerApplication.open(_url);
+
+ PDFViewerApplication.open(url);
} else {
PDFViewerApplication.setTitleUsingUrl(file.name);
var fileReader = new FileReader();
+
fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
var buffer = evt.target.result;
PDFViewerApplication.open(new Uint8Array(buffer));
};
+
fileReader.readAsArrayBuffer(file);
}
+
var appConfig = PDFViewerApplication.appConfig;
appConfig.toolbar.viewBookmark.setAttribute('hidden', 'true');
appConfig.secondaryToolbar.viewBookmarkButton.setAttribute('hidden', 'true');
@@ -1813,66 +2021,88 @@ var webViewerFileInputChange = void 0;
appConfig.secondaryToolbar.downloadButton.setAttribute('hidden', 'true');
};
}
+
function webViewerPresentationMode() {
PDFViewerApplication.requestPresentationMode();
}
+
function webViewerOpenFile() {
var openFileInputName = PDFViewerApplication.appConfig.openFileInputName;
document.getElementById(openFileInputName).click();
}
+
function webViewerPrint() {
window.print();
}
+
function webViewerDownload() {
PDFViewerApplication.download();
}
+
function webViewerFirstPage() {
if (PDFViewerApplication.pdfDocument) {
PDFViewerApplication.page = 1;
}
}
+
function webViewerLastPage() {
if (PDFViewerApplication.pdfDocument) {
PDFViewerApplication.page = PDFViewerApplication.pagesCount;
}
}
+
function webViewerNextPage() {
PDFViewerApplication.page++;
}
+
function webViewerPreviousPage() {
PDFViewerApplication.page--;
}
+
function webViewerZoomIn() {
PDFViewerApplication.zoomIn();
}
+
function webViewerZoomOut() {
PDFViewerApplication.zoomOut();
}
+
function webViewerPageNumberChanged(evt) {
var pdfViewer = PDFViewerApplication.pdfViewer;
- pdfViewer.currentPageLabel = evt.value;
+
+ if (evt.value !== '') {
+ pdfViewer.currentPageLabel = evt.value;
+ }
+
if (evt.value !== pdfViewer.currentPageNumber.toString() && evt.value !== pdfViewer.currentPageLabel) {
PDFViewerApplication.toolbar.setPageNumber(pdfViewer.currentPageNumber, pdfViewer.currentPageLabel);
}
}
+
function webViewerScaleChanged(evt) {
PDFViewerApplication.pdfViewer.currentScaleValue = evt.value;
}
+
function webViewerRotateCw() {
PDFViewerApplication.rotatePages(90);
}
+
function webViewerRotateCcw() {
PDFViewerApplication.rotatePages(-90);
}
+
function webViewerSwitchScrollMode(evt) {
PDFViewerApplication.pdfViewer.scrollMode = evt.mode;
}
+
function webViewerSwitchSpreadMode(evt) {
PDFViewerApplication.pdfViewer.spreadMode = evt.mode;
}
+
function webViewerDocumentProperties() {
PDFViewerApplication.pdfDocumentProperties.open();
}
+
function webViewerFind(evt) {
PDFViewerApplication.findController.executeCommand('find' + evt.type, {
query: evt.query,
@@ -1883,6 +2113,7 @@ function webViewerFind(evt) {
findPrevious: evt.findPrevious
});
}
+
function webViewerFindFromUrlHash(evt) {
PDFViewerApplication.findController.executeCommand('find', {
query: evt.query,
@@ -1893,8 +2124,9 @@ function webViewerFindFromUrlHash(evt) {
findPrevious: false
});
}
-function webViewerUpdateFindMatchesCount(_ref15) {
- var matchesCount = _ref15.matchesCount;
+
+function webViewerUpdateFindMatchesCount(_ref8) {
+ var matchesCount = _ref8.matchesCount;
if (PDFViewerApplication.supportsIntegratedFind) {
PDFViewerApplication.externalServices.updateFindMatchesCount(matchesCount);
@@ -1902,10 +2134,11 @@ function webViewerUpdateFindMatchesCount(_ref15) {
PDFViewerApplication.findBar.updateResultsCount(matchesCount);
}
}
-function webViewerUpdateFindControlState(_ref16) {
- var state = _ref16.state,
- previous = _ref16.previous,
- matchesCount = _ref16.matchesCount;
+
+function webViewerUpdateFindControlState(_ref9) {
+ var state = _ref9.state,
+ previous = _ref9.previous,
+ matchesCount = _ref9.matchesCount;
if (PDFViewerApplication.supportsIntegratedFind) {
PDFViewerApplication.externalServices.updateFindControlState({
@@ -1917,55 +2150,87 @@ function webViewerUpdateFindControlState(_ref16) {
PDFViewerApplication.findBar.updateUIState(state, previous, matchesCount);
}
}
+
function webViewerScaleChanging(evt) {
PDFViewerApplication.toolbar.setPageScale(evt.presetValue, evt.scale);
PDFViewerApplication.pdfViewer.update();
}
+
function webViewerRotationChanging(evt) {
PDFViewerApplication.pdfThumbnailViewer.pagesRotation = evt.pagesRotation;
PDFViewerApplication.forceRendering();
PDFViewerApplication.pdfViewer.currentPageNumber = evt.pageNumber;
}
+
function webViewerPageChanging(evt) {
var page = evt.pageNumber;
PDFViewerApplication.toolbar.setPageNumber(page, evt.pageLabel || null);
PDFViewerApplication.secondaryToolbar.setPageNumber(page);
+
if (PDFViewerApplication.pdfSidebar.isThumbnailViewVisible) {
PDFViewerApplication.pdfThumbnailViewer.scrollThumbnailIntoView(page);
}
+
if (typeof Stats !== 'undefined' && Stats.enabled) {
var pageView = PDFViewerApplication.pdfViewer.getPageView(page - 1);
+
if (pageView && pageView.stats) {
Stats.add(page, pageView.stats);
}
}
}
-var zoomDisabled = false,
- zoomDisabledTimeout = void 0;
+
+function webViewerVisibilityChange(evt) {
+ if (document.visibilityState === 'visible') {
+ setZoomDisabledTimeout();
+ }
+}
+
+var zoomDisabledTimeout = null;
+
+function setZoomDisabledTimeout() {
+ if (zoomDisabledTimeout) {
+ clearTimeout(zoomDisabledTimeout);
+ }
+
+ zoomDisabledTimeout = setTimeout(function () {
+ zoomDisabledTimeout = null;
+ }, WHEEL_ZOOM_DISABLED_TIMEOUT);
+}
+
function webViewerWheel(evt) {
var pdfViewer = PDFViewerApplication.pdfViewer;
+
if (pdfViewer.isInPresentationMode) {
return;
}
+
if (evt.ctrlKey || evt.metaKey) {
var support = PDFViewerApplication.supportedMouseWheelZoomModifierKeys;
+
if (evt.ctrlKey && !support.ctrlKey || evt.metaKey && !support.metaKey) {
return;
}
+
evt.preventDefault();
- if (zoomDisabled) {
+
+ if (zoomDisabledTimeout || document.visibilityState === 'hidden') {
return;
}
+
var previousScale = pdfViewer.currentScale;
var delta = (0, _ui_utils.normalizeWheelEventDelta)(evt);
var MOUSE_WHEEL_DELTA_PER_PAGE_SCALE = 3.0;
var ticks = delta * MOUSE_WHEEL_DELTA_PER_PAGE_SCALE;
+
if (ticks < 0) {
PDFViewerApplication.zoomOut(-ticks);
} else {
PDFViewerApplication.zoomIn(ticks);
}
+
var currentScale = pdfViewer.currentScale;
+
if (previousScale !== currentScale) {
var scaleCorrectionFactor = currentScale / previousScale - 1;
var rect = pdfViewer.container.getBoundingClientRect();
@@ -1975,31 +2240,33 @@ function webViewerWheel(evt) {
pdfViewer.container.scrollTop += dy * scaleCorrectionFactor;
}
} else {
- zoomDisabled = true;
- clearTimeout(zoomDisabledTimeout);
- zoomDisabledTimeout = setTimeout(function () {
- zoomDisabled = false;
- }, 1000);
+ setZoomDisabledTimeout();
}
}
+
function webViewerClick(evt) {
if (!PDFViewerApplication.secondaryToolbar.isOpen) {
return;
}
+
var appConfig = PDFViewerApplication.appConfig;
+
if (PDFViewerApplication.pdfViewer.containsElement(evt.target) || appConfig.toolbar.container.contains(evt.target) && evt.target !== appConfig.secondaryToolbar.toggleButton) {
PDFViewerApplication.secondaryToolbar.close();
}
}
+
function webViewerKeyDown(evt) {
if (PDFViewerApplication.overlayManager.active) {
return;
}
+
var handled = false,
ensureViewerFocused = false;
var cmd = (evt.ctrlKey ? 1 : 0) | (evt.altKey ? 2 : 0) | (evt.shiftKey ? 4 : 0) | (evt.metaKey ? 8 : 0);
var pdfViewer = PDFViewerApplication.pdfViewer;
var isViewerInPresentationMode = pdfViewer && pdfViewer.isInPresentationMode;
+
if (cmd === 1 || cmd === 8 || cmd === 5 || cmd === 12) {
switch (evt.keyCode) {
case 70:
@@ -2007,10 +2274,13 @@ function webViewerKeyDown(evt) {
PDFViewerApplication.findBar.open();
handled = true;
}
+
break;
+
case 71:
if (!PDFViewerApplication.supportsIntegratedFind) {
var findState = PDFViewerApplication.findController.state;
+
if (findState) {
PDFViewerApplication.findController.executeCommand('findagain', {
query: findState.query,
@@ -2021,9 +2291,12 @@ function webViewerKeyDown(evt) {
findPrevious: cmd === 5 || cmd === 12
});
}
+
handled = true;
}
+
break;
+
case 61:
case 107:
case 187:
@@ -2031,16 +2304,20 @@ function webViewerKeyDown(evt) {
if (!isViewerInPresentationMode) {
PDFViewerApplication.zoomIn();
}
+
handled = true;
break;
+
case 173:
case 109:
case 189:
if (!isViewerInPresentationMode) {
PDFViewerApplication.zoomOut();
}
+
handled = true;
break;
+
case 48:
case 96:
if (!isViewerInPresentationMode) {
@@ -2049,23 +2326,29 @@ function webViewerKeyDown(evt) {
});
handled = false;
}
+
break;
+
case 38:
if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
PDFViewerApplication.page = 1;
handled = true;
ensureViewerFocused = true;
}
+
break;
+
case 40:
if (isViewerInPresentationMode || PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
PDFViewerApplication.page = PDFViewerApplication.pagesCount;
handled = true;
ensureViewerFocused = true;
}
+
break;
}
}
+
if (cmd === 1 || cmd === 8) {
switch (evt.keyCode) {
case 83:
@@ -2074,113 +2357,147 @@ function webViewerKeyDown(evt) {
break;
}
}
+
if (cmd === 3 || cmd === 10) {
switch (evt.keyCode) {
case 80:
PDFViewerApplication.requestPresentationMode();
handled = true;
break;
+
case 71:
PDFViewerApplication.appConfig.toolbar.pageNumber.select();
handled = true;
break;
}
}
+
if (handled) {
if (ensureViewerFocused && !isViewerInPresentationMode) {
pdfViewer.focus();
}
+
evt.preventDefault();
return;
}
+
var curElement = document.activeElement || document.querySelector(':focus');
var curElementTagName = curElement && curElement.tagName.toUpperCase();
+
if (curElementTagName === 'INPUT' || curElementTagName === 'TEXTAREA' || curElementTagName === 'SELECT') {
if (evt.keyCode !== 27) {
return;
}
}
+
if (cmd === 0) {
var turnPage = 0,
turnOnlyIfPageFit = false;
+
switch (evt.keyCode) {
case 38:
case 33:
if (pdfViewer.isVerticalScrollbarEnabled) {
turnOnlyIfPageFit = true;
}
+
turnPage = -1;
break;
+
case 8:
if (!isViewerInPresentationMode) {
turnOnlyIfPageFit = true;
}
+
turnPage = -1;
break;
+
case 37:
if (pdfViewer.isHorizontalScrollbarEnabled) {
turnOnlyIfPageFit = true;
}
+
case 75:
case 80:
turnPage = -1;
break;
+
case 27:
if (PDFViewerApplication.secondaryToolbar.isOpen) {
PDFViewerApplication.secondaryToolbar.close();
handled = true;
}
+
if (!PDFViewerApplication.supportsIntegratedFind && PDFViewerApplication.findBar.opened) {
PDFViewerApplication.findBar.close();
handled = true;
}
+
break;
+
case 40:
case 34:
if (pdfViewer.isVerticalScrollbarEnabled) {
turnOnlyIfPageFit = true;
}
+
turnPage = 1;
break;
+
case 13:
case 32:
if (!isViewerInPresentationMode) {
turnOnlyIfPageFit = true;
}
+
turnPage = 1;
break;
+
case 39:
if (pdfViewer.isHorizontalScrollbarEnabled) {
turnOnlyIfPageFit = true;
}
+
case 74:
case 78:
turnPage = 1;
break;
+
case 36:
if (isViewerInPresentationMode || PDFViewerApplication.page > 1) {
PDFViewerApplication.page = 1;
handled = true;
ensureViewerFocused = true;
}
+
break;
+
case 35:
if (isViewerInPresentationMode || PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
PDFViewerApplication.page = PDFViewerApplication.pagesCount;
handled = true;
ensureViewerFocused = true;
}
+
break;
+
case 83:
PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool.SELECT);
break;
+
case 72:
PDFViewerApplication.pdfCursorTools.switchTool(_pdf_cursor_tools.CursorTool.HAND);
break;
+
case 82:
PDFViewerApplication.rotatePages(90);
break;
+
+ case 115:
+ PDFViewerApplication.pdfSidebar.toggle();
+ break;
}
+
if (turnPage !== 0 && (!turnOnlyIfPageFit || pdfViewer.currentScaleValue === 'page-fit')) {
if (turnPage > 0) {
if (PDFViewerApplication.page < PDFViewerApplication.pagesCount) {
@@ -2191,9 +2508,11 @@ function webViewerKeyDown(evt) {
PDFViewerApplication.page--;
}
}
+
handled = true;
}
}
+
if (cmd === 4) {
switch (evt.keyCode) {
case 13:
@@ -2201,42 +2520,55 @@ function webViewerKeyDown(evt) {
if (!isViewerInPresentationMode && pdfViewer.currentScaleValue !== 'page-fit') {
break;
}
+
if (PDFViewerApplication.page > 1) {
PDFViewerApplication.page--;
}
+
handled = true;
break;
+
case 82:
PDFViewerApplication.rotatePages(-90);
break;
}
}
+
if (!handled && !isViewerInPresentationMode) {
if (evt.keyCode >= 33 && evt.keyCode <= 40 || evt.keyCode === 32 && curElementTagName !== 'BUTTON') {
ensureViewerFocused = true;
}
}
+
if (ensureViewerFocused && !pdfViewer.containsElement(curElement)) {
pdfViewer.focus();
}
+
if (handled) {
evt.preventDefault();
}
}
+
function apiPageModeToSidebarView(mode) {
switch (mode) {
case 'UseNone':
return _pdf_sidebar.SidebarView.NONE;
+
case 'UseThumbs':
return _pdf_sidebar.SidebarView.THUMBS;
+
case 'UseOutlines':
return _pdf_sidebar.SidebarView.OUTLINE;
+
case 'UseAttachments':
return _pdf_sidebar.SidebarView.ATTACHMENTS;
+
case 'UseOC':
}
+
return _pdf_sidebar.SidebarView.NONE;
}
+
var PDFPrintServiceFactory = {
instance: {
supportsPrinting: false,
@@ -2245,8 +2577,6 @@ var PDFPrintServiceFactory = {
}
}
};
-exports.PDFViewerApplication = PDFViewerApplication;
-exports.DefaultExternalServices = DefaultExternalServices;
exports.PDFPrintServiceFactory = PDFPrintServiceFactory;
/***/ }),
@@ -2265,13 +2595,17 @@ module.exports = __webpack_require__(3);
"use strict";
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
var g = function () {
- return this;
+ return this || (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" && self;
}() || Function("return this")();
+
var hadRuntime = g.regeneratorRuntime && Object.getOwnPropertyNames(g).indexOf("regeneratorRuntime") >= 0;
var oldRuntime = hadRuntime && g.regeneratorRuntime;
g.regeneratorRuntime = undefined;
module.exports = __webpack_require__(4);
+
if (hadRuntime) {
g.regeneratorRuntime = oldRuntime;
} else {
@@ -2289,7 +2623,7 @@ if (hadRuntime) {
"use strict";
/* WEBPACK VAR INJECTION */(function(module) {
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
!function (global) {
"use strict";
@@ -2303,13 +2637,17 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
var toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
var inModule = ( false ? undefined : _typeof(module)) === "object";
var runtime = global.regeneratorRuntime;
+
if (runtime) {
if (inModule) {
module.exports = runtime;
}
+
return;
}
+
runtime = global.regeneratorRuntime = inModule ? module.exports : {};
+
function wrap(innerFn, outerFn, self, tryLocsList) {
var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator;
var generator = Object.create(protoGenerator.prototype);
@@ -2317,7 +2655,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
generator._invoke = makeInvokeMethod(innerFn, self, context);
return generator;
}
+
runtime.wrap = wrap;
+
function tryCatch(fn, obj, arg) {
try {
return {
@@ -2331,27 +2671,37 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
};
}
}
+
var GenStateSuspendedStart = "suspendedStart";
var GenStateSuspendedYield = "suspendedYield";
var GenStateExecuting = "executing";
var GenStateCompleted = "completed";
var ContinueSentinel = {};
+
function Generator() {}
+
function GeneratorFunction() {}
+
function GeneratorFunctionPrototype() {}
+
var IteratorPrototype = {};
+
IteratorPrototype[iteratorSymbol] = function () {
return this;
};
+
var getProto = Object.getPrototypeOf;
var NativeIteratorPrototype = getProto && getProto(getProto(values([])));
+
if (NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol)) {
IteratorPrototype = NativeIteratorPrototype;
}
+
var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
GeneratorFunction.prototype = Gp.constructor = GeneratorFunctionPrototype;
GeneratorFunctionPrototype.constructor = GeneratorFunction;
GeneratorFunctionPrototype[toStringTagSymbol] = GeneratorFunction.displayName = "GeneratorFunction";
+
function defineIteratorMethods(prototype) {
["next", "throw", "return"].forEach(function (method) {
prototype[method] = function (arg) {
@@ -2359,91 +2709,120 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
};
});
}
+
runtime.isGeneratorFunction = function (genFun) {
var ctor = typeof genFun === "function" && genFun.constructor;
return ctor ? ctor === GeneratorFunction || (ctor.displayName || ctor.name) === "GeneratorFunction" : false;
};
+
runtime.mark = function (genFun) {
if (Object.setPrototypeOf) {
Object.setPrototypeOf(genFun, GeneratorFunctionPrototype);
} else {
genFun.__proto__ = GeneratorFunctionPrototype;
+
if (!(toStringTagSymbol in genFun)) {
genFun[toStringTagSymbol] = "GeneratorFunction";
}
}
+
genFun.prototype = Object.create(Gp);
return genFun;
};
+
runtime.awrap = function (arg) {
- return { __await: arg };
+ return {
+ __await: arg
+ };
};
+
function AsyncIterator(generator) {
function invoke(method, arg, resolve, reject) {
var record = tryCatch(generator[method], generator, arg);
+
if (record.type === "throw") {
reject(record.arg);
} else {
var result = record.arg;
var value = result.value;
- if (value && (typeof value === "undefined" ? "undefined" : _typeof(value)) === "object" && hasOwn.call(value, "__await")) {
+
+ if (value && _typeof(value) === "object" && hasOwn.call(value, "__await")) {
return Promise.resolve(value.__await).then(function (value) {
invoke("next", value, resolve, reject);
}, function (err) {
invoke("throw", err, resolve, reject);
});
}
+
return Promise.resolve(value).then(function (unwrapped) {
result.value = unwrapped;
resolve(result);
- }, reject);
+ }, function (error) {
+ return invoke("throw", error, resolve, reject);
+ });
}
}
+
var previousPromise;
+
function enqueue(method, arg) {
function callInvokeWithMethodAndArg() {
return new Promise(function (resolve, reject) {
invoke(method, arg, resolve, reject);
});
}
+
return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
}
+
this._invoke = enqueue;
}
+
defineIteratorMethods(AsyncIterator.prototype);
+
AsyncIterator.prototype[asyncIteratorSymbol] = function () {
return this;
};
+
runtime.AsyncIterator = AsyncIterator;
+
runtime.async = function (innerFn, outerFn, self, tryLocsList) {
var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList));
return runtime.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
return result.done ? result.value : iter.next();
});
};
+
function makeInvokeMethod(innerFn, self, context) {
var state = GenStateSuspendedStart;
return function invoke(method, arg) {
if (state === GenStateExecuting) {
throw new Error("Generator is already running");
}
+
if (state === GenStateCompleted) {
if (method === "throw") {
throw arg;
}
+
return doneResult();
}
+
context.method = method;
context.arg = arg;
+
while (true) {
var delegate = context.delegate;
+
if (delegate) {
var delegateResult = maybeInvokeDelegate(delegate, context);
+
if (delegateResult) {
if (delegateResult === ContinueSentinel) continue;
return delegateResult;
}
}
+
if (context.method === "next") {
context.sent = context._sent = context.arg;
} else if (context.method === "throw") {
@@ -2451,17 +2830,22 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
state = GenStateCompleted;
throw context.arg;
}
+
context.dispatchException(context.arg);
} else if (context.method === "return") {
context.abrupt("return", context.arg);
}
+
state = GenStateExecuting;
var record = tryCatch(innerFn, self, context);
+
if (record.type === "normal") {
state = context.done ? GenStateCompleted : GenStateSuspendedYield;
+
if (record.arg === ContinueSentinel) {
continue;
}
+
return {
value: record.arg,
done: context.done
@@ -2474,41 +2858,53 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
}
};
}
+
function maybeInvokeDelegate(delegate, context) {
var method = delegate.iterator[context.method];
+
if (method === undefined) {
context.delegate = null;
+
if (context.method === "throw") {
if (delegate.iterator.return) {
context.method = "return";
context.arg = undefined;
maybeInvokeDelegate(delegate, context);
+
if (context.method === "throw") {
return ContinueSentinel;
}
}
+
context.method = "throw";
context.arg = new TypeError("The iterator does not provide a 'throw' method");
}
+
return ContinueSentinel;
}
+
var record = tryCatch(method, delegate.iterator, context.arg);
+
if (record.type === "throw") {
context.method = "throw";
context.arg = record.arg;
context.delegate = null;
return ContinueSentinel;
}
+
var info = record.arg;
+
if (!info) {
context.method = "throw";
context.arg = new TypeError("iterator result is not an object");
context.delegate = null;
return ContinueSentinel;
}
+
if (info.done) {
context[delegate.resultName] = info.value;
context.next = delegate.nextLoc;
+
if (context.method !== "return") {
context.method = "next";
context.arg = undefined;
@@ -2516,67 +2912,90 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else {
return info;
}
+
context.delegate = null;
return ContinueSentinel;
}
+
defineIteratorMethods(Gp);
Gp[toStringTagSymbol] = "Generator";
+
Gp[iteratorSymbol] = function () {
return this;
};
+
Gp.toString = function () {
return "[object Generator]";
};
+
function pushTryEntry(locs) {
- var entry = { tryLoc: locs[0] };
+ var entry = {
+ tryLoc: locs[0]
+ };
+
if (1 in locs) {
entry.catchLoc = locs[1];
}
+
if (2 in locs) {
entry.finallyLoc = locs[2];
entry.afterLoc = locs[3];
}
+
this.tryEntries.push(entry);
}
+
function resetTryEntry(entry) {
var record = entry.completion || {};
record.type = "normal";
delete record.arg;
entry.completion = record;
}
+
function Context(tryLocsList) {
- this.tryEntries = [{ tryLoc: "root" }];
+ this.tryEntries = [{
+ tryLoc: "root"
+ }];
tryLocsList.forEach(pushTryEntry, this);
this.reset(true);
}
+
runtime.keys = function (object) {
var keys = [];
+
for (var key in object) {
keys.push(key);
}
+
keys.reverse();
return function next() {
while (keys.length) {
var key = keys.pop();
+
if (key in object) {
next.value = key;
next.done = false;
return next;
}
}
+
next.done = true;
return next;
};
};
+
function values(iterable) {
if (iterable) {
var iteratorMethod = iterable[iteratorSymbol];
+
if (iteratorMethod) {
return iteratorMethod.call(iterable);
}
+
if (typeof iterable.next === "function") {
return iterable;
}
+
if (!isNaN(iterable.length)) {
var i = -1,
next = function next() {
@@ -2587,22 +3006,30 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
return next;
}
}
+
next.value = undefined;
next.done = true;
return next;
};
+
return next.next = next;
}
}
- return { next: doneResult };
+
+ return {
+ next: doneResult
+ };
}
+
runtime.values = values;
+
function doneResult() {
return {
value: undefined,
done: true
};
}
+
Context.prototype = {
constructor: Context,
reset: function reset(skipTempReset) {
@@ -2614,6 +3041,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.method = "next";
this.arg = undefined;
this.tryEntries.forEach(resetTryEntry);
+
if (!skipTempReset) {
for (var name in this) {
if (name.charAt(0) === "t" && hasOwn.call(this, name) && !isNaN(+name.slice(1))) {
@@ -2626,35 +3054,45 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
this.done = true;
var rootEntry = this.tryEntries[0];
var rootRecord = rootEntry.completion;
+
if (rootRecord.type === "throw") {
throw rootRecord.arg;
}
+
return this.rval;
},
dispatchException: function dispatchException(exception) {
if (this.done) {
throw exception;
}
+
var context = this;
+
function handle(loc, caught) {
record.type = "throw";
record.arg = exception;
context.next = loc;
+
if (caught) {
context.method = "next";
context.arg = undefined;
}
+
return !!caught;
}
+
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
var record = entry.completion;
+
if (entry.tryLoc === "root") {
return handle("end");
}
+
if (entry.tryLoc <= this.prev) {
var hasCatch = hasOwn.call(entry, "catchLoc");
var hasFinally = hasOwn.call(entry, "finallyLoc");
+
if (hasCatch && hasFinally) {
if (this.prev < entry.catchLoc) {
return handle(entry.catchLoc, true);
@@ -2678,28 +3116,34 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
abrupt: function abrupt(type, arg) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
+
if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
var finallyEntry = entry;
break;
}
}
+
if (finallyEntry && (type === "break" || type === "continue") && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc) {
finallyEntry = null;
}
+
var record = finallyEntry ? finallyEntry.completion : {};
record.type = type;
record.arg = arg;
+
if (finallyEntry) {
this.method = "next";
this.next = finallyEntry.finallyLoc;
return ContinueSentinel;
}
+
return this.complete(record);
},
complete: function complete(record, afterLoc) {
if (record.type === "throw") {
throw record.arg;
}
+
if (record.type === "break" || record.type === "continue") {
this.next = record.arg;
} else if (record.type === "return") {
@@ -2709,11 +3153,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
} else if (record.type === "normal" && afterLoc) {
this.next = afterLoc;
}
+
return ContinueSentinel;
},
finish: function finish(finallyLoc) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
+
if (entry.finallyLoc === finallyLoc) {
this.complete(entry.completion, entry.afterLoc);
resetTryEntry(entry);
@@ -2724,15 +3170,19 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
"catch": function _catch(tryLoc) {
for (var i = this.tryEntries.length - 1; i >= 0; --i) {
var entry = this.tryEntries[i];
+
if (entry.tryLoc === tryLoc) {
var record = entry.completion;
+
if (record.type === "throw") {
var thrown = record.arg;
resetTryEntry(entry);
}
+
return thrown;
}
}
+
throw new Error("illegal catch attempt");
},
delegateYield: function delegateYield(iterable, resultName, nextLoc) {
@@ -2741,14 +3191,16 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
resultName: resultName,
nextLoc: nextLoc
};
+
if (this.method === "next") {
this.arg = undefined;
}
+
return ContinueSentinel;
}
};
}(function () {
- return this;
+ return this || (typeof self === "undefined" ? "undefined" : _typeof(self)) === "object" && self;
}() || Function("return this")());
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)(module)))
@@ -2762,6 +3214,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
module.exports = function (module) {
if (!module.webpackPolyfill) {
module.deprecate = function () {};
+
module.paths = [];
if (!module.children) module.children = [];
Object.defineProperty(module, "loaded", {
@@ -2778,6 +3231,7 @@ module.exports = function (module) {
});
module.webpackPolyfill = 1;
}
+
return module;
};
@@ -2791,67 +3245,110 @@ module.exports = function (module) {
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.moveToEndOfArray = exports.waitOnEventOrTimeout = exports.WaitOnType = exports.animationStarted = exports.normalizeWheelEventDelta = exports.binarySearchFirstItem = exports.watchScroll = exports.scrollIntoView = exports.getOutputScale = exports.approximateFraction = exports.getPageSizeInches = exports.roundToDivide = exports.getVisibleElements = exports.backtrackBeforeAllVisibleElements = exports.parseQueryString = exports.noContextMenuHandler = exports.getPDFFileNameFromURL = exports.ProgressBar = exports.getGlobalEventBus = exports.EventBus = exports.NullL10n = exports.TextLayerMode = exports.RendererType = exports.PresentationModeState = exports.isPortraitOrientation = exports.isValidRotation = exports.VERTICAL_PADDING = exports.SCROLLBAR_PADDING = exports.MAX_AUTO_SCALE = exports.UNKNOWN_SCALE = exports.MAX_SCALE = exports.MIN_SCALE = exports.DEFAULT_SCALE = exports.DEFAULT_SCALE_VALUE = exports.CSS_UNITS = undefined;
+exports.isValidRotation = isValidRotation;
+exports.isPortraitOrientation = isPortraitOrientation;
+exports.getGlobalEventBus = getGlobalEventBus;
+exports.getPDFFileNameFromURL = getPDFFileNameFromURL;
+exports.noContextMenuHandler = noContextMenuHandler;
+exports.parseQueryString = parseQueryString;
+exports.backtrackBeforeAllVisibleElements = backtrackBeforeAllVisibleElements;
+exports.getVisibleElements = getVisibleElements;
+exports.roundToDivide = roundToDivide;
+exports.getPageSizeInches = getPageSizeInches;
+exports.approximateFraction = approximateFraction;
+exports.getOutputScale = getOutputScale;
+exports.scrollIntoView = scrollIntoView;
+exports.watchScroll = watchScroll;
+exports.binarySearchFirstItem = binarySearchFirstItem;
+exports.normalizeWheelEventDelta = normalizeWheelEventDelta;
+exports.waitOnEventOrTimeout = waitOnEventOrTimeout;
+exports.moveToEndOfArray = moveToEndOfArray;
+exports.WaitOnType = exports.animationStarted = exports.ProgressBar = exports.EventBus = exports.NullL10n = exports.TextLayerMode = exports.RendererType = exports.PresentationModeState = exports.VERTICAL_PADDING = exports.SCROLLBAR_PADDING = exports.MAX_AUTO_SCALE = exports.UNKNOWN_SCALE = exports.MAX_SCALE = exports.MIN_SCALE = exports.DEFAULT_SCALE = exports.DEFAULT_SCALE_VALUE = exports.CSS_UNITS = void 0;
-var _regenerator = __webpack_require__(2);
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
-var _regenerator2 = _interopRequireDefault(_regenerator);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
var CSS_UNITS = 96.0 / 72.0;
+exports.CSS_UNITS = CSS_UNITS;
var DEFAULT_SCALE_VALUE = 'auto';
+exports.DEFAULT_SCALE_VALUE = DEFAULT_SCALE_VALUE;
var DEFAULT_SCALE = 1.0;
+exports.DEFAULT_SCALE = DEFAULT_SCALE;
var MIN_SCALE = 0.10;
+exports.MIN_SCALE = MIN_SCALE;
var MAX_SCALE = 10.0;
+exports.MAX_SCALE = MAX_SCALE;
var UNKNOWN_SCALE = 0;
+exports.UNKNOWN_SCALE = UNKNOWN_SCALE;
var MAX_AUTO_SCALE = 1.25;
+exports.MAX_AUTO_SCALE = MAX_AUTO_SCALE;
var SCROLLBAR_PADDING = 40;
+exports.SCROLLBAR_PADDING = SCROLLBAR_PADDING;
var VERTICAL_PADDING = 5;
+exports.VERTICAL_PADDING = VERTICAL_PADDING;
var PresentationModeState = {
UNKNOWN: 0,
NORMAL: 1,
CHANGING: 2,
FULLSCREEN: 3
};
+exports.PresentationModeState = PresentationModeState;
var RendererType = {
CANVAS: 'canvas',
SVG: 'svg'
};
+exports.RendererType = RendererType;
var TextLayerMode = {
DISABLE: 0,
ENABLE: 1,
ENABLE_ENHANCE: 2
};
+exports.TextLayerMode = TextLayerMode;
+
function formatL10nValue(text, args) {
if (!args) {
return text;
}
+
return text.replace(/\{\{\s*(\w+)\s*\}\}/g, function (all, name) {
return name in args ? args[name] : '{{' + name + '}}';
});
}
+
var NullL10n = {
getLanguage: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
- return _regenerator2.default.wrap(function _callee$(_context) {
+ var _getLanguage = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- return _context.abrupt('return', 'en-us');
+ return _context.abrupt("return", 'en-us');
case 1:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -2859,21 +3356,23 @@ var NullL10n = {
}));
function getLanguage() {
- return _ref.apply(this, arguments);
+ return _getLanguage.apply(this, arguments);
}
return getLanguage;
}(),
getDirection: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _getDirection = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
- return _context2.abrupt('return', 'ltr');
+ return _context2.abrupt("return", 'ltr');
case 1:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -2881,21 +3380,23 @@ var NullL10n = {
}));
function getDirection() {
- return _ref2.apply(this, arguments);
+ return _getDirection.apply(this, arguments);
}
return getDirection;
}(),
get: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3(property, args, fallback) {
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ var _get = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3(property, args, fallback) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
- return _context3.abrupt('return', formatL10nValue(fallback, args));
+ return _context3.abrupt("return", formatL10nValue(fallback, args));
case 1:
- case 'end':
+ case "end":
return _context3.stop();
}
}
@@ -2903,18 +3404,20 @@ var NullL10n = {
}));
function get(_x, _x2, _x3) {
- return _ref3.apply(this, arguments);
+ return _get.apply(this, arguments);
}
return get;
}(),
translate: function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee4(element) {
- return _regenerator2.default.wrap(function _callee4$(_context4) {
+ var _translate = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee4(element) {
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
- case 'end':
+ case "end":
return _context4.stop();
}
}
@@ -2922,12 +3425,14 @@ var NullL10n = {
}));
function translate(_x4) {
- return _ref4.apply(this, arguments);
+ return _translate.apply(this, arguments);
}
return translate;
}()
};
+exports.NullL10n = NullL10n;
+
function getOutputScale(ctx) {
var devicePixelRatio = window.devicePixelRatio || 1;
var backingStoreRatio = ctx.webkitBackingStorePixelRatio || ctx.mozBackingStorePixelRatio || ctx.msBackingStorePixelRatio || ctx.oBackingStorePixelRatio || ctx.backingStorePixelRatio || 1;
@@ -2938,61 +3443,76 @@ function getOutputScale(ctx) {
scaled: pixelRatio !== 1
};
}
+
function scrollIntoView(element, spot) {
var skipOverflowHiddenElements = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
var parent = element.offsetParent;
+
if (!parent) {
console.error('offsetParent is not set -- cannot scroll');
return;
}
+
var offsetY = element.offsetTop + element.clientTop;
var offsetX = element.offsetLeft + element.clientLeft;
+
while (parent.clientHeight === parent.scrollHeight && parent.clientWidth === parent.scrollWidth || skipOverflowHiddenElements && getComputedStyle(parent).overflow === 'hidden') {
if (parent.dataset._scaleY) {
offsetY /= parent.dataset._scaleY;
offsetX /= parent.dataset._scaleX;
}
+
offsetY += parent.offsetTop;
offsetX += parent.offsetLeft;
parent = parent.offsetParent;
+
if (!parent) {
return;
}
}
+
if (spot) {
if (spot.top !== undefined) {
offsetY += spot.top;
}
+
if (spot.left !== undefined) {
offsetX += spot.left;
parent.scrollLeft = offsetX;
}
}
+
parent.scrollTop = offsetY;
}
+
function watchScroll(viewAreaElement, callback) {
var debounceScroll = function debounceScroll(evt) {
if (rAF) {
return;
}
+
rAF = window.requestAnimationFrame(function viewAreaElementScrolled() {
rAF = null;
var currentX = viewAreaElement.scrollLeft;
var lastX = state.lastX;
+
if (currentX !== lastX) {
state.right = currentX > lastX;
}
+
state.lastX = currentX;
var currentY = viewAreaElement.scrollTop;
var lastY = state.lastY;
+
if (currentY !== lastY) {
state.down = currentY > lastY;
}
+
state.lastY = currentY;
callback(state);
});
};
+
var state = {
right: true,
down: true,
@@ -3004,59 +3524,75 @@ function watchScroll(viewAreaElement, callback) {
viewAreaElement.addEventListener('scroll', debounceScroll, true);
return state;
}
+
function parseQueryString(query) {
var parts = query.split('&');
var params = Object.create(null);
+
for (var i = 0, ii = parts.length; i < ii; ++i) {
var param = parts[i].split('=');
var key = param[0].toLowerCase();
var value = param.length > 1 ? param[1] : null;
params[decodeURIComponent(key)] = decodeURIComponent(value);
}
+
return params;
}
+
function binarySearchFirstItem(items, condition) {
var minIndex = 0;
var maxIndex = items.length - 1;
+
if (items.length === 0 || !condition(items[maxIndex])) {
return items.length;
}
+
if (condition(items[minIndex])) {
return minIndex;
}
+
while (minIndex < maxIndex) {
var currentIndex = minIndex + maxIndex >> 1;
var currentItem = items[currentIndex];
+
if (condition(currentItem)) {
maxIndex = currentIndex;
} else {
minIndex = currentIndex + 1;
}
}
+
return minIndex;
}
+
function approximateFraction(x) {
if (Math.floor(x) === x) {
return [x, 1];
}
+
var xinv = 1 / x;
var limit = 8;
+
if (xinv > limit) {
return [1, limit];
} else if (Math.floor(xinv) === xinv) {
return [1, xinv];
}
+
var x_ = x > 1 ? xinv : x;
var a = 0,
b = 1,
c = 1,
d = 1;
+
while (true) {
var p = a + c,
q = b + d;
+
if (q > limit) {
break;
}
+
if (x_ <= p / q) {
c = p;
d = q;
@@ -3065,22 +3601,27 @@ function approximateFraction(x) {
b = q;
}
}
- var result = void 0;
+
+ var result;
+
if (x_ - a / b < c / d - x_) {
result = x_ === x ? [a, b] : [b, a];
} else {
result = x_ === x ? [c, d] : [d, c];
}
+
return result;
}
+
function roundToDivide(x, div) {
var r = x % div;
return r === 0 ? x : Math.round(x - r + div);
}
-function getPageSizeInches(_ref5) {
- var view = _ref5.view,
- userUnit = _ref5.userUnit,
- rotate = _ref5.rotate;
+
+function getPageSizeInches(_ref) {
+ var view = _ref.view,
+ userUnit = _ref.userUnit,
+ rotate = _ref.rotate;
var _view = _slicedToArray(view, 4),
x1 = _view[0],
@@ -3096,60 +3637,67 @@ function getPageSizeInches(_ref5) {
height: changeOrientation ? width : height
};
}
+
function backtrackBeforeAllVisibleElements(index, views, top) {
if (index < 2) {
return index;
}
+
var elt = views[index].div;
var pageTop = elt.offsetTop + elt.clientTop;
+
if (pageTop >= top) {
elt = views[index - 1].div;
pageTop = elt.offsetTop + elt.clientTop;
}
+
for (var i = index - 2; i >= 0; --i) {
elt = views[i].div;
+
if (elt.offsetTop + elt.clientTop + elt.clientHeight <= pageTop) {
break;
}
+
index = i;
}
+
return index;
}
+
function getVisibleElements(scrollEl, views) {
var sortByVisibility = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
var horizontal = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-
var top = scrollEl.scrollTop,
bottom = top + scrollEl.clientHeight;
var left = scrollEl.scrollLeft,
right = left + scrollEl.clientWidth;
+
function isElementBottomAfterViewTop(view) {
var element = view.div;
var elementBottom = element.offsetTop + element.clientTop + element.clientHeight;
return elementBottom > top;
}
+
function isElementRightAfterViewLeft(view) {
var element = view.div;
var elementRight = element.offsetLeft + element.clientLeft + element.clientWidth;
return elementRight > left;
}
+
var visible = [],
- view = void 0,
- element = void 0;
- var currentHeight = void 0,
- viewHeight = void 0,
- viewBottom = void 0,
- hiddenHeight = void 0;
- var currentWidth = void 0,
- viewWidth = void 0,
- viewRight = void 0,
- hiddenWidth = void 0;
- var percentVisible = void 0;
+ view,
+ element;
+ var currentHeight, viewHeight, viewBottom, hiddenHeight;
+ var currentWidth, viewWidth, viewRight, hiddenWidth;
+ var percentVisible;
var firstVisibleElementInd = views.length === 0 ? 0 : binarySearchFirstItem(views, horizontal ? isElementRightAfterViewLeft : isElementBottomAfterViewTop);
+
if (views.length > 0 && !horizontal) {
firstVisibleElementInd = backtrackBeforeAllVisibleElements(firstVisibleElementInd, views, top);
}
+
var lastEdge = horizontal ? right : -1;
+
for (var i = firstVisibleElementInd, ii = views.length; i < ii; i++) {
view = views[i];
element = view.div;
@@ -3159,6 +3707,7 @@ function getVisibleElements(scrollEl, views) {
viewHeight = element.clientHeight;
viewRight = currentWidth + viewWidth;
viewBottom = currentHeight + viewHeight;
+
if (lastEdge === -1) {
if (viewBottom >= bottom) {
lastEdge = viewBottom;
@@ -3166,9 +3715,11 @@ function getVisibleElements(scrollEl, views) {
} else if ((horizontal ? currentWidth : currentHeight) > lastEdge) {
break;
}
+
if (viewBottom <= top || currentHeight >= bottom || viewRight <= left || currentWidth >= right) {
continue;
}
+
hiddenHeight = Math.max(0, top - currentHeight) + Math.max(0, viewBottom - bottom);
hiddenWidth = Math.max(0, left - currentWidth) + Math.max(0, viewRight - right);
percentVisible = (viewHeight - hiddenHeight) * (viewWidth - hiddenWidth) * 100 / viewHeight / viewWidth | 0;
@@ -3180,125 +3731,159 @@ function getVisibleElements(scrollEl, views) {
percent: percentVisible
});
}
+
var first = visible[0];
var last = visible[visible.length - 1];
+
if (sortByVisibility) {
visible.sort(function (a, b) {
var pc = a.percent - b.percent;
+
if (Math.abs(pc) > 0.001) {
return -pc;
}
+
return a.id - b.id;
});
}
+
return {
first: first,
last: last,
views: visible
};
}
+
function noContextMenuHandler(evt) {
evt.preventDefault();
}
+
function isDataSchema(url) {
var i = 0,
ii = url.length;
+
while (i < ii && url[i].trim() === '') {
i++;
}
+
return url.substring(i, i + 5).toLowerCase() === 'data:';
}
+
function getPDFFileNameFromURL(url) {
var defaultFilename = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'document.pdf';
if (typeof url !== 'string') {
return defaultFilename;
}
+
if (isDataSchema(url)) {
console.warn('getPDFFileNameFromURL: ' + 'ignoring "data:" URL for performance reasons.');
return defaultFilename;
}
+
var reURI = /^(?:(?:[^:]+:)?\/\/[^\/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/;
var reFilename = /[^\/?#=]+\.pdf\b(?!.*\.pdf\b)/i;
var splitURI = reURI.exec(url);
var suggestedFilename = reFilename.exec(splitURI[1]) || reFilename.exec(splitURI[2]) || reFilename.exec(splitURI[3]);
+
if (suggestedFilename) {
suggestedFilename = suggestedFilename[0];
+
if (suggestedFilename.includes('%')) {
try {
suggestedFilename = reFilename.exec(decodeURIComponent(suggestedFilename))[0];
} catch (ex) {}
}
}
+
return suggestedFilename || defaultFilename;
}
+
function normalizeWheelEventDelta(evt) {
var delta = Math.sqrt(evt.deltaX * evt.deltaX + evt.deltaY * evt.deltaY);
var angle = Math.atan2(evt.deltaY, evt.deltaX);
+
if (-0.25 * Math.PI < angle && angle < 0.75 * Math.PI) {
delta = -delta;
}
+
var MOUSE_DOM_DELTA_PIXEL_MODE = 0;
var MOUSE_DOM_DELTA_LINE_MODE = 1;
var MOUSE_PIXELS_PER_LINE = 30;
var MOUSE_LINES_PER_PAGE = 30;
+
if (evt.deltaMode === MOUSE_DOM_DELTA_PIXEL_MODE) {
delta /= MOUSE_PIXELS_PER_LINE * MOUSE_LINES_PER_PAGE;
} else if (evt.deltaMode === MOUSE_DOM_DELTA_LINE_MODE) {
delta /= MOUSE_LINES_PER_PAGE;
}
+
return delta;
}
+
function isValidRotation(angle) {
return Number.isInteger(angle) && angle % 90 === 0;
}
+
function isPortraitOrientation(size) {
return size.width <= size.height;
}
+
var WaitOnType = {
EVENT: 'event',
TIMEOUT: 'timeout'
};
-function waitOnEventOrTimeout(_ref6) {
- var target = _ref6.target,
- name = _ref6.name,
- _ref6$delay = _ref6.delay,
- delay = _ref6$delay === undefined ? 0 : _ref6$delay;
+exports.WaitOnType = WaitOnType;
+function waitOnEventOrTimeout(_ref2) {
+ var target = _ref2.target,
+ name = _ref2.name,
+ _ref2$delay = _ref2.delay,
+ delay = _ref2$delay === void 0 ? 0 : _ref2$delay;
return new Promise(function (resolve, reject) {
- if ((typeof target === 'undefined' ? 'undefined' : _typeof(target)) !== 'object' || !(name && typeof name === 'string') || !(Number.isInteger(delay) && delay >= 0)) {
+ if (_typeof(target) !== 'object' || !(name && typeof name === 'string') || !(Number.isInteger(delay) && delay >= 0)) {
throw new Error('waitOnEventOrTimeout - invalid parameters.');
}
+
function handler(type) {
if (target instanceof EventBus) {
target.off(name, eventHandler);
} else {
target.removeEventListener(name, eventHandler);
}
+
if (timeout) {
clearTimeout(timeout);
}
+
resolve(type);
}
+
var eventHandler = handler.bind(null, WaitOnType.EVENT);
+
if (target instanceof EventBus) {
target.on(name, eventHandler);
} else {
target.addEventListener(name, eventHandler);
}
+
var timeoutHandler = handler.bind(null, WaitOnType.TIMEOUT);
var timeout = setTimeout(timeoutHandler, delay);
});
}
+
var animationStarted = new Promise(function (resolve) {
window.requestAnimationFrame(resolve);
});
+exports.animationStarted = animationStarted;
-var EventBus = function () {
+var EventBus =
+/*#__PURE__*/
+function () {
function EventBus() {
- var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
- _ref7$dispatchToDOM = _ref7.dispatchToDOM,
- dispatchToDOM = _ref7$dispatchToDOM === undefined ? false : _ref7$dispatchToDOM;
+ var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+ _ref3$dispatchToDOM = _ref3.dispatchToDOM,
+ dispatchToDOM = _ref3$dispatchToDOM === void 0 ? false : _ref3$dispatchToDOM;
_classCallCheck(this, EventBus);
@@ -3307,63 +3892,77 @@ var EventBus = function () {
}
_createClass(EventBus, [{
- key: 'on',
+ key: "on",
value: function on(eventName, listener) {
var eventListeners = this._listeners[eventName];
+
if (!eventListeners) {
eventListeners = [];
this._listeners[eventName] = eventListeners;
}
+
eventListeners.push(listener);
}
}, {
- key: 'off',
+ key: "off",
value: function off(eventName, listener) {
var eventListeners = this._listeners[eventName];
- var i = void 0;
+ var i;
+
if (!eventListeners || (i = eventListeners.indexOf(listener)) < 0) {
return;
}
+
eventListeners.splice(i, 1);
}
}, {
- key: 'dispatch',
+ key: "dispatch",
value: function dispatch(eventName) {
var eventListeners = this._listeners[eventName];
+
if (!eventListeners || eventListeners.length === 0) {
if (this._dispatchToDOM) {
var _args5 = Array.prototype.slice.call(arguments, 1);
+
this._dispatchDOMEvent(eventName, _args5);
}
+
return;
}
+
var args = Array.prototype.slice.call(arguments, 1);
eventListeners.slice(0).forEach(function (listener) {
listener.apply(null, args);
});
+
if (this._dispatchToDOM) {
this._dispatchDOMEvent(eventName, args);
}
}
}, {
- key: '_dispatchDOMEvent',
+ key: "_dispatchDOMEvent",
value: function _dispatchDOMEvent(eventName) {
var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
var details = Object.create(null);
+
if (args && args.length > 0) {
var obj = args[0];
+
for (var key in obj) {
var value = obj[key];
+
if (key === 'source') {
if (value === window || value === document) {
return;
}
+
continue;
}
+
details[key] = value;
}
}
+
var event = document.createEvent('CustomEvent');
event.initCustomEvent(eventName, true, true, details);
document.dispatchEvent(event);
@@ -3373,25 +3972,33 @@ var EventBus = function () {
return EventBus;
}();
+exports.EventBus = EventBus;
var globalEventBus = null;
+
function getGlobalEventBus() {
var dispatchToDOM = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (!globalEventBus) {
- globalEventBus = new EventBus({ dispatchToDOM: dispatchToDOM });
+ globalEventBus = new EventBus({
+ dispatchToDOM: dispatchToDOM
+ });
}
+
return globalEventBus;
}
+
function clamp(v, min, max) {
return Math.min(Math.max(v, min), max);
}
-var ProgressBar = function () {
+var ProgressBar =
+/*#__PURE__*/
+function () {
function ProgressBar(id) {
- var _ref8 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
- height = _ref8.height,
- width = _ref8.width,
- units = _ref8.units;
+ var _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+ height = _ref4.height,
+ width = _ref4.width,
+ units = _ref4.units;
_classCallCheck(this, ProgressBar);
@@ -3406,57 +4013,63 @@ var ProgressBar = function () {
}
_createClass(ProgressBar, [{
- key: '_updateBar',
+ key: "_updateBar",
value: function _updateBar() {
if (this._indeterminate) {
this.div.classList.add('indeterminate');
this.div.style.width = this.width + this.units;
return;
}
+
this.div.classList.remove('indeterminate');
var progressSize = this.width * this._percent / 100;
this.div.style.width = progressSize + this.units;
}
}, {
- key: 'setWidth',
+ key: "setWidth",
value: function setWidth(viewer) {
if (!viewer) {
return;
}
+
var container = viewer.parentNode;
var scrollbarWidth = container.offsetWidth - viewer.offsetWidth;
+
if (scrollbarWidth > 0) {
this.bar.setAttribute('style', 'width: calc(100% - ' + scrollbarWidth + 'px);');
}
}
}, {
- key: 'hide',
+ key: "hide",
value: function hide() {
if (!this.visible) {
return;
}
+
this.visible = false;
this.bar.classList.add('hidden');
document.body.classList.remove('loadingInProgress');
}
}, {
- key: 'show',
+ key: "show",
value: function show() {
if (this.visible) {
return;
}
+
this.visible = true;
document.body.classList.add('loadingInProgress');
this.bar.classList.remove('hidden');
}
}, {
- key: 'percent',
+ key: "percent",
get: function get() {
return this._percent;
},
set: function set(val) {
this._indeterminate = isNaN(val);
this._percent = clamp(val, 0, 100);
+
this._updateBar();
}
}]);
@@ -3464,10 +4077,13 @@ var ProgressBar = function () {
return ProgressBar;
}();
+exports.ProgressBar = ProgressBar;
+
function moveToEndOfArray(arr, condition) {
var moved = [],
len = arr.length;
var write = 0;
+
for (var read = 0; read < len; ++read) {
if (condition(arr[read])) {
moved.push(arr[read]);
@@ -3476,45 +4092,11 @@ function moveToEndOfArray(arr, condition) {
++write;
}
}
+
for (var _read = 0; write < len; ++_read, ++write) {
arr[write] = moved[_read];
}
}
-exports.CSS_UNITS = CSS_UNITS;
-exports.DEFAULT_SCALE_VALUE = DEFAULT_SCALE_VALUE;
-exports.DEFAULT_SCALE = DEFAULT_SCALE;
-exports.MIN_SCALE = MIN_SCALE;
-exports.MAX_SCALE = MAX_SCALE;
-exports.UNKNOWN_SCALE = UNKNOWN_SCALE;
-exports.MAX_AUTO_SCALE = MAX_AUTO_SCALE;
-exports.SCROLLBAR_PADDING = SCROLLBAR_PADDING;
-exports.VERTICAL_PADDING = VERTICAL_PADDING;
-exports.isValidRotation = isValidRotation;
-exports.isPortraitOrientation = isPortraitOrientation;
-exports.PresentationModeState = PresentationModeState;
-exports.RendererType = RendererType;
-exports.TextLayerMode = TextLayerMode;
-exports.NullL10n = NullL10n;
-exports.EventBus = EventBus;
-exports.getGlobalEventBus = getGlobalEventBus;
-exports.ProgressBar = ProgressBar;
-exports.getPDFFileNameFromURL = getPDFFileNameFromURL;
-exports.noContextMenuHandler = noContextMenuHandler;
-exports.parseQueryString = parseQueryString;
-exports.backtrackBeforeAllVisibleElements = backtrackBeforeAllVisibleElements;
-exports.getVisibleElements = getVisibleElements;
-exports.roundToDivide = roundToDivide;
-exports.getPageSizeInches = getPageSizeInches;
-exports.approximateFraction = approximateFraction;
-exports.getOutputScale = getOutputScale;
-exports.scrollIntoView = scrollIntoView;
-exports.watchScroll = watchScroll;
-exports.binarySearchFirstItem = binarySearchFirstItem;
-exports.normalizeWheelEventDelta = normalizeWheelEventDelta;
-exports.animationStarted = animationStarted;
-exports.WaitOnType = WaitOnType;
-exports.waitOnEventOrTimeout = waitOnEventOrTimeout;
-exports.moveToEndOfArray = moveToEndOfArray;
/***/ }),
/* 7 */
@@ -3523,12 +4105,14 @@ exports.moveToEndOfArray = moveToEndOfArray;
"use strict";
-var pdfjsLib = void 0;
+var pdfjsLib;
+
if (typeof window !== 'undefined' && window['pdfjs-dist/build/pdf']) {
pdfjsLib = window['pdfjs-dist/build/pdf'];
} else {
pdfjsLib = require('../build/pdf.js');
}
+
module.exports = pdfjsLib;
/***/ }),
@@ -3541,28 +4125,33 @@ module.exports = pdfjsLib;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFCursorTools = exports.CursorTool = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFCursorTools = exports.CursorTool = void 0;
var _grab_to_pan = __webpack_require__(9);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var CursorTool = {
SELECT: 0,
HAND: 1,
ZOOM: 2
};
+exports.CursorTool = CursorTool;
-var PDFCursorTools = function () {
+var PDFCursorTools =
+/*#__PURE__*/
+function () {
function PDFCursorTools(_ref) {
var _this = this;
var container = _ref.container,
eventBus = _ref.eventBus,
_ref$cursorToolOnLoad = _ref.cursorToolOnLoad,
- cursorToolOnLoad = _ref$cursorToolOnLoad === undefined ? CursorTool.SELECT : _ref$cursorToolOnLoad;
+ cursorToolOnLoad = _ref$cursorToolOnLoad === void 0 ? CursorTool.SELECT : _ref$cursorToolOnLoad;
_classCallCheck(this, PDFCursorTools);
@@ -3570,52 +4159,66 @@ var PDFCursorTools = function () {
this.eventBus = eventBus;
this.active = CursorTool.SELECT;
this.activeBeforePresentationMode = null;
- this.handTool = new _grab_to_pan.GrabToPan({ element: this.container });
+ this.handTool = new _grab_to_pan.GrabToPan({
+ element: this.container
+ });
+
this._addEventListeners();
+
Promise.resolve().then(function () {
_this.switchTool(cursorToolOnLoad);
});
}
_createClass(PDFCursorTools, [{
- key: 'switchTool',
+ key: "switchTool",
value: function switchTool(tool) {
var _this2 = this;
if (this.activeBeforePresentationMode !== null) {
return;
}
+
if (tool === this.active) {
return;
}
+
var disableActiveTool = function disableActiveTool() {
switch (_this2.active) {
case CursorTool.SELECT:
break;
+
case CursorTool.HAND:
_this2.handTool.deactivate();
+
break;
+
case CursorTool.ZOOM:
}
};
+
switch (tool) {
case CursorTool.SELECT:
disableActiveTool();
break;
+
case CursorTool.HAND:
disableActiveTool();
this.handTool.activate();
break;
+
case CursorTool.ZOOM:
default:
- console.error('switchTool: "' + tool + '" is an unsupported value.');
+ console.error("switchTool: \"".concat(tool, "\" is an unsupported value."));
return;
}
+
this.active = tool;
+
this._dispatchEvent();
}
}, {
- key: '_dispatchEvent',
+ key: "_dispatchEvent",
value: function _dispatchEvent() {
this.eventBus.dispatch('cursortoolchanged', {
source: this,
@@ -3623,7 +4226,7 @@ var PDFCursorTools = function () {
});
}
}, {
- key: '_addEventListeners',
+ key: "_addEventListeners",
value: function _addEventListeners() {
var _this3 = this;
@@ -3634,20 +4237,25 @@ var PDFCursorTools = function () {
if (evt.switchInProgress) {
return;
}
- var previouslyActive = void 0;
+
+ var previouslyActive;
+
if (evt.active) {
previouslyActive = _this3.active;
+
_this3.switchTool(CursorTool.SELECT);
+
_this3.activeBeforePresentationMode = previouslyActive;
} else {
previouslyActive = _this3.activeBeforePresentationMode;
_this3.activeBeforePresentationMode = null;
+
_this3.switchTool(previouslyActive);
}
});
}
}, {
- key: 'activeTool',
+ key: "activeTool",
get: function get() {
return this.active;
}
@@ -3656,7 +4264,6 @@ var PDFCursorTools = function () {
return PDFCursorTools;
}();
-exports.CursorTool = CursorTool;
exports.PDFCursorTools = PDFCursorTools;
/***/ }),
@@ -3669,12 +4276,16 @@ exports.PDFCursorTools = PDFCursorTools;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.GrabToPan = GrabToPan;
+
function GrabToPan(options) {
this.element = options.element;
this.document = options.element.ownerDocument;
+
if (typeof options.ignoreTarget === 'function') {
this.ignoreTarget = options.ignoreTarget;
}
+
this.onActiveChanged = options.onActiveChanged;
this.activate = this.activate.bind(this);
this.deactivate = this.deactivate.bind(this);
@@ -3685,6 +4296,7 @@ function GrabToPan(options) {
var overlay = this.overlay = document.createElement('div');
overlay.className = 'grab-to-pan-grabbing';
}
+
GrabToPan.prototype = {
CSS_CLASS_GRAB: 'grab-to-pan-grab',
activate: function GrabToPan_activate() {
@@ -3692,6 +4304,7 @@ GrabToPan.prototype = {
this.active = true;
this.element.addEventListener('mousedown', this._onmousedown, true);
this.element.classList.add(this.CSS_CLASS_GRAB);
+
if (this.onActiveChanged) {
this.onActiveChanged(true);
}
@@ -3701,8 +4314,11 @@ GrabToPan.prototype = {
if (this.active) {
this.active = false;
this.element.removeEventListener('mousedown', this._onmousedown, true);
+
this._endPan();
+
this.element.classList.remove(this.CSS_CLASS_GRAB);
+
if (this.onActiveChanged) {
this.onActiveChanged(false);
}
@@ -3722,6 +4338,7 @@ GrabToPan.prototype = {
if (event.button !== 0 || this.ignoreTarget(event.target)) {
return;
}
+
if (event.originalTarget) {
try {
event.originalTarget.tagName;
@@ -3729,6 +4346,7 @@ GrabToPan.prototype = {
return;
}
}
+
this.scrollLeftStart = this.element.scrollLeft;
this.scrollTopStart = this.element.scrollTop;
this.clientXStart = event.clientX;
@@ -3739,20 +4357,25 @@ GrabToPan.prototype = {
event.preventDefault();
event.stopPropagation();
var focusedElement = document.activeElement;
+
if (focusedElement && !focusedElement.contains(event.target)) {
focusedElement.blur();
}
},
_onmousemove: function GrabToPan__onmousemove(event) {
this.element.removeEventListener('scroll', this._endPan, true);
+
if (isLeftMouseReleased(event)) {
this._endPan();
+
return;
}
+
var xDiff = event.clientX - this.clientXStart;
var yDiff = event.clientY - this.clientYStart;
var scrollTop = this.scrollTopStart - yDiff;
var scrollLeft = this.scrollLeftStart - xDiff;
+
if (this.element.scrollTo) {
this.element.scrollTo({
top: scrollTop,
@@ -3763,6 +4386,7 @@ GrabToPan.prototype = {
this.element.scrollTop = scrollTop;
this.element.scrollLeft = scrollLeft;
}
+
if (!this.overlay.parentNode) {
document.body.appendChild(this.overlay);
}
@@ -3777,28 +4401,33 @@ GrabToPan.prototype = {
var matchesSelector;
['webkitM', 'mozM', 'msM', 'oM', 'm'].some(function (prefix) {
var name = prefix + 'atches';
+
if (name in document.documentElement) {
matchesSelector = name;
}
+
name += 'Selector';
+
if (name in document.documentElement) {
matchesSelector = name;
}
+
return matchesSelector;
});
var isNotIEorIsIE10plus = !document.documentMode || document.documentMode > 9;
var chrome = window.chrome;
var isChrome15OrOpera15plus = chrome && (chrome.webstore || chrome.app);
var isSafari6plus = /Apple/.test(navigator.vendor) && /Version\/([6-9]\d*|[1-5]\d+)/.test(navigator.userAgent);
+
function isLeftMouseReleased(event) {
if ('buttons' in event && isNotIEorIsIE10plus) {
return !(event.buttons & 1);
}
+
if (isChrome15OrOpera15plus || isSafari6plus) {
return event.which === 0;
}
}
-exports.GrabToPan = GrabToPan;
/***/ }),
/* 10 */
@@ -3810,11 +4439,14 @@ exports.GrabToPan = GrabToPan;
Object.defineProperty(exports, "__esModule", {
value: true
});
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFRenderingQueue = exports.RenderingStates = void 0;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var CLEANUP_TIMEOUT = 30000;
var RenderingStates = {
INITIAL: 0,
@@ -3822,8 +4454,11 @@ var RenderingStates = {
PAUSED: 2,
FINISHED: 3
};
+exports.RenderingStates = RenderingStates;
-var PDFRenderingQueue = function () {
+var PDFRenderingQueue =
+/*#__PURE__*/
+function () {
function PDFRenderingQueue() {
_classCallCheck(this, PDFRenderingQueue);
@@ -3858,17 +4493,21 @@ var PDFRenderingQueue = function () {
clearTimeout(this.idleTimeout);
this.idleTimeout = null;
}
+
if (this.pdfViewer.forceRendering(currentlyVisiblePages)) {
return;
}
+
if (this.pdfThumbnailViewer && this.isThumbnailViewEnabled) {
if (this.pdfThumbnailViewer.forceRendering()) {
return;
}
}
+
if (this.printing) {
return;
}
+
if (this.onIdle) {
this.idleTimeout = setTimeout(this.onIdle.bind(this), CLEANUP_TIMEOUT);
}
@@ -3878,26 +4517,33 @@ var PDFRenderingQueue = function () {
value: function getHighestPriority(visible, views, scrolledDown) {
var visibleViews = visible.views;
var numVisible = visibleViews.length;
+
if (numVisible === 0) {
return false;
}
+
for (var i = 0; i < numVisible; ++i) {
var view = visibleViews[i].view;
+
if (!this.isViewFinished(view)) {
return view;
}
}
+
if (scrolledDown) {
var nextPageIndex = visible.last.id;
+
if (views[nextPageIndex] && !this.isViewFinished(views[nextPageIndex])) {
return views[nextPageIndex];
}
} else {
var previousPageIndex = visible.first.id - 2;
+
if (views[previousPageIndex] && !this.isViewFinished(views[previousPageIndex])) {
return views[previousPageIndex];
}
}
+
return null;
}
}, {
@@ -3913,21 +4559,27 @@ var PDFRenderingQueue = function () {
switch (view.renderingState) {
case RenderingStates.FINISHED:
return false;
+
case RenderingStates.PAUSED:
this.highestPriorityPage = view.renderingId;
view.resume();
break;
+
case RenderingStates.RUNNING:
this.highestPriorityPage = view.renderingId;
break;
+
case RenderingStates.INITIAL:
this.highestPriorityPage = view.renderingId;
+
var continueRendering = function continueRendering() {
_this.renderHighestPriority();
};
+
view.draw().then(continueRendering, continueRendering);
break;
}
+
return true;
}
}]);
@@ -3935,7 +4587,6 @@ var PDFRenderingQueue = function () {
return PDFRenderingQueue;
}();
-exports.RenderingStates = RenderingStates;
exports.PDFRenderingQueue = PDFRenderingQueue;
/***/ }),
@@ -3948,9 +4599,7 @@ exports.PDFRenderingQueue = PDFRenderingQueue;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFSidebar = exports.SidebarView = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFSidebar = exports.SidebarView = void 0;
var _ui_utils = __webpack_require__(6);
@@ -3958,6 +4607,10 @@ var _pdf_rendering_queue = __webpack_require__(10);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var UI_NOTIFICATION_CLASS = 'pdfSidebarNotification';
var SidebarView = {
NONE: 0,
@@ -3965,8 +4618,11 @@ var SidebarView = {
OUTLINE: 2,
ATTACHMENTS: 3
};
+exports.SidebarView = SidebarView;
-var PDFSidebar = function () {
+var PDFSidebar =
+/*#__PURE__*/
+function () {
function PDFSidebar(options, eventBus) {
var l10n = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _ui_utils.NullL10n;
@@ -3990,39 +4646,47 @@ var PDFSidebar = function () {
this.disableNotification = options.disableNotification || false;
this.eventBus = eventBus;
this.l10n = l10n;
+
this._addEventListeners();
}
_createClass(PDFSidebar, [{
- key: 'reset',
+ key: "reset",
value: function reset() {
this.isInitialViewSet = false;
+
this._hideUINotification(null);
+
this.switchView(SidebarView.THUMBS);
this.outlineButton.disabled = false;
this.attachmentsButton.disabled = false;
}
}, {
- key: 'setInitialView',
+ key: "setInitialView",
value: function setInitialView() {
var view = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : SidebarView.NONE;
if (this.isInitialViewSet) {
return;
}
+
this.isInitialViewSet = true;
+
if (this.isOpen && view === SidebarView.NONE) {
this._dispatchEvent();
+
return;
}
+
var isViewPreserved = view === this.visibleView;
this.switchView(view, true);
+
if (isViewPreserved) {
this._dispatchEvent();
}
}
}, {
- key: 'switchView',
+ key: "switchView",
value: function switchView(view) {
var forceOpen = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -4030,8 +4694,10 @@ var PDFSidebar = function () {
this.close();
return;
}
+
var isViewChanged = view !== this.active;
var shouldForceRendering = false;
+
switch (view) {
case SidebarView.THUMBS:
this.thumbnailButton.classList.add('toggled');
@@ -4040,15 +4706,20 @@ var PDFSidebar = function () {
this.thumbnailView.classList.remove('hidden');
this.outlineView.classList.add('hidden');
this.attachmentsView.classList.add('hidden');
+
if (this.isOpen && isViewChanged) {
this._updateThumbnailViewer();
+
shouldForceRendering = true;
}
+
break;
+
case SidebarView.OUTLINE:
if (this.outlineButton.disabled) {
return;
}
+
this.thumbnailButton.classList.remove('toggled');
this.outlineButton.classList.add('toggled');
this.attachmentsButton.classList.remove('toggled');
@@ -4056,10 +4727,12 @@ var PDFSidebar = function () {
this.outlineView.classList.remove('hidden');
this.attachmentsView.classList.add('hidden');
break;
+
case SidebarView.ATTACHMENTS:
if (this.attachmentsButton.disabled) {
return;
}
+
this.thumbnailButton.classList.remove('toggled');
this.outlineButton.classList.remove('toggled');
this.attachmentsButton.classList.add('toggled');
@@ -4067,55 +4740,69 @@ var PDFSidebar = function () {
this.outlineView.classList.add('hidden');
this.attachmentsView.classList.remove('hidden');
break;
+
default:
console.error('PDFSidebar_switchView: "' + view + '" is an unsupported value.');
return;
}
+
this.active = view | 0;
+
if (forceOpen && !this.isOpen) {
this.open();
return;
}
+
if (shouldForceRendering) {
this._forceRendering();
}
+
if (isViewChanged) {
this._dispatchEvent();
}
+
this._hideUINotification(this.active);
}
}, {
- key: 'open',
+ key: "open",
value: function open() {
if (this.isOpen) {
return;
}
+
this.isOpen = true;
this.toggleButton.classList.add('toggled');
this.outerContainer.classList.add('sidebarMoving');
this.outerContainer.classList.add('sidebarOpen');
+
if (this.active === SidebarView.THUMBS) {
this._updateThumbnailViewer();
}
+
this._forceRendering();
+
this._dispatchEvent();
+
this._hideUINotification(this.active);
}
}, {
- key: 'close',
+ key: "close",
value: function close() {
if (!this.isOpen) {
return;
}
+
this.isOpen = false;
this.toggleButton.classList.remove('toggled');
this.outerContainer.classList.add('sidebarMoving');
this.outerContainer.classList.remove('sidebarOpen');
+
this._forceRendering();
+
this._dispatchEvent();
}
}, {
- key: 'toggle',
+ key: "toggle",
value: function toggle() {
if (this.isOpen) {
this.close();
@@ -4124,7 +4811,7 @@ var PDFSidebar = function () {
}
}
}, {
- key: '_dispatchEvent',
+ key: "_dispatchEvent",
value: function _dispatchEvent() {
this.eventBus.dispatch('sidebarviewchanged', {
source: this,
@@ -4132,7 +4819,7 @@ var PDFSidebar = function () {
});
}
}, {
- key: '_forceRendering',
+ key: "_forceRendering",
value: function _forceRendering() {
if (this.onToggled) {
this.onToggled();
@@ -4142,81 +4829,96 @@ var PDFSidebar = function () {
}
}
}, {
- key: '_updateThumbnailViewer',
+ key: "_updateThumbnailViewer",
value: function _updateThumbnailViewer() {
var pdfViewer = this.pdfViewer,
pdfThumbnailViewer = this.pdfThumbnailViewer;
-
var pagesCount = pdfViewer.pagesCount;
+
for (var pageIndex = 0; pageIndex < pagesCount; pageIndex++) {
var pageView = pdfViewer.getPageView(pageIndex);
+
if (pageView && pageView.renderingState === _pdf_rendering_queue.RenderingStates.FINISHED) {
var thumbnailView = pdfThumbnailViewer.getThumbnail(pageIndex);
thumbnailView.setImage(pageView);
}
}
+
pdfThumbnailViewer.scrollThumbnailIntoView(pdfViewer.currentPageNumber);
}
}, {
- key: '_showUINotification',
+ key: "_showUINotification",
value: function _showUINotification(view) {
var _this = this;
if (this.disableNotification) {
return;
}
+
this.l10n.get('toggle_sidebar_notification.title', null, 'Toggle Sidebar (document contains outline/attachments)').then(function (msg) {
_this.toggleButton.title = msg;
});
+
if (!this.isOpen) {
this.toggleButton.classList.add(UI_NOTIFICATION_CLASS);
} else if (view === this.active) {
return;
}
+
switch (view) {
case SidebarView.OUTLINE:
this.outlineButton.classList.add(UI_NOTIFICATION_CLASS);
break;
+
case SidebarView.ATTACHMENTS:
this.attachmentsButton.classList.add(UI_NOTIFICATION_CLASS);
break;
}
}
}, {
- key: '_hideUINotification',
+ key: "_hideUINotification",
value: function _hideUINotification(view) {
var _this2 = this;
if (this.disableNotification) {
return;
}
+
var removeNotification = function removeNotification(view) {
switch (view) {
case SidebarView.OUTLINE:
_this2.outlineButton.classList.remove(UI_NOTIFICATION_CLASS);
+
break;
+
case SidebarView.ATTACHMENTS:
_this2.attachmentsButton.classList.remove(UI_NOTIFICATION_CLASS);
+
break;
}
};
+
if (!this.isOpen && view !== null) {
return;
}
+
this.toggleButton.classList.remove(UI_NOTIFICATION_CLASS);
+
if (view !== null) {
removeNotification(view);
return;
}
+
for (view in SidebarView) {
removeNotification(SidebarView[view]);
}
+
this.l10n.get('toggle_sidebar.title', null, 'Toggle Sidebar').then(function (msg) {
_this2.toggleButton.title = msg;
});
}
}, {
- key: '_addEventListeners',
+ key: "_addEventListeners",
value: function _addEventListeners() {
var _this3 = this;
@@ -4232,7 +4934,9 @@ var PDFSidebar = function () {
_this3.switchView(SidebarView.OUTLINE);
});
this.outlineButton.addEventListener('dblclick', function () {
- _this3.eventBus.dispatch('toggleoutlinetree', { source: _this3 });
+ _this3.eventBus.dispatch('toggleoutlinetree', {
+ source: _this3
+ });
});
this.attachmentsButton.addEventListener('click', function () {
_this3.switchView(SidebarView.ATTACHMENTS);
@@ -4240,6 +4944,7 @@ var PDFSidebar = function () {
this.eventBus.on('outlineloaded', function (evt) {
var outlineCount = evt.outlineCount;
_this3.outlineButton.disabled = !outlineCount;
+
if (outlineCount) {
_this3._showUINotification(SidebarView.OUTLINE);
} else if (_this3.active === SidebarView.OUTLINE) {
@@ -4249,14 +4954,19 @@ var PDFSidebar = function () {
this.eventBus.on('attachmentsloaded', function (evt) {
if (evt.attachmentsCount) {
_this3.attachmentsButton.disabled = false;
+
_this3._showUINotification(SidebarView.ATTACHMENTS);
+
return;
}
+
Promise.resolve().then(function () {
if (_this3.attachmentsView.hasChildNodes()) {
return;
}
+
_this3.attachmentsButton.disabled = true;
+
if (_this3.active === SidebarView.ATTACHMENTS) {
_this3.switchView(SidebarView.THUMBS);
}
@@ -4269,22 +4979,22 @@ var PDFSidebar = function () {
});
}
}, {
- key: 'visibleView',
+ key: "visibleView",
get: function get() {
return this.isOpen ? this.active : SidebarView.NONE;
}
}, {
- key: 'isThumbnailViewVisible',
+ key: "isThumbnailViewVisible",
get: function get() {
return this.isOpen && this.active === SidebarView.THUMBS;
}
}, {
- key: 'isOutlineViewVisible',
+ key: "isOutlineViewVisible",
get: function get() {
return this.isOpen && this.active === SidebarView.OUTLINE;
}
}, {
- key: 'isAttachmentsViewVisible',
+ key: "isAttachmentsViewVisible",
get: function get() {
return this.isOpen && this.active === SidebarView.ATTACHMENTS;
}
@@ -4293,7 +5003,6 @@ var PDFSidebar = function () {
return PDFSidebar;
}();
-exports.SidebarView = SidebarView;
exports.PDFSidebar = PDFSidebar;
/***/ }),
@@ -4306,9 +5015,7 @@ exports.PDFSidebar = PDFSidebar;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.OptionKind = exports.AppOptions = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.OptionKind = exports.AppOptions = void 0;
var _pdfjsLib = __webpack_require__(7);
@@ -4316,18 +5023,23 @@ var _viewer_compatibility = __webpack_require__(13);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var OptionKind = {
VIEWER: 'viewer',
API: 'api',
WORKER: 'worker'
};
+exports.OptionKind = OptionKind;
var defaultOptions = {
cursorToolOnLoad: {
value: 0,
kind: OptionKind.VIEWER
},
defaultUrl: {
- value: '/* saladict *//pdf/default.pdf',
+ value: /* saladict */'/static/pdf/default.pdf',
kind: OptionKind.VIEWER
},
defaultZoomValue: {
@@ -4468,6 +5180,10 @@ var defaultOptions = {
}
};
{
+ defaultOptions.disablePreferences = {
+ value: false,
+ kind: OptionKind.VIEWER
+ };
defaultOptions.locale = {
value: typeof navigator !== 'undefined' ? navigator.language : 'en-US',
kind: OptionKind.VIEWER
@@ -4475,7 +5191,9 @@ var defaultOptions = {
}
var userOptions = Object.create(null);
-var AppOptions = function () {
+var AppOptions =
+/*#__PURE__*/
+function () {
function AppOptions() {
_classCallCheck(this, AppOptions);
@@ -4483,38 +5201,43 @@ var AppOptions = function () {
}
_createClass(AppOptions, null, [{
- key: 'get',
+ key: "get",
value: function get(name) {
var defaultOption = defaultOptions[name],
userOption = userOptions[name];
+
if (userOption !== undefined) {
return userOption;
}
+
return defaultOption !== undefined ? defaultOption.value : undefined;
}
}, {
- key: 'getAll',
+ key: "getAll",
value: function getAll() {
var kind = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-
var options = Object.create(null);
+
for (var name in defaultOptions) {
var defaultOption = defaultOptions[name],
userOption = userOptions[name];
+
if (kind && defaultOption.kind !== kind) {
continue;
}
+
options[name] = userOption !== undefined ? userOption : defaultOption.value;
}
+
return options;
}
}, {
- key: 'set',
+ key: "set",
value: function set(name, value) {
userOptions[name] = value;
}
}, {
- key: 'remove',
+ key: "remove",
value: function remove(name) {
delete userOptions[name];
}
@@ -4524,7 +5247,6 @@ var AppOptions = function () {
}();
exports.AppOptions = AppOptions;
-exports.OptionKind = OptionKind;
/***/ }),
/* 13 */
@@ -4538,6 +5260,7 @@ var compatibilityParams = Object.create(null);
var userAgent = typeof navigator !== 'undefined' && navigator.userAgent || '';
var isAndroid = /Android/.test(userAgent);
var isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent);
+
(function checkCanvasSizeLimitation() {
if (isIOS || isAndroid) {
compatibilityParams.maxCanvasPixels = 5242880;
@@ -4556,21 +5279,25 @@ exports.viewerCompatibilityParams = Object.freeze(compatibilityParams);
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.OverlayManager = undefined;
-
-var _regenerator = __webpack_require__(2);
+exports.OverlayManager = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var OverlayManager = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var OverlayManager =
+/*#__PURE__*/
+function () {
function OverlayManager() {
_classCallCheck(this, OverlayManager);
@@ -4580,34 +5307,38 @@ var OverlayManager = function () {
}
_createClass(OverlayManager, [{
- key: 'register',
+ key: "register",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(name, element) {
- var callerCloseMethod = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
- var canForceClose = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
- var container;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ var _register = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(name, element) {
+ var callerCloseMethod,
+ canForceClose,
+ container,
+ _args = arguments;
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- container = void 0;
+ callerCloseMethod = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+ canForceClose = _args.length > 3 && _args[3] !== undefined ? _args[3] : false;
if (!(!name || !element || !(container = element.parentNode))) {
- _context.next = 5;
+ _context.next = 6;
break;
}
throw new Error('Not enough parameters.');
- case 5:
+ case 6:
if (!this._overlays[name]) {
- _context.next = 7;
+ _context.next = 8;
break;
}
throw new Error('The overlay is already registered.');
- case 7:
+ case 8:
this._overlays[name] = {
element: element,
container: container,
@@ -4615,25 +5346,27 @@ var OverlayManager = function () {
canForceClose: canForceClose
};
- case 8:
- case 'end':
+ case 9:
+ case "end":
return _context.stop();
}
}
}, _callee, this);
}));
- function register(_x3, _x4) {
- return _ref.apply(this, arguments);
+ function register(_x, _x2) {
+ return _register.apply(this, arguments);
}
return register;
}()
}, {
- key: 'unregister',
+ key: "unregister",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2(name) {
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _unregister = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2(name) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -4656,24 +5389,26 @@ var OverlayManager = function () {
delete this._overlays[name];
case 7:
- case 'end':
+ case "end":
return _context2.stop();
}
}
}, _callee2, this);
}));
- function unregister(_x5) {
- return _ref2.apply(this, arguments);
+ function unregister(_x3) {
+ return _unregister.apply(this, arguments);
}
return unregister;
}()
}, {
- key: 'open',
+ key: "open",
value: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3(name) {
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ var _open = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3(name) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
@@ -4696,6 +5431,7 @@ var OverlayManager = function () {
}
this._closeThroughCaller();
+
_context3.next = 14;
break;
@@ -4712,29 +5448,34 @@ var OverlayManager = function () {
case 14:
this._active = name;
+
this._overlays[this._active].element.classList.remove('hidden');
+
this._overlays[this._active].container.classList.remove('hidden');
+
window.addEventListener('keydown', this._keyDownBound);
case 18:
- case 'end':
+ case "end":
return _context3.stop();
}
}
}, _callee3, this);
}));
- function open(_x6) {
- return _ref3.apply(this, arguments);
+ function open(_x4) {
+ return _open.apply(this, arguments);
}
return open;
}()
}, {
- key: 'close',
+ key: "close",
value: function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee4(name) {
- return _regenerator2.default.wrap(function _callee4$(_context4) {
+ var _close = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee4(name) {
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
@@ -4763,44 +5504,48 @@ var OverlayManager = function () {
case 10:
this._overlays[this._active].container.classList.add('hidden');
+
this._overlays[this._active].element.classList.add('hidden');
+
this._active = null;
window.removeEventListener('keydown', this._keyDownBound);
case 14:
- case 'end':
+ case "end":
return _context4.stop();
}
}
}, _callee4, this);
}));
- function close(_x7) {
- return _ref4.apply(this, arguments);
+ function close(_x5) {
+ return _close.apply(this, arguments);
}
return close;
}()
}, {
- key: '_keyDown',
+ key: "_keyDown",
value: function _keyDown(evt) {
if (this._active && evt.keyCode === 27) {
this._closeThroughCaller();
+
evt.preventDefault();
}
}
}, {
- key: '_closeThroughCaller',
+ key: "_closeThroughCaller",
value: function _closeThroughCaller() {
if (this._overlays[this._active].callerCloseMethod) {
this._overlays[this._active].callerCloseMethod();
}
+
if (this._active) {
this.close(this._active);
}
}
}, {
- key: 'active',
+ key: "active",
get: function get() {
return this._active;
}
@@ -4821,9 +5566,7 @@ exports.OverlayManager = OverlayManager;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PasswordPrompt = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PasswordPrompt = void 0;
var _ui_utils = __webpack_require__(6);
@@ -4831,7 +5574,13 @@ var _pdfjsLib = __webpack_require__(7);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var PasswordPrompt = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var PasswordPrompt =
+/*#__PURE__*/
+function () {
function PasswordPrompt(options, overlayManager) {
var _this = this;
@@ -4860,25 +5609,28 @@ var PasswordPrompt = function () {
}
_createClass(PasswordPrompt, [{
- key: 'open',
+ key: "open",
value: function open() {
var _this2 = this;
this.overlayManager.open(this.overlayName).then(function () {
_this2.input.focus();
- var promptString = void 0;
+
+ var promptString;
+
if (_this2.reason === _pdfjsLib.PasswordResponses.INCORRECT_PASSWORD) {
promptString = _this2.l10n.get('password_invalid', null, 'Invalid password. Please try again.');
} else {
promptString = _this2.l10n.get('password_label', null, 'Enter the password to open this PDF file.');
}
+
promptString.then(function (msg) {
_this2.label.textContent = msg;
});
});
}
}, {
- key: 'close',
+ key: "close",
value: function close() {
var _this3 = this;
@@ -4887,16 +5639,17 @@ var PasswordPrompt = function () {
});
}
}, {
- key: 'verify',
+ key: "verify",
value: function verify() {
var password = this.input.value;
+
if (password && password.length > 0) {
this.close();
return this.updateCallback(password);
}
}
}, {
- key: 'setUpdateCallback',
+ key: "setUpdateCallback",
value: function setUpdateCallback(updateCallback, reason) {
this.updateCallback = updateCallback;
this.reason = reason;
@@ -4918,15 +5671,19 @@ exports.PasswordPrompt = PasswordPrompt;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFAttachmentViewer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFAttachmentViewer = void 0;
var _pdfjsLib = __webpack_require__(7);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var PDFAttachmentViewer = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var PDFAttachmentViewer =
+/*#__PURE__*/
+function () {
function PDFAttachmentViewer(_ref) {
var container = _ref.container,
eventBus = _ref.eventBus,
@@ -4942,72 +5699,82 @@ var PDFAttachmentViewer = function () {
}
_createClass(PDFAttachmentViewer, [{
- key: 'reset',
+ key: "reset",
value: function reset() {
var keepRenderedCapability = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
this.attachments = null;
this.container.textContent = '';
+
if (!keepRenderedCapability) {
this._renderedCapability = (0, _pdfjsLib.createPromiseCapability)();
}
}
}, {
- key: '_dispatchEvent',
+ key: "_dispatchEvent",
value: function _dispatchEvent(attachmentsCount) {
this._renderedCapability.resolve();
+
this.eventBus.dispatch('attachmentsloaded', {
source: this,
attachmentsCount: attachmentsCount
});
}
}, {
- key: '_bindPdfLink',
+ key: "_bindPdfLink",
value: function _bindPdfLink(button, content, filename) {
if (this.downloadManager.disableCreateObjectURL) {
throw new Error('bindPdfLink: Unsupported "disableCreateObjectURL" value.');
}
- var blobUrl = void 0;
+
+ var blobUrl;
+
button.onclick = function () {
if (!blobUrl) {
blobUrl = (0, _pdfjsLib.createObjectURL)(content, 'application/pdf');
}
- var viewerUrl = void 0;
+
+ var viewerUrl;
viewerUrl = '?file=' + encodeURIComponent(blobUrl + '#' + filename);
window.open(viewerUrl);
return false;
};
}
}, {
- key: '_bindLink',
+ key: "_bindLink",
value: function _bindLink(button, content, filename) {
var _this = this;
button.onclick = function () {
_this.downloadManager.downloadData(content, filename, '');
+
return false;
};
}
}, {
- key: 'render',
+ key: "render",
value: function render(_ref2) {
var attachments = _ref2.attachments,
_ref2$keepRenderedCap = _ref2.keepRenderedCapability,
- keepRenderedCapability = _ref2$keepRenderedCap === undefined ? false : _ref2$keepRenderedCap;
-
+ keepRenderedCapability = _ref2$keepRenderedCap === void 0 ? false : _ref2$keepRenderedCap;
var attachmentsCount = 0;
+
if (this.attachments) {
this.reset(keepRenderedCapability === true);
}
+
this.attachments = attachments || null;
+
if (!attachments) {
this._dispatchEvent(attachmentsCount);
+
return;
}
+
var names = Object.keys(attachments).sort(function (a, b) {
return a.toLowerCase().localeCompare(b.toLowerCase());
});
attachmentsCount = names.length;
+
for (var i = 0; i < attachmentsCount; i++) {
var item = attachments[names[i]];
var filename = (0, _pdfjsLib.removeNullCharacters)((0, _pdfjsLib.getFilenameFromUrl)(item.filename));
@@ -5015,18 +5782,21 @@ var PDFAttachmentViewer = function () {
div.className = 'attachmentsItem';
var button = document.createElement('button');
button.textContent = filename;
+
if (/\.pdf$/i.test(filename) && !this.downloadManager.disableCreateObjectURL) {
this._bindPdfLink(button, item.content, filename);
} else {
this._bindLink(button, item.content, filename);
}
+
div.appendChild(button);
this.container.appendChild(div);
}
+
this._dispatchEvent(attachmentsCount);
}
}, {
- key: '_appendAttachment',
+ key: "_appendAttachment",
value: function _appendAttachment(_ref3) {
var _this2 = this;
@@ -5036,6 +5806,7 @@ var PDFAttachmentViewer = function () {
this._renderedCapability.promise.then(function () {
var attachments = _this2.attachments;
+
if (!attachments) {
attachments = Object.create(null);
} else {
@@ -5045,10 +5816,12 @@ var PDFAttachmentViewer = function () {
}
}
}
+
attachments[id] = {
filename: filename,
content: content
};
+
_this2.render({
attachments: attachments,
keepRenderedCapability: true
@@ -5072,18 +5845,26 @@ exports.PDFAttachmentViewer = PDFAttachmentViewer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFDocumentProperties = undefined;
-
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFDocumentProperties = void 0;
var _ui_utils = __webpack_require__(6);
var _pdfjsLib = __webpack_require__(7);
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var DEFAULT_FIELD_CONTENT = '-';
var NON_METRIC_LOCALES = ['en-us', 'en-lr', 'my'];
var US_PAGE_NAMES = {
@@ -5094,21 +5875,23 @@ var METRIC_PAGE_NAMES = {
'297x420': 'A3',
'210x297': 'A4'
};
+
function getPageName(size, isPortrait, pageNames) {
var width = isPortrait ? size.width : size.height;
var height = isPortrait ? size.height : size.width;
- return pageNames[width + 'x' + height];
+ return pageNames["".concat(width, "x").concat(height)];
}
-var PDFDocumentProperties = function () {
+var PDFDocumentProperties =
+/*#__PURE__*/
+function () {
function PDFDocumentProperties(_ref, overlayManager, eventBus) {
+ var _this = this;
+
var overlayName = _ref.overlayName,
fields = _ref.fields,
container = _ref.container,
closeButton = _ref.closeButton;
-
- var _this = this;
-
var l10n = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _ui_utils.NullL10n;
_classCallCheck(this, PDFDocumentProperties);
@@ -5118,11 +5901,15 @@ var PDFDocumentProperties = function () {
this.container = container;
this.overlayManager = overlayManager;
this.l10n = l10n;
+
this._reset();
+
if (closeButton) {
closeButton.addEventListener('click', this.close.bind(this));
}
+
this.overlayManager.register(this.overlayName, this.container, this.close.bind(this));
+
if (eventBus) {
eventBus.on('pagechanging', function (evt) {
_this._currentPageNumber = evt.pageNumber;
@@ -5131,6 +5918,7 @@ var PDFDocumentProperties = function () {
_this._pagesRotation = evt.pagesRotation;
});
}
+
this._isNonMetricLocale = true;
l10n.getLanguage().then(function (locale) {
_this._isNonMetricLocale = NON_METRIC_LOCALES.includes(locale);
@@ -5138,7 +5926,7 @@ var PDFDocumentProperties = function () {
}
_createClass(PDFDocumentProperties, [{
- key: 'open',
+ key: "open",
value: function open() {
var _this2 = this;
@@ -5150,18 +5938,21 @@ var PDFDocumentProperties = function () {
configurable: true
});
};
+
Promise.all([this.overlayManager.open(this.overlayName), this._dataAvailableCapability.promise]).then(function () {
var currentPageNumber = _this2._currentPageNumber;
var pagesRotation = _this2._pagesRotation;
+
if (_this2.fieldData && currentPageNumber === _this2.fieldData['_currentPageNumber'] && pagesRotation === _this2.fieldData['_pagesRotation']) {
_this2._updateUI();
+
return;
}
+
_this2.pdfDocument.getMetadata().then(function (_ref2) {
var info = _ref2.info,
metadata = _ref2.metadata,
contentDispositionFilename = _ref2.contentDispositionFilename;
-
return Promise.all([info, metadata, contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(_this2.url || ''), _this2._parseFileSize(_this2.maybeFileSize), _this2._parseDate(info.CreationDate), _this2._parseDate(info.ModDate), _this2.pdfDocument.getPage(currentPageNumber).then(function (pdfPage) {
return _this2._parsePageSize((0, _ui_utils.getPageSizeInches)(pdfPage), pagesRotation);
}), _this2._parseLinearization(info.IsLinearized)]);
@@ -5194,54 +5985,61 @@ var PDFDocumentProperties = function () {
'_currentPageNumber': currentPageNumber,
'_pagesRotation': pagesRotation
});
+
_this2._updateUI();
+
return _this2.pdfDocument.getDownloadInfo();
}).then(function (_ref5) {
var length = _ref5.length;
-
_this2.maybeFileSize = length;
return _this2._parseFileSize(length);
}).then(function (fileSize) {
if (fileSize === _this2.fieldData['fileSize']) {
return;
}
+
var data = Object.assign(Object.create(null), _this2.fieldData);
data['fileSize'] = fileSize;
freezeFieldData(data);
+
_this2._updateUI();
});
});
}
}, {
- key: 'close',
+ key: "close",
value: function close() {
this.overlayManager.close(this.overlayName);
}
}, {
- key: 'setDocument',
+ key: "setDocument",
value: function setDocument(pdfDocument) {
var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
if (this.pdfDocument) {
this._reset();
+
this._updateUI(true);
}
+
if (!pdfDocument) {
return;
}
+
this.pdfDocument = pdfDocument;
this.url = url;
+
this._dataAvailableCapability.resolve();
}
}, {
- key: 'setFileSize',
+ key: "setFileSize",
value: function setFileSize(fileSize) {
if (Number.isInteger(fileSize) && fileSize > 0) {
this.maybeFileSize = fileSize;
}
}
}, {
- key: '_reset',
+ key: "_reset",
value: function _reset() {
this.pdfDocument = null;
this.url = null;
@@ -5252,7 +6050,7 @@ var PDFDocumentProperties = function () {
this._pagesRotation = 0;
}
}, {
- key: '_updateUI',
+ key: "_updateUI",
value: function _updateUI() {
var reset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -5260,22 +6058,25 @@ var PDFDocumentProperties = function () {
for (var id in this.fields) {
this.fields[id].textContent = DEFAULT_FIELD_CONTENT;
}
+
return;
}
+
if (this.overlayManager.active !== this.overlayName) {
return;
}
+
for (var _id in this.fields) {
var content = this.fieldData[_id];
this.fields[_id].textContent = content || content === 0 ? content : DEFAULT_FIELD_CONTENT;
}
}
}, {
- key: '_parseFileSize',
+ key: "_parseFileSize",
value: function _parseFileSize() {
var fileSize = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-
var kb = fileSize / 1024;
+
if (!kb) {
return Promise.resolve(undefined);
} else if (kb < 1024) {
@@ -5284,25 +6085,28 @@ var PDFDocumentProperties = function () {
size_b: fileSize.toLocaleString()
}, '{{size_kb}} KB ({{size_b}} bytes)');
}
+
return this.l10n.get('document_properties_mb', {
size_mb: (+(kb / 1024).toPrecision(3)).toLocaleString(),
size_b: fileSize.toLocaleString()
}, '{{size_mb}} MB ({{size_b}} bytes)');
}
}, {
- key: '_parsePageSize',
+ key: "_parsePageSize",
value: function _parsePageSize(pageSizeInches, pagesRotation) {
var _this3 = this;
if (!pageSizeInches) {
return Promise.resolve(undefined);
}
+
if (pagesRotation % 180 !== 0) {
pageSizeInches = {
width: pageSizeInches.height,
height: pageSizeInches.width
};
}
+
var isPortrait = (0, _ui_utils.isPortraitOrientation)(pageSizeInches);
var sizeInches = {
width: Math.round(pageSizeInches.width * 100) / 100,
@@ -5314,6 +6118,7 @@ var PDFDocumentProperties = function () {
};
var pageName = null;
var name = getPageName(sizeInches, isPortrait, US_PAGE_NAMES) || getPageName(sizeMillimeters, isPortrait, METRIC_PAGE_NAMES);
+
if (!name && !(Number.isInteger(sizeMillimeters.width) && Number.isInteger(sizeMillimeters.height))) {
var exactMillimeters = {
width: pageSizeInches.width * 25.4,
@@ -5323,8 +6128,10 @@ var PDFDocumentProperties = function () {
width: Math.round(sizeMillimeters.width),
height: Math.round(sizeMillimeters.height)
};
+
if (Math.abs(exactMillimeters.width - intMillimeters.width) < 0.1 && Math.abs(exactMillimeters.height - intMillimeters.height) < 0.1) {
name = getPageName(intMillimeters, isPortrait, METRIC_PAGE_NAMES);
+
if (name) {
sizeInches = {
width: Math.round(intMillimeters.width / 25.4 * 100) / 100,
@@ -5334,9 +6141,11 @@ var PDFDocumentProperties = function () {
}
}
}
+
if (name) {
pageName = this.l10n.get('document_properties_page_size_name_' + name.toLowerCase(), null, name);
}
+
return Promise.all([this._isNonMetricLocale ? sizeInches : sizeMillimeters, this.l10n.get('document_properties_page_size_unit_' + (this._isNonMetricLocale ? 'inches' : 'millimeters'), null, this._isNonMetricLocale ? 'in' : 'mm'), pageName, this.l10n.get('document_properties_page_size_orientation_' + (isPortrait ? 'portrait' : 'landscape'), null, isPortrait ? 'portrait' : 'landscape')]).then(function (_ref6) {
var _ref7 = _slicedToArray(_ref6, 4),
_ref7$ = _ref7[0],
@@ -5356,15 +6165,18 @@ var PDFDocumentProperties = function () {
});
}
}, {
- key: '_parseDate',
+ key: "_parseDate",
value: function _parseDate(inputDate) {
if (!inputDate) {
return;
}
+
var dateToParse = inputDate;
+
if (dateToParse.substring(0, 2) === 'D:') {
dateToParse = dateToParse.substring(2);
}
+
var year = parseInt(dateToParse.substring(0, 4), 10);
var month = parseInt(dateToParse.substring(4, 6), 10) - 1;
var day = parseInt(dateToParse.substring(6, 8), 10);
@@ -5374,6 +6186,7 @@ var PDFDocumentProperties = function () {
var utRel = dateToParse.substring(14, 15);
var offsetHours = parseInt(dateToParse.substring(15, 17), 10);
var offsetMinutes = parseInt(dateToParse.substring(18, 20), 10);
+
if (utRel === '-') {
hours += offsetHours;
minutes += offsetMinutes;
@@ -5381,6 +6194,7 @@ var PDFDocumentProperties = function () {
hours -= offsetHours;
minutes -= offsetMinutes;
}
+
var date = new Date(Date.UTC(year, month, day, hours, minutes, seconds));
var dateString = date.toLocaleDateString();
var timeString = date.toLocaleTimeString();
@@ -5390,7 +6204,7 @@ var PDFDocumentProperties = function () {
}, '{{date}}, {{time}}');
}
}, {
- key: '_parseLinearization',
+ key: "_parseLinearization",
value: function _parseLinearization(isLinearized) {
return this.l10n.get('document_properties_linearized_' + (isLinearized ? 'yes' : 'no'), null, isLinearized ? 'Yes' : 'No');
}
@@ -5411,9 +6225,7 @@ exports.PDFDocumentProperties = PDFDocumentProperties;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFFindBar = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFFindBar = void 0;
var _ui_utils = __webpack_require__(6);
@@ -5421,9 +6233,15 @@ var _pdf_find_controller = __webpack_require__(19);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var MATCHES_COUNT_LIMIT = 1000;
-var PDFFindBar = function () {
+var PDFFindBar =
+/*#__PURE__*/
+function () {
function PDFFindBar(options) {
var _this = this;
@@ -5457,9 +6275,12 @@ var PDFFindBar = function () {
if (e.target === _this.findField) {
_this.dispatchEvent('again', e.shiftKey);
}
+
break;
+
case 27:
_this.close();
+
break;
}
});
@@ -5482,12 +6303,12 @@ var PDFFindBar = function () {
}
_createClass(PDFFindBar, [{
- key: 'reset',
+ key: "reset",
value: function reset() {
this.updateUIState();
}
}, {
- key: 'dispatchEvent',
+ key: "dispatchEvent",
value: function dispatchEvent(type, findPrev) {
this.eventBus.dispatch('find', {
source: this,
@@ -5501,58 +6322,69 @@ var PDFFindBar = function () {
});
}
}, {
- key: 'updateUIState',
+ key: "updateUIState",
value: function updateUIState(state, previous, matchesCount) {
var _this2 = this;
var notFound = false;
var findMsg = '';
var status = '';
+
switch (state) {
case _pdf_find_controller.FindState.FOUND:
break;
+
case _pdf_find_controller.FindState.PENDING:
status = 'pending';
break;
+
case _pdf_find_controller.FindState.NOT_FOUND:
findMsg = this.l10n.get('find_not_found', null, 'Phrase not found');
notFound = true;
break;
+
case _pdf_find_controller.FindState.WRAPPED:
if (previous) {
findMsg = this.l10n.get('find_reached_top', null, 'Reached top of document, continued from bottom');
} else {
findMsg = this.l10n.get('find_reached_bottom', null, 'Reached end of document, continued from top');
}
+
break;
}
+
this.findField.classList.toggle('notFound', notFound);
this.findField.setAttribute('data-status', status);
Promise.resolve(findMsg).then(function (msg) {
_this2.findMsg.textContent = msg;
+
_this2._adjustWidth();
});
this.updateResultsCount(matchesCount);
}
}, {
- key: 'updateResultsCount',
+ key: "updateResultsCount",
value: function updateResultsCount() {
var _this3 = this;
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
_ref$current = _ref.current,
- current = _ref$current === undefined ? 0 : _ref$current,
+ current = _ref$current === void 0 ? 0 : _ref$current,
_ref$total = _ref.total,
- total = _ref$total === undefined ? 0 : _ref$total;
+ total = _ref$total === void 0 ? 0 : _ref$total;
if (!this.findResultsCount) {
return;
}
+
var matchesCountMsg = '',
limit = MATCHES_COUNT_LIMIT;
+
if (total > 0) {
if (total > limit) {
- matchesCountMsg = this.l10n.get('find_match_count_limit', { limit: limit }, 'More than {{limit}} match' + (limit !== 1 ? 'es' : ''));
+ matchesCountMsg = this.l10n.get('find_match_count_limit', {
+ limit: limit
+ }, 'More than {{limit}} match' + (limit !== 1 ? 'es' : ''));
} else {
matchesCountMsg = this.l10n.get('find_match_count', {
current: current,
@@ -5560,37 +6392,45 @@ var PDFFindBar = function () {
}, '{{current}} of {{total}} match' + (total !== 1 ? 'es' : ''));
}
}
+
Promise.resolve(matchesCountMsg).then(function (msg) {
_this3.findResultsCount.textContent = msg;
+
_this3.findResultsCount.classList[!total ? 'add' : 'remove']('hidden');
+
_this3._adjustWidth();
});
}
}, {
- key: 'open',
+ key: "open",
value: function open() {
if (!this.opened) {
this.opened = true;
this.toggleButton.classList.add('toggled');
this.bar.classList.remove('hidden');
}
+
this.findField.select();
this.findField.focus();
+
this._adjustWidth();
}
}, {
- key: 'close',
+ key: "close",
value: function close() {
if (!this.opened) {
return;
}
+
this.opened = false;
this.toggleButton.classList.remove('toggled');
this.bar.classList.add('hidden');
- this.eventBus.dispatch('findbarclose', { source: this });
+ this.eventBus.dispatch('findbarclose', {
+ source: this
+ });
}
}, {
- key: 'toggle',
+ key: "toggle",
value: function toggle() {
if (this.opened) {
this.close();
@@ -5599,14 +6439,16 @@ var PDFFindBar = function () {
}
}
}, {
- key: '_adjustWidth',
+ key: "_adjustWidth",
value: function _adjustWidth() {
if (!this.opened) {
return;
}
+
this.bar.classList.remove('wrapContainers');
var findbarHeight = this.bar.clientHeight;
var inputContainerHeight = this.bar.firstElementChild.clientHeight;
+
if (findbarHeight > inputContainerHeight) {
this.bar.classList.add('wrapContainers');
}
@@ -5628,115 +6470,182 @@ exports.PDFFindBar = PDFFindBar;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFFindController = exports.FindState = undefined;
+exports.PDFFindController = exports.FindState = void 0;
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _ui_utils = __webpack_require__(6);
var _pdfjsLib = __webpack_require__(7);
var _pdf_find_utils = __webpack_require__(20);
-var _ui_utils = __webpack_require__(6);
-
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var FindState = {
FOUND: 0,
NOT_FOUND: 1,
WRAPPED: 2,
PENDING: 3
};
+exports.FindState = FindState;
var FIND_TIMEOUT = 250;
+var MATCH_SCROLL_OFFSET_TOP = -50;
+var MATCH_SCROLL_OFFSET_LEFT = -400;
var CHARACTERS_TO_NORMALIZE = {
- '\u2018': '\'',
- '\u2019': '\'',
- '\u201A': '\'',
- '\u201B': '\'',
- '\u201C': '"',
- '\u201D': '"',
- '\u201E': '"',
- '\u201F': '"',
- '\xBC': '1/4',
- '\xBD': '1/2',
- '\xBE': '3/4'
+ "\u2018": '\'',
+ "\u2019": '\'',
+ "\u201A": '\'',
+ "\u201B": '\'',
+ "\u201C": '"',
+ "\u201D": '"',
+ "\u201E": '"',
+ "\u201F": '"',
+ "\xBC": '1/4',
+ "\xBD": '1/2',
+ "\xBE": '3/4'
};
var normalizationRegex = null;
+
function normalize(text) {
if (!normalizationRegex) {
var replace = Object.keys(CHARACTERS_TO_NORMALIZE).join('');
- normalizationRegex = new RegExp('[' + replace + ']', 'g');
+ normalizationRegex = new RegExp("[".concat(replace, "]"), 'g');
}
+
return text.replace(normalizationRegex, function (ch) {
return CHARACTERS_TO_NORMALIZE[ch];
});
}
-var PDFFindController = function () {
+var PDFFindController =
+/*#__PURE__*/
+function () {
function PDFFindController(_ref) {
var linkService = _ref.linkService,
_ref$eventBus = _ref.eventBus,
- eventBus = _ref$eventBus === undefined ? (0, _ui_utils.getGlobalEventBus)() : _ref$eventBus;
+ eventBus = _ref$eventBus === void 0 ? (0, _ui_utils.getGlobalEventBus)() : _ref$eventBus;
_classCallCheck(this, PDFFindController);
this._linkService = linkService;
this._eventBus = eventBus;
+
this._reset();
+
eventBus.on('findbarclose', this._onFindBarClose.bind(this));
}
_createClass(PDFFindController, [{
- key: 'setDocument',
+ key: "setDocument",
value: function setDocument(pdfDocument) {
if (this._pdfDocument) {
this._reset();
}
+
if (!pdfDocument) {
return;
}
+
this._pdfDocument = pdfDocument;
+
this._firstPageCapability.resolve();
}
}, {
- key: 'executeCommand',
+ key: "executeCommand",
value: function executeCommand(cmd, state) {
var _this = this;
+ if (!state) {
+ return;
+ }
+
var pdfDocument = this._pdfDocument;
- if (this._state === null || cmd !== 'findagain') {
+
+ if (this._state === null || this._shouldDirtyMatch(cmd, state)) {
this._dirtyMatch = true;
}
+
this._state = state;
- this._updateUIState(FindState.PENDING);
+
+ if (cmd !== 'findhighlightallchange') {
+ this._updateUIState(FindState.PENDING);
+ }
+
this._firstPageCapability.promise.then(function () {
if (!_this._pdfDocument || pdfDocument && _this._pdfDocument !== pdfDocument) {
return;
}
+
_this._extractText();
+
+ var findbarClosed = !_this._highlightMatches;
+ var pendingTimeout = !!_this._findTimeout;
+
if (_this._findTimeout) {
clearTimeout(_this._findTimeout);
_this._findTimeout = null;
}
+
if (cmd === 'find') {
_this._findTimeout = setTimeout(function () {
_this._nextMatch();
+
_this._findTimeout = null;
}, FIND_TIMEOUT);
- } else if (cmd === 'findagain' && !_this._dirtyMatch) {
- var updateHighlightAll = !_this._highlightMatches && _this._state.highlightAll;
+ } else if (_this._dirtyMatch) {
_this._nextMatch();
- if (updateHighlightAll) {
+ } else if (cmd === 'findagain') {
+ _this._nextMatch();
+
+ if (findbarClosed && _this._state.highlightAll) {
_this._updateAllPages();
}
+ } else if (cmd === 'findhighlightallchange') {
+ if (pendingTimeout) {
+ _this._nextMatch();
+ } else {
+ _this._highlightMatches = true;
+ }
+
+ _this._updateAllPages();
} else {
_this._nextMatch();
}
});
}
}, {
- key: '_reset',
+ key: "scrollMatchIntoView",
+ value: function scrollMatchIntoView(_ref2) {
+ var _ref2$element = _ref2.element,
+ element = _ref2$element === void 0 ? null : _ref2$element,
+ _ref2$pageIndex = _ref2.pageIndex,
+ pageIndex = _ref2$pageIndex === void 0 ? -1 : _ref2$pageIndex,
+ _ref2$matchIndex = _ref2.matchIndex,
+ matchIndex = _ref2$matchIndex === void 0 ? -1 : _ref2$matchIndex;
+
+ if (!this._scrollMatches || !element) {
+ return;
+ } else if (matchIndex === -1 || matchIndex !== this._selected.matchIdx) {
+ return;
+ } else if (pageIndex === -1 || pageIndex !== this._selected.pageIdx) {
+ return;
+ }
+
+ this._scrollMatches = false;
+ var spot = {
+ top: MATCH_SCROLL_OFFSET_TOP,
+ left: MATCH_SCROLL_OFFSET_LEFT
+ };
+ (0, _ui_utils.scrollIntoView)(element, spot, true);
+ }
+ }, {
+ key: "_reset",
value: function _reset() {
this._highlightMatches = false;
+ this._scrollMatches = false;
this._pdfDocument = null;
this._pageMatches = [];
this._pageMatchesLength = [];
@@ -5762,96 +6671,145 @@ var PDFFindController = function () {
this._firstPageCapability = (0, _pdfjsLib.createPromiseCapability)();
}
}, {
- key: '_prepareMatches',
+ key: "_shouldDirtyMatch",
+ value: function _shouldDirtyMatch(cmd, state) {
+ if (state.query !== this._state.query) {
+ return true;
+ }
+
+ switch (cmd) {
+ case 'findagain':
+ var pageNumber = this._selected.pageIdx + 1;
+ var linkService = this._linkService;
+
+ if (pageNumber >= 1 && pageNumber <= linkService.pagesCount && linkService.page !== pageNumber && linkService.isPageVisible && !linkService.isPageVisible(pageNumber)) {
+ break;
+ }
+
+ return false;
+
+ case 'findhighlightallchange':
+ return false;
+ }
+
+ return true;
+ }
+ }, {
+ key: "_prepareMatches",
value: function _prepareMatches(matchesWithLength, matches, matchesLength) {
function isSubTerm(matchesWithLength, currentIndex) {
var currentElem = matchesWithLength[currentIndex];
var nextElem = matchesWithLength[currentIndex + 1];
+
if (currentIndex < matchesWithLength.length - 1 && currentElem.match === nextElem.match) {
currentElem.skipped = true;
return true;
}
+
for (var i = currentIndex - 1; i >= 0; i--) {
var prevElem = matchesWithLength[i];
+
if (prevElem.skipped) {
continue;
}
+
if (prevElem.match + prevElem.matchLength < currentElem.match) {
break;
}
+
if (prevElem.match + prevElem.matchLength >= currentElem.match + currentElem.matchLength) {
currentElem.skipped = true;
return true;
}
}
+
return false;
}
+
matchesWithLength.sort(function (a, b) {
return a.match === b.match ? a.matchLength - b.matchLength : a.match - b.match;
});
+
for (var i = 0, len = matchesWithLength.length; i < len; i++) {
if (isSubTerm(matchesWithLength, i)) {
continue;
}
+
matches.push(matchesWithLength[i].match);
matchesLength.push(matchesWithLength[i].matchLength);
}
}
}, {
- key: '_isEntireWord',
+ key: "_isEntireWord",
value: function _isEntireWord(content, startIdx, length) {
if (startIdx > 0) {
var first = content.charCodeAt(startIdx);
var limit = content.charCodeAt(startIdx - 1);
+
if ((0, _pdf_find_utils.getCharacterType)(first) === (0, _pdf_find_utils.getCharacterType)(limit)) {
return false;
}
}
+
var endIdx = startIdx + length - 1;
+
if (endIdx < content.length - 1) {
var last = content.charCodeAt(endIdx);
+
var _limit = content.charCodeAt(endIdx + 1);
+
if ((0, _pdf_find_utils.getCharacterType)(last) === (0, _pdf_find_utils.getCharacterType)(_limit)) {
return false;
}
}
+
return true;
}
}, {
- key: '_calculatePhraseMatch',
+ key: "_calculatePhraseMatch",
value: function _calculatePhraseMatch(query, pageIndex, pageContent, entireWord) {
var matches = [];
var queryLen = query.length;
var matchIdx = -queryLen;
+
while (true) {
matchIdx = pageContent.indexOf(query, matchIdx + queryLen);
+
if (matchIdx === -1) {
break;
}
+
if (entireWord && !this._isEntireWord(pageContent, matchIdx, queryLen)) {
continue;
}
+
matches.push(matchIdx);
}
+
this._pageMatches[pageIndex] = matches;
}
}, {
- key: '_calculateWordMatch',
+ key: "_calculateWordMatch",
value: function _calculateWordMatch(query, pageIndex, pageContent, entireWord) {
var matchesWithLength = [];
var queryArray = query.match(/\S+/g);
+
for (var i = 0, len = queryArray.length; i < len; i++) {
var subquery = queryArray[i];
var subqueryLen = subquery.length;
var matchIdx = -subqueryLen;
+
while (true) {
matchIdx = pageContent.indexOf(subquery, matchIdx + subqueryLen);
+
if (matchIdx === -1) {
break;
}
+
if (entireWord && !this._isEntireWord(pageContent, matchIdx, subqueryLen)) {
continue;
}
+
matchesWithLength.push({
match: matchIdx,
matchLength: subqueryLen,
@@ -5859,53 +6817,64 @@ var PDFFindController = function () {
});
}
}
+
this._pageMatchesLength[pageIndex] = [];
this._pageMatches[pageIndex] = [];
+
this._prepareMatches(matchesWithLength, this._pageMatches[pageIndex], this._pageMatchesLength[pageIndex]);
}
}, {
- key: '_calculateMatch',
+ key: "_calculateMatch",
value: function _calculateMatch(pageIndex) {
var pageContent = this._pageContents[pageIndex];
var query = this._query;
- var _state = this._state,
- caseSensitive = _state.caseSensitive,
- entireWord = _state.entireWord,
- phraseSearch = _state.phraseSearch;
+ var _this$_state = this._state,
+ caseSensitive = _this$_state.caseSensitive,
+ entireWord = _this$_state.entireWord,
+ phraseSearch = _this$_state.phraseSearch;
if (query.length === 0) {
return;
}
+
if (!caseSensitive) {
pageContent = pageContent.toLowerCase();
query = query.toLowerCase();
}
+
if (phraseSearch) {
this._calculatePhraseMatch(query, pageIndex, pageContent, entireWord);
} else {
this._calculateWordMatch(query, pageIndex, pageContent, entireWord);
}
+
if (this._state.highlightAll) {
this._updatePage(pageIndex);
}
+
if (this._resumePageIdx === pageIndex) {
this._resumePageIdx = null;
+
this._nextPageMatch();
}
+
var pageMatchesCount = this._pageMatches[pageIndex].length;
+
if (pageMatchesCount > 0) {
this._matchesCountTotal += pageMatchesCount;
+
this._updateUIResultsCount();
}
}
}, {
- key: '_extractText',
+ key: "_extractText",
value: function _extractText() {
var _this2 = this;
if (this._extractTextPromises.length > 0) {
return;
}
+
var promise = Promise.resolve();
var _loop = function _loop(i, ii) {
@@ -5913,17 +6882,21 @@ var PDFFindController = function () {
_this2._extractTextPromises[i] = extractTextCapability.promise;
promise = promise.then(function () {
return _this2._pdfDocument.getPage(i + 1).then(function (pdfPage) {
- return pdfPage.getTextContent({ normalizeWhitespace: true });
+ return pdfPage.getTextContent({
+ normalizeWhitespace: true
+ });
}).then(function (textContent) {
var textItems = textContent.items;
var strBuf = [];
+
for (var j = 0, jj = textItems.length; j < jj; j++) {
strBuf.push(textItems[j].str);
}
+
_this2._pageContents[i] = normalize(strBuf.join(''));
extractTextCapability.resolve(i);
}, function (reason) {
- console.error('Unable to get text content for page ' + (i + 1), reason);
+ console.error("Unable to get text content for page ".concat(i + 1), reason);
_this2._pageContents[i] = '';
extractTextCapability.resolve(i);
});
@@ -5935,18 +6908,19 @@ var PDFFindController = function () {
}
}
}, {
- key: '_updatePage',
+ key: "_updatePage",
value: function _updatePage(index) {
- if (this._selected.pageIdx === index) {
+ if (this._scrollMatches && this._selected.pageIdx === index) {
this._linkService.page = index + 1;
}
+
this._eventBus.dispatch('updatetextlayermatches', {
source: this,
pageIndex: index
});
}
}, {
- key: '_updateAllPages',
+ key: "_updateAllPages",
value: function _updateAllPages() {
this._eventBus.dispatch('updatetextlayermatches', {
source: this,
@@ -5954,7 +6928,7 @@ var PDFFindController = function () {
});
}
}, {
- key: '_nextMatch',
+ key: "_nextMatch",
value: function _nextMatch() {
var _this3 = this;
@@ -5962,6 +6936,7 @@ var PDFFindController = function () {
var currentPageIndex = this._linkService.page - 1;
var numPages = this._linkService.pagesCount;
this._highlightMatches = true;
+
if (this._dirtyMatch) {
this._dirtyMatch = false;
this._selected.pageIdx = this._selected.matchIdx = -1;
@@ -5972,69 +6947,95 @@ var PDFFindController = function () {
this._pageMatches.length = 0;
this._pageMatchesLength.length = 0;
this._matchesCountTotal = 0;
+
this._updateAllPages();
+
for (var i = 0; i < numPages; i++) {
if (this._pendingFindMatches[i] === true) {
continue;
}
+
this._pendingFindMatches[i] = true;
+
this._extractTextPromises[i].then(function (pageIdx) {
delete _this3._pendingFindMatches[pageIdx];
+
_this3._calculateMatch(pageIdx);
});
}
}
+
if (this._query === '') {
this._updateUIState(FindState.FOUND);
+
return;
}
+
if (this._resumePageIdx) {
return;
}
+
var offset = this._offset;
this._pagesToSearch = numPages;
+
if (offset.matchIdx !== null) {
var numPageMatches = this._pageMatches[offset.pageIdx].length;
+
if (!previous && offset.matchIdx + 1 < numPageMatches || previous && offset.matchIdx > 0) {
offset.matchIdx = previous ? offset.matchIdx - 1 : offset.matchIdx + 1;
+
this._updateMatch(true);
+
return;
}
+
this._advanceOffsetPage(previous);
}
+
this._nextPageMatch();
}
}, {
- key: '_matchesReady',
+ key: "_matchesReady",
value: function _matchesReady(matches) {
var offset = this._offset;
var numMatches = matches.length;
var previous = this._state.findPrevious;
+
if (numMatches) {
offset.matchIdx = previous ? numMatches - 1 : 0;
+
this._updateMatch(true);
+
return true;
}
+
this._advanceOffsetPage(previous);
+
if (offset.wrapped) {
offset.matchIdx = null;
+
if (this._pagesToSearch < 0) {
this._updateMatch(false);
+
return true;
}
}
+
return false;
}
}, {
- key: '_nextPageMatch',
+ key: "_nextPageMatch",
value: function _nextPageMatch() {
if (this._resumePageIdx !== null) {
console.error('There can only be one pending page.');
}
+
var matches = null;
+
do {
var pageIdx = this._offset.pageIdx;
matches = this._pageMatches[pageIdx];
+
if (!matches) {
this._resumePageIdx = pageIdx;
break;
@@ -6042,88 +7043,103 @@ var PDFFindController = function () {
} while (!this._matchesReady(matches));
}
}, {
- key: '_advanceOffsetPage',
+ key: "_advanceOffsetPage",
value: function _advanceOffsetPage(previous) {
var offset = this._offset;
var numPages = this._linkService.pagesCount;
offset.pageIdx = previous ? offset.pageIdx - 1 : offset.pageIdx + 1;
offset.matchIdx = null;
this._pagesToSearch--;
+
if (offset.pageIdx >= numPages || offset.pageIdx < 0) {
offset.pageIdx = previous ? numPages - 1 : 0;
offset.wrapped = true;
}
}
}, {
- key: '_updateMatch',
+ key: "_updateMatch",
value: function _updateMatch() {
var found = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
var state = FindState.NOT_FOUND;
var wrapped = this._offset.wrapped;
this._offset.wrapped = false;
+
if (found) {
var previousPage = this._selected.pageIdx;
this._selected.pageIdx = this._offset.pageIdx;
this._selected.matchIdx = this._offset.matchIdx;
state = wrapped ? FindState.WRAPPED : FindState.FOUND;
+
if (previousPage !== -1 && previousPage !== this._selected.pageIdx) {
this._updatePage(previousPage);
}
}
+
this._updateUIState(state, this._state.findPrevious);
+
if (this._selected.pageIdx !== -1) {
+ this._scrollMatches = true;
+
this._updatePage(this._selected.pageIdx);
}
}
}, {
- key: '_onFindBarClose',
+ key: "_onFindBarClose",
value: function _onFindBarClose(evt) {
var _this4 = this;
var pdfDocument = this._pdfDocument;
+
this._firstPageCapability.promise.then(function () {
if (!_this4._pdfDocument || pdfDocument && _this4._pdfDocument !== pdfDocument) {
return;
}
+
if (_this4._findTimeout) {
clearTimeout(_this4._findTimeout);
_this4._findTimeout = null;
}
+
if (_this4._resumePageIdx) {
_this4._resumePageIdx = null;
_this4._dirtyMatch = true;
}
+
_this4._updateUIState(FindState.FOUND);
+
_this4._highlightMatches = false;
+
_this4._updateAllPages();
});
}
}, {
- key: '_requestMatchesCount',
+ key: "_requestMatchesCount",
value: function _requestMatchesCount() {
- var _selected = this._selected,
- pageIdx = _selected.pageIdx,
- matchIdx = _selected.matchIdx;
-
+ var _this$_selected = this._selected,
+ pageIdx = _this$_selected.pageIdx,
+ matchIdx = _this$_selected.matchIdx;
var current = 0,
total = this._matchesCountTotal;
+
if (matchIdx !== -1) {
for (var i = 0; i < pageIdx; i++) {
current += this._pageMatches[i] && this._pageMatches[i].length || 0;
}
+
current += matchIdx + 1;
}
+
if (current < 1 || current > total) {
current = total = 0;
}
+
return {
current: current,
total: total
};
}
}, {
- key: '_updateUIResultsCount',
+ key: "_updateUIResultsCount",
value: function _updateUIResultsCount() {
this._eventBus.dispatch('updatefindmatchescount', {
source: this,
@@ -6131,7 +7147,7 @@ var PDFFindController = function () {
});
}
}, {
- key: '_updateUIState',
+ key: "_updateUIState",
value: function _updateUIState(state, previous) {
this._eventBus.dispatch('updatefindcontrolstate', {
source: this,
@@ -6141,37 +7157,38 @@ var PDFFindController = function () {
});
}
}, {
- key: 'highlightMatches',
+ key: "highlightMatches",
get: function get() {
return this._highlightMatches;
}
}, {
- key: 'pageMatches',
+ key: "pageMatches",
get: function get() {
return this._pageMatches;
}
}, {
- key: 'pageMatchesLength',
+ key: "pageMatchesLength",
get: function get() {
return this._pageMatchesLength;
}
}, {
- key: 'selected',
+ key: "selected",
get: function get() {
return this._selected;
}
}, {
- key: 'state',
+ key: "state",
get: function get() {
return this._state;
}
}, {
- key: '_query',
+ key: "_query",
get: function get() {
if (this._state.query !== this._rawQuery) {
this._rawQuery = this._state.query;
this._normalizedQuery = normalize(this._state.query);
}
+
return this._normalizedQuery;
}
}]);
@@ -6179,7 +7196,6 @@ var PDFFindController = function () {
return PDFFindController;
}();
-exports.FindState = FindState;
exports.PDFFindController = PDFFindController;
/***/ }),
@@ -6192,6 +7208,8 @@ exports.PDFFindController = PDFFindController;
Object.defineProperty(exports, "__esModule", {
value: true
});
+exports.getCharacterType = getCharacterType;
+exports.CharacterType = void 0;
var CharacterType = {
SPACE: 0,
ALPHA_LETTER: 1,
@@ -6202,36 +7220,48 @@ var CharacterType = {
HALFWIDTH_KATAKANA_LETTER: 6,
THAI_LETTER: 7
};
+exports.CharacterType = CharacterType;
+
function isAlphabeticalScript(charCode) {
return charCode < 0x2E80;
}
+
function isAscii(charCode) {
return (charCode & 0xFF80) === 0;
}
+
function isAsciiAlpha(charCode) {
return charCode >= 0x61 && charCode <= 0x7A || charCode >= 0x41 && charCode <= 0x5A;
}
+
function isAsciiDigit(charCode) {
return charCode >= 0x30 && charCode <= 0x39;
}
+
function isAsciiSpace(charCode) {
return charCode === 0x20 || charCode === 0x09 || charCode === 0x0D || charCode === 0x0A;
}
+
function isHan(charCode) {
return charCode >= 0x3400 && charCode <= 0x9FFF || charCode >= 0xF900 && charCode <= 0xFAFF;
}
+
function isKatakana(charCode) {
return charCode >= 0x30A0 && charCode <= 0x30FF;
}
+
function isHiragana(charCode) {
return charCode >= 0x3040 && charCode <= 0x309F;
}
+
function isHalfwidthKatakana(charCode) {
return charCode >= 0xFF60 && charCode <= 0xFF9F;
}
+
function isThai(charCode) {
return (charCode & 0xFF80) === 0x0E00;
}
+
function getCharacterType(charCode) {
if (isAlphabeticalScript(charCode)) {
if (isAscii(charCode)) {
@@ -6240,14 +7270,17 @@ function getCharacterType(charCode) {
} else if (isAsciiAlpha(charCode) || isAsciiDigit(charCode) || charCode === 0x5F) {
return CharacterType.ALPHA_LETTER;
}
+
return CharacterType.PUNCT;
} else if (isThai(charCode)) {
return CharacterType.THAI_LETTER;
} else if (charCode === 0xA0) {
return CharacterType.SPACE;
}
+
return CharacterType.ALPHA_LETTER;
}
+
if (isHan(charCode)) {
return CharacterType.HAN_LETTER;
} else if (isKatakana(charCode)) {
@@ -6257,10 +7290,9 @@ function getCharacterType(charCode) {
} else if (isHalfwidthKatakana(charCode)) {
return CharacterType.HALFWIDTH_KATAKANA_LETTER;
}
+
return CharacterType.ALPHA_LETTER;
}
-exports.CharacterType = CharacterType;
-exports.getCharacterType = getCharacterType;
/***/ }),
/* 21 */
@@ -6272,29 +7304,37 @@ exports.getCharacterType = getCharacterType;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.isDestArraysEqual = exports.isDestHashesEqual = exports.PDFHistory = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.isDestHashesEqual = isDestHashesEqual;
+exports.isDestArraysEqual = isDestArraysEqual;
+exports.PDFHistory = void 0;
var _ui_utils = __webpack_require__(6);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var HASH_CHANGE_TIMEOUT = 1000;
var POSITION_UPDATED_THRESHOLD = 50;
var UPDATE_VIEWAREA_TIMEOUT = 1000;
+
function getCurrentHash() {
return document.location.hash;
}
+
function parseCurrentHash(linkService) {
var hash = unescape(getCurrentHash()).substring(1);
var params = (0, _ui_utils.parseQueryString)(hash);
var page = params.page | 0;
+
if (!(Number.isInteger(page) && page > 0 && page <= linkService.pagesCount)) {
page = null;
}
+
return {
hash: hash,
page: page,
@@ -6302,7 +7342,9 @@ function parseCurrentHash(linkService) {
};
}
-var PDFHistory = function () {
+var PDFHistory =
+/*#__PURE__*/
+function () {
function PDFHistory(_ref) {
var _this = this;
@@ -6328,7 +7370,7 @@ var PDFHistory = function () {
}
_createClass(PDFHistory, [{
- key: 'initialize',
+ key: "initialize",
value: function initialize(fingerprint) {
var resetHistory = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -6336,11 +7378,14 @@ var PDFHistory = function () {
console.error('PDFHistory.initialize: The "fingerprint" must be a non-empty string.');
return;
}
+
var reInitialized = this.initialized && this.fingerprint !== fingerprint;
this.fingerprint = fingerprint;
+
if (!this.initialized) {
this._bindEvents();
}
+
var state = window.history.state;
this.initialized = true;
this.initialBookmark = null;
@@ -6352,6 +7397,7 @@ var PDFHistory = function () {
this._uid = this._maxUid = 0;
this._destination = null;
this._position = null;
+
if (!this._isValidState(state) || resetHistory) {
var _parseCurrentHash = parseCurrentHash(this.linkService),
hash = _parseCurrentHash.hash,
@@ -6360,34 +7406,42 @@ var PDFHistory = function () {
if (!hash || reInitialized || resetHistory) {
this._pushOrReplaceState(null, true);
+
return;
}
+
this._pushOrReplaceState({
hash: hash,
page: page,
rotation: rotation
}, true);
+
return;
}
+
var destination = state.destination;
+
this._updateInternalState(destination, state.uid, true);
+
if (this._uid > this._maxUid) {
this._maxUid = this._uid;
}
+
if (destination.rotation !== undefined) {
this.initialRotation = destination.rotation;
}
+
if (destination.dest) {
this.initialBookmark = JSON.stringify(destination.dest);
this._destination.page = null;
} else if (destination.hash) {
this.initialBookmark = destination.hash;
} else if (destination.page) {
- this.initialBookmark = 'page=' + destination.page;
+ this.initialBookmark = "page=".concat(destination.page);
}
}
}, {
- key: 'push',
+ key: "push",
value: function push(_ref2) {
var _this2 = this;
@@ -6398,30 +7452,39 @@ var PDFHistory = function () {
if (!this.initialized) {
return;
}
+
if (namedDest && typeof namedDest !== 'string' || !Array.isArray(explicitDest) || !(Number.isInteger(pageNumber) && pageNumber > 0 && pageNumber <= this.linkService.pagesCount)) {
console.error('PDFHistory.push: Invalid parameters.');
return;
}
+
var hash = namedDest || JSON.stringify(explicitDest);
+
if (!hash) {
return;
}
+
var forceReplace = false;
+
if (this._destination && (isDestHashesEqual(this._destination.hash, hash) || isDestArraysEqual(this._destination.dest, explicitDest))) {
if (this._destination.page) {
return;
}
+
forceReplace = true;
}
+
if (this._popStateInProgress && !forceReplace) {
return;
}
+
this._pushOrReplaceState({
dest: explicitDest,
hash: hash,
page: pageNumber,
rotation: this.linkService.rotation
}, forceReplace);
+
if (!this._popStateInProgress) {
this._popStateInProgress = true;
Promise.resolve().then(function () {
@@ -6430,47 +7493,53 @@ var PDFHistory = function () {
}
}
}, {
- key: 'pushCurrentPosition',
+ key: "pushCurrentPosition",
value: function pushCurrentPosition() {
if (!this.initialized || this._popStateInProgress) {
return;
}
+
this._tryPushCurrentPosition();
}
}, {
- key: 'back',
+ key: "back",
value: function back() {
if (!this.initialized || this._popStateInProgress) {
return;
}
+
var state = window.history.state;
+
if (this._isValidState(state) && state.uid > 0) {
window.history.back();
}
}
}, {
- key: 'forward',
+ key: "forward",
value: function forward() {
if (!this.initialized || this._popStateInProgress) {
return;
}
+
var state = window.history.state;
+
if (this._isValidState(state) && state.uid < this._maxUid) {
window.history.forward();
}
}
}, {
- key: '_pushOrReplaceState',
+ key: "_pushOrReplaceState",
value: function _pushOrReplaceState(destination) {
var forceReplace = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var shouldReplace = forceReplace || !this._destination;
var newState = {
fingerprint: this.fingerprint,
uid: shouldReplace ? this._uid : this._uid + 1,
destination: destination
};
+
this._updateInternalState(destination, newState.uid);
+
if (shouldReplace) {
window.history.replaceState(newState, '');
} else {
@@ -6479,60 +7548,76 @@ var PDFHistory = function () {
}
}
}, {
- key: '_tryPushCurrentPosition',
+ key: "_tryPushCurrentPosition",
value: function _tryPushCurrentPosition() {
var temporary = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (!this._position) {
return;
}
+
var position = this._position;
+
if (temporary) {
position = Object.assign(Object.create(null), this._position);
position.temporary = true;
}
+
if (!this._destination) {
this._pushOrReplaceState(position);
+
return;
}
+
if (this._destination.temporary) {
this._pushOrReplaceState(position, true);
+
return;
}
+
if (this._destination.hash === position.hash) {
return;
}
+
if (!this._destination.page && (POSITION_UPDATED_THRESHOLD <= 0 || this._numPositionUpdates <= POSITION_UPDATED_THRESHOLD)) {
return;
}
+
var forceReplace = false;
- if (this._destination.page === position.first || this._destination.page === position.page) {
+
+ if (this._destination.page >= position.first && this._destination.page <= position.page) {
if (this._destination.dest || !this._destination.first) {
return;
}
+
forceReplace = true;
}
+
this._pushOrReplaceState(position, forceReplace);
}
}, {
- key: '_isValidState',
+ key: "_isValidState",
value: function _isValidState(state) {
if (!state) {
return false;
}
+
if (state.fingerprint !== this.fingerprint) {
return false;
}
+
if (!Number.isInteger(state.uid) || state.uid < 0) {
return false;
}
+
if (state.destination === null || _typeof(state.destination) !== 'object') {
return false;
}
+
return true;
}
}, {
- key: '_updateInternalState',
+ key: "_updateInternalState",
value: function _updateInternalState(destination, uid) {
var removeTemporary = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -6540,15 +7625,17 @@ var PDFHistory = function () {
clearTimeout(this._updateViewareaTimeout);
this._updateViewareaTimeout = null;
}
+
if (removeTemporary && destination && destination.temporary) {
delete destination.temporary;
}
+
this._destination = destination;
this._uid = uid;
this._numPositionUpdates = 0;
}
}, {
- key: '_updateViewarea',
+ key: "_updateViewarea",
value: function _updateViewarea(_ref3) {
var _this3 = this;
@@ -6558,37 +7645,42 @@ var PDFHistory = function () {
clearTimeout(this._updateViewareaTimeout);
this._updateViewareaTimeout = null;
}
+
this._position = {
- hash: this._isViewerInPresentationMode ? 'page=' + location.pageNumber : location.pdfOpenParams.substring(1),
+ hash: this._isViewerInPresentationMode ? "page=".concat(location.pageNumber) : location.pdfOpenParams.substring(1),
page: this.linkService.page,
first: location.pageNumber,
rotation: location.rotation
};
+
if (this._popStateInProgress) {
return;
}
+
if (POSITION_UPDATED_THRESHOLD > 0 && this._isPagesLoaded && this._destination && !this._destination.page) {
this._numPositionUpdates++;
}
+
if (UPDATE_VIEWAREA_TIMEOUT > 0) {
this._updateViewareaTimeout = setTimeout(function () {
if (!_this3._popStateInProgress) {
_this3._tryPushCurrentPosition(true);
}
+
_this3._updateViewareaTimeout = null;
}, UPDATE_VIEWAREA_TIMEOUT);
}
}
}, {
- key: '_popState',
+ key: "_popState",
value: function _popState(_ref4) {
var _this4 = this;
var state = _ref4.state;
-
var newHash = getCurrentHash(),
hashChanged = this._currentHash !== newHash;
this._currentHash = newHash;
+
if (!state || false) {
this._uid++;
@@ -6602,12 +7694,16 @@ var PDFHistory = function () {
page: page,
rotation: rotation
}, true);
+
return;
}
+
if (!this._isValidState(state)) {
return;
}
+
this._popStateInProgress = true;
+
if (hashChanged) {
this._blockHashChange++;
(0, _ui_utils.waitOnEventOrTimeout)({
@@ -6618,14 +7714,19 @@ var PDFHistory = function () {
_this4._blockHashChange--;
});
}
+
var destination = state.destination;
+
this._updateInternalState(destination, state.uid, true);
+
if (this._uid > this._maxUid) {
this._maxUid = this._uid;
}
+
if ((0, _ui_utils.isValidRotation)(destination.rotation)) {
this.linkService.rotation = destination.rotation;
}
+
if (destination.dest) {
this.linkService.navigateTo(destination.dest);
} else if (destination.hash) {
@@ -6633,31 +7734,33 @@ var PDFHistory = function () {
} else if (destination.page) {
this.linkService.page = destination.page;
}
+
Promise.resolve().then(function () {
_this4._popStateInProgress = false;
});
}
}, {
- key: '_bindEvents',
+ key: "_bindEvents",
value: function _bindEvents() {
var _this5 = this;
var _boundEvents = this._boundEvents,
eventBus = this.eventBus;
-
_boundEvents.updateViewarea = this._updateViewarea.bind(this);
_boundEvents.popState = this._popState.bind(this);
+
_boundEvents.pageHide = function (evt) {
if (!_this5._destination || _this5._destination.temporary) {
_this5._tryPushCurrentPosition();
}
};
+
eventBus.on('updateviewarea', _boundEvents.updateViewarea);
window.addEventListener('popstate', _boundEvents.popState);
window.addEventListener('pagehide', _boundEvents.pageHide);
}
}, {
- key: 'popStateInProgress',
+ key: "popStateInProgress",
get: function get() {
return this.initialized && (this._popStateInProgress || this._blockHashChange > 0);
}
@@ -6666,10 +7769,13 @@ var PDFHistory = function () {
return PDFHistory;
}();
+exports.PDFHistory = PDFHistory;
+
function isDestHashesEqual(destHash, pushHash) {
if (typeof destHash !== 'string' || typeof pushHash !== 'string') {
return false;
}
+
if (destHash === pushHash) {
return true;
}
@@ -6680,45 +7786,53 @@ function isDestHashesEqual(destHash, pushHash) {
if (nameddest === pushHash) {
return true;
}
+
return false;
}
+
function isDestArraysEqual(firstDest, secondDest) {
function isEntryEqual(first, second) {
- if ((typeof first === 'undefined' ? 'undefined' : _typeof(first)) !== (typeof second === 'undefined' ? 'undefined' : _typeof(second))) {
+ if (_typeof(first) !== _typeof(second)) {
return false;
}
+
if (Array.isArray(first) || Array.isArray(second)) {
return false;
}
- if (first !== null && (typeof first === 'undefined' ? 'undefined' : _typeof(first)) === 'object' && second !== null) {
+
+ if (first !== null && _typeof(first) === 'object' && second !== null) {
if (Object.keys(first).length !== Object.keys(second).length) {
return false;
}
+
for (var key in first) {
if (!isEntryEqual(first[key], second[key])) {
return false;
}
}
+
return true;
}
+
return first === second || Number.isNaN(first) && Number.isNaN(second);
}
+
if (!(Array.isArray(firstDest) && Array.isArray(secondDest))) {
return false;
}
+
if (firstDest.length !== secondDest.length) {
return false;
}
+
for (var i = 0, ii = firstDest.length; i < ii; i++) {
if (!isEntryEqual(firstDest[i], secondDest[i])) {
return false;
}
}
+
return true;
}
-exports.PDFHistory = PDFHistory;
-exports.isDestHashesEqual = isDestHashesEqual;
-exports.isDestArraysEqual = isDestArraysEqual;
/***/ }),
/* 22 */
@@ -6730,24 +7844,28 @@ exports.isDestArraysEqual = isDestArraysEqual;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.SimpleLinkService = exports.PDFLinkService = undefined;
-
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.SimpleLinkService = exports.PDFLinkService = void 0;
var _ui_utils = __webpack_require__(6);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var PDFLinkService = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var PDFLinkService =
+/*#__PURE__*/
+function () {
function PDFLinkService() {
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
eventBus = _ref.eventBus,
_ref$externalLinkTarg = _ref.externalLinkTarget,
- externalLinkTarget = _ref$externalLinkTarg === undefined ? null : _ref$externalLinkTarg,
+ externalLinkTarget = _ref$externalLinkTarg === void 0 ? null : _ref$externalLinkTarg,
_ref$externalLinkRel = _ref.externalLinkRel,
- externalLinkRel = _ref$externalLinkRel === undefined ? null : _ref$externalLinkRel;
+ externalLinkRel = _ref$externalLinkRel === void 0 ? null : _ref$externalLinkRel;
_classCallCheck(this, PDFLinkService);
@@ -6762,72 +7880,79 @@ var PDFLinkService = function () {
}
_createClass(PDFLinkService, [{
- key: 'setDocument',
+ key: "setDocument",
value: function setDocument(pdfDocument) {
var baseUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
this.baseUrl = baseUrl;
this.pdfDocument = pdfDocument;
this._pagesRefCache = Object.create(null);
}
}, {
- key: 'setViewer',
+ key: "setViewer",
value: function setViewer(pdfViewer) {
this.pdfViewer = pdfViewer;
}
}, {
- key: 'setHistory',
+ key: "setHistory",
value: function setHistory(pdfHistory) {
this.pdfHistory = pdfHistory;
}
}, {
- key: 'navigateTo',
+ key: "navigateTo",
value: function navigateTo(dest) {
var _this = this;
var goToDestination = function goToDestination(_ref2) {
var namedDest = _ref2.namedDest,
explicitDest = _ref2.explicitDest;
-
var destRef = explicitDest[0],
- pageNumber = void 0;
+ pageNumber;
+
if (destRef instanceof Object) {
pageNumber = _this._cachedPageNumber(destRef);
+
if (pageNumber === null) {
_this.pdfDocument.getPageIndex(destRef).then(function (pageIndex) {
_this.cachePageRef(pageIndex + 1, destRef);
+
goToDestination({
namedDest: namedDest,
explicitDest: explicitDest
});
}).catch(function () {
- console.error('PDFLinkService.navigateTo: "' + destRef + '" is not ' + ('a valid page reference, for dest="' + dest + '".'));
+ console.error("PDFLinkService.navigateTo: \"".concat(destRef, "\" is not ") + "a valid page reference, for dest=\"".concat(dest, "\"."));
});
+
return;
}
} else if (Number.isInteger(destRef)) {
pageNumber = destRef + 1;
} else {
- console.error('PDFLinkService.navigateTo: "' + destRef + '" is not ' + ('a valid destination reference, for dest="' + dest + '".'));
+ console.error("PDFLinkService.navigateTo: \"".concat(destRef, "\" is not ") + "a valid destination reference, for dest=\"".concat(dest, "\"."));
return;
}
+
if (!pageNumber || pageNumber < 1 || pageNumber > _this.pagesCount) {
- console.error('PDFLinkService.navigateTo: "' + pageNumber + '" is not ' + ('a valid page number, for dest="' + dest + '".'));
+ console.error("PDFLinkService.navigateTo: \"".concat(pageNumber, "\" is not ") + "a valid page number, for dest=\"".concat(dest, "\"."));
return;
}
+
if (_this.pdfHistory) {
_this.pdfHistory.pushCurrentPosition();
+
_this.pdfHistory.push({
namedDest: namedDest,
explicitDest: explicitDest,
pageNumber: pageNumber
});
}
+
_this.pdfViewer.scrollPageIntoView({
pageNumber: pageNumber,
destArray: explicitDest
});
};
+
new Promise(function (resolve, reject) {
if (typeof dest === 'string') {
_this.pdfDocument.getDestination(dest).then(function (destArray) {
@@ -6836,44 +7961,50 @@ var PDFLinkService = function () {
explicitDest: destArray
});
});
+
return;
}
+
resolve({
namedDest: '',
explicitDest: dest
});
}).then(function (data) {
if (!Array.isArray(data.explicitDest)) {
- console.error('PDFLinkService.navigateTo: "' + data.explicitDest + '" is' + (' not a valid destination array, for dest="' + dest + '".'));
+ console.error("PDFLinkService.navigateTo: \"".concat(data.explicitDest, "\" is") + " not a valid destination array, for dest=\"".concat(dest, "\"."));
return;
}
+
goToDestination(data);
});
}
}, {
- key: 'getDestinationHash',
+ key: "getDestinationHash",
value: function getDestinationHash(dest) {
if (typeof dest === 'string') {
return this.getAnchorUrl('#' + escape(dest));
}
+
if (Array.isArray(dest)) {
var str = JSON.stringify(dest);
return this.getAnchorUrl('#' + escape(str));
}
+
return this.getAnchorUrl('');
}
}, {
- key: 'getAnchorUrl',
+ key: "getAnchorUrl",
value: function getAnchorUrl(anchor) {
return (this.baseUrl || '') + anchor;
}
}, {
- key: 'setHash',
+ key: "setHash",
value: function setHash(hash) {
- var pageNumber = void 0,
- dest = void 0;
+ var pageNumber, dest;
+
if (hash.includes('=')) {
var params = (0, _ui_utils.parseQueryString)(hash);
+
if ('search' in params) {
this.eventBus.dispatch('findfromurlhash', {
source: this,
@@ -6881,35 +8012,48 @@ var PDFLinkService = function () {
phraseSearch: params['phrase'] === 'true'
});
}
+
if ('nameddest' in params) {
this.navigateTo(params.nameddest);
return;
}
+
if ('page' in params) {
pageNumber = params.page | 0 || 1;
}
+
if ('zoom' in params) {
var zoomArgs = params.zoom.split(',');
var zoomArg = zoomArgs[0];
var zoomArgNumber = parseFloat(zoomArg);
+
if (!zoomArg.includes('Fit')) {
- dest = [null, { name: 'XYZ' }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null, zoomArgs.length > 2 ? zoomArgs[2] | 0 : null, zoomArgNumber ? zoomArgNumber / 100 : zoomArg];
+ dest = [null, {
+ name: 'XYZ'
+ }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null, zoomArgs.length > 2 ? zoomArgs[2] | 0 : null, zoomArgNumber ? zoomArgNumber / 100 : zoomArg];
} else {
if (zoomArg === 'Fit' || zoomArg === 'FitB') {
- dest = [null, { name: zoomArg }];
+ dest = [null, {
+ name: zoomArg
+ }];
} else if (zoomArg === 'FitH' || zoomArg === 'FitBH' || zoomArg === 'FitV' || zoomArg === 'FitBV') {
- dest = [null, { name: zoomArg }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null];
+ dest = [null, {
+ name: zoomArg
+ }, zoomArgs.length > 1 ? zoomArgs[1] | 0 : null];
} else if (zoomArg === 'FitR') {
if (zoomArgs.length !== 5) {
console.error('PDFLinkService.setHash: Not enough parameters for "FitR".');
} else {
- dest = [null, { name: zoomArg }, zoomArgs[1] | 0, zoomArgs[2] | 0, zoomArgs[3] | 0, zoomArgs[4] | 0];
+ dest = [null, {
+ name: zoomArg
+ }, zoomArgs[1] | 0, zoomArgs[2] | 0, zoomArgs[3] | 0, zoomArgs[4] | 0];
}
} else {
- console.error('PDFLinkService.setHash: "' + zoomArg + '" is not ' + 'a valid zoom value.');
+ console.error("PDFLinkService.setHash: \"".concat(zoomArg, "\" is not ") + 'a valid zoom value.');
}
}
}
+
if (dest) {
this.pdfViewer.scrollPageIntoView({
pageNumber: pageNumber || this.page,
@@ -6919,6 +8063,7 @@ var PDFLinkService = function () {
} else if (pageNumber) {
this.page = pageNumber;
}
+
if ('pagemode' in params) {
this.eventBus.dispatch('pagemode', {
source: this,
@@ -6927,79 +8072,100 @@ var PDFLinkService = function () {
}
} else {
dest = unescape(hash);
+
try {
dest = JSON.parse(dest);
+
if (!Array.isArray(dest)) {
dest = dest.toString();
}
} catch (ex) {}
+
if (typeof dest === 'string' || isValidExplicitDestination(dest)) {
this.navigateTo(dest);
return;
}
- console.error('PDFLinkService.setHash: "' + unescape(hash) + '" is not ' + 'a valid destination.');
+
+ console.error("PDFLinkService.setHash: \"".concat(unescape(hash), "\" is not ") + 'a valid destination.');
}
}
}, {
- key: 'executeNamedAction',
+ key: "executeNamedAction",
value: function executeNamedAction(action) {
switch (action) {
case 'GoBack':
if (this.pdfHistory) {
this.pdfHistory.back();
}
+
break;
+
case 'GoForward':
if (this.pdfHistory) {
this.pdfHistory.forward();
}
+
break;
+
case 'NextPage':
if (this.page < this.pagesCount) {
this.page++;
}
+
break;
+
case 'PrevPage':
if (this.page > 1) {
this.page--;
}
+
break;
+
case 'LastPage':
this.page = this.pagesCount;
break;
+
case 'FirstPage':
this.page = 1;
break;
+
default:
break;
}
+
this.eventBus.dispatch('namedaction', {
source: this,
action: action
});
}
}, {
- key: 'cachePageRef',
+ key: "cachePageRef",
value: function cachePageRef(pageNum, pageRef) {
if (!pageRef) {
return;
}
+
var refStr = pageRef.num + ' ' + pageRef.gen + ' R';
this._pagesRefCache[refStr] = pageNum;
}
}, {
- key: '_cachedPageNumber',
+ key: "_cachedPageNumber",
value: function _cachedPageNumber(pageRef) {
var refStr = pageRef.num + ' ' + pageRef.gen + ' R';
return this._pagesRefCache && this._pagesRefCache[refStr] || null;
}
}, {
- key: 'pagesCount',
+ key: "isPageVisible",
+ value: function isPageVisible(pageNumber) {
+ return this.pdfViewer.isPageVisible(pageNumber);
+ }
+ }, {
+ key: "pagesCount",
get: function get() {
return this.pdfDocument ? this.pdfDocument.numPages : 0;
}
}, {
- key: 'page',
+ key: "page",
get: function get() {
return this.pdfViewer.currentPageNumber;
},
@@ -7007,7 +8173,7 @@ var PDFLinkService = function () {
this.pdfViewer.currentPageNumber = value;
}
}, {
- key: 'rotation',
+ key: "rotation",
get: function get() {
return this.pdfViewer.pagesRotation;
},
@@ -7019,32 +8185,44 @@ var PDFLinkService = function () {
return PDFLinkService;
}();
+exports.PDFLinkService = PDFLinkService;
+
function isValidExplicitDestination(dest) {
if (!Array.isArray(dest)) {
return false;
}
+
var destLength = dest.length,
allowNull = true;
+
if (destLength < 2) {
return false;
}
+
var page = dest[0];
- if (!((typeof page === 'undefined' ? 'undefined' : _typeof(page)) === 'object' && Number.isInteger(page.num) && Number.isInteger(page.gen)) && !(Number.isInteger(page) && page >= 0)) {
+
+ if (!(_typeof(page) === 'object' && Number.isInteger(page.num) && Number.isInteger(page.gen)) && !(Number.isInteger(page) && page >= 0)) {
return false;
}
+
var zoom = dest[1];
- if (!((typeof zoom === 'undefined' ? 'undefined' : _typeof(zoom)) === 'object' && typeof zoom.name === 'string')) {
+
+ if (!(_typeof(zoom) === 'object' && typeof zoom.name === 'string')) {
return false;
}
+
switch (zoom.name) {
case 'XYZ':
if (destLength !== 5) {
return false;
}
+
break;
+
case 'Fit':
case 'FitB':
return destLength === 2;
+
case 'FitH':
case 'FitBH':
case 'FitV':
@@ -7052,26 +8230,35 @@ function isValidExplicitDestination(dest) {
if (destLength !== 3) {
return false;
}
+
break;
+
case 'FitR':
if (destLength !== 6) {
return false;
}
+
allowNull = false;
break;
+
default:
return false;
}
+
for (var i = 2; i < destLength; i++) {
var param = dest[i];
+
if (!(typeof param === 'number' || allowNull && param === null)) {
return false;
}
}
+
return true;
}
-var SimpleLinkService = function () {
+var SimpleLinkService =
+/*#__PURE__*/
+function () {
function SimpleLinkService() {
_classCallCheck(this, SimpleLinkService);
@@ -7080,40 +8267,45 @@ var SimpleLinkService = function () {
}
_createClass(SimpleLinkService, [{
- key: 'navigateTo',
+ key: "navigateTo",
value: function navigateTo(dest) {}
}, {
- key: 'getDestinationHash',
+ key: "getDestinationHash",
value: function getDestinationHash(dest) {
return '#';
}
}, {
- key: 'getAnchorUrl',
+ key: "getAnchorUrl",
value: function getAnchorUrl(hash) {
return '#';
}
}, {
- key: 'setHash',
+ key: "setHash",
value: function setHash(hash) {}
}, {
- key: 'executeNamedAction',
+ key: "executeNamedAction",
value: function executeNamedAction(action) {}
}, {
- key: 'cachePageRef',
+ key: "cachePageRef",
value: function cachePageRef(pageNum, pageRef) {}
}, {
- key: 'pagesCount',
+ key: "isPageVisible",
+ value: function isPageVisible(pageNumber) {
+ return true;
+ }
+ }, {
+ key: "pagesCount",
get: function get() {
return 0;
}
}, {
- key: 'page',
+ key: "page",
get: function get() {
return 0;
},
set: function set(value) {}
}, {
- key: 'rotation',
+ key: "rotation",
get: function get() {
return 0;
},
@@ -7123,7 +8315,6 @@ var SimpleLinkService = function () {
return SimpleLinkService;
}();
-exports.PDFLinkService = PDFLinkService;
exports.SimpleLinkService = SimpleLinkService;
/***/ }),
@@ -7136,17 +8327,21 @@ exports.SimpleLinkService = SimpleLinkService;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFOutlineViewer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFOutlineViewer = void 0;
var _pdfjsLib = __webpack_require__(7);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var DEFAULT_TITLE = '\u2013';
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-var PDFOutlineViewer = function () {
+var DEFAULT_TITLE = "\u2013";
+
+var PDFOutlineViewer =
+/*#__PURE__*/
+function () {
function PDFOutlineViewer(_ref) {
var container = _ref.container,
linkService = _ref.linkService,
@@ -7162,7 +8357,7 @@ var PDFOutlineViewer = function () {
}
_createClass(PDFOutlineViewer, [{
- key: 'reset',
+ key: "reset",
value: function reset() {
this.outline = null;
this.lastToggleIsShow = true;
@@ -7170,7 +8365,7 @@ var PDFOutlineViewer = function () {
this.container.classList.remove('outlineWithDeepNesting');
}
}, {
- key: '_dispatchEvent',
+ key: "_dispatchEvent",
value: function _dispatchEvent(outlineCount) {
this.eventBus.dispatch('outlineloaded', {
source: this,
@@ -7178,7 +8373,7 @@ var PDFOutlineViewer = function () {
});
}
}, {
- key: '_bindLink',
+ key: "_bindLink",
value: function _bindLink(element, _ref2) {
var url = _ref2.url,
newWindow = _ref2.newWindow,
@@ -7193,99 +8388,122 @@ var PDFOutlineViewer = function () {
});
return;
}
+
element.href = linkService.getDestinationHash(dest);
+
element.onclick = function () {
if (dest) {
linkService.navigateTo(dest);
}
+
return false;
};
}
}, {
- key: '_setStyles',
+ key: "_setStyles",
value: function _setStyles(element, _ref3) {
var bold = _ref3.bold,
italic = _ref3.italic;
-
var styleStr = '';
+
if (bold) {
styleStr += 'font-weight: bold;';
}
+
if (italic) {
styleStr += 'font-style: italic;';
}
+
if (styleStr) {
element.setAttribute('style', styleStr);
}
}
}, {
- key: '_addToggleButton',
+ key: "_addToggleButton",
value: function _addToggleButton(div) {
var _this = this;
var toggler = document.createElement('div');
toggler.className = 'outlineItemToggler';
+
toggler.onclick = function (evt) {
evt.stopPropagation();
toggler.classList.toggle('outlineItemsHidden');
+
if (evt.shiftKey) {
var shouldShowAll = !toggler.classList.contains('outlineItemsHidden');
+
_this._toggleOutlineItem(div, shouldShowAll);
}
};
+
div.insertBefore(toggler, div.firstChild);
}
}, {
- key: '_toggleOutlineItem',
+ key: "_toggleOutlineItem",
value: function _toggleOutlineItem(root, show) {
this.lastToggleIsShow = show;
var togglers = root.querySelectorAll('.outlineItemToggler');
+
for (var i = 0, ii = togglers.length; i < ii; ++i) {
togglers[i].classList[show ? 'remove' : 'add']('outlineItemsHidden');
}
}
}, {
- key: 'toggleOutlineTree',
+ key: "toggleOutlineTree",
value: function toggleOutlineTree() {
if (!this.outline) {
return;
}
+
this._toggleOutlineItem(this.container, !this.lastToggleIsShow);
}
}, {
- key: 'render',
+ key: "render",
value: function render(_ref4) {
var outline = _ref4.outline;
-
var outlineCount = 0;
+
if (this.outline) {
this.reset();
}
+
this.outline = outline || null;
+
if (!outline) {
this._dispatchEvent(outlineCount);
+
return;
}
+
var fragment = document.createDocumentFragment();
var queue = [{
parent: fragment,
items: this.outline
}];
var hasAnyNesting = false;
+
while (queue.length > 0) {
var levelData = queue.shift();
+
for (var i = 0, len = levelData.items.length; i < len; i++) {
var item = levelData.items[i];
var div = document.createElement('div');
div.className = 'outlineItem';
var element = document.createElement('a');
+
this._bindLink(element, item);
+
this._setStyles(element, item);
+
element.textContent = (0, _pdfjsLib.removeNullCharacters)(item.title) || DEFAULT_TITLE;
div.appendChild(element);
+
if (item.items.length > 0) {
hasAnyNesting = true;
+
this._addToggleButton(div);
+
var itemsDiv = document.createElement('div');
itemsDiv.className = 'outlineItems';
div.appendChild(itemsDiv);
@@ -7294,14 +8512,18 @@ var PDFOutlineViewer = function () {
items: item.items
});
}
+
levelData.parent.appendChild(div);
outlineCount++;
}
}
+
if (hasAnyNesting) {
this.container.classList.add('outlineWithDeepNesting');
}
+
this.container.appendChild(fragment);
+
this._dispatchEvent(outlineCount);
}
}]);
@@ -7321,14 +8543,16 @@ exports.PDFOutlineViewer = PDFOutlineViewer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFPresentationMode = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFPresentationMode = void 0;
var _ui_utils = __webpack_require__(6);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS = 1500;
var DELAY_BEFORE_HIDING_CONTROLS = 3000;
var ACTIVE_SELECTOR = 'pdfPresentationMode';
@@ -7338,17 +8562,19 @@ var PAGE_SWITCH_THRESHOLD = 0.1;
var SWIPE_MIN_DISTANCE_THRESHOLD = 50;
var SWIPE_ANGLE_THRESHOLD = Math.PI / 6;
-var PDFPresentationMode = function () {
+var PDFPresentationMode =
+/*#__PURE__*/
+function () {
function PDFPresentationMode(_ref) {
var _this = this;
var container = _ref.container,
_ref$viewer = _ref.viewer,
- viewer = _ref$viewer === undefined ? null : _ref$viewer,
+ viewer = _ref$viewer === void 0 ? null : _ref$viewer,
pdfViewer = _ref.pdfViewer,
eventBus = _ref.eventBus,
_ref$contextMenuItems = _ref.contextMenuItems,
- contextMenuItems = _ref$contextMenuItems === undefined ? null : _ref$contextMenuItems;
+ contextMenuItems = _ref$contextMenuItems === void 0 ? null : _ref$contextMenuItems;
_classCallCheck(this, PDFPresentationMode);
@@ -7362,35 +8588,52 @@ var PDFPresentationMode = function () {
this.mouseScrollTimeStamp = 0;
this.mouseScrollDelta = 0;
this.touchSwipeState = null;
+
if (contextMenuItems) {
contextMenuItems.contextFirstPage.addEventListener('click', function () {
_this.contextMenuOpen = false;
- _this.eventBus.dispatch('firstpage', { source: _this });
+
+ _this.eventBus.dispatch('firstpage', {
+ source: _this
+ });
});
contextMenuItems.contextLastPage.addEventListener('click', function () {
_this.contextMenuOpen = false;
- _this.eventBus.dispatch('lastpage', { source: _this });
+
+ _this.eventBus.dispatch('lastpage', {
+ source: _this
+ });
});
contextMenuItems.contextPageRotateCw.addEventListener('click', function () {
_this.contextMenuOpen = false;
- _this.eventBus.dispatch('rotatecw', { source: _this });
+
+ _this.eventBus.dispatch('rotatecw', {
+ source: _this
+ });
});
contextMenuItems.contextPageRotateCcw.addEventListener('click', function () {
_this.contextMenuOpen = false;
- _this.eventBus.dispatch('rotateccw', { source: _this });
+
+ _this.eventBus.dispatch('rotateccw', {
+ source: _this
+ });
});
}
}
_createClass(PDFPresentationMode, [{
- key: 'request',
+ key: "request",
value: function request() {
if (this.switchInProgress || this.active || !this.viewer.hasChildNodes()) {
return false;
}
+
this._addFullscreenChangeListeners();
+
this._setSwitchInProgress();
+
this._notifyStateChange();
+
if (this.container.requestFullscreen) {
this.container.requestFullscreen();
} else if (this.container.mozRequestFullScreen) {
@@ -7402,6 +8645,7 @@ var PDFPresentationMode = function () {
} else {
return false;
}
+
this.args = {
page: this.pdfViewer.currentPageNumber,
previousScale: this.pdfViewer.currentScaleValue
@@ -7409,53 +8653,65 @@ var PDFPresentationMode = function () {
return true;
}
}, {
- key: '_mouseWheel',
+ key: "_mouseWheel",
value: function _mouseWheel(evt) {
if (!this.active) {
return;
}
+
evt.preventDefault();
var delta = (0, _ui_utils.normalizeWheelEventDelta)(evt);
var currentTime = new Date().getTime();
var storedTime = this.mouseScrollTimeStamp;
+
if (currentTime > storedTime && currentTime - storedTime < MOUSE_SCROLL_COOLDOWN_TIME) {
return;
}
+
if (this.mouseScrollDelta > 0 && delta < 0 || this.mouseScrollDelta < 0 && delta > 0) {
this._resetMouseScrollState();
}
+
this.mouseScrollDelta += delta;
+
if (Math.abs(this.mouseScrollDelta) >= PAGE_SWITCH_THRESHOLD) {
var totalDelta = this.mouseScrollDelta;
+
this._resetMouseScrollState();
+
var success = totalDelta > 0 ? this._goToPreviousPage() : this._goToNextPage();
+
if (success) {
this.mouseScrollTimeStamp = currentTime;
}
}
}
}, {
- key: '_goToPreviousPage',
+ key: "_goToPreviousPage",
value: function _goToPreviousPage() {
var page = this.pdfViewer.currentPageNumber;
+
if (page <= 1) {
return false;
}
+
this.pdfViewer.currentPageNumber = page - 1;
return true;
}
}, {
- key: '_goToNextPage',
+ key: "_goToNextPage",
value: function _goToNextPage() {
var page = this.pdfViewer.currentPageNumber;
+
if (page >= this.pdfViewer.pagesCount) {
return false;
}
+
this.pdfViewer.currentPageNumber = page + 1;
return true;
}
}, {
- key: '_notifyStateChange',
+ key: "_notifyStateChange",
value: function _notifyStateChange() {
this.eventBus.dispatch('presentationmodechanged', {
source: this,
@@ -7464,21 +8720,24 @@ var PDFPresentationMode = function () {
});
}
}, {
- key: '_setSwitchInProgress',
+ key: "_setSwitchInProgress",
value: function _setSwitchInProgress() {
var _this2 = this;
if (this.switchInProgress) {
clearTimeout(this.switchInProgress);
}
+
this.switchInProgress = setTimeout(function () {
_this2._removeFullscreenChangeListeners();
+
delete _this2.switchInProgress;
+
_this2._notifyStateChange();
}, DELAY_BEFORE_RESETTING_SWITCH_IN_PROGRESS);
}
}, {
- key: '_resetSwitchInProgress',
+ key: "_resetSwitchInProgress",
value: function _resetSwitchInProgress() {
if (this.switchInProgress) {
clearTimeout(this.switchInProgress);
@@ -7486,26 +8745,32 @@ var PDFPresentationMode = function () {
}
}
}, {
- key: '_enter',
+ key: "_enter",
value: function _enter() {
var _this3 = this;
this.active = true;
+
this._resetSwitchInProgress();
+
this._notifyStateChange();
+
this.container.classList.add(ACTIVE_SELECTOR);
setTimeout(function () {
_this3.pdfViewer.currentPageNumber = _this3.args.page;
_this3.pdfViewer.currentScaleValue = 'page-fit';
}, 0);
+
this._addWindowListeners();
+
this._showControls();
+
this.contextMenuOpen = false;
this.container.setAttribute('contextmenu', 'viewerContextMenu');
window.getSelection().removeAllRanges();
}
}, {
- key: '_exit',
+ key: "_exit",
value: function _exit() {
var _this4 = this;
@@ -7513,30 +8778,40 @@ var PDFPresentationMode = function () {
this.container.classList.remove(ACTIVE_SELECTOR);
setTimeout(function () {
_this4.active = false;
+
_this4._removeFullscreenChangeListeners();
+
_this4._notifyStateChange();
+
_this4.pdfViewer.currentScaleValue = _this4.args.previousScale;
_this4.pdfViewer.currentPageNumber = page;
_this4.args = null;
}, 0);
+
this._removeWindowListeners();
+
this._hideControls();
+
this._resetMouseScrollState();
+
this.container.removeAttribute('contextmenu');
this.contextMenuOpen = false;
}
}, {
- key: '_mouseDown',
+ key: "_mouseDown",
value: function _mouseDown(evt) {
if (this.contextMenuOpen) {
this.contextMenuOpen = false;
evt.preventDefault();
return;
}
+
if (evt.button === 0) {
var isInternalLink = evt.target.href && evt.target.classList.contains('internalLink');
+
if (!isInternalLink) {
evt.preventDefault();
+
if (evt.shiftKey) {
this._goToPreviousPage();
} else {
@@ -7546,12 +8821,12 @@ var PDFPresentationMode = function () {
}
}
}, {
- key: '_contextMenu',
+ key: "_contextMenu",
value: function _contextMenu() {
this.contextMenuOpen = true;
}
}, {
- key: '_showControls',
+ key: "_showControls",
value: function _showControls() {
var _this5 = this;
@@ -7560,37 +8835,42 @@ var PDFPresentationMode = function () {
} else {
this.container.classList.add(CONTROLS_SELECTOR);
}
+
this.controlsTimeout = setTimeout(function () {
_this5.container.classList.remove(CONTROLS_SELECTOR);
+
delete _this5.controlsTimeout;
}, DELAY_BEFORE_HIDING_CONTROLS);
}
}, {
- key: '_hideControls',
+ key: "_hideControls",
value: function _hideControls() {
if (!this.controlsTimeout) {
return;
}
+
clearTimeout(this.controlsTimeout);
this.container.classList.remove(CONTROLS_SELECTOR);
delete this.controlsTimeout;
}
}, {
- key: '_resetMouseScrollState',
+ key: "_resetMouseScrollState",
value: function _resetMouseScrollState() {
this.mouseScrollTimeStamp = 0;
this.mouseScrollDelta = 0;
}
}, {
- key: '_touchSwipe',
+ key: "_touchSwipe",
value: function _touchSwipe(evt) {
if (!this.active) {
return;
}
+
if (evt.touches.length > 1) {
this.touchSwipeState = null;
return;
}
+
switch (evt.type) {
case 'touchstart':
this.touchSwipeState = {
@@ -7600,37 +8880,44 @@ var PDFPresentationMode = function () {
endY: evt.touches[0].pageY
};
break;
+
case 'touchmove':
if (this.touchSwipeState === null) {
return;
}
+
this.touchSwipeState.endX = evt.touches[0].pageX;
this.touchSwipeState.endY = evt.touches[0].pageY;
evt.preventDefault();
break;
+
case 'touchend':
if (this.touchSwipeState === null) {
return;
}
+
var delta = 0;
var dx = this.touchSwipeState.endX - this.touchSwipeState.startX;
var dy = this.touchSwipeState.endY - this.touchSwipeState.startY;
var absAngle = Math.abs(Math.atan2(dy, dx));
+
if (Math.abs(dx) > SWIPE_MIN_DISTANCE_THRESHOLD && (absAngle <= SWIPE_ANGLE_THRESHOLD || absAngle >= Math.PI - SWIPE_ANGLE_THRESHOLD)) {
delta = dx;
} else if (Math.abs(dy) > SWIPE_MIN_DISTANCE_THRESHOLD && Math.abs(absAngle - Math.PI / 2) <= SWIPE_ANGLE_THRESHOLD) {
delta = dy;
}
+
if (delta > 0) {
this._goToPreviousPage();
} else if (delta < 0) {
this._goToNextPage();
}
+
break;
}
}
}, {
- key: '_addWindowListeners',
+ key: "_addWindowListeners",
value: function _addWindowListeners() {
this.showControlsBind = this._showControls.bind(this);
this.mouseDownBind = this._mouseDown.bind(this);
@@ -7648,7 +8935,7 @@ var PDFPresentationMode = function () {
window.addEventListener('touchend', this.touchSwipeBind);
}
}, {
- key: '_removeWindowListeners',
+ key: "_removeWindowListeners",
value: function _removeWindowListeners() {
window.removeEventListener('mousemove', this.showControlsBind);
window.removeEventListener('mousedown', this.mouseDownBind);
@@ -7666,7 +8953,7 @@ var PDFPresentationMode = function () {
delete this.touchSwipeBind;
}
}, {
- key: '_fullscreenChange',
+ key: "_fullscreenChange",
value: function _fullscreenChange() {
if (this.isFullscreen) {
this._enter();
@@ -7675,7 +8962,7 @@ var PDFPresentationMode = function () {
}
}
}, {
- key: '_addFullscreenChangeListeners',
+ key: "_addFullscreenChangeListeners",
value: function _addFullscreenChangeListeners() {
this.fullscreenChangeBind = this._fullscreenChange.bind(this);
window.addEventListener('fullscreenchange', this.fullscreenChangeBind);
@@ -7684,7 +8971,7 @@ var PDFPresentationMode = function () {
window.addEventListener('MSFullscreenChange', this.fullscreenChangeBind);
}
}, {
- key: '_removeFullscreenChangeListeners',
+ key: "_removeFullscreenChangeListeners",
value: function _removeFullscreenChangeListeners() {
window.removeEventListener('fullscreenchange', this.fullscreenChangeBind);
window.removeEventListener('mozfullscreenchange', this.fullscreenChangeBind);
@@ -7693,7 +8980,7 @@ var PDFPresentationMode = function () {
delete this.fullscreenChangeBind;
}
}, {
- key: 'isFullscreen',
+ key: "isFullscreen",
get: function get() {
return !!(document.fullscreenElement || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement);
}
@@ -7714,19 +9001,23 @@ exports.PDFPresentationMode = PDFPresentationMode;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFSidebarResizer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFSidebarResizer = void 0;
var _ui_utils = __webpack_require__(6);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var SIDEBAR_WIDTH_VAR = '--sidebar-width';
var SIDEBAR_MIN_WIDTH = 200;
var SIDEBAR_RESIZING_CLASS = 'sidebarResizing';
-var PDFSidebarResizer = function () {
+var PDFSidebarResizer =
+/*#__PURE__*/
+function () {
function PDFSidebarResizer(options, eventBus) {
var _this = this;
@@ -7745,66 +9036,79 @@ var PDFSidebarResizer = function () {
this.resizer = options.resizer;
this.eventBus = eventBus;
this.l10n = l10n;
- if (typeof CSS === 'undefined' || typeof CSS.supports !== 'function' || !CSS.supports(SIDEBAR_WIDTH_VAR, 'calc(-1 * ' + SIDEBAR_MIN_WIDTH + 'px)')) {
+
+ if (typeof CSS === 'undefined' || typeof CSS.supports !== 'function' || !CSS.supports(SIDEBAR_WIDTH_VAR, "calc(-1 * ".concat(SIDEBAR_MIN_WIDTH, "px)"))) {
console.warn('PDFSidebarResizer: ' + 'The browser does not support resizing of the sidebar.');
return;
}
+
this.enabled = true;
this.resizer.classList.remove('hidden');
this.l10n.getDirection().then(function (dir) {
_this.isRTL = dir === 'rtl';
});
+
this._addEventListeners();
}
_createClass(PDFSidebarResizer, [{
- key: '_updateWidth',
+ key: "_updateWidth",
value: function _updateWidth() {
var width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
if (!this.enabled) {
return false;
}
+
var maxWidth = Math.floor(this.outerContainerWidth / 2);
+
if (width > maxWidth) {
width = maxWidth;
}
+
if (width < SIDEBAR_MIN_WIDTH) {
width = SIDEBAR_MIN_WIDTH;
}
+
if (width === this._width) {
return false;
}
+
this._width = width;
- this.doc.style.setProperty(SIDEBAR_WIDTH_VAR, width + 'px');
+ this.doc.style.setProperty(SIDEBAR_WIDTH_VAR, "".concat(width, "px"));
return true;
}
}, {
- key: '_mouseMove',
+ key: "_mouseMove",
value: function _mouseMove(evt) {
var width = evt.clientX;
+
if (this.isRTL) {
width = this.outerContainerWidth - width;
}
+
this._updateWidth(width);
}
}, {
- key: '_mouseUp',
+ key: "_mouseUp",
value: function _mouseUp(evt) {
this.outerContainer.classList.remove(SIDEBAR_RESIZING_CLASS);
- this.eventBus.dispatch('resize', { source: this });
+ this.eventBus.dispatch('resize', {
+ source: this
+ });
var _boundEvents = this._boundEvents;
window.removeEventListener('mousemove', _boundEvents.mouseMove);
window.removeEventListener('mouseup', _boundEvents.mouseUp);
}
}, {
- key: '_addEventListeners',
+ key: "_addEventListeners",
value: function _addEventListeners() {
var _this2 = this;
if (!this.enabled) {
return;
}
+
var _boundEvents = this._boundEvents;
_boundEvents.mouseMove = this._mouseMove.bind(this);
_boundEvents.mouseUp = this._mouseUp.bind(this);
@@ -7812,7 +9116,9 @@ var PDFSidebarResizer = function () {
if (evt.button !== 0) {
return;
}
+
_this2.outerContainer.classList.add(SIDEBAR_RESIZING_CLASS);
+
window.addEventListener('mousemove', _boundEvents.mouseMove);
window.addEventListener('mouseup', _boundEvents.mouseUp);
});
@@ -7822,14 +9128,20 @@ var PDFSidebarResizer = function () {
this.eventBus.on('resize', function (evt) {
if (evt && evt.source === window) {
_this2._outerContainerWidth = null;
+
if (_this2._width) {
if (_this2.sidebarOpen) {
_this2.outerContainer.classList.add(SIDEBAR_RESIZING_CLASS);
+
var updated = _this2._updateWidth(_this2._width);
+
Promise.resolve().then(function () {
_this2.outerContainer.classList.remove(SIDEBAR_RESIZING_CLASS);
+
if (updated) {
- _this2.eventBus.dispatch('resize', { source: _this2 });
+ _this2.eventBus.dispatch('resize', {
+ source: _this2
+ });
}
});
} else {
@@ -7840,11 +9152,12 @@ var PDFSidebarResizer = function () {
});
}
}, {
- key: 'outerContainerWidth',
+ key: "outerContainerWidth",
get: function get() {
if (!this._outerContainerWidth) {
this._outerContainerWidth = this.outerContainer.clientWidth;
}
+
return this._outerContainerWidth;
}
}]);
@@ -7864,9 +9177,7 @@ exports.PDFSidebarResizer = PDFSidebarResizer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFThumbnailViewer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFThumbnailViewer = void 0;
var _ui_utils = __webpack_require__(6);
@@ -7874,16 +9185,22 @@ var _pdf_thumbnail_view = __webpack_require__(27);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var THUMBNAIL_SCROLL_MARGIN = -19;
var THUMBNAIL_SELECTED_CLASS = 'selected';
-var PDFThumbnailViewer = function () {
+var PDFThumbnailViewer =
+/*#__PURE__*/
+function () {
function PDFThumbnailViewer(_ref) {
var container = _ref.container,
linkService = _ref.linkService,
renderingQueue = _ref.renderingQueue,
_ref$l10n = _ref.l10n,
- l10n = _ref$l10n === undefined ? _ui_utils.NullL10n : _ref$l10n;
+ l10n = _ref$l10n === void 0 ? _ui_utils.NullL10n : _ref$l10n;
_classCallCheck(this, PDFThumbnailViewer);
@@ -7892,46 +9209,54 @@ var PDFThumbnailViewer = function () {
this.renderingQueue = renderingQueue;
this.l10n = l10n;
this.scroll = (0, _ui_utils.watchScroll)(this.container, this._scrollUpdated.bind(this));
+
this._resetView();
}
_createClass(PDFThumbnailViewer, [{
- key: '_scrollUpdated',
+ key: "_scrollUpdated",
value: function _scrollUpdated() {
this.renderingQueue.renderHighestPriority();
}
}, {
- key: 'getThumbnail',
+ key: "getThumbnail",
value: function getThumbnail(index) {
return this._thumbnails[index];
}
}, {
- key: '_getVisibleThumbs',
+ key: "_getVisibleThumbs",
value: function _getVisibleThumbs() {
return (0, _ui_utils.getVisibleElements)(this.container, this._thumbnails);
}
}, {
- key: 'scrollThumbnailIntoView',
+ key: "scrollThumbnailIntoView",
value: function scrollThumbnailIntoView(pageNumber) {
if (!this.pdfDocument) {
return;
}
+
var thumbnailView = this._thumbnails[pageNumber - 1];
+
if (!thumbnailView) {
console.error('scrollThumbnailIntoView: Invalid "pageNumber" parameter.');
return;
}
+
if (pageNumber !== this._currentPageNumber) {
var prevThumbnailView = this._thumbnails[this._currentPageNumber - 1];
prevThumbnailView.div.classList.remove(THUMBNAIL_SELECTED_CLASS);
thumbnailView.div.classList.add(THUMBNAIL_SELECTED_CLASS);
}
+
var visibleThumbs = this._getVisibleThumbs();
+
var numVisibleThumbs = visibleThumbs.views.length;
+
if (numVisibleThumbs > 0) {
var first = visibleThumbs.first.id;
var last = numVisibleThumbs > 1 ? visibleThumbs.last.id : first;
var shouldScroll = false;
+
if (pageNumber <= first || pageNumber >= last) {
shouldScroll = true;
} else {
@@ -7939,23 +9264,28 @@ var PDFThumbnailViewer = function () {
if (view.id !== pageNumber) {
return false;
}
+
shouldScroll = view.percent < 100;
return true;
});
}
+
if (shouldScroll) {
- (0, _ui_utils.scrollIntoView)(thumbnailView.div, { top: THUMBNAIL_SCROLL_MARGIN });
+ (0, _ui_utils.scrollIntoView)(thumbnailView.div, {
+ top: THUMBNAIL_SCROLL_MARGIN
+ });
}
}
+
this._currentPageNumber = pageNumber;
}
}, {
- key: 'cleanup',
+ key: "cleanup",
value: function cleanup() {
_pdf_thumbnail_view.PDFThumbnailView.cleanup();
}
}, {
- key: '_resetView',
+ key: "_resetView",
value: function _resetView() {
this._thumbnails = [];
this._currentPageNumber = 1;
@@ -7965,21 +9295,28 @@ var PDFThumbnailViewer = function () {
this.container.textContent = '';
}
}, {
- key: 'setDocument',
+ key: "setDocument",
value: function setDocument(pdfDocument) {
var _this = this;
if (this.pdfDocument) {
this._cancelRendering();
+
this._resetView();
}
+
this.pdfDocument = pdfDocument;
+
if (!pdfDocument) {
return;
}
+
pdfDocument.getPage(1).then(function (firstPage) {
var pagesCount = pdfDocument.numPages;
- var viewport = firstPage.getViewport(1.0);
+ var viewport = firstPage.getViewport({
+ scale: 1
+ });
+
for (var pageNum = 1; pageNum <= pagesCount; ++pageNum) {
var thumbnail = new _pdf_thumbnail_view.PDFThumbnailView({
container: _this.container,
@@ -7990,8 +9327,10 @@ var PDFThumbnailViewer = function () {
disableCanvasToImageConversion: false,
l10n: _this.l10n
});
+
_this._thumbnails.push(thumbnail);
}
+
var thumbnailView = _this._thumbnails[_this._currentPageNumber - 1];
thumbnailView.div.classList.add(THUMBNAIL_SELECTED_CLASS);
}).catch(function (reason) {
@@ -7999,7 +9338,7 @@ var PDFThumbnailViewer = function () {
});
}
}, {
- key: '_cancelRendering',
+ key: "_cancelRendering",
value: function _cancelRendering() {
for (var i = 0, ii = this._thumbnails.length; i < ii; i++) {
if (this._thumbnails[i]) {
@@ -8008,11 +9347,12 @@ var PDFThumbnailViewer = function () {
}
}
}, {
- key: 'setPageLabels',
+ key: "setPageLabels",
value: function setPageLabels(labels) {
if (!this.pdfDocument) {
return;
}
+
if (!labels) {
this._pageLabels = null;
} else if (!(Array.isArray(labels) && this.pdfDocument.numPages === labels.length)) {
@@ -8021,23 +9361,28 @@ var PDFThumbnailViewer = function () {
} else {
this._pageLabels = labels;
}
+
for (var i = 0, ii = this._thumbnails.length; i < ii; i++) {
var label = this._pageLabels && this._pageLabels[i];
+
this._thumbnails[i].setPageLabel(label);
}
}
}, {
- key: '_ensurePdfPageLoaded',
+ key: "_ensurePdfPageLoaded",
value: function _ensurePdfPageLoaded(thumbView) {
var _this2 = this;
if (thumbView.pdfPage) {
return Promise.resolve(thumbView.pdfPage);
}
+
var pageNumber = thumbView.id;
+
if (this._pagesRequests[pageNumber]) {
return this._pagesRequests[pageNumber];
}
+
var promise = this.pdfDocument.getPage(pageNumber).then(function (pdfPage) {
thumbView.setPdfPage(pdfPage);
_this2._pagesRequests[pageNumber] = null;
@@ -8050,22 +9395,26 @@ var PDFThumbnailViewer = function () {
return promise;
}
}, {
- key: 'forceRendering',
+ key: "forceRendering",
value: function forceRendering() {
var _this3 = this;
var visibleThumbs = this._getVisibleThumbs();
+
var thumbView = this.renderingQueue.getHighestPriority(visibleThumbs, this._thumbnails, this.scroll.down);
+
if (thumbView) {
this._ensurePdfPageLoaded(thumbView).then(function () {
_this3.renderingQueue.renderView(thumbView);
});
+
return true;
}
+
return false;
}
}, {
- key: 'pagesRotation',
+ key: "pagesRotation",
get: function get() {
return this._pagesRotation;
},
@@ -8073,13 +9422,17 @@ var PDFThumbnailViewer = function () {
if (!(0, _ui_utils.isValidRotation)(rotation)) {
throw new Error('Invalid thumbnails rotation angle.');
}
+
if (!this.pdfDocument) {
return;
}
+
if (this._pagesRotation === rotation) {
return;
}
+
this._pagesRotation = rotation;
+
for (var i = 0, ii = this._thumbnails.length; i < ii; i++) {
this._thumbnails[i].update(rotation);
}
@@ -8101,9 +9454,7 @@ exports.PDFThumbnailViewer = PDFThumbnailViewer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFThumbnailView = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFThumbnailView = void 0;
var _pdfjsLib = __webpack_require__(7);
@@ -8113,22 +9464,31 @@ var _pdf_rendering_queue = __webpack_require__(10);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var MAX_NUM_SCALING_STEPS = 3;
var THUMBNAIL_CANVAS_BORDER_WIDTH = 1;
var THUMBNAIL_WIDTH = 98;
+
var TempImageFactory = function TempImageFactoryClosure() {
var tempCanvasCache = null;
return {
getCanvas: function getCanvas(width, height) {
var tempCanvas = tempCanvasCache;
+
if (!tempCanvas) {
tempCanvas = document.createElement('canvas');
tempCanvasCache = tempCanvas;
}
+
tempCanvas.width = width;
tempCanvas.height = height;
tempCanvas.mozOpaque = true;
- var ctx = tempCanvas.getContext('2d', { alpha: false });
+ var ctx = tempCanvas.getContext('2d', {
+ alpha: false
+ });
ctx.save();
ctx.fillStyle = 'rgb(255, 255, 255)';
ctx.fillRect(0, 0, width, height);
@@ -8137,16 +9497,20 @@ var TempImageFactory = function TempImageFactoryClosure() {
},
destroyCanvas: function destroyCanvas() {
var tempCanvas = tempCanvasCache;
+
if (tempCanvas) {
tempCanvas.width = 0;
tempCanvas.height = 0;
}
+
tempCanvasCache = null;
}
};
}();
-var PDFThumbnailView = function () {
+var PDFThumbnailView =
+/*#__PURE__*/
+function () {
function PDFThumbnailView(_ref) {
var container = _ref.container,
id = _ref.id,
@@ -8154,9 +9518,9 @@ var PDFThumbnailView = function () {
linkService = _ref.linkService,
renderingQueue = _ref.renderingQueue,
_ref$disableCanvasToI = _ref.disableCanvasToImageConversion,
- disableCanvasToImageConversion = _ref$disableCanvasToI === undefined ? false : _ref$disableCanvasToI,
+ disableCanvasToImageConversion = _ref$disableCanvasToI === void 0 ? false : _ref$disableCanvasToI,
_ref$l10n = _ref.l10n,
- l10n = _ref$l10n === undefined ? _ui_utils.NullL10n : _ref$l10n;
+ l10n = _ref$l10n === void 0 ? _ui_utils.NullL10n : _ref$l10n;
_classCallCheck(this, PDFThumbnailView);
@@ -8182,13 +9546,17 @@ var PDFThumbnailView = function () {
this.l10n = l10n;
var anchor = document.createElement('a');
anchor.href = linkService.getAnchorUrl('#page=' + id);
- this.l10n.get('thumb_page_title', { page: id }, 'Page {{page}}').then(function (msg) {
+ this.l10n.get('thumb_page_title', {
+ page: id
+ }, 'Page {{page}}').then(function (msg) {
anchor.title = msg;
});
+
anchor.onclick = function () {
linkService.page = id;
return false;
};
+
this.anchor = anchor;
var div = document.createElement('div');
div.className = 'thumbnail';
@@ -8206,16 +9574,19 @@ var PDFThumbnailView = function () {
}
_createClass(PDFThumbnailView, [{
- key: 'setPdfPage',
+ key: "setPdfPage",
value: function setPdfPage(pdfPage) {
this.pdfPage = pdfPage;
this.pdfPageRotate = pdfPage.rotate;
var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
- this.viewport = pdfPage.getViewport(1, totalRotation);
+ this.viewport = pdfPage.getViewport({
+ scale: 1,
+ rotation: totalRotation
+ });
this.reset();
}
}, {
- key: 'reset',
+ key: "reset",
value: function reset() {
this.cancelRendering();
this.pageWidth = this.viewport.width;
@@ -8226,28 +9597,33 @@ var PDFThumbnailView = function () {
this.div.removeAttribute('data-loaded');
var ring = this.ring;
var childNodes = ring.childNodes;
+
for (var i = childNodes.length - 1; i >= 0; i--) {
ring.removeChild(childNodes[i]);
}
+
var borderAdjustment = 2 * THUMBNAIL_CANVAS_BORDER_WIDTH;
ring.style.width = this.canvasWidth + borderAdjustment + 'px';
ring.style.height = this.canvasHeight + borderAdjustment + 'px';
+
if (this.canvas) {
this.canvas.width = 0;
this.canvas.height = 0;
delete this.canvas;
}
+
if (this.image) {
this.image.removeAttribute('src');
delete this.image;
}
}
}, {
- key: 'update',
+ key: "update",
value: function update(rotation) {
if (typeof rotation !== 'undefined') {
this.rotation = rotation;
}
+
var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
this.viewport = this.viewport.clone({
scale: 1,
@@ -8256,61 +9632,73 @@ var PDFThumbnailView = function () {
this.reset();
}
}, {
- key: 'cancelRendering',
+ key: "cancelRendering",
value: function cancelRendering() {
if (this.renderTask) {
this.renderTask.cancel();
this.renderTask = null;
}
+
this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
this.resume = null;
}
}, {
- key: '_getPageDrawContext',
+ key: "_getPageDrawContext",
value: function _getPageDrawContext() {
var noCtxScale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
var canvas = document.createElement('canvas');
this.canvas = canvas;
canvas.mozOpaque = true;
- var ctx = canvas.getContext('2d', { alpha: false });
+ var ctx = canvas.getContext('2d', {
+ alpha: false
+ });
var outputScale = (0, _ui_utils.getOutputScale)(ctx);
canvas.width = this.canvasWidth * outputScale.sx | 0;
canvas.height = this.canvasHeight * outputScale.sy | 0;
canvas.style.width = this.canvasWidth + 'px';
canvas.style.height = this.canvasHeight + 'px';
+
if (!noCtxScale && outputScale.scaled) {
ctx.scale(outputScale.sx, outputScale.sy);
}
+
return ctx;
}
}, {
- key: '_convertCanvasToImage',
+ key: "_convertCanvasToImage",
value: function _convertCanvasToImage() {
var _this = this;
if (!this.canvas) {
return;
}
+
if (this.renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
return;
}
+
var id = this.renderingId;
var className = 'thumbnailImage';
+
if (this.disableCanvasToImageConversion) {
this.canvas.id = id;
this.canvas.className = className;
- this.l10n.get('thumb_page_canvas', { page: this.pageId }, 'Thumbnail of Page {{page}}').then(function (msg) {
+ this.l10n.get('thumb_page_canvas', {
+ page: this.pageId
+ }, 'Thumbnail of Page {{page}}').then(function (msg) {
_this.canvas.setAttribute('aria-label', msg);
});
this.div.setAttribute('data-loaded', true);
this.ring.appendChild(this.canvas);
return;
}
+
var image = document.createElement('img');
image.id = id;
image.className = className;
- this.l10n.get('thumb_page_canvas', { page: this.pageId }, 'Thumbnail of Page {{page}}').then(function (msg) {
+ this.l10n.get('thumb_page_canvas', {
+ page: this.pageId
+ }, 'Thumbnail of Page {{page}}').then(function (msg) {
image.setAttribute('aria-label', msg);
});
image.style.width = this.canvasWidth + 'px';
@@ -8324,7 +9712,7 @@ var PDFThumbnailView = function () {
delete this.canvas;
}
}, {
- key: 'draw',
+ key: "draw",
value: function draw() {
var _this2 = this;
@@ -8332,37 +9720,52 @@ var PDFThumbnailView = function () {
console.error('Must be in new state before drawing');
return Promise.resolve(undefined);
}
+
this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
var renderCapability = (0, _pdfjsLib.createPromiseCapability)();
+
var finishRenderTask = function finishRenderTask(error) {
if (renderTask === _this2.renderTask) {
_this2.renderTask = null;
}
+
if (error instanceof _pdfjsLib.RenderingCancelledException) {
renderCapability.resolve(undefined);
return;
}
+
_this2.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+
_this2._convertCanvasToImage();
+
if (!error) {
renderCapability.resolve(undefined);
} else {
renderCapability.reject(error);
}
};
+
var ctx = this._getPageDrawContext();
- var drawViewport = this.viewport.clone({ scale: this.scale });
+
+ var drawViewport = this.viewport.clone({
+ scale: this.scale
+ });
+
var renderContinueCallback = function renderContinueCallback(cont) {
if (!_this2.renderingQueue.isHighestPriority(_this2)) {
_this2.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+
_this2.resume = function () {
_this2.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
cont();
};
+
return;
}
+
cont();
};
+
var renderContext = {
canvasContext: ctx,
viewport: drawViewport
@@ -8377,56 +9780,77 @@ var PDFThumbnailView = function () {
return renderCapability.promise;
}
}, {
- key: 'setImage',
+ key: "setImage",
value: function setImage(pageView) {
if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
return;
}
+
var img = pageView.canvas;
+
if (!img) {
return;
}
+
if (!this.pdfPage) {
this.setPdfPage(pageView.pdfPage);
}
+
this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+
var ctx = this._getPageDrawContext(true);
+
var canvas = ctx.canvas;
+
if (img.width <= 2 * canvas.width) {
ctx.drawImage(img, 0, 0, img.width, img.height, 0, 0, canvas.width, canvas.height);
+
this._convertCanvasToImage();
+
return;
}
+
var reducedWidth = canvas.width << MAX_NUM_SCALING_STEPS;
var reducedHeight = canvas.height << MAX_NUM_SCALING_STEPS;
var reducedImage = TempImageFactory.getCanvas(reducedWidth, reducedHeight);
var reducedImageCtx = reducedImage.getContext('2d');
+
while (reducedWidth > img.width || reducedHeight > img.height) {
reducedWidth >>= 1;
reducedHeight >>= 1;
}
+
reducedImageCtx.drawImage(img, 0, 0, img.width, img.height, 0, 0, reducedWidth, reducedHeight);
+
while (reducedWidth > 2 * canvas.width) {
reducedImageCtx.drawImage(reducedImage, 0, 0, reducedWidth, reducedHeight, 0, 0, reducedWidth >> 1, reducedHeight >> 1);
reducedWidth >>= 1;
reducedHeight >>= 1;
}
+
ctx.drawImage(reducedImage, 0, 0, reducedWidth, reducedHeight, 0, 0, canvas.width, canvas.height);
+
this._convertCanvasToImage();
}
}, {
- key: 'setPageLabel',
+ key: "setPageLabel",
value: function setPageLabel(label) {
var _this3 = this;
this.pageLabel = typeof label === 'string' ? label : null;
- this.l10n.get('thumb_page_title', { page: this.pageId }, 'Page {{page}}').then(function (msg) {
+ this.l10n.get('thumb_page_title', {
+ page: this.pageId
+ }, 'Page {{page}}').then(function (msg) {
_this3.anchor.title = msg;
});
+
if (this.renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
return;
}
- this.l10n.get('thumb_page_canvas', { page: this.pageId }, 'Thumbnail of Page {{page}}').then(function (ariaLabel) {
+
+ this.l10n.get('thumb_page_canvas', {
+ page: this.pageId
+ }, 'Thumbnail of Page {{page}}').then(function (ariaLabel) {
if (_this3.image) {
_this3.image.setAttribute('aria-label', ariaLabel);
} else if (_this3.disableCanvasToImageConversion && _this3.canvas) {
@@ -8435,12 +9859,12 @@ var PDFThumbnailView = function () {
});
}
}, {
- key: 'pageId',
+ key: "pageId",
get: function get() {
return this.pageLabel !== null ? this.pageLabel : this.id;
}
}], [{
- key: 'cleanup',
+ key: "cleanup",
value: function cleanup() {
TempImageFactory.destroyCanvas();
}
@@ -8461,9 +9885,7 @@ exports.PDFThumbnailView = PDFThumbnailView;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFViewer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFViewer = void 0;
var _base_viewer = __webpack_require__(29);
@@ -8471,34 +9893,48 @@ var _ui_utils = __webpack_require__(6);
var _pdfjsLib = __webpack_require__(7);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-var PDFViewer = function (_BaseViewer) {
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+var PDFViewer =
+/*#__PURE__*/
+function (_BaseViewer) {
_inherits(PDFViewer, _BaseViewer);
function PDFViewer() {
_classCallCheck(this, PDFViewer);
- return _possibleConstructorReturn(this, (PDFViewer.__proto__ || Object.getPrototypeOf(PDFViewer)).apply(this, arguments));
+ return _possibleConstructorReturn(this, _getPrototypeOf(PDFViewer).apply(this, arguments));
}
_createClass(PDFViewer, [{
- key: '_scrollIntoView',
+ key: "_scrollIntoView",
value: function _scrollIntoView(_ref) {
var pageDiv = _ref.pageDiv,
_ref$pageSpot = _ref.pageSpot,
- pageSpot = _ref$pageSpot === undefined ? null : _ref$pageSpot;
+ pageSpot = _ref$pageSpot === void 0 ? null : _ref$pageSpot;
if (!pageSpot && !this.isInPresentationMode) {
var left = pageDiv.offsetLeft + pageDiv.clientLeft;
var right = left + pageDiv.clientWidth;
- var _container = this.container,
- scrollLeft = _container.scrollLeft,
- clientWidth = _container.clientWidth;
+ var _this$container = this.container,
+ scrollLeft = _this$container.scrollLeft,
+ clientWidth = _this$container.clientWidth;
if (this._scrollMode === _base_viewer.ScrollMode.HORIZONTAL || left < scrollLeft || right > scrollLeft + clientWidth) {
pageSpot = {
@@ -8507,58 +9943,71 @@ var PDFViewer = function (_BaseViewer) {
};
}
}
+
(0, _ui_utils.scrollIntoView)(pageDiv, pageSpot);
}
}, {
- key: '_getVisiblePages',
+ key: "_getVisiblePages",
value: function _getVisiblePages() {
if (!this.isInPresentationMode) {
return (0, _ui_utils.getVisibleElements)(this.container, this._pages, true, this._scrollMode === _base_viewer.ScrollMode.HORIZONTAL);
}
+
return this._getCurrentVisiblePage();
}
}, {
- key: 'update',
+ key: "update",
value: function update() {
var visible = this._getVisiblePages();
+
var visiblePages = visible.views,
numVisiblePages = visiblePages.length;
+
if (numVisiblePages === 0) {
return;
}
+
this._resizeBuffer(numVisiblePages, visiblePages);
+
this.renderingQueue.renderHighestPriority(visible);
var currentId = this._currentPageNumber;
var stillFullyVisible = false;
+
for (var i = 0; i < numVisiblePages; ++i) {
var page = visiblePages[i];
+
if (page.percent < 100) {
break;
}
+
if (page.id === currentId) {
stillFullyVisible = true;
break;
}
}
+
if (!stillFullyVisible) {
currentId = visiblePages[0].id;
}
+
if (!this.isInPresentationMode) {
this._setCurrentPageNumber(currentId);
}
+
this._updateLocation(visible.first);
+
this.eventBus.dispatch('updateviewarea', {
source: this,
location: this._location
});
}
}, {
- key: '_setDocumentViewerElement',
+ key: "_setDocumentViewerElement",
get: function get() {
return (0, _pdfjsLib.shadow)(this, '_setDocumentViewerElement', this.viewer);
}
}, {
- key: '_isScrollModeHorizontal',
+ key: "_isScrollModeHorizontal",
get: function get() {
return this.isInPresentationMode ? false : this._scrollMode === _base_viewer.ScrollMode.HORIZONTAL;
}
@@ -8579,9 +10028,7 @@ exports.PDFViewer = PDFViewer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.SpreadMode = exports.ScrollMode = exports.BaseViewer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.SpreadMode = exports.ScrollMode = exports.BaseViewer = void 0;
var _ui_utils = __webpack_require__(6);
@@ -8599,56 +10046,77 @@ var _text_layer_builder = __webpack_require__(32);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var DEFAULT_CACHE_SIZE = 10;
var ScrollMode = {
VERTICAL: 0,
HORIZONTAL: 1,
WRAPPED: 2
};
+exports.ScrollMode = ScrollMode;
var SpreadMode = {
NONE: 0,
ODD: 1,
EVEN: 2
};
+exports.SpreadMode = SpreadMode;
+
function PDFPageViewBuffer(size) {
var data = [];
+
this.push = function (view) {
var i = data.indexOf(view);
+
if (i >= 0) {
data.splice(i, 1);
}
+
data.push(view);
+
if (data.length > size) {
data.shift().destroy();
}
};
+
this.resize = function (newSize, pagesToKeep) {
size = newSize;
+
if (pagesToKeep) {
var pageIdsToKeep = new Set();
+
for (var i = 0, iMax = pagesToKeep.length; i < iMax; ++i) {
pageIdsToKeep.add(pagesToKeep[i].id);
}
+
(0, _ui_utils.moveToEndOfArray)(data, function (page) {
return pageIdsToKeep.has(page.id);
});
}
+
while (data.length > size) {
data.shift().destroy();
}
};
}
+
function isSameScale(oldScale, newScale) {
if (newScale === oldScale) {
return true;
}
+
if (Math.abs(newScale - oldScale) < 1e-15) {
return true;
}
+
return false;
}
-var BaseViewer = function () {
+var BaseViewer =
+/*#__PURE__*/
+function () {
function BaseViewer(options) {
var _this = this;
@@ -8657,6 +10125,7 @@ var BaseViewer = function () {
if (this.constructor === BaseViewer) {
throw new Error('Cannot initialize BaseViewer.');
}
+
this._name = this.constructor.name;
this.container = options.container;
this.viewer = options.viewer || options.container.firstElementChild;
@@ -8675,30 +10144,37 @@ var BaseViewer = function () {
this.maxCanvasPixels = options.maxCanvasPixels;
this.l10n = options.l10n || _ui_utils.NullL10n;
this.defaultRenderingQueue = !options.renderingQueue;
+
if (this.defaultRenderingQueue) {
this.renderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
this.renderingQueue.setViewer(this);
} else {
this.renderingQueue = options.renderingQueue;
}
+
this.scroll = (0, _ui_utils.watchScroll)(this.container, this._scrollUpdate.bind(this));
this.presentationModeState = _ui_utils.PresentationModeState.UNKNOWN;
+
this._resetView();
+
if (this.removePageBorders) {
this.viewer.classList.add('removePageBorders');
}
+
Promise.resolve().then(function () {
- _this.eventBus.dispatch('baseviewerinit', { source: _this });
+ _this.eventBus.dispatch('baseviewerinit', {
+ source: _this
+ });
});
}
_createClass(BaseViewer, [{
- key: 'getPageView',
+ key: "getPageView",
value: function getPageView(index) {
return this._pages[index];
}
}, {
- key: '_setCurrentPageNumber',
+ key: "_setCurrentPageNumber",
value: function _setCurrentPageNumber(val) {
var resetCurrentPageView = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -8706,43 +10182,54 @@ var BaseViewer = function () {
if (resetCurrentPageView) {
this._resetCurrentPageView();
}
- return;
+
+ return true;
}
+
if (!(0 < val && val <= this.pagesCount)) {
- console.error(this._name + '._setCurrentPageNumber: "' + val + '" is out of bounds.');
- return;
+ return false;
}
+
this._currentPageNumber = val;
this.eventBus.dispatch('pagechanging', {
source: this,
pageNumber: val,
pageLabel: this._pageLabels && this._pageLabels[val - 1]
});
+
if (resetCurrentPageView) {
this._resetCurrentPageView();
}
+
+ return true;
}
}, {
- key: 'setDocument',
+ key: "setDocument",
value: function setDocument(pdfDocument) {
var _this2 = this;
if (this.pdfDocument) {
this._cancelRendering();
+
this._resetView();
+
if (this.findController) {
this.findController.setDocument(null);
}
}
+
this.pdfDocument = pdfDocument;
+
if (!pdfDocument) {
return;
}
+
var pagesCount = pdfDocument.numPages;
var pagesCapability = (0, _pdfjsLib.createPromiseCapability)();
this.pagesPromise = pagesCapability.promise;
pagesCapability.promise.then(function () {
_this2._pageViewsReady = true;
+
_this2.eventBus.dispatch('pagesloaded', {
source: _this2,
pagesCount: pagesCount
@@ -8751,10 +10238,12 @@ var BaseViewer = function () {
var isOnePageRenderedResolved = false;
var onePageRenderedCapability = (0, _pdfjsLib.createPromiseCapability)();
this.onePageRendered = onePageRenderedCapability.promise;
+
var bindOnAfterAndBeforeDraw = function bindOnAfterAndBeforeDraw(pageView) {
pageView.onBeforeDraw = function () {
_this2._buffer.push(pageView);
};
+
pageView.onAfterDraw = function () {
if (!isOnePageRenderedResolved) {
isOnePageRenderedResolved = true;
@@ -8762,16 +10251,22 @@ var BaseViewer = function () {
}
};
};
+
var firstPagePromise = pdfDocument.getPage(1);
this.firstPagePromise = firstPagePromise;
firstPagePromise.then(function (pdfPage) {
var scale = _this2.currentScale;
- var viewport = pdfPage.getViewport(scale * _ui_utils.CSS_UNITS);
+ var viewport = pdfPage.getViewport({
+ scale: scale * _ui_utils.CSS_UNITS
+ });
+
for (var pageNum = 1; pageNum <= pagesCount; ++pageNum) {
var textLayerFactory = null;
+
if (_this2.textLayerMode !== _ui_utils.TextLayerMode.DISABLE) {
textLayerFactory = _this2;
}
+
var pageView = new _pdf_page_view.PDFPageView({
container: _this2._setDocumentViewerElement,
eventBus: _this2.eventBus,
@@ -8791,30 +10286,38 @@ var BaseViewer = function () {
l10n: _this2.l10n
});
bindOnAfterAndBeforeDraw(pageView);
+
_this2._pages.push(pageView);
}
+
if (_this2._spreadMode !== SpreadMode.NONE) {
_this2._updateSpreadMode();
}
+
onePageRenderedCapability.promise.then(function () {
if (pdfDocument.loadingParams['disableAutoFetch']) {
pagesCapability.resolve();
return;
}
+
var getPagesLeft = pagesCount;
var _loop = function _loop(_pageNum) {
pdfDocument.getPage(_pageNum).then(function (pdfPage) {
var pageView = _this2._pages[_pageNum - 1];
+
if (!pageView.pdfPage) {
pageView.setPdfPage(pdfPage);
}
+
_this2.linkService.cachePageRef(_pageNum, pdfPage.ref);
+
if (--getPagesLeft === 0) {
pagesCapability.resolve();
}
}, function (reason) {
- console.error('Unable to get page ' + _pageNum + ' to initialize viewer', reason);
+ console.error("Unable to get page ".concat(_pageNum, " to initialize viewer"), reason);
+
if (--getPagesLeft === 0) {
pagesCapability.resolve();
}
@@ -8825,10 +10328,15 @@ var BaseViewer = function () {
_loop(_pageNum);
}
});
- _this2.eventBus.dispatch('pagesinit', { source: _this2 });
+
+ _this2.eventBus.dispatch('pagesinit', {
+ source: _this2
+ });
+
if (_this2.findController) {
_this2.findController.setDocument(pdfDocument);
}
+
if (_this2.defaultRenderingQueue) {
_this2.update();
}
@@ -8837,19 +10345,21 @@ var BaseViewer = function () {
});
}
}, {
- key: 'setPageLabels',
+ key: "setPageLabels",
value: function setPageLabels(labels) {
if (!this.pdfDocument) {
return;
}
+
if (!labels) {
this._pageLabels = null;
} else if (!(Array.isArray(labels) && this.pdfDocument.numPages === labels.length)) {
this._pageLabels = null;
- console.error(this._name + '.setPageLabels: Invalid page labels.');
+ console.error("".concat(this._name, ".setPageLabels: Invalid page labels."));
} else {
this._pageLabels = labels;
}
+
for (var i = 0, ii = this._pages.length; i < ii; i++) {
var pageView = this._pages[i];
var label = this._pageLabels && this._pageLabels[i];
@@ -8857,7 +10367,7 @@ var BaseViewer = function () {
}
}
}, {
- key: '_resetView',
+ key: "_resetView",
value: function _resetView() {
this._pages = [];
this._currentPageNumber = 1;
@@ -8872,34 +10382,35 @@ var BaseViewer = function () {
this._scrollMode = ScrollMode.VERTICAL;
this._spreadMode = SpreadMode.NONE;
this.viewer.textContent = '';
+
this._updateScrollMode();
}
}, {
- key: '_scrollUpdate',
+ key: "_scrollUpdate",
value: function _scrollUpdate() {
if (this.pagesCount === 0) {
return;
}
+
this.update();
}
}, {
- key: '_scrollIntoView',
+ key: "_scrollIntoView",
value: function _scrollIntoView(_ref) {
var pageDiv = _ref.pageDiv,
_ref$pageSpot = _ref.pageSpot,
- pageSpot = _ref$pageSpot === undefined ? null : _ref$pageSpot,
+ pageSpot = _ref$pageSpot === void 0 ? null : _ref$pageSpot,
_ref$pageNumber = _ref.pageNumber,
- pageNumber = _ref$pageNumber === undefined ? null : _ref$pageNumber;
-
+ pageNumber = _ref$pageNumber === void 0 ? null : _ref$pageNumber;
throw new Error('Not implemented: _scrollIntoView');
}
}, {
- key: '_setScaleUpdatePages',
+ key: "_setScaleUpdatePages",
value: function _setScaleUpdatePages(newScale, newValue) {
var noScroll = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
var preset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-
this._currentScaleValue = newValue.toString();
+
if (isSameScale(this._currentScale, newScale)) {
if (preset) {
this.eventBus.dispatch('scalechanging', {
@@ -8908,180 +10419,227 @@ var BaseViewer = function () {
presetValue: newValue
});
}
+
return;
}
+
for (var i = 0, ii = this._pages.length; i < ii; i++) {
this._pages[i].update(newScale);
}
+
this._currentScale = newScale;
+
if (!noScroll) {
var page = this._currentPageNumber,
- dest = void 0;
+ dest;
+
if (this._location && !(this.isInPresentationMode || this.isChangingPresentationMode)) {
page = this._location.pageNumber;
- dest = [null, { name: 'XYZ' }, this._location.left, this._location.top, null];
+ dest = [null, {
+ name: 'XYZ'
+ }, this._location.left, this._location.top, null];
}
+
this.scrollPageIntoView({
pageNumber: page,
destArray: dest,
allowNegativeOffset: true
});
}
+
this.eventBus.dispatch('scalechanging', {
source: this,
scale: newScale,
presetValue: preset ? newValue : undefined
});
+
if (this.defaultRenderingQueue) {
this.update();
}
}
}, {
- key: '_setScale',
+ key: "_setScale",
value: function _setScale(value) {
var noScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var scale = parseFloat(value);
+
if (scale > 0) {
this._setScaleUpdatePages(scale, value, noScroll, false);
} else {
var currentPage = this._pages[this._currentPageNumber - 1];
+
if (!currentPage) {
return;
}
+
var noPadding = this.isInPresentationMode || this.removePageBorders;
var hPadding = noPadding ? 0 : _ui_utils.SCROLLBAR_PADDING;
var vPadding = noPadding ? 0 : _ui_utils.VERTICAL_PADDING;
+
if (!noPadding && this._isScrollModeHorizontal) {
var _ref2 = [vPadding, hPadding];
hPadding = _ref2[0];
vPadding = _ref2[1];
}
+
var pageWidthScale = (this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale;
var pageHeightScale = (this.container.clientHeight - vPadding) / currentPage.height * currentPage.scale;
+
switch (value) {
case 'page-actual':
scale = 1;
break;
+
case 'page-width':
scale = pageWidthScale;
break;
+
case 'page-height':
scale = pageHeightScale;
break;
+
case 'page-fit':
scale = Math.min(pageWidthScale, pageHeightScale);
break;
+
case 'auto':
var horizontalScale = (0, _ui_utils.isPortraitOrientation)(currentPage) ? pageWidthScale : Math.min(pageHeightScale, pageWidthScale);
scale = Math.min(_ui_utils.MAX_AUTO_SCALE, horizontalScale);
break;
+
default:
- console.error(this._name + '._setScale: "' + value + '" is an unknown zoom value.');
+ console.error("".concat(this._name, "._setScale: \"").concat(value, "\" is an unknown zoom value."));
return;
}
+
this._setScaleUpdatePages(scale, value, noScroll, true);
}
}
}, {
- key: '_resetCurrentPageView',
+ key: "_resetCurrentPageView",
value: function _resetCurrentPageView() {
if (this.isInPresentationMode) {
this._setScale(this._currentScaleValue, true);
}
+
var pageView = this._pages[this._currentPageNumber - 1];
- this._scrollIntoView({ pageDiv: pageView.div });
+
+ this._scrollIntoView({
+ pageDiv: pageView.div
+ });
}
}, {
- key: 'scrollPageIntoView',
- value: function scrollPageIntoView(params) {
+ key: "scrollPageIntoView",
+ value: function scrollPageIntoView(_ref3) {
+ var pageNumber = _ref3.pageNumber,
+ _ref3$destArray = _ref3.destArray,
+ destArray = _ref3$destArray === void 0 ? null : _ref3$destArray,
+ _ref3$allowNegativeOf = _ref3.allowNegativeOffset,
+ allowNegativeOffset = _ref3$allowNegativeOf === void 0 ? false : _ref3$allowNegativeOf;
+
if (!this.pdfDocument) {
return;
}
- var pageNumber = params.pageNumber || 0;
- var dest = params.destArray || null;
- var allowNegativeOffset = params.allowNegativeOffset || false;
- if (this.isInPresentationMode || !dest) {
- this._setCurrentPageNumber(pageNumber, true);
+
+ var pageView = Number.isInteger(pageNumber) && this._pages[pageNumber - 1];
+
+ if (!pageView) {
+ console.error("".concat(this._name, ".scrollPageIntoView: ") + "\"".concat(pageNumber, "\" is not a valid pageNumber parameter."));
return;
}
- var pageView = this._pages[pageNumber - 1];
- if (!pageView) {
- console.error(this._name + '.scrollPageIntoView: Invalid "pageNumber" parameter.');
+
+ if (this.isInPresentationMode || !destArray) {
+ this._setCurrentPageNumber(pageNumber, true);
+
return;
}
+
var x = 0,
y = 0;
var width = 0,
height = 0,
- widthScale = void 0,
- heightScale = void 0;
+ widthScale,
+ heightScale;
var changeOrientation = pageView.rotation % 180 === 0 ? false : true;
var pageWidth = (changeOrientation ? pageView.height : pageView.width) / pageView.scale / _ui_utils.CSS_UNITS;
var pageHeight = (changeOrientation ? pageView.width : pageView.height) / pageView.scale / _ui_utils.CSS_UNITS;
var scale = 0;
- switch (dest[1].name) {
+
+ switch (destArray[1].name) {
case 'XYZ':
- x = dest[2];
- y = dest[3];
- scale = dest[4];
+ x = destArray[2];
+ y = destArray[3];
+ scale = destArray[4];
x = x !== null ? x : 0;
y = y !== null ? y : pageHeight;
break;
+
case 'Fit':
case 'FitB':
scale = 'page-fit';
break;
+
case 'FitH':
case 'FitBH':
- y = dest[2];
+ y = destArray[2];
scale = 'page-width';
+
if (y === null && this._location) {
x = this._location.left;
y = this._location.top;
}
+
break;
+
case 'FitV':
case 'FitBV':
- x = dest[2];
+ x = destArray[2];
width = pageWidth;
height = pageHeight;
scale = 'page-height';
break;
+
case 'FitR':
- x = dest[2];
- y = dest[3];
- width = dest[4] - x;
- height = dest[5] - y;
+ x = destArray[2];
+ y = destArray[3];
+ width = destArray[4] - x;
+ height = destArray[5] - y;
var hPadding = this.removePageBorders ? 0 : _ui_utils.SCROLLBAR_PADDING;
var vPadding = this.removePageBorders ? 0 : _ui_utils.VERTICAL_PADDING;
widthScale = (this.container.clientWidth - hPadding) / width / _ui_utils.CSS_UNITS;
heightScale = (this.container.clientHeight - vPadding) / height / _ui_utils.CSS_UNITS;
scale = Math.min(Math.abs(widthScale), Math.abs(heightScale));
break;
+
default:
- console.error(this._name + '.scrollPageIntoView: "' + dest[1].name + '" ' + 'is not a valid destination type.');
+ console.error("".concat(this._name, ".scrollPageIntoView: ") + "\"".concat(destArray[1].name, "\" is not a valid destination type."));
return;
}
+
if (scale && scale !== this._currentScale) {
this.currentScaleValue = scale;
} else if (this._currentScale === _ui_utils.UNKNOWN_SCALE) {
this.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
}
- if (scale === 'page-fit' && !dest[4]) {
+
+ if (scale === 'page-fit' && !destArray[4]) {
this._scrollIntoView({
pageDiv: pageView.div,
pageNumber: pageNumber
});
+
return;
}
+
var boundingRect = [pageView.viewport.convertToViewportPoint(x, y), pageView.viewport.convertToViewportPoint(x + width, y + height)];
var left = Math.min(boundingRect[0][0], boundingRect[1][0]);
var top = Math.min(boundingRect[0][1], boundingRect[1][1]);
+
if (!allowNegativeOffset) {
left = Math.max(left, 0);
top = Math.max(top, 0);
}
+
this._scrollIntoView({
pageDiv: pageView.div,
pageSpot: {
@@ -9092,13 +10650,14 @@ var BaseViewer = function () {
});
}
}, {
- key: '_resizeBuffer',
+ key: "_resizeBuffer",
value: function _resizeBuffer(numVisiblePages, visiblePages) {
var suggestedCacheSize = Math.max(DEFAULT_CACHE_SIZE, 2 * numVisiblePages + 1);
+
this._buffer.resize(suggestedCacheSize, visiblePages);
}
}, {
- key: '_updateLocation',
+ key: "_updateLocation",
value: function _updateLocation(firstPage) {
var currentScale = this._currentScale;
var currentScaleValue = this._currentScaleValue;
@@ -9122,26 +10681,29 @@ var BaseViewer = function () {
};
}
}, {
- key: 'update',
+ key: "update",
value: function update() {
throw new Error('Not implemented: update');
}
}, {
- key: 'containsElement',
+ key: "containsElement",
value: function containsElement(element) {
return this.container.contains(element);
}
}, {
- key: 'focus',
+ key: "focus",
value: function focus() {
this.container.focus();
}
}, {
- key: '_getCurrentVisiblePage',
+ key: "_getCurrentVisiblePage",
value: function _getCurrentVisiblePage() {
if (!this.pagesCount) {
- return { views: [] };
+ return {
+ views: []
+ };
}
+
var pageView = this._pages[this._currentPageNumber - 1];
var element = pageView.div;
var view = {
@@ -9157,12 +10719,28 @@ var BaseViewer = function () {
};
}
}, {
- key: '_getVisiblePages',
+ key: "_getVisiblePages",
value: function _getVisiblePages() {
throw new Error('Not implemented: _getVisiblePages');
}
}, {
- key: 'cleanup',
+ key: "isPageVisible",
+ value: function isPageVisible(pageNumber) {
+ if (!this.pdfDocument) {
+ return false;
+ }
+
+ if (this.pageNumber < 1 || pageNumber > this.pagesCount) {
+ console.error("".concat(this._name, ".isPageVisible: \"").concat(pageNumber, "\" is out of bounds."));
+ return false;
+ }
+
+ return this._getVisiblePages().views.some(function (view) {
+ return view.id === pageNumber;
+ });
+ }
+ }, {
+ key: "cleanup",
value: function cleanup() {
for (var i = 0, ii = this._pages.length; i < ii; i++) {
if (this._pages[i] && this._pages[i].renderingState !== _pdf_rendering_queue.RenderingStates.FINISHED) {
@@ -9171,7 +10749,7 @@ var BaseViewer = function () {
}
}
}, {
- key: '_cancelRendering',
+ key: "_cancelRendering",
value: function _cancelRendering() {
for (var i = 0, ii = this._pages.length; i < ii; i++) {
if (this._pages[i]) {
@@ -9180,21 +10758,25 @@ var BaseViewer = function () {
}
}
}, {
- key: '_ensurePdfPageLoaded',
+ key: "_ensurePdfPageLoaded",
value: function _ensurePdfPageLoaded(pageView) {
var _this3 = this;
if (pageView.pdfPage) {
return Promise.resolve(pageView.pdfPage);
}
+
var pageNumber = pageView.id;
+
if (this._pagesRequests[pageNumber]) {
return this._pagesRequests[pageNumber];
}
+
var promise = this.pdfDocument.getPage(pageNumber).then(function (pdfPage) {
if (!pageView.pdfPage) {
pageView.setPdfPage(pdfPage);
}
+
_this3._pagesRequests[pageNumber] = null;
return pdfPage;
}).catch(function (reason) {
@@ -9205,26 +10787,29 @@ var BaseViewer = function () {
return promise;
}
}, {
- key: 'forceRendering',
+ key: "forceRendering",
value: function forceRendering(currentlyVisiblePages) {
var _this4 = this;
var visiblePages = currentlyVisiblePages || this._getVisiblePages();
+
var scrollAhead = this._isScrollModeHorizontal ? this.scroll.right : this.scroll.down;
var pageView = this.renderingQueue.getHighestPriority(visiblePages, this._pages, scrollAhead);
+
if (pageView) {
this._ensurePdfPageLoaded(pageView).then(function () {
_this4.renderingQueue.renderView(pageView);
});
+
return true;
}
+
return false;
}
}, {
- key: 'createTextLayerBuilder',
+ key: "createTextLayerBuilder",
value: function createTextLayerBuilder(textLayerDiv, pageIndex, viewport) {
var enhanceTextSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-
return new _text_layer_builder.TextLayerBuilder({
textLayerDiv: textLayerDiv,
eventBus: this.eventBus,
@@ -9235,12 +10820,11 @@ var BaseViewer = function () {
});
}
}, {
- key: 'createAnnotationLayerBuilder',
+ key: "createAnnotationLayerBuilder",
value: function createAnnotationLayerBuilder(pageDiv, pdfPage) {
var imageResourcesPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
var renderInteractiveForms = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
var l10n = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _ui_utils.NullL10n;
-
return new _annotation_layer_builder.AnnotationLayerBuilder({
pageDiv: pageDiv,
pdfPage: pdfPage,
@@ -9252,24 +10836,29 @@ var BaseViewer = function () {
});
}
}, {
- key: 'getPagesOverview',
+ key: "getPagesOverview",
value: function getPagesOverview() {
var pagesOverview = this._pages.map(function (pageView) {
- var viewport = pageView.pdfPage.getViewport(1);
+ var viewport = pageView.pdfPage.getViewport({
+ scale: 1
+ });
return {
width: viewport.width,
height: viewport.height,
rotation: viewport.rotation
};
});
+
if (!this.enablePrintAutoRotate) {
return pagesOverview;
}
+
var isFirstPagePortrait = (0, _ui_utils.isPortraitOrientation)(pagesOverview[0]);
return pagesOverview.map(function (size) {
if (isFirstPagePortrait === (0, _ui_utils.isPortraitOrientation)(size)) {
return size;
}
+
return {
width: size.height,
height: size.width,
@@ -9278,34 +10867,39 @@ var BaseViewer = function () {
});
}
}, {
- key: '_updateScrollMode',
+ key: "_updateScrollMode",
value: function _updateScrollMode() {
var pageNumber = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-
var scrollMode = this._scrollMode,
viewer = this.viewer;
viewer.classList.toggle('scrollHorizontal', scrollMode === ScrollMode.HORIZONTAL);
viewer.classList.toggle('scrollWrapped', scrollMode === ScrollMode.WRAPPED);
+
if (!this.pdfDocument || !pageNumber) {
return;
}
+
if (this._currentScaleValue && isNaN(this._currentScaleValue)) {
this._setScale(this._currentScaleValue, true);
}
- this.scrollPageIntoView({ pageNumber: pageNumber });
+
+ this._setCurrentPageNumber(pageNumber, true);
+
this.update();
}
}, {
- key: '_updateSpreadMode',
+ key: "_updateSpreadMode",
value: function _updateSpreadMode() {
var pageNumber = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
if (!this.pdfDocument) {
return;
}
+
var viewer = this.viewer,
pages = this._pages;
viewer.textContent = '';
+
if (this._spreadMode === SpreadMode.NONE) {
for (var i = 0, iMax = pages.length; i < iMax; ++i) {
viewer.appendChild(pages[i].div);
@@ -9313,6 +10907,7 @@ var BaseViewer = function () {
} else {
var parity = this._spreadMode - 1;
var spread = null;
+
for (var _i = 0, _iMax = pages.length; _i < _iMax; ++_i) {
if (spread === null) {
spread = document.createElement('div');
@@ -9322,27 +10917,31 @@ var BaseViewer = function () {
spread = spread.cloneNode(false);
viewer.appendChild(spread);
}
+
spread.appendChild(pages[_i].div);
}
}
+
if (!pageNumber) {
return;
}
- this.scrollPageIntoView({ pageNumber: pageNumber });
+
+ this._setCurrentPageNumber(pageNumber, true);
+
this.update();
}
}, {
- key: 'pagesCount',
+ key: "pagesCount",
get: function get() {
return this._pages.length;
}
}, {
- key: 'pageViewsReady',
+ key: "pageViewsReady",
get: function get() {
return this._pageViewsReady;
}
}, {
- key: 'currentPageNumber',
+ key: "currentPageNumber",
get: function get() {
return this._currentPageNumber;
},
@@ -9350,42 +10949,57 @@ var BaseViewer = function () {
if (!Number.isInteger(val)) {
throw new Error('Invalid page number.');
}
+
if (!this.pdfDocument) {
return;
}
- this._setCurrentPageNumber(val, true);
+
+ if (!this._setCurrentPageNumber(val, true)) {
+ console.error("".concat(this._name, ".currentPageNumber: \"").concat(val, "\" is not a valid page."));
+ }
}
}, {
- key: 'currentPageLabel',
+ key: "currentPageLabel",
get: function get() {
return this._pageLabels && this._pageLabels[this._currentPageNumber - 1];
},
set: function set(val) {
- var pageNumber = val | 0;
+ if (!this.pdfDocument) {
+ return;
+ }
+
+ var page = val | 0;
+
if (this._pageLabels) {
var i = this._pageLabels.indexOf(val);
+
if (i >= 0) {
- pageNumber = i + 1;
+ page = i + 1;
}
}
- this.currentPageNumber = pageNumber;
+
+ if (!this._setCurrentPageNumber(page, true)) {
+ console.error("".concat(this._name, ".currentPageLabel: \"").concat(val, "\" is not a valid page."));
+ }
}
}, {
- key: 'currentScale',
+ key: "currentScale",
get: function get() {
return this._currentScale !== _ui_utils.UNKNOWN_SCALE ? this._currentScale : _ui_utils.DEFAULT_SCALE;
},
set: function set(val) {
if (isNaN(val)) {
- throw new Error('Invalid numeric scale');
+ throw new Error('Invalid numeric scale.');
}
+
if (!this.pdfDocument) {
return;
}
+
this._setScale(val, false);
}
}, {
- key: 'currentScaleValue',
+ key: "currentScaleValue",
get: function get() {
return this._currentScaleValue;
},
@@ -9393,10 +11007,11 @@ var BaseViewer = function () {
if (!this.pdfDocument) {
return;
}
+
this._setScale(val, false);
}
}, {
- key: 'pagesRotation',
+ key: "pagesRotation",
get: function get() {
return this._pagesRotation;
},
@@ -9404,74 +11019,84 @@ var BaseViewer = function () {
if (!(0, _ui_utils.isValidRotation)(rotation)) {
throw new Error('Invalid pages rotation angle.');
}
+
if (!this.pdfDocument) {
return;
}
+
if (this._pagesRotation === rotation) {
return;
}
+
this._pagesRotation = rotation;
var pageNumber = this._currentPageNumber;
+
for (var i = 0, ii = this._pages.length; i < ii; i++) {
var pageView = this._pages[i];
pageView.update(pageView.scale, rotation);
}
+
if (this._currentScaleValue) {
this._setScale(this._currentScaleValue, true);
}
+
this.eventBus.dispatch('rotationchanging', {
source: this,
pagesRotation: rotation,
pageNumber: pageNumber
});
+
if (this.defaultRenderingQueue) {
this.update();
}
}
}, {
- key: '_setDocumentViewerElement',
+ key: "_setDocumentViewerElement",
get: function get() {
throw new Error('Not implemented: _setDocumentViewerElement');
}
}, {
- key: '_isScrollModeHorizontal',
+ key: "_isScrollModeHorizontal",
get: function get() {
throw new Error('Not implemented: _isScrollModeHorizontal');
}
}, {
- key: 'isInPresentationMode',
+ key: "isInPresentationMode",
get: function get() {
return this.presentationModeState === _ui_utils.PresentationModeState.FULLSCREEN;
}
}, {
- key: 'isChangingPresentationMode',
+ key: "isChangingPresentationMode",
get: function get() {
return this.presentationModeState === _ui_utils.PresentationModeState.CHANGING;
}
}, {
- key: 'isHorizontalScrollbarEnabled',
+ key: "isHorizontalScrollbarEnabled",
get: function get() {
return this.isInPresentationMode ? false : this.container.scrollWidth > this.container.clientWidth;
}
}, {
- key: 'isVerticalScrollbarEnabled',
+ key: "isVerticalScrollbarEnabled",
get: function get() {
return this.isInPresentationMode ? false : this.container.scrollHeight > this.container.clientHeight;
}
}, {
- key: 'hasEqualPageSizes',
+ key: "hasEqualPageSizes",
get: function get() {
var firstPageView = this._pages[0];
+
for (var i = 1, ii = this._pages.length; i < ii; ++i) {
var pageView = this._pages[i];
+
if (pageView.width !== firstPageView.width || pageView.height !== firstPageView.height) {
return false;
}
}
+
return true;
}
}, {
- key: 'scrollMode',
+ key: "scrollMode",
get: function get() {
return this._scrollMode;
},
@@ -9479,18 +11104,21 @@ var BaseViewer = function () {
if (this._scrollMode === mode) {
return;
}
+
if (!Number.isInteger(mode) || !Object.values(ScrollMode).includes(mode)) {
- throw new Error('Invalid scroll mode: ' + mode);
+ throw new Error("Invalid scroll mode: ".concat(mode));
}
+
this._scrollMode = mode;
this.eventBus.dispatch('scrollmodechanged', {
source: this,
mode: mode
});
+
this._updateScrollMode(this._currentPageNumber);
}
}, {
- key: 'spreadMode',
+ key: "spreadMode",
get: function get() {
return this._spreadMode;
},
@@ -9498,14 +11126,17 @@ var BaseViewer = function () {
if (this._spreadMode === mode) {
return;
}
+
if (!Number.isInteger(mode) || !Object.values(SpreadMode).includes(mode)) {
- throw new Error('Invalid spread mode: ' + mode);
+ throw new Error("Invalid spread mode: ".concat(mode));
}
+
this._spreadMode = mode;
this.eventBus.dispatch('spreadmodechanged', {
source: this,
mode: mode
});
+
this._updateSpreadMode(this._currentPageNumber);
}
}]);
@@ -9514,8 +11145,6 @@ var BaseViewer = function () {
}();
exports.BaseViewer = BaseViewer;
-exports.ScrollMode = ScrollMode;
-exports.SpreadMode = SpreadMode;
/***/ }),
/* 30 */
@@ -9527,9 +11156,7 @@ exports.SpreadMode = SpreadMode;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.DefaultAnnotationLayerFactory = exports.AnnotationLayerBuilder = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.DefaultAnnotationLayerFactory = exports.AnnotationLayerBuilder = void 0;
var _pdfjsLib = __webpack_require__(7);
@@ -9539,18 +11166,24 @@ var _pdf_link_service = __webpack_require__(22);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var AnnotationLayerBuilder = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var AnnotationLayerBuilder =
+/*#__PURE__*/
+function () {
function AnnotationLayerBuilder(_ref) {
var pageDiv = _ref.pageDiv,
pdfPage = _ref.pdfPage,
linkService = _ref.linkService,
downloadManager = _ref.downloadManager,
_ref$imageResourcesPa = _ref.imageResourcesPath,
- imageResourcesPath = _ref$imageResourcesPa === undefined ? '' : _ref$imageResourcesPa,
+ imageResourcesPath = _ref$imageResourcesPa === void 0 ? '' : _ref$imageResourcesPa,
_ref$renderInteractiv = _ref.renderInteractiveForms,
- renderInteractiveForms = _ref$renderInteractiv === undefined ? false : _ref$renderInteractiv,
+ renderInteractiveForms = _ref$renderInteractiv === void 0 ? false : _ref$renderInteractiv,
_ref$l10n = _ref.l10n,
- l10n = _ref$l10n === undefined ? _ui_utils.NullL10n : _ref$l10n;
+ l10n = _ref$l10n === void 0 ? _ui_utils.NullL10n : _ref$l10n;
_classCallCheck(this, AnnotationLayerBuilder);
@@ -9566,18 +11199,22 @@ var AnnotationLayerBuilder = function () {
}
_createClass(AnnotationLayerBuilder, [{
- key: 'render',
+ key: "render",
value: function render(viewport) {
var _this = this;
var intent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'display';
-
- this.pdfPage.getAnnotations({ intent: intent }).then(function (annotations) {
+ this.pdfPage.getAnnotations({
+ intent: intent
+ }).then(function (annotations) {
if (_this._cancelled) {
return;
}
+
var parameters = {
- viewport: viewport.clone({ dontFlip: true }),
+ viewport: viewport.clone({
+ dontFlip: true
+ }),
div: _this.div,
annotations: annotations,
page: _this.pdfPage,
@@ -9586,32 +11223,39 @@ var AnnotationLayerBuilder = function () {
linkService: _this.linkService,
downloadManager: _this.downloadManager
};
+
if (_this.div) {
_pdfjsLib.AnnotationLayer.update(parameters);
} else {
if (annotations.length === 0) {
return;
}
+
_this.div = document.createElement('div');
_this.div.className = 'annotationLayer';
+
_this.pageDiv.appendChild(_this.div);
+
parameters.div = _this.div;
+
_pdfjsLib.AnnotationLayer.render(parameters);
+
_this.l10n.translate(_this.div);
}
});
}
}, {
- key: 'cancel',
+ key: "cancel",
value: function cancel() {
this._cancelled = true;
}
}, {
- key: 'hide',
+ key: "hide",
value: function hide() {
if (!this.div) {
return;
}
+
this.div.setAttribute('hidden', 'true');
}
}]);
@@ -9619,18 +11263,21 @@ var AnnotationLayerBuilder = function () {
return AnnotationLayerBuilder;
}();
-var DefaultAnnotationLayerFactory = function () {
+exports.AnnotationLayerBuilder = AnnotationLayerBuilder;
+
+var DefaultAnnotationLayerFactory =
+/*#__PURE__*/
+function () {
function DefaultAnnotationLayerFactory() {
_classCallCheck(this, DefaultAnnotationLayerFactory);
}
_createClass(DefaultAnnotationLayerFactory, [{
- key: 'createAnnotationLayerBuilder',
+ key: "createAnnotationLayerBuilder",
value: function createAnnotationLayerBuilder(pageDiv, pdfPage) {
var imageResourcesPath = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
var renderInteractiveForms = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
var l10n = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _ui_utils.NullL10n;
-
return new AnnotationLayerBuilder({
pageDiv: pageDiv,
pdfPage: pdfPage,
@@ -9645,7 +11292,6 @@ var DefaultAnnotationLayerFactory = function () {
return DefaultAnnotationLayerFactory;
}();
-exports.AnnotationLayerBuilder = AnnotationLayerBuilder;
exports.DefaultAnnotationLayerFactory = DefaultAnnotationLayerFactory;
/***/ }),
@@ -9658,9 +11304,7 @@ exports.DefaultAnnotationLayerFactory = DefaultAnnotationLayerFactory;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFPageView = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.PDFPageView = void 0;
var _ui_utils = __webpack_require__(6);
@@ -9672,9 +11316,15 @@ var _viewer_compatibility = __webpack_require__(13);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var MAX_CANVAS_PIXELS = _viewer_compatibility.viewerCompatibilityParams.maxCanvasPixels || 16777216;
-var PDFPageView = function () {
+var PDFPageView =
+/*#__PURE__*/
+function () {
function PDFPageView(options) {
_classCallCheck(this, PDFPageView);
@@ -9721,46 +11371,52 @@ var PDFPageView = function () {
}
_createClass(PDFPageView, [{
- key: 'setPdfPage',
+ key: "setPdfPage",
value: function setPdfPage(pdfPage) {
this.pdfPage = pdfPage;
this.pdfPageRotate = pdfPage.rotate;
var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
- this.viewport = pdfPage.getViewport(this.scale * _ui_utils.CSS_UNITS, totalRotation);
+ this.viewport = pdfPage.getViewport({
+ scale: this.scale * _ui_utils.CSS_UNITS,
+ rotation: totalRotation
+ });
this.stats = pdfPage.stats;
this.reset();
}
}, {
- key: 'destroy',
+ key: "destroy",
value: function destroy() {
this.reset();
+
if (this.pdfPage) {
this.pdfPage.cleanup();
}
}
}, {
- key: '_resetZoomLayer',
+ key: "_resetZoomLayer",
value: function _resetZoomLayer() {
var removeFromDOM = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (!this.zoomLayer) {
return;
}
+
var zoomLayerCanvas = this.zoomLayer.firstChild;
this.paintedViewportMap.delete(zoomLayerCanvas);
zoomLayerCanvas.width = 0;
zoomLayerCanvas.height = 0;
+
if (removeFromDOM) {
this.zoomLayer.remove();
}
+
this.zoomLayer = null;
}
}, {
- key: 'reset',
+ key: "reset",
value: function reset() {
var keepZoomLayer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
var keepAnnotations = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
this.cancelRendering(keepAnnotations);
var div = this.div;
div.style.width = Math.floor(this.viewport.width) + 'px';
@@ -9768,20 +11424,26 @@ var PDFPageView = function () {
var childNodes = div.childNodes;
var currentZoomLayerNode = keepZoomLayer && this.zoomLayer || null;
var currentAnnotationNode = keepAnnotations && this.annotationLayer && this.annotationLayer.div || null;
+
for (var i = childNodes.length - 1; i >= 0; i--) {
var node = childNodes[i];
+
if (currentZoomLayerNode === node || currentAnnotationNode === node) {
continue;
}
+
div.removeChild(node);
}
+
div.removeAttribute('data-loaded');
+
if (currentAnnotationNode) {
this.annotationLayer.hide();
} else if (this.annotationLayer) {
this.annotationLayer.cancel();
this.annotationLayer = null;
}
+
if (!currentZoomLayerNode) {
if (this.canvas) {
this.paintedViewportMap.delete(this.canvas);
@@ -9789,28 +11451,34 @@ var PDFPageView = function () {
this.canvas.height = 0;
delete this.canvas;
}
+
this._resetZoomLayer();
}
+
if (this.svg) {
this.paintedViewportMap.delete(this.svg);
delete this.svg;
}
+
this.loadingIconDiv = document.createElement('div');
this.loadingIconDiv.className = 'loadingIcon';
div.appendChild(this.loadingIconDiv);
}
}, {
- key: 'update',
+ key: "update",
value: function update(scale, rotation) {
this.scale = scale || this.scale;
+
if (typeof rotation !== 'undefined') {
this.rotation = rotation;
}
+
var totalRotation = (this.rotation + this.pdfPageRotate) % 360;
this.viewport = this.viewport.clone({
scale: this.scale * _ui_utils.CSS_UNITS,
rotation: totalRotation
});
+
if (this.svg) {
this.cssTransform(this.svg, true);
this.eventBus.dispatch('pagerendered', {
@@ -9820,13 +11488,17 @@ var PDFPageView = function () {
});
return;
}
+
var isScalingRestricted = false;
+
if (this.canvas && this.maxCanvasPixels > 0) {
var outputScale = this.outputScale;
+
if ((Math.floor(this.viewport.width) * outputScale.sx | 0) * (Math.floor(this.viewport.height) * outputScale.sy | 0) > this.maxCanvasPixels) {
isScalingRestricted = true;
}
}
+
if (this.canvas) {
if (this.useOnlyCssZoom || this.hasRestrictedScaling && isScalingRestricted) {
this.cssTransform(this.canvas, true);
@@ -9837,36 +11509,43 @@ var PDFPageView = function () {
});
return;
}
+
if (!this.zoomLayer && !this.canvas.hasAttribute('hidden')) {
this.zoomLayer = this.canvas.parentNode;
this.zoomLayer.style.position = 'absolute';
}
}
+
if (this.zoomLayer) {
this.cssTransform(this.zoomLayer.firstChild);
}
+
this.reset(true, true);
}
}, {
- key: 'cancelRendering',
+ key: "cancelRendering",
value: function cancelRendering() {
var keepAnnotations = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
var renderingState = this.renderingState;
+
if (this.paintTask) {
this.paintTask.cancel();
this.paintTask = null;
}
+
this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
this.resume = null;
+
if (this.textLayer) {
this.textLayer.cancel();
this.textLayer = null;
}
+
if (!keepAnnotations && this.annotationLayer) {
this.annotationLayer.cancel();
this.annotationLayer = null;
}
+
if (renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
this.eventBus.dispatch('pagecancelled', {
source: this,
@@ -9876,10 +11555,9 @@ var PDFPageView = function () {
}
}
}, {
- key: 'cssTransform',
+ key: "cssTransform",
value: function cssTransform(target) {
var redrawAnnotations = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
var width = this.viewport.width;
var height = this.viewport.height;
var div = this.div;
@@ -9889,57 +11567,68 @@ var PDFPageView = function () {
var absRotation = Math.abs(relativeRotation);
var scaleX = 1,
scaleY = 1;
+
if (absRotation === 90 || absRotation === 270) {
scaleX = height / width;
scaleY = width / height;
}
+
var cssTransform = 'rotate(' + relativeRotation + 'deg) ' + 'scale(' + scaleX + ',' + scaleY + ')';
target.style.transform = cssTransform;
+
if (this.textLayer) {
var textLayerViewport = this.textLayer.viewport;
var textRelativeRotation = this.viewport.rotation - textLayerViewport.rotation;
var textAbsRotation = Math.abs(textRelativeRotation);
var scale = width / textLayerViewport.width;
+
if (textAbsRotation === 90 || textAbsRotation === 270) {
scale = width / textLayerViewport.height;
}
+
var textLayerDiv = this.textLayer.textLayerDiv;
- var transX = void 0,
- transY = void 0;
+ var transX, transY;
+
switch (textAbsRotation) {
case 0:
transX = transY = 0;
break;
+
case 90:
transX = 0;
transY = '-' + textLayerDiv.style.height;
break;
+
case 180:
transX = '-' + textLayerDiv.style.width;
transY = '-' + textLayerDiv.style.height;
break;
+
case 270:
transX = '-' + textLayerDiv.style.width;
transY = 0;
break;
+
default:
console.error('Bad rotation value.');
break;
}
+
textLayerDiv.style.transform = 'rotate(' + textAbsRotation + 'deg) ' + 'scale(' + scale + ', ' + scale + ') ' + 'translate(' + transX + ', ' + transY + ')';
textLayerDiv.style.transformOrigin = '0% 0%';
}
+
if (redrawAnnotations && this.annotationLayer) {
this.annotationLayer.render(this.viewport, 'display');
}
}
}, {
- key: 'getPagePoint',
+ key: "getPagePoint",
value: function getPagePoint(x, y) {
return this.viewport.convertToPdfPoint(x, y);
}
}, {
- key: 'draw',
+ key: "draw",
value: function draw() {
var _this = this;
@@ -9947,10 +11636,12 @@ var PDFPageView = function () {
console.error('Must be in new state before drawing');
this.reset();
}
+
if (!this.pdfPage) {
this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
return Promise.reject(new Error('Page is not loaded'));
}
+
this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
var pdfPage = this.pdfPage;
var div = this.div;
@@ -9958,75 +11649,98 @@ var PDFPageView = function () {
canvasWrapper.style.width = div.style.width;
canvasWrapper.style.height = div.style.height;
canvasWrapper.classList.add('canvasWrapper');
+
if (this.annotationLayer && this.annotationLayer.div) {
div.insertBefore(canvasWrapper, this.annotationLayer.div);
} else {
div.appendChild(canvasWrapper);
}
+
var textLayer = null;
+
if (this.textLayerMode !== _ui_utils.TextLayerMode.DISABLE && this.textLayerFactory) {
var textLayerDiv = document.createElement('div');
textLayerDiv.className = 'textLayer';
textLayerDiv.style.width = canvasWrapper.style.width;
textLayerDiv.style.height = canvasWrapper.style.height;
+
if (this.annotationLayer && this.annotationLayer.div) {
div.insertBefore(textLayerDiv, this.annotationLayer.div);
} else {
div.appendChild(textLayerDiv);
}
+
textLayer = this.textLayerFactory.createTextLayerBuilder(textLayerDiv, this.id - 1, this.viewport, this.textLayerMode === _ui_utils.TextLayerMode.ENABLE_ENHANCE);
}
+
this.textLayer = textLayer;
var renderContinueCallback = null;
+
if (this.renderingQueue) {
renderContinueCallback = function renderContinueCallback(cont) {
if (!_this.renderingQueue.isHighestPriority(_this)) {
_this.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+
_this.resume = function () {
_this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
cont();
};
+
return;
}
+
cont();
};
}
+
var finishPaintTask = function finishPaintTask(error) {
if (paintTask === _this.paintTask) {
_this.paintTask = null;
}
+
if (error instanceof _pdfjsLib.RenderingCancelledException) {
_this.error = null;
return Promise.resolve(undefined);
}
+
_this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+
if (_this.loadingIconDiv) {
div.removeChild(_this.loadingIconDiv);
delete _this.loadingIconDiv;
}
+
_this._resetZoomLayer(true);
+
_this.error = error;
_this.stats = pdfPage.stats;
+
if (_this.onAfterDraw) {
_this.onAfterDraw();
}
+
_this.eventBus.dispatch('pagerendered', {
source: _this,
pageNumber: _this.id,
cssTransform: false
});
+
if (error) {
return Promise.reject(error);
}
+
return Promise.resolve(undefined);
};
+
var paintTask = this.renderer === _ui_utils.RendererType.SVG ? this.paintOnSvg(canvasWrapper) : this.paintOnCanvas(canvasWrapper);
paintTask.onRenderContinue = renderContinueCallback;
this.paintTask = paintTask;
var resultPromise = paintTask.promise.then(function () {
return finishPaintTask(null).then(function () {
if (textLayer) {
- var readableStream = pdfPage.streamTextContent({ normalizeWhitespace: true });
+ var readableStream = pdfPage.streamTextContent({
+ normalizeWhitespace: true
+ });
textLayer.setTextContentStream(readableStream);
textLayer.render();
}
@@ -10034,20 +11748,25 @@ var PDFPageView = function () {
}, function (reason) {
return finishPaintTask(reason);
});
+
if (this.annotationLayerFactory) {
if (!this.annotationLayer) {
this.annotationLayer = this.annotationLayerFactory.createAnnotationLayerBuilder(div, pdfPage, this.imageResourcesPath, this.renderInteractiveForms, this.l10n);
}
+
this.annotationLayer.render(this.viewport, 'display');
}
+
div.setAttribute('data-loaded', true);
+
if (this.onBeforeDraw) {
this.onBeforeDraw();
}
+
return resultPromise;
}
}, {
- key: 'paintOnCanvas',
+ key: "paintOnCanvas",
value: function paintOnCanvas(canvasWrapper) {
var renderCapability = (0, _pdfjsLib.createPromiseCapability)();
var result = {
@@ -10064,27 +11783,36 @@ var PDFPageView = function () {
canvas.id = this.renderingId;
canvas.setAttribute('hidden', 'hidden');
var isCanvasHidden = true;
+
var showCanvas = function showCanvas() {
if (isCanvasHidden) {
canvas.removeAttribute('hidden');
isCanvasHidden = false;
}
};
+
canvasWrapper.appendChild(canvas);
this.canvas = canvas;
canvas.mozOpaque = true;
- var ctx = canvas.getContext('2d', { alpha: false });
+ var ctx = canvas.getContext('2d', {
+ alpha: false
+ });
var outputScale = (0, _ui_utils.getOutputScale)(ctx);
this.outputScale = outputScale;
+
if (this.useOnlyCssZoom) {
- var actualSizeViewport = viewport.clone({ scale: _ui_utils.CSS_UNITS });
+ var actualSizeViewport = viewport.clone({
+ scale: _ui_utils.CSS_UNITS
+ });
outputScale.sx *= actualSizeViewport.width / viewport.width;
outputScale.sy *= actualSizeViewport.height / viewport.height;
outputScale.scaled = true;
}
+
if (this.maxCanvasPixels > 0) {
var pixelsInViewport = viewport.width * viewport.height;
var maxScale = Math.sqrt(this.maxCanvasPixels / pixelsInViewport);
+
if (outputScale.sx > maxScale || outputScale.sy > maxScale) {
outputScale.sx = maxScale;
outputScale.sy = maxScale;
@@ -10094,6 +11822,7 @@ var PDFPageView = function () {
this.hasRestrictedScaling = false;
}
}
+
var sfx = (0, _ui_utils.approximateFraction)(outputScale.sx);
var sfy = (0, _ui_utils.approximateFraction)(outputScale.sy);
canvas.width = (0, _ui_utils.roundToDivide)(viewport.width * outputScale.sx, sfx[0]);
@@ -10110,14 +11839,17 @@ var PDFPageView = function () {
renderInteractiveForms: this.renderInteractiveForms
};
var renderTask = this.pdfPage.render(renderContext);
+
renderTask.onContinue = function (cont) {
showCanvas();
+
if (result.onRenderContinue) {
result.onRenderContinue(cont);
} else {
cont();
}
};
+
renderTask.promise.then(function () {
showCanvas();
renderCapability.resolve(undefined);
@@ -10128,25 +11860,31 @@ var PDFPageView = function () {
return result;
}
}, {
- key: 'paintOnSvg',
+ key: "paintOnSvg",
value: function paintOnSvg(wrapper) {
var _this2 = this;
var cancelled = false;
+
var ensureNotCancelled = function ensureNotCancelled() {
if (cancelled) {
throw new _pdfjsLib.RenderingCancelledException('Rendering cancelled, page ' + _this2.id, 'svg');
}
};
+
var pdfPage = this.pdfPage;
- var actualSizeViewport = this.viewport.clone({ scale: _ui_utils.CSS_UNITS });
+ var actualSizeViewport = this.viewport.clone({
+ scale: _ui_utils.CSS_UNITS
+ });
var promise = pdfPage.getOperatorList().then(function (opList) {
ensureNotCancelled();
var svgGfx = new _pdfjsLib.SVGGraphics(pdfPage.commonObjs, pdfPage.objs);
return svgGfx.getSVG(opList, actualSizeViewport).then(function (svg) {
ensureNotCancelled();
_this2.svg = svg;
+
_this2.paintedViewportMap.set(svg, actualSizeViewport);
+
svg.style.width = wrapper.style.width;
svg.style.height = wrapper.style.height;
_this2.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
@@ -10164,9 +11902,10 @@ var PDFPageView = function () {
};
}
}, {
- key: 'setPageLabel',
+ key: "setPageLabel",
value: function setPageLabel(label) {
this.pageLabel = typeof label === 'string' ? label : null;
+
if (this.pageLabel !== null) {
this.div.setAttribute('data-page-label', this.pageLabel);
} else {
@@ -10174,12 +11913,12 @@ var PDFPageView = function () {
}
}
}, {
- key: 'width',
+ key: "width",
get: function get() {
return this.viewport.width;
}
}, {
- key: 'height',
+ key: "height",
get: function get() {
return this.viewport.height;
}
@@ -10200,9 +11939,7 @@ exports.PDFPageView = PDFPageView;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.DefaultTextLayerFactory = exports.TextLayerBuilder = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.DefaultTextLayerFactory = exports.TextLayerBuilder = void 0;
var _ui_utils = __webpack_require__(6);
@@ -10210,20 +11947,24 @@ var _pdfjsLib = __webpack_require__(7);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var EXPAND_DIVS_TIMEOUT = 300;
-var MATCH_SCROLL_OFFSET_TOP = -50;
-var MATCH_SCROLL_OFFSET_LEFT = -400;
-var TextLayerBuilder = function () {
+var TextLayerBuilder =
+/*#__PURE__*/
+function () {
function TextLayerBuilder(_ref) {
var textLayerDiv = _ref.textLayerDiv,
eventBus = _ref.eventBus,
pageIndex = _ref.pageIndex,
viewport = _ref.viewport,
_ref$findController = _ref.findController,
- findController = _ref$findController === undefined ? null : _ref$findController,
+ findController = _ref$findController === void 0 ? null : _ref$findController,
_ref$enhanceTextSelec = _ref.enhanceTextSelection,
- enhanceTextSelection = _ref$enhanceTextSelec === undefined ? false : _ref$enhanceTextSelec;
+ enhanceTextSelection = _ref$enhanceTextSelec === void 0 ? false : _ref$enhanceTextSelec;
_classCallCheck(this, TextLayerBuilder);
@@ -10242,19 +11983,23 @@ var TextLayerBuilder = function () {
this.textLayerRenderTask = null;
this.enhanceTextSelection = enhanceTextSelection;
this._boundEvents = Object.create(null);
+
this._bindEvents();
+
this._bindMouse();
}
_createClass(TextLayerBuilder, [{
- key: '_finishRendering',
+ key: "_finishRendering",
value: function _finishRendering() {
this.renderingDone = true;
+
if (!this.enhanceTextSelection) {
var endOfContent = document.createElement('div');
endOfContent.className = 'endOfContent';
this.textLayerDiv.appendChild(endOfContent);
}
+
this.eventBus.dispatch('textlayerrendered', {
source: this,
pageNumber: this.pageNumber,
@@ -10262,7 +12007,7 @@ var TextLayerBuilder = function () {
});
}
}, {
- key: 'render',
+ key: "render",
value: function render() {
var _this = this;
@@ -10271,6 +12016,7 @@ var TextLayerBuilder = function () {
if (!(this.textContent || this.textContentStream) || this.renderingDone) {
return;
}
+
this.cancel();
this.textDivs = [];
var textLayerFrag = document.createDocumentFragment();
@@ -10286,12 +12032,14 @@ var TextLayerBuilder = function () {
});
this.textLayerRenderTask.promise.then(function () {
_this.textLayerDiv.appendChild(textLayerFrag);
+
_this._finishRendering();
+
_this._updateMatches();
}, function (reason) {});
}
}, {
- key: 'cancel',
+ key: "cancel",
value: function cancel() {
if (this.textLayerRenderTask) {
this.textLayerRenderTask.cancel();
@@ -10299,74 +12047,82 @@ var TextLayerBuilder = function () {
}
}
}, {
- key: 'setTextContentStream',
+ key: "setTextContentStream",
value: function setTextContentStream(readableStream) {
this.cancel();
this.textContentStream = readableStream;
}
}, {
- key: 'setTextContent',
+ key: "setTextContent",
value: function setTextContent(textContent) {
this.cancel();
this.textContent = textContent;
}
}, {
- key: '_convertMatches',
+ key: "_convertMatches",
value: function _convertMatches(matches, matchesLength) {
if (!matches) {
return [];
}
+
var findController = this.findController,
textContentItemsStr = this.textContentItemsStr;
-
var i = 0,
iIndex = 0;
var end = textContentItemsStr.length - 1;
var queryLen = findController.state.query.length;
var result = [];
+
for (var m = 0, mm = matches.length; m < mm; m++) {
var matchIdx = matches[m];
+
while (i !== end && matchIdx >= iIndex + textContentItemsStr[i].length) {
iIndex += textContentItemsStr[i].length;
i++;
}
+
if (i === textContentItemsStr.length) {
console.error('Could not find a matching mapping');
}
+
var match = {
begin: {
divIdx: i,
offset: matchIdx - iIndex
}
};
+
if (matchesLength) {
matchIdx += matchesLength[m];
} else {
matchIdx += queryLen;
}
+
while (i !== end && matchIdx > iIndex + textContentItemsStr[i].length) {
iIndex += textContentItemsStr[i].length;
i++;
}
+
match.end = {
divIdx: i,
offset: matchIdx - iIndex
};
result.push(match);
}
+
return result;
}
}, {
- key: '_renderMatches',
+ key: "_renderMatches",
value: function _renderMatches(matches) {
if (matches.length === 0) {
return;
}
+
var findController = this.findController,
pageIdx = this.pageIdx,
textContentItemsStr = this.textContentItemsStr,
textDivs = this.textDivs;
-
var isSelectedPage = pageIdx === findController.selected.pageIdx;
var selectedMatchIdx = findController.selected.matchIdx;
var highlightAll = findController.state.highlightAll;
@@ -10375,15 +12131,18 @@ var TextLayerBuilder = function () {
divIdx: -1,
offset: undefined
};
+
function beginText(begin, className) {
var divIdx = begin.divIdx;
textDivs[divIdx].textContent = '';
appendTextToDiv(divIdx, 0, begin.offset, className);
}
+
function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
var div = textDivs[divIdx];
var content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
var node = document.createTextNode(content);
+
if (className) {
var span = document.createElement('span');
span.className = className;
@@ -10391,85 +12150,103 @@ var TextLayerBuilder = function () {
div.appendChild(span);
return;
}
+
div.appendChild(node);
}
+
var i0 = selectedMatchIdx,
i1 = i0 + 1;
+
if (highlightAll) {
i0 = 0;
i1 = matches.length;
} else if (!isSelectedPage) {
return;
}
+
for (var i = i0; i < i1; i++) {
var match = matches[i];
var begin = match.begin;
var end = match.end;
var isSelected = isSelectedPage && i === selectedMatchIdx;
var highlightSuffix = isSelected ? ' selected' : '';
- if (findController.selected.matchIdx === i && findController.selected.pageIdx === pageIdx) {
- var spot = {
- top: MATCH_SCROLL_OFFSET_TOP,
- left: MATCH_SCROLL_OFFSET_LEFT
- };
- (0, _ui_utils.scrollIntoView)(textDivs[begin.divIdx], spot, true);
+
+ if (isSelected) {
+ findController.scrollMatchIntoView({
+ element: textDivs[begin.divIdx],
+ pageIndex: pageIdx,
+ matchIndex: selectedMatchIdx
+ });
}
+
if (!prevEnd || begin.divIdx !== prevEnd.divIdx) {
if (prevEnd !== null) {
appendTextToDiv(prevEnd.divIdx, prevEnd.offset, infinity.offset);
}
+
beginText(begin);
} else {
appendTextToDiv(prevEnd.divIdx, prevEnd.offset, begin.offset);
}
+
if (begin.divIdx === end.divIdx) {
appendTextToDiv(begin.divIdx, begin.offset, end.offset, 'highlight' + highlightSuffix);
} else {
appendTextToDiv(begin.divIdx, begin.offset, infinity.offset, 'highlight begin' + highlightSuffix);
+
for (var n0 = begin.divIdx + 1, n1 = end.divIdx; n0 < n1; n0++) {
textDivs[n0].className = 'highlight middle' + highlightSuffix;
}
+
beginText(end, 'highlight end' + highlightSuffix);
}
+
prevEnd = end;
}
+
if (prevEnd) {
appendTextToDiv(prevEnd.divIdx, prevEnd.offset, infinity.offset);
}
}
}, {
- key: '_updateMatches',
+ key: "_updateMatches",
value: function _updateMatches() {
if (!this.renderingDone) {
return;
}
+
var findController = this.findController,
matches = this.matches,
pageIdx = this.pageIdx,
textContentItemsStr = this.textContentItemsStr,
textDivs = this.textDivs;
-
var clearedUntilDivIdx = -1;
+
for (var i = 0, ii = matches.length; i < ii; i++) {
var match = matches[i];
var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
+
for (var n = begin, end = match.end.divIdx; n <= end; n++) {
var div = textDivs[n];
div.textContent = textContentItemsStr[n];
div.className = '';
}
+
clearedUntilDivIdx = match.end.divIdx + 1;
}
+
if (!findController || !findController.highlightMatches) {
return;
}
+
var pageMatches = findController.pageMatches[pageIdx] || null;
var pageMatchesLength = findController.pageMatchesLength[pageIdx] || null;
this.matches = this._convertMatches(pageMatches, pageMatchesLength);
+
this._renderMatches(this.matches);
}
}, {
- key: '_bindEvents',
+ key: "_bindEvents",
value: function _bindEvents() {
var _this2 = this;
@@ -10480,26 +12257,31 @@ var TextLayerBuilder = function () {
if (evt.pageNumber !== _this2.pageNumber) {
return;
}
+
if (_this2.textLayerRenderTask) {
console.error('TextLayerBuilder._bindEvents: `this.cancel()` should ' + 'have been called when the page was reset, or rendering cancelled.');
return;
}
+
for (var name in _boundEvents) {
eventBus.off(name.toLowerCase(), _boundEvents[name]);
delete _boundEvents[name];
}
};
+
_boundEvents.updateTextLayerMatches = function (evt) {
if (evt.pageIndex !== _this2.pageIdx && evt.pageIndex !== -1) {
return;
}
+
_this2._updateMatches();
};
+
eventBus.on('pagecancelled', _boundEvents.pageCancelled);
eventBus.on('updatetextlayermatches', _boundEvents.updateTextLayerMatches);
}
}, {
- key: '_bindMouse',
+ key: "_bindMouse",
value: function _bindMouse() {
var _this3 = this;
@@ -10508,23 +12290,30 @@ var TextLayerBuilder = function () {
div.addEventListener('mousedown', function (evt) {
if (_this3.enhanceTextSelection && _this3.textLayerRenderTask) {
_this3.textLayerRenderTask.expandTextDivs(true);
+
if (expandDivsTimer) {
clearTimeout(expandDivsTimer);
expandDivsTimer = null;
}
+
return;
}
+
var end = div.querySelector('.endOfContent');
+
if (!end) {
return;
}
+
var adjustTop = evt.target !== div;
adjustTop = adjustTop && window.getComputedStyle(end).getPropertyValue('-moz-user-select') !== 'none';
+
if (adjustTop) {
var divBounds = div.getBoundingClientRect();
var r = Math.max(0, (evt.pageY - divBounds.top) / divBounds.height);
end.style.top = (r * 100).toFixed(2) + '%';
}
+
end.classList.add('active');
});
div.addEventListener('mouseup', function () {
@@ -10533,14 +12322,18 @@ var TextLayerBuilder = function () {
if (_this3.textLayerRenderTask) {
_this3.textLayerRenderTask.expandTextDivs(false);
}
+
expandDivsTimer = null;
}, EXPAND_DIVS_TIMEOUT);
return;
}
+
var end = div.querySelector('.endOfContent');
+
if (!end) {
return;
}
+
end.style.top = '';
end.classList.remove('active');
});
@@ -10550,16 +12343,19 @@ var TextLayerBuilder = function () {
return TextLayerBuilder;
}();
-var DefaultTextLayerFactory = function () {
+exports.TextLayerBuilder = TextLayerBuilder;
+
+var DefaultTextLayerFactory =
+/*#__PURE__*/
+function () {
function DefaultTextLayerFactory() {
_classCallCheck(this, DefaultTextLayerFactory);
}
_createClass(DefaultTextLayerFactory, [{
- key: 'createTextLayerBuilder',
+ key: "createTextLayerBuilder",
value: function createTextLayerBuilder(textLayerDiv, pageIndex, viewport) {
var enhanceTextSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-
return new TextLayerBuilder({
textLayerDiv: textLayerDiv,
pageIndex: pageIndex,
@@ -10572,7 +12368,6 @@ var DefaultTextLayerFactory = function () {
return DefaultTextLayerFactory;
}();
-exports.TextLayerBuilder = TextLayerBuilder;
exports.DefaultTextLayerFactory = DefaultTextLayerFactory;
/***/ }),
@@ -10585,9 +12380,7 @@ exports.DefaultTextLayerFactory = DefaultTextLayerFactory;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.SecondaryToolbar = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.SecondaryToolbar = void 0;
var _base_viewer = __webpack_require__(29);
@@ -10599,7 +12392,13 @@ var _ui_utils = __webpack_require__(6);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-var SecondaryToolbar = function () {
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+var SecondaryToolbar =
+/*#__PURE__*/
+function () {
function SecondaryToolbar(options, mainContainer, eventBus) {
var _this = this;
@@ -10647,42 +12446,58 @@ var SecondaryToolbar = function () {
}, {
element: options.cursorSelectToolButton,
eventName: 'switchcursortool',
- eventDetails: { tool: _pdf_cursor_tools.CursorTool.SELECT },
+ eventDetails: {
+ tool: _pdf_cursor_tools.CursorTool.SELECT
+ },
close: true
}, {
element: options.cursorHandToolButton,
eventName: 'switchcursortool',
- eventDetails: { tool: _pdf_cursor_tools.CursorTool.HAND },
+ eventDetails: {
+ tool: _pdf_cursor_tools.CursorTool.HAND
+ },
close: true
}, {
element: options.scrollVerticalButton,
eventName: 'switchscrollmode',
- eventDetails: { mode: _base_viewer.ScrollMode.VERTICAL },
+ eventDetails: {
+ mode: _base_viewer.ScrollMode.VERTICAL
+ },
close: true
}, {
element: options.scrollHorizontalButton,
eventName: 'switchscrollmode',
- eventDetails: { mode: _base_viewer.ScrollMode.HORIZONTAL },
+ eventDetails: {
+ mode: _base_viewer.ScrollMode.HORIZONTAL
+ },
close: true
}, {
element: options.scrollWrappedButton,
eventName: 'switchscrollmode',
- eventDetails: { mode: _base_viewer.ScrollMode.WRAPPED },
+ eventDetails: {
+ mode: _base_viewer.ScrollMode.WRAPPED
+ },
close: true
}, {
element: options.spreadNoneButton,
eventName: 'switchspreadmode',
- eventDetails: { mode: _base_viewer.SpreadMode.NONE },
+ eventDetails: {
+ mode: _base_viewer.SpreadMode.NONE
+ },
close: true
}, {
element: options.spreadOddButton,
eventName: 'switchspreadmode',
- eventDetails: { mode: _base_viewer.SpreadMode.ODD },
+ eventDetails: {
+ mode: _base_viewer.SpreadMode.ODD
+ },
close: true
}, {
element: options.spreadEvenButton,
eventName: 'switchspreadmode',
- eventDetails: { mode: _base_viewer.SpreadMode.EVEN },
+ eventDetails: {
+ mode: _base_viewer.SpreadMode.EVEN
+ },
close: true
}, {
element: options.documentPropertiesButton,
@@ -10701,10 +12516,15 @@ var SecondaryToolbar = function () {
this.containerHeight = null;
this.previousContainerHeight = null;
this.reset();
+
this._bindClickListeners();
+
this._bindCursorToolsListener(options);
+
this._bindScrollModeListener(options);
+
this._bindSpreadModeListener(options);
+
this.eventBus.on('resize', this._setMaxHeight.bind(this));
this.eventBus.on('baseviewerinit', function (evt) {
if (evt.source instanceof _pdf_single_page_viewer.PDFSinglePageViewer) {
@@ -10716,27 +12536,33 @@ var SecondaryToolbar = function () {
}
_createClass(SecondaryToolbar, [{
- key: 'setPageNumber',
+ key: "setPageNumber",
value: function setPageNumber(pageNumber) {
this.pageNumber = pageNumber;
+
this._updateUIState();
}
}, {
- key: 'setPagesCount',
+ key: "setPagesCount",
value: function setPagesCount(pagesCount) {
this.pagesCount = pagesCount;
+
this._updateUIState();
}
}, {
- key: 'reset',
+ key: "reset",
value: function reset() {
this.pageNumber = 0;
this.pagesCount = 0;
+
this._updateUIState();
- this.eventBus.dispatch('secondarytoolbarreset', { source: this });
+
+ this.eventBus.dispatch('secondarytoolbarreset', {
+ source: this
+ });
}
}, {
- key: '_updateUIState',
+ key: "_updateUIState",
value: function _updateUIState() {
this.items.firstPage.disabled = this.pageNumber <= 1;
this.items.lastPage.disabled = this.pageNumber >= this.pagesCount;
@@ -10744,27 +12570,31 @@ var SecondaryToolbar = function () {
this.items.pageRotateCcw.disabled = this.pagesCount === 0;
}
}, {
- key: '_bindClickListeners',
+ key: "_bindClickListeners",
value: function _bindClickListeners() {
var _this2 = this;
this.toggleButton.addEventListener('click', this.toggle.bind(this));
var _loop = function _loop(button) {
- var _buttons$button = _this2.buttons[button],
- element = _buttons$button.element,
- eventName = _buttons$button.eventName,
- close = _buttons$button.close,
- eventDetails = _buttons$button.eventDetails;
-
+ var _this2$buttons$button = _this2.buttons[button],
+ element = _this2$buttons$button.element,
+ eventName = _this2$buttons$button.eventName,
+ close = _this2$buttons$button.close,
+ eventDetails = _this2$buttons$button.eventDetails;
element.addEventListener('click', function (evt) {
if (eventName !== null) {
- var details = { source: _this2 };
+ var details = {
+ source: _this2
+ };
+
for (var property in eventDetails) {
details[property] = eventDetails[property];
}
+
_this2.eventBus.dispatch(eventName, details);
}
+
if (close) {
_this2.close();
}
@@ -10776,15 +12606,17 @@ var SecondaryToolbar = function () {
}
}
}, {
- key: '_bindCursorToolsListener',
+ key: "_bindCursorToolsListener",
value: function _bindCursorToolsListener(buttons) {
this.eventBus.on('cursortoolchanged', function (evt) {
buttons.cursorSelectToolButton.classList.remove('toggled');
buttons.cursorHandToolButton.classList.remove('toggled');
+
switch (evt.tool) {
case _pdf_cursor_tools.CursorTool.SELECT:
buttons.cursorSelectToolButton.classList.add('toggled');
break;
+
case _pdf_cursor_tools.CursorTool.HAND:
buttons.cursorHandToolButton.classList.add('toggled');
break;
@@ -10792,7 +12624,7 @@ var SecondaryToolbar = function () {
});
}
}, {
- key: '_bindScrollModeListener',
+ key: "_bindScrollModeListener",
value: function _bindScrollModeListener(buttons) {
var _this3 = this;
@@ -10800,31 +12632,38 @@ var SecondaryToolbar = function () {
buttons.scrollVerticalButton.classList.remove('toggled');
buttons.scrollHorizontalButton.classList.remove('toggled');
buttons.scrollWrappedButton.classList.remove('toggled');
+
switch (evt.mode) {
case _base_viewer.ScrollMode.VERTICAL:
buttons.scrollVerticalButton.classList.add('toggled');
break;
+
case _base_viewer.ScrollMode.HORIZONTAL:
buttons.scrollHorizontalButton.classList.add('toggled');
break;
+
case _base_viewer.ScrollMode.WRAPPED:
buttons.scrollWrappedButton.classList.add('toggled');
break;
}
+
var isScrollModeHorizontal = evt.mode === _base_viewer.ScrollMode.HORIZONTAL;
buttons.spreadNoneButton.disabled = isScrollModeHorizontal;
buttons.spreadOddButton.disabled = isScrollModeHorizontal;
buttons.spreadEvenButton.disabled = isScrollModeHorizontal;
}
+
this.eventBus.on('scrollmodechanged', scrollModeChanged);
this.eventBus.on('secondarytoolbarreset', function (evt) {
if (evt.source === _this3) {
- scrollModeChanged({ mode: _base_viewer.ScrollMode.VERTICAL });
+ scrollModeChanged({
+ mode: _base_viewer.ScrollMode.VERTICAL
+ });
}
});
}
}, {
- key: '_bindSpreadModeListener',
+ key: "_bindSpreadModeListener",
value: function _bindSpreadModeListener(buttons) {
var _this4 = this;
@@ -10832,48 +12671,58 @@ var SecondaryToolbar = function () {
buttons.spreadNoneButton.classList.remove('toggled');
buttons.spreadOddButton.classList.remove('toggled');
buttons.spreadEvenButton.classList.remove('toggled');
+
switch (evt.mode) {
case _base_viewer.SpreadMode.NONE:
buttons.spreadNoneButton.classList.add('toggled');
break;
+
case _base_viewer.SpreadMode.ODD:
buttons.spreadOddButton.classList.add('toggled');
break;
+
case _base_viewer.SpreadMode.EVEN:
buttons.spreadEvenButton.classList.add('toggled');
break;
}
}
+
this.eventBus.on('spreadmodechanged', spreadModeChanged);
this.eventBus.on('secondarytoolbarreset', function (evt) {
if (evt.source === _this4) {
- spreadModeChanged({ mode: _base_viewer.SpreadMode.NONE });
+ spreadModeChanged({
+ mode: _base_viewer.SpreadMode.NONE
+ });
}
});
}
}, {
- key: 'open',
+ key: "open",
value: function open() {
if (this.opened) {
return;
}
+
this.opened = true;
+
this._setMaxHeight();
+
this.toggleButton.classList.add('toggled');
this.toolbar.classList.remove('hidden');
}
}, {
- key: 'close',
+ key: "close",
value: function close() {
if (!this.opened) {
return;
}
+
this.opened = false;
this.toolbar.classList.add('hidden');
this.toggleButton.classList.remove('toggled');
}
}, {
- key: 'toggle',
+ key: "toggle",
value: function toggle() {
if (this.opened) {
this.close();
@@ -10882,20 +12731,23 @@ var SecondaryToolbar = function () {
}
}
}, {
- key: '_setMaxHeight',
+ key: "_setMaxHeight",
value: function _setMaxHeight() {
if (!this.opened) {
return;
}
+
this.containerHeight = this.mainContainer.clientHeight;
+
if (this.containerHeight === this.previousContainerHeight) {
return;
}
+
this.toolbarButtonContainer.setAttribute('style', 'max-height: ' + (this.containerHeight - _ui_utils.SCROLLBAR_PADDING) + 'px;');
this.previousContainerHeight = this.containerHeight;
}
}, {
- key: 'isOpen',
+ key: "isOpen",
get: function get() {
return this.opened;
}
@@ -10916,11 +12768,7 @@ exports.SecondaryToolbar = SecondaryToolbar;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFSinglePageViewer = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+exports.PDFSinglePageViewer = void 0;
var _base_viewer = __webpack_require__(29);
@@ -10928,133 +12776,175 @@ var _ui_utils = __webpack_require__(6);
var _pdfjsLib = __webpack_require__(7);
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-var PDFSinglePageViewer = function (_BaseViewer) {
+function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
+
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+var PDFSinglePageViewer =
+/*#__PURE__*/
+function (_BaseViewer) {
_inherits(PDFSinglePageViewer, _BaseViewer);
function PDFSinglePageViewer(options) {
+ var _this;
+
_classCallCheck(this, PDFSinglePageViewer);
- var _this = _possibleConstructorReturn(this, (PDFSinglePageViewer.__proto__ || Object.getPrototypeOf(PDFSinglePageViewer)).call(this, options));
+ _this = _possibleConstructorReturn(this, _getPrototypeOf(PDFSinglePageViewer).call(this, options));
_this.eventBus.on('pagesinit', function (evt) {
_this._ensurePageViewVisible();
});
+
return _this;
}
_createClass(PDFSinglePageViewer, [{
- key: '_resetView',
+ key: "_resetView",
value: function _resetView() {
- _get(PDFSinglePageViewer.prototype.__proto__ || Object.getPrototypeOf(PDFSinglePageViewer.prototype), '_resetView', this).call(this);
+ _get(_getPrototypeOf(PDFSinglePageViewer.prototype), "_resetView", this).call(this);
+
this._previousPageNumber = 1;
this._shadowViewer = document.createDocumentFragment();
}
}, {
- key: '_ensurePageViewVisible',
+ key: "_ensurePageViewVisible",
value: function _ensurePageViewVisible() {
var pageView = this._pages[this._currentPageNumber - 1];
var previousPageView = this._pages[this._previousPageNumber - 1];
var viewerNodes = this.viewer.childNodes;
+
switch (viewerNodes.length) {
case 0:
this.viewer.appendChild(pageView.div);
break;
+
case 1:
if (viewerNodes[0] !== previousPageView.div) {
throw new Error('_ensurePageViewVisible: Unexpected previously visible page.');
}
+
if (pageView === previousPageView) {
break;
}
+
this._shadowViewer.appendChild(previousPageView.div);
+
this.viewer.appendChild(pageView.div);
this.container.scrollTop = 0;
break;
+
default:
throw new Error('_ensurePageViewVisible: Only one page should be visible at a time.');
}
+
this._previousPageNumber = this._currentPageNumber;
}
}, {
- key: '_scrollUpdate',
+ key: "_scrollUpdate",
value: function _scrollUpdate() {
if (this._updateScrollDown) {
this._updateScrollDown();
}
- _get(PDFSinglePageViewer.prototype.__proto__ || Object.getPrototypeOf(PDFSinglePageViewer.prototype), '_scrollUpdate', this).call(this);
+
+ _get(_getPrototypeOf(PDFSinglePageViewer.prototype), "_scrollUpdate", this).call(this);
}
}, {
- key: '_scrollIntoView',
+ key: "_scrollIntoView",
value: function _scrollIntoView(_ref) {
var _this2 = this;
var pageDiv = _ref.pageDiv,
_ref$pageSpot = _ref.pageSpot,
- pageSpot = _ref$pageSpot === undefined ? null : _ref$pageSpot,
+ pageSpot = _ref$pageSpot === void 0 ? null : _ref$pageSpot,
_ref$pageNumber = _ref.pageNumber,
- pageNumber = _ref$pageNumber === undefined ? null : _ref$pageNumber;
+ pageNumber = _ref$pageNumber === void 0 ? null : _ref$pageNumber;
if (pageNumber) {
this._setCurrentPageNumber(pageNumber);
}
+
var scrolledDown = this._currentPageNumber >= this._previousPageNumber;
var previousLocation = this._location;
+
this._ensurePageViewVisible();
+
(0, _ui_utils.scrollIntoView)(pageDiv, pageSpot);
+
this._updateScrollDown = function () {
_this2.scroll.down = scrolledDown;
delete _this2._updateScrollDown;
};
+
setTimeout(function () {
if (_this2._location === previousLocation) {
if (_this2._updateScrollDown) {
_this2._updateScrollDown();
}
+
_this2.update();
}
}, 0);
}
}, {
- key: '_getVisiblePages',
+ key: "_getVisiblePages",
value: function _getVisiblePages() {
return this._getCurrentVisiblePage();
}
}, {
- key: 'update',
+ key: "update",
value: function update() {
var visible = this._getVisiblePages();
+
var visiblePages = visible.views,
numVisiblePages = visiblePages.length;
+
if (numVisiblePages === 0) {
return;
}
+
this._resizeBuffer(numVisiblePages);
+
this.renderingQueue.renderHighestPriority(visible);
+
this._updateLocation(visible.first);
+
this.eventBus.dispatch('updateviewarea', {
source: this,
location: this._location
});
}
}, {
- key: '_updateScrollMode',
+ key: "_updateScrollMode",
value: function _updateScrollMode() {}
}, {
- key: '_updateSpreadMode',
+ key: "_updateSpreadMode",
value: function _updateSpreadMode() {}
}, {
- key: '_setDocumentViewerElement',
+ key: "_setDocumentViewerElement",
get: function get() {
return (0, _pdfjsLib.shadow)(this, '_setDocumentViewerElement', this._shadowViewer);
}
}, {
- key: '_isScrollModeHorizontal',
+ key: "_isScrollModeHorizontal",
get: function get() {
return (0, _pdfjsLib.shadow)(this, '_isScrollModeHorizontal', false);
}
@@ -11075,19 +12965,23 @@ exports.PDFSinglePageViewer = PDFSinglePageViewer;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.Toolbar = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.Toolbar = void 0;
var _ui_utils = __webpack_require__(6);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var PAGE_NUMBER_LOADING_INDICATOR = 'visiblePageIsLoading';
var SCALE_SELECT_CONTAINER_PADDING = 8;
var SCALE_SELECT_PADDING = 22;
-var Toolbar = function () {
+var Toolbar =
+/*#__PURE__*/
+function () {
function Toolbar(options, eventBus) {
var l10n = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _ui_utils.NullL10n;
@@ -11099,32 +12993,36 @@ var Toolbar = function () {
this.items = options;
this._wasLocalized = false;
this.reset();
+
this._bindListeners();
}
_createClass(Toolbar, [{
- key: 'setPageNumber',
+ key: "setPageNumber",
value: function setPageNumber(pageNumber, pageLabel) {
this.pageNumber = pageNumber;
this.pageLabel = pageLabel;
+
this._updateUIState(false);
}
}, {
- key: 'setPagesCount',
+ key: "setPagesCount",
value: function setPagesCount(pagesCount, hasPageLabels) {
this.pagesCount = pagesCount;
this.hasPageLabels = hasPageLabels;
+
this._updateUIState(true);
}
}, {
- key: 'setPageScale',
+ key: "setPageScale",
value: function setPageScale(pageScaleValue, pageScale) {
this.pageScaleValue = (pageScaleValue || pageScale).toString();
this.pageScale = pageScale;
+
this._updateUIState(false);
}
}, {
- key: 'reset',
+ key: "reset",
value: function reset() {
this.pageNumber = 0;
this.pageLabel = null;
@@ -11132,28 +13030,36 @@ var Toolbar = function () {
this.pagesCount = 0;
this.pageScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
this.pageScale = _ui_utils.DEFAULT_SCALE;
+
this._updateUIState(true);
}
}, {
- key: '_bindListeners',
+ key: "_bindListeners",
value: function _bindListeners() {
var _this = this;
var eventBus = this.eventBus,
items = this.items;
-
var self = this;
items.previous.addEventListener('click', function () {
- eventBus.dispatch('previouspage', { source: self });
+ eventBus.dispatch('previouspage', {
+ source: self
+ });
});
items.next.addEventListener('click', function () {
- eventBus.dispatch('nextpage', { source: self });
+ eventBus.dispatch('nextpage', {
+ source: self
+ });
});
items.zoomIn.addEventListener('click', function () {
- eventBus.dispatch('zoomin', { source: self });
+ eventBus.dispatch('zoomin', {
+ source: self
+ });
});
items.zoomOut.addEventListener('click', function () {
- eventBus.dispatch('zoomout', { source: self });
+ eventBus.dispatch('zoomout', {
+ source: self
+ });
});
items.pageNumber.addEventListener('click', function () {
this.select();
@@ -11168,22 +13074,31 @@ var Toolbar = function () {
if (this.value === 'custom') {
return;
}
+
eventBus.dispatch('scalechanged', {
source: self,
value: this.value
});
});
items.presentationModeButton.addEventListener('click', function () {
- eventBus.dispatch('presentationmode', { source: self });
+ eventBus.dispatch('presentationmode', {
+ source: self
+ });
});
items.openFile.addEventListener('click', function () {
- eventBus.dispatch('openfile', { source: self });
+ eventBus.dispatch('openfile', {
+ source: self
+ });
});
items.print.addEventListener('click', function () {
- eventBus.dispatch('print', { source: self });
+ eventBus.dispatch('print', {
+ source: self
+ });
});
items.download.addEventListener('click', function () {
- eventBus.dispatch('download', { source: self });
+ eventBus.dispatch('download', {
+ source: self
+ });
});
items.scaleSelect.oncontextmenu = _ui_utils.noContextMenuHandler;
eventBus.on('localized', function () {
@@ -11191,20 +13106,23 @@ var Toolbar = function () {
});
}
}, {
- key: '_localized',
+ key: "_localized",
value: function _localized() {
this._wasLocalized = true;
+
this._adjustScaleWidth();
+
this._updateUIState(true);
}
}, {
- key: '_updateUIState',
+ key: "_updateUIState",
value: function _updateUIState() {
var resetNumPages = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
if (!this._wasLocalized) {
return;
}
+
var pageNumber = this.pageNumber,
pagesCount = this.pagesCount,
pageScaleValue = this.pageScaleValue,
@@ -11216,12 +13134,16 @@ var Toolbar = function () {
items.pageNumber.type = 'text';
} else {
items.pageNumber.type = 'number';
- this.l10n.get('of_pages', { pagesCount: pagesCount }, 'of {{pagesCount}}').then(function (msg) {
+ this.l10n.get('of_pages', {
+ pagesCount: pagesCount
+ }, 'of {{pagesCount}}').then(function (msg) {
items.numPages.textContent = msg;
});
}
+
items.pageNumber.max = pagesCount;
}
+
if (this.hasPageLabels) {
items.pageNumber.value = this.pageLabel;
this.l10n.get('page_of_pages', {
@@ -11233,23 +13155,30 @@ var Toolbar = function () {
} else {
items.pageNumber.value = pageNumber;
}
+
items.previous.disabled = pageNumber <= 1;
items.next.disabled = pageNumber >= pagesCount;
items.zoomOut.disabled = pageScale <= _ui_utils.MIN_SCALE;
items.zoomIn.disabled = pageScale >= _ui_utils.MAX_SCALE;
var customScale = Math.round(pageScale * 10000) / 100;
- this.l10n.get('page_scale_percent', { scale: customScale }, '{{scale}}%').then(function (msg) {
+ this.l10n.get('page_scale_percent', {
+ scale: customScale
+ }, '{{scale}}%').then(function (msg) {
var options = items.scaleSelect.options;
var predefinedValueFound = false;
+
for (var i = 0, ii = options.length; i < ii; i++) {
var option = options[i];
+
if (option.value !== pageScaleValue) {
option.selected = false;
continue;
}
+
option.selected = true;
predefinedValueFound = true;
}
+
if (!predefinedValueFound) {
items.customScaleOption.textContent = msg;
items.customScaleOption.selected = true;
@@ -11257,22 +13186,23 @@ var Toolbar = function () {
});
}
}, {
- key: 'updateLoadingIndicatorState',
+ key: "updateLoadingIndicatorState",
value: function updateLoadingIndicatorState() {
var loading = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
var pageNumberInput = this.items.pageNumber;
pageNumberInput.classList.toggle(PAGE_NUMBER_LOADING_INDICATOR, loading);
}
}, {
- key: '_adjustScaleWidth',
+ key: "_adjustScaleWidth",
value: function _adjustScaleWidth() {
var container = this.items.scaleSelectContainer;
var select = this.items.scaleSelect;
+
_ui_utils.animationStarted.then(function () {
if (container.clientWidth === 0) {
container.setAttribute('style', 'display: inherit;');
}
+
if (container.clientWidth > 0) {
select.setAttribute('style', 'min-width: inherit;');
var width = select.clientWidth + SCALE_SELECT_CONTAINER_PADDING;
@@ -11298,23 +13228,27 @@ exports.Toolbar = Toolbar;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.ViewHistory = undefined;
+exports.ViewHistory = void 0;
-var _regenerator = __webpack_require__(2);
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var DEFAULT_VIEW_HISTORY_CACHE_SIZE = 20;
-var ViewHistory = function () {
+var ViewHistory =
+/*#__PURE__*/
+function () {
function ViewHistory(fingerprint) {
var _this = this;
@@ -11326,6 +13260,7 @@ var ViewHistory = function () {
this.cacheSize = cacheSize;
this._initializedPromise = this._readFromStorage().then(function (databaseStr) {
var database = JSON.parse(databaseStr || '{}');
+
if (!('files' in database)) {
database.files = [];
} else {
@@ -11333,37 +13268,45 @@ var ViewHistory = function () {
database.files.shift();
}
}
+
var index = -1;
+
for (var i = 0, length = database.files.length; i < length; i++) {
var branch = database.files[i];
+
if (branch.fingerprint === _this.fingerprint) {
index = i;
break;
}
}
+
if (index === -1) {
- index = database.files.push({ fingerprint: _this.fingerprint }) - 1;
+ index = database.files.push({
+ fingerprint: _this.fingerprint
+ }) - 1;
}
+
_this.file = database.files[index];
_this.database = database;
});
}
_createClass(ViewHistory, [{
- key: '_writeToStorage',
+ key: "_writeToStorage",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+ var _writeToStorage2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
var databaseStr;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
databaseStr = JSON.stringify(this.database);
-
localStorage.setItem('pdfjs.history', databaseStr);
case 2:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -11371,23 +13314,25 @@ var ViewHistory = function () {
}));
function _writeToStorage() {
- return _ref.apply(this, arguments);
+ return _writeToStorage2.apply(this, arguments);
}
return _writeToStorage;
}()
}, {
- key: '_readFromStorage',
+ key: "_readFromStorage",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _readFromStorage2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
- return _context2.abrupt('return', localStorage.getItem('pdfjs.history'));
+ return _context2.abrupt("return", localStorage.getItem('pdfjs.history'));
case 1:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -11395,16 +13340,18 @@ var ViewHistory = function () {
}));
function _readFromStorage() {
- return _ref2.apply(this, arguments);
+ return _readFromStorage2.apply(this, arguments);
}
return _readFromStorage;
}()
}, {
- key: 'set',
+ key: "set",
value: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3(name, val) {
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ var _set = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3(name, val) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
@@ -11413,28 +13360,30 @@ var ViewHistory = function () {
case 2:
this.file[name] = val;
- return _context3.abrupt('return', this._writeToStorage());
+ return _context3.abrupt("return", this._writeToStorage());
case 4:
- case 'end':
+ case "end":
return _context3.stop();
}
}
}, _callee3, this);
}));
- function set(_x2, _x3) {
- return _ref3.apply(this, arguments);
+ function set(_x, _x2) {
+ return _set.apply(this, arguments);
}
return set;
}()
}, {
- key: 'setMultiple',
+ key: "setMultiple",
value: function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee4(properties) {
+ var _setMultiple = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee4(properties) {
var name;
- return _regenerator2.default.wrap(function _callee4$(_context4) {
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
@@ -11445,28 +13394,31 @@ var ViewHistory = function () {
for (name in properties) {
this.file[name] = properties[name];
}
- return _context4.abrupt('return', this._writeToStorage());
+
+ return _context4.abrupt("return", this._writeToStorage());
case 4:
- case 'end':
+ case "end":
return _context4.stop();
}
}
}, _callee4, this);
}));
- function setMultiple(_x4) {
- return _ref4.apply(this, arguments);
+ function setMultiple(_x3) {
+ return _setMultiple.apply(this, arguments);
}
return setMultiple;
}()
}, {
- key: 'get',
+ key: "get",
value: function () {
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee5(name, defaultValue) {
+ var _get = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee5(name, defaultValue) {
var val;
- return _regenerator2.default.wrap(function _callee5$(_context5) {
+ return _regenerator.default.wrap(function _callee5$(_context5) {
while (1) {
switch (_context5.prev = _context5.next) {
case 0:
@@ -11475,28 +13427,30 @@ var ViewHistory = function () {
case 2:
val = this.file[name];
- return _context5.abrupt('return', val !== undefined ? val : defaultValue);
+ return _context5.abrupt("return", val !== undefined ? val : defaultValue);
case 4:
- case 'end':
+ case "end":
return _context5.stop();
}
}
}, _callee5, this);
}));
- function get(_x5, _x6) {
- return _ref5.apply(this, arguments);
+ function get(_x4, _x5) {
+ return _get.apply(this, arguments);
}
return get;
}()
}, {
- key: 'getMultiple',
+ key: "getMultiple",
value: function () {
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee6(properties) {
+ var _getMultiple = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee6(properties) {
var values, name, val;
- return _regenerator2.default.wrap(function _callee6$(_context6) {
+ return _regenerator.default.wrap(function _callee6$(_context6) {
while (1) {
switch (_context6.prev = _context6.next) {
case 0:
@@ -11508,21 +13462,21 @@ var ViewHistory = function () {
for (name in properties) {
val = this.file[name];
-
values[name] = val !== undefined ? val : properties[name];
}
- return _context6.abrupt('return', values);
+
+ return _context6.abrupt("return", values);
case 5:
- case 'end':
+ case "end":
return _context6.stop();
}
}
}, _callee6, this);
}));
- function getMultiple(_x7) {
- return _ref6.apply(this, arguments);
+ function getMultiple(_x6) {
+ return _getMultiple.apply(this, arguments);
}
return getMultiple;
@@ -11544,13 +13498,9 @@ exports.ViewHistory = ViewHistory;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.GenericCom = undefined;
-
-var _regenerator = __webpack_require__(2);
+exports.GenericCom = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
var _app = __webpack_require__(1);
@@ -11562,38 +13512,57 @@ var _genericl10n = __webpack_require__(40);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
;
var GenericCom = {};
+exports.GenericCom = GenericCom;
-var GenericPreferences = function (_BasePreferences) {
+var GenericPreferences =
+/*#__PURE__*/
+function (_BasePreferences) {
_inherits(GenericPreferences, _BasePreferences);
function GenericPreferences() {
_classCallCheck(this, GenericPreferences);
- return _possibleConstructorReturn(this, (GenericPreferences.__proto__ || Object.getPrototypeOf(GenericPreferences)).apply(this, arguments));
+ return _possibleConstructorReturn(this, _getPrototypeOf(GenericPreferences).apply(this, arguments));
}
_createClass(GenericPreferences, [{
- key: '_writeToStorage',
+ key: "_writeToStorage",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(prefObj) {
- return _regenerator2.default.wrap(function _callee$(_context) {
+ var _writeToStorage2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(prefObj) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
localStorage.setItem('pdfjs.preferences', JSON.stringify(prefObj));
case 1:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -11601,23 +13570,25 @@ var GenericPreferences = function (_BasePreferences) {
}));
function _writeToStorage(_x) {
- return _ref.apply(this, arguments);
+ return _writeToStorage2.apply(this, arguments);
}
return _writeToStorage;
}()
}, {
- key: '_readFromStorage',
+ key: "_readFromStorage",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2(prefObj) {
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _readFromStorage2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2(prefObj) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
- return _context2.abrupt('return', JSON.parse(localStorage.getItem('pdfjs.preferences')));
+ return _context2.abrupt("return", JSON.parse(localStorage.getItem('pdfjs.preferences')));
case 1:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -11625,7 +13596,7 @@ var GenericPreferences = function (_BasePreferences) {
}));
function _readFromStorage(_x2) {
- return _ref2.apply(this, arguments);
+ return _readFromStorage2.apply(this, arguments);
}
return _readFromStorage;
@@ -11636,20 +13607,22 @@ var GenericPreferences = function (_BasePreferences) {
}(_preferences.BasePreferences);
var GenericExternalServices = Object.create(_app.DefaultExternalServices);
+
GenericExternalServices.createDownloadManager = function (options) {
return new _download_manager.DownloadManager(options);
};
+
GenericExternalServices.createPreferences = function () {
return new GenericPreferences();
};
-GenericExternalServices.createL10n = function (_ref3) {
- var _ref3$locale = _ref3.locale,
- locale = _ref3$locale === undefined ? 'en-US' : _ref3$locale;
+GenericExternalServices.createL10n = function (_ref) {
+ var _ref$locale = _ref.locale,
+ locale = _ref$locale === void 0 ? 'en-US' : _ref$locale;
return new _genericl10n.GenericL10n(locale);
};
+
_app.PDFViewerApplication.externalServices = GenericExternalServices;
-exports.GenericCom = GenericCom;
/***/ }),
/* 38 */
@@ -11661,23 +13634,26 @@ exports.GenericCom = GenericCom;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.BasePreferences = undefined;
-
-var _regenerator = __webpack_require__(2);
+exports.BasePreferences = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
-var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var defaultPreferences = null;
+
function getDefaultPreferences() {
if (!defaultPreferences) {
defaultPreferences = Promise.resolve({
@@ -11704,10 +13680,13 @@ function getDefaultPreferences() {
"spreadModeOnLoad": 0
});
}
+
return defaultPreferences;
}
-var BasePreferences = function () {
+var BasePreferences =
+/*#__PURE__*/
+function () {
function BasePreferences() {
var _this = this;
@@ -11716,6 +13695,7 @@ var BasePreferences = function () {
if (this.constructor === BasePreferences) {
throw new Error('Cannot initialize BasePreferences.');
}
+
this.prefs = null;
this._initializedPromise = getDefaultPreferences().then(function (defaults) {
Object.defineProperty(_this, 'defaults', {
@@ -11730,12 +13710,15 @@ var BasePreferences = function () {
if (!prefs) {
return;
}
+
for (var name in prefs) {
var defaultValue = _this.defaults[name],
prefValue = prefs[name];
- if (defaultValue === undefined || (typeof prefValue === "undefined" ? "undefined" : _typeof(prefValue)) !== (typeof defaultValue === "undefined" ? "undefined" : _typeof(defaultValue))) {
+
+ if (defaultValue === undefined || _typeof(prefValue) !== _typeof(defaultValue)) {
continue;
}
+
_this.prefs[name] = prefValue;
}
});
@@ -11744,8 +13727,10 @@ var BasePreferences = function () {
_createClass(BasePreferences, [{
key: "_writeToStorage",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee(prefObj) {
- return _regenerator2.default.wrap(function _callee$(_context) {
+ var _writeToStorage2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee(prefObj) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -11760,7 +13745,7 @@ var BasePreferences = function () {
}));
function _writeToStorage(_x) {
- return _ref.apply(this, arguments);
+ return _writeToStorage2.apply(this, arguments);
}
return _writeToStorage;
@@ -11768,8 +13753,10 @@ var BasePreferences = function () {
}, {
key: "_readFromStorage",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2(prefObj) {
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ var _readFromStorage2 = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2(prefObj) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -11784,7 +13771,7 @@ var BasePreferences = function () {
}));
function _readFromStorage(_x2) {
- return _ref2.apply(this, arguments);
+ return _readFromStorage2.apply(this, arguments);
}
return _readFromStorage;
@@ -11792,8 +13779,10 @@ var BasePreferences = function () {
}, {
key: "reset",
value: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ var _reset = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3() {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
@@ -11813,7 +13802,7 @@ var BasePreferences = function () {
}));
function reset() {
- return _ref3.apply(this, arguments);
+ return _reset.apply(this, arguments);
}
return reset;
@@ -11821,9 +13810,11 @@ var BasePreferences = function () {
}, {
key: "set",
value: function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee4(name, value) {
+ var _set = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee4(name, value) {
var defaultValue, valueType, defaultType;
- return _regenerator2.default.wrap(function _callee4$(_context4) {
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
@@ -11838,7 +13829,7 @@ var BasePreferences = function () {
break;
}
- throw new Error("Set preference: \"" + name + "\" is undefined.");
+ throw new Error("Set preference: \"".concat(name, "\" is undefined."));
case 7:
if (!(value === undefined)) {
@@ -11849,8 +13840,8 @@ var BasePreferences = function () {
throw new Error('Set preference: no value is specified.');
case 9:
- valueType = typeof value === "undefined" ? "undefined" : _typeof(value);
- defaultType = typeof defaultValue === "undefined" ? "undefined" : _typeof(defaultValue);
+ valueType = _typeof(value);
+ defaultType = _typeof(defaultValue);
if (!(valueType !== defaultType)) {
_context4.next = 19;
@@ -11867,7 +13858,7 @@ var BasePreferences = function () {
break;
case 16:
- throw new Error("Set preference: \"" + value + "\" is a " + valueType + ", " + ("expected a " + defaultType + "."));
+ throw new Error("Set preference: \"".concat(value, "\" is a ").concat(valueType, ", ") + "expected a ".concat(defaultType, "."));
case 17:
_context4.next = 21;
@@ -11879,7 +13870,7 @@ var BasePreferences = function () {
break;
}
- throw new Error("Set preference: \"" + value + "\" must be an integer.");
+ throw new Error("Set preference: \"".concat(value, "\" must be an integer."));
case 21:
this.prefs[name] = value;
@@ -11894,7 +13885,7 @@ var BasePreferences = function () {
}));
function set(_x3, _x4) {
- return _ref4.apply(this, arguments);
+ return _set.apply(this, arguments);
}
return set;
@@ -11902,9 +13893,11 @@ var BasePreferences = function () {
}, {
key: "get",
value: function () {
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee5(name) {
+ var _get = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee5(name) {
var defaultValue, prefValue;
- return _regenerator2.default.wrap(function _callee5$(_context5) {
+ return _regenerator.default.wrap(function _callee5$(_context5) {
while (1) {
switch (_context5.prev = _context5.next) {
case 0:
@@ -11919,7 +13912,7 @@ var BasePreferences = function () {
break;
}
- throw new Error("Get preference: \"" + name + "\" is undefined.");
+ throw new Error("Get preference: \"".concat(name, "\" is undefined."));
case 7:
prefValue = this.prefs[name];
@@ -11943,7 +13936,7 @@ var BasePreferences = function () {
}));
function get(_x5) {
- return _ref5.apply(this, arguments);
+ return _get.apply(this, arguments);
}
return get;
@@ -11951,8 +13944,10 @@ var BasePreferences = function () {
}, {
key: "getAll",
value: function () {
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
- return _regenerator2.default.wrap(function _callee6$(_context6) {
+ var _getAll = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee6() {
+ return _regenerator.default.wrap(function _callee6$(_context6) {
while (1) {
switch (_context6.prev = _context6.next) {
case 0:
@@ -11971,7 +13966,7 @@ var BasePreferences = function () {
}));
function getAll() {
- return _ref6.apply(this, arguments);
+ return _getAll.apply(this, arguments);
}
return getAll;
@@ -11993,35 +13988,44 @@ exports.BasePreferences = BasePreferences;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.DownloadManager = undefined;
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.DownloadManager = void 0;
var _pdfjsLib = __webpack_require__(7);
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
;
var DISABLE_CREATE_OBJECT_URL = _pdfjsLib.apiCompatibilityParams.disableCreateObjectURL || false;
+
function _download(blobUrl, filename) {
var a = document.createElement('a');
+
if (!a.click) {
throw new Error('DownloadManager: "a.click()" is not supported.');
}
+
a.href = blobUrl;
a.target = '_parent';
+
if ('download' in a) {
a.download = filename;
}
+
(document.body || document.documentElement).appendChild(a);
a.click();
a.remove();
}
-var DownloadManager = function () {
+var DownloadManager =
+/*#__PURE__*/
+function () {
function DownloadManager(_ref) {
var _ref$disableCreateObj = _ref.disableCreateObjectURL,
- disableCreateObjectURL = _ref$disableCreateObj === undefined ? DISABLE_CREATE_OBJECT_URL : _ref$disableCreateObj;
+ disableCreateObjectURL = _ref$disableCreateObj === void 0 ? DISABLE_CREATE_OBJECT_URL : _ref$disableCreateObj;
_classCallCheck(this, DownloadManager);
@@ -12029,36 +14033,45 @@ var DownloadManager = function () {
}
_createClass(DownloadManager, [{
- key: 'downloadUrl',
+ key: "downloadUrl",
value: function downloadUrl(url, filename) {
if (!(0, _pdfjsLib.createValidAbsoluteUrl)(url, 'http://example.com')) {
return;
}
+
_download(url + '#pdfjs.action=download', filename);
}
}, {
- key: 'downloadData',
+ key: "downloadData",
value: function downloadData(data, filename, contentType) {
if (navigator.msSaveBlob) {
- return navigator.msSaveBlob(new Blob([data], { type: contentType }), filename);
+ return navigator.msSaveBlob(new Blob([data], {
+ type: contentType
+ }), filename);
}
+
var blobUrl = (0, _pdfjsLib.createObjectURL)(data, contentType, this.disableCreateObjectURL);
+
_download(blobUrl, filename);
}
}, {
- key: 'download',
+ key: "download",
value: function download(blob, url, filename) {
if (navigator.msSaveBlob) {
if (!navigator.msSaveBlob(blob, filename)) {
this.downloadUrl(url, filename);
}
+
return;
}
+
if (this.disableCreateObjectURL) {
this.downloadUrl(url, filename);
return;
}
+
var blobUrl = _pdfjsLib.URL.createObjectURL(blob);
+
_download(blobUrl, filename);
}
}]);
@@ -12078,25 +14091,29 @@ exports.DownloadManager = DownloadManager;
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.GenericL10n = undefined;
-
-var _regenerator = __webpack_require__(2);
+exports.GenericL10n = void 0;
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _regenerator = _interopRequireDefault(__webpack_require__(2));
__webpack_require__(41);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
var webL10n = document.webL10n;
-var GenericL10n = function () {
+var GenericL10n =
+/*#__PURE__*/
+function () {
function GenericL10n(lang) {
_classCallCheck(this, GenericL10n);
@@ -12109,11 +14126,13 @@ var GenericL10n = function () {
}
_createClass(GenericL10n, [{
- key: 'getLanguage',
+ key: "getLanguage",
value: function () {
- var _ref = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+ var _getLanguage = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee() {
var l10n;
- return _regenerator2.default.wrap(function _callee$(_context) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
@@ -12122,10 +14141,10 @@ var GenericL10n = function () {
case 2:
l10n = _context.sent;
- return _context.abrupt('return', l10n.getLanguage());
+ return _context.abrupt("return", l10n.getLanguage());
case 4:
- case 'end':
+ case "end":
return _context.stop();
}
}
@@ -12133,17 +14152,19 @@ var GenericL10n = function () {
}));
function getLanguage() {
- return _ref.apply(this, arguments);
+ return _getLanguage.apply(this, arguments);
}
return getLanguage;
}()
}, {
- key: 'getDirection',
+ key: "getDirection",
value: function () {
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+ var _getDirection = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee2() {
var l10n;
- return _regenerator2.default.wrap(function _callee2$(_context2) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
@@ -12152,10 +14173,10 @@ var GenericL10n = function () {
case 2:
l10n = _context2.sent;
- return _context2.abrupt('return', l10n.getDirection());
+ return _context2.abrupt("return", l10n.getDirection());
case 4:
- case 'end':
+ case "end":
return _context2.stop();
}
}
@@ -12163,17 +14184,19 @@ var GenericL10n = function () {
}));
function getDirection() {
- return _ref2.apply(this, arguments);
+ return _getDirection.apply(this, arguments);
}
return getDirection;
}()
}, {
- key: 'get',
+ key: "get",
value: function () {
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee3(property, args, fallback) {
+ var _get = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee3(property, args, fallback) {
var l10n;
- return _regenerator2.default.wrap(function _callee3$(_context3) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
@@ -12182,10 +14205,10 @@ var GenericL10n = function () {
case 2:
l10n = _context3.sent;
- return _context3.abrupt('return', l10n.get(property, args, fallback));
+ return _context3.abrupt("return", l10n.get(property, args, fallback));
case 4:
- case 'end':
+ case "end":
return _context3.stop();
}
}
@@ -12193,17 +14216,19 @@ var GenericL10n = function () {
}));
function get(_x, _x2, _x3) {
- return _ref3.apply(this, arguments);
+ return _get.apply(this, arguments);
}
return get;
}()
}, {
- key: 'translate',
+ key: "translate",
value: function () {
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regenerator2.default.mark(function _callee4(element) {
+ var _translate = _asyncToGenerator(
+ /*#__PURE__*/
+ _regenerator.default.mark(function _callee4(element) {
var l10n;
- return _regenerator2.default.wrap(function _callee4$(_context4) {
+ return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
@@ -12212,10 +14237,10 @@ var GenericL10n = function () {
case 2:
l10n = _context4.sent;
- return _context4.abrupt('return', l10n.translate(element));
+ return _context4.abrupt("return", l10n.translate(element));
case 4:
- case 'end':
+ case "end":
return _context4.stop();
}
}
@@ -12223,7 +14248,7 @@ var GenericL10n = function () {
}));
function translate(_x4) {
- return _ref4.apply(this, arguments);
+ return _translate.apply(this, arguments);
}
return translate;
@@ -12250,21 +14275,26 @@ document.webL10n = function (window, document, undefined) {
var gMacros = {};
var gReadyState = 'loading';
var gAsyncResourceLoading = true;
+
function getL10nResourceLinks() {
return document.querySelectorAll('link[type="application/l10n"]');
}
+
function getL10nDictionary() {
var script = document.querySelector('script[type="application/l10n"]');
return script ? JSON.parse(script.innerHTML) : null;
}
+
function getTranslatableChildren(element) {
return element ? element.querySelectorAll('*[data-l10n-id]') : [];
}
+
function getL10nAttributes(element) {
if (!element) return {};
var l10nId = element.getAttribute('data-l10n-id');
var l10nArgs = element.getAttribute('data-l10n-args');
var args = {};
+
if (l10nArgs) {
try {
args = JSON.parse(l10nArgs);
@@ -12272,25 +14302,32 @@ document.webL10n = function (window, document, undefined) {
console.warn('could not parse arguments for #' + l10nId);
}
}
+
return {
id: l10nId,
args: args
};
}
+
function fireL10nReadyEvent(lang) {
var evtObject = document.createEvent('Event');
evtObject.initEvent('localized', true, false);
evtObject.language = lang;
document.dispatchEvent(evtObject);
}
+
function xhrLoadText(url, onSuccess, onFailure) {
onSuccess = onSuccess || function _onSuccess(data) {};
+
onFailure = onFailure || function _onFailure() {};
+
var xhr = new XMLHttpRequest();
xhr.open('GET', url, gAsyncResourceLoading);
+
if (xhr.overrideMimeType) {
xhr.overrideMimeType('text/plain; charset=utf-8');
}
+
xhr.onreadystatechange = function () {
if (xhr.readyState == 4) {
if (xhr.status == 200 || xhr.status === 0) {
@@ -12300,20 +14337,25 @@ document.webL10n = function (window, document, undefined) {
}
}
};
+
xhr.onerror = onFailure;
xhr.ontimeout = onFailure;
+
try {
xhr.send(null);
} catch (e) {
onFailure();
}
}
+
function parseResource(href, lang, successCallback, failureCallback) {
var baseURL = href.replace(/[^\/]*$/, '') || './';
+
function evalString(text) {
if (text.lastIndexOf('\\') < 0) return text;
return text.replace(/\\\\/g, '\\').replace(/\\n/g, '\n').replace(/\\r/g, '\r').replace(/\\t/g, '\t').replace(/\\b/g, '\b').replace(/\\f/g, '\f').replace(/\\{/g, '{').replace(/\\}/g, '}').replace(/\\"/g, '"').replace(/\\'/g, "'");
}
+
function parseProperties(text, parsedPropertiesCallback) {
var dictionary = {};
var reBlank = /^\s*|\s*$/;
@@ -12321,22 +14363,27 @@ document.webL10n = function (window, document, undefined) {
var reSection = /^\s*\[(.*)\]\s*$/;
var reImport = /^\s*@import\s+url\((.*)\)\s*$/i;
var reSplit = /^([^=\s]*)\s*=\s*(.+)$/;
+
function parseRawLines(rawText, extendedSyntax, parsedRawLinesCallback) {
var entries = rawText.replace(reBlank, '').split(/[\r\n]+/);
var currentLang = '*';
var genericLang = lang.split('-', 1)[0];
var skipLang = false;
var match = '';
+
function nextEntry() {
while (true) {
if (!entries.length) {
parsedRawLinesCallback();
return;
}
+
var line = entries.shift();
if (reComment.test(line)) continue;
+
if (extendedSyntax) {
match = reSection.exec(line);
+
if (match) {
currentLang = match[1].toLowerCase();
skipLang = currentLang !== '*' && currentLang !== lang && currentLang !== genericLang;
@@ -12344,20 +14391,26 @@ document.webL10n = function (window, document, undefined) {
} else if (skipLang) {
continue;
}
+
match = reImport.exec(line);
+
if (match) {
loadImport(baseURL + match[1], nextEntry);
return;
}
}
+
var tmp = line.match(reSplit);
+
if (tmp && tmp.length == 3) {
dictionary[tmp[1]] = evalString(tmp[2]);
}
}
}
+
nextEntry();
}
+
function loadImport(url, callback) {
xhrLoadText(url, function (content) {
parseRawLines(content, false, callback);
@@ -12366,10 +14419,12 @@ document.webL10n = function (window, document, undefined) {
callback();
});
}
+
parseRawLines(text, true, function () {
parsedPropertiesCallback(dictionary);
});
}
+
xhrLoadText(href, function (response) {
gTextData += response;
parseProperties(response, function (data) {
@@ -12377,6 +14432,7 @@ document.webL10n = function (window, document, undefined) {
var id,
prop,
index = key.lastIndexOf('.');
+
if (index > 0) {
id = key.substring(0, index);
prop = key.substring(index + 1);
@@ -12384,35 +14440,46 @@ document.webL10n = function (window, document, undefined) {
id = key;
prop = gTextProp;
}
+
if (!gL10nData[id]) {
gL10nData[id] = {};
}
+
gL10nData[id][prop] = data[key];
}
+
if (successCallback) {
successCallback();
}
});
}, failureCallback);
}
+
function loadLocale(lang, callback) {
if (lang) {
lang = lang.toLowerCase();
}
+
callback = callback || function _callback() {};
+
clear();
gLanguage = lang;
var langLinks = getL10nResourceLinks();
var langCount = langLinks.length;
+
if (langCount === 0) {
var dict = getL10nDictionary();
+
if (dict && dict.locales && dict.default_locale) {
console.log('using the embedded JSON directory, early way out');
gL10nData = dict.locales[lang];
+
if (!gL10nData) {
var defaultLocale = dict.default_locale.toLowerCase();
+
for (var anyCaseLang in dict.locales) {
anyCaseLang = anyCaseLang.toLowerCase();
+
if (anyCaseLang === lang) {
gL10nData = dict.locales[lang];
break;
@@ -12421,26 +14488,33 @@ document.webL10n = function (window, document, undefined) {
}
}
}
+
callback();
} else {
console.log('no resource to load, early way out');
}
+
fireL10nReadyEvent(lang);
gReadyState = 'complete';
return;
}
+
var onResourceLoaded = null;
var gResourceCount = 0;
+
onResourceLoaded = function onResourceLoaded() {
gResourceCount++;
+
if (gResourceCount >= langCount) {
callback();
fireL10nReadyEvent(lang);
gReadyState = 'complete';
}
};
+
function L10nResourceLink(link) {
var href = link.href;
+
this.load = function (lang, callback) {
parseResource(href, lang, callback, function () {
console.warn(href + ' not found.');
@@ -12450,16 +14524,19 @@ document.webL10n = function (window, document, undefined) {
});
};
}
+
for (var i = 0; i < langCount; i++) {
var resource = new L10nResourceLink(langLinks[i]);
resource.load(lang, onResourceLoaded);
}
}
+
function clear() {
gL10nData = {};
gTextData = '';
gLanguage = '';
}
+
function getPluralRules(lang) {
var locales2rules = {
'af': 3,
@@ -12633,12 +14710,15 @@ document.webL10n = function (window, document, undefined) {
'zh': 0,
'zu': 3
};
+
function isIn(n, list) {
return list.indexOf(n) !== -1;
}
+
function isBetween(n, start, end) {
return start <= n && n <= end;
}
+
var pluralRules = {
'0': function _(n) {
return 'other';
@@ -12775,22 +14855,28 @@ document.webL10n = function (window, document, undefined) {
}
};
var index = locales2rules[lang.replace(/-.*$/, '')];
+
if (!(index in pluralRules)) {
console.warn('plural form unknown for [' + lang + ']');
return function () {
return 'other';
};
}
+
return pluralRules[index];
}
+
gMacros.plural = function (str, param, key, prop) {
var n = parseFloat(param);
if (isNaN(n)) return str;
if (prop != gTextProp) return str;
+
if (!gMacros._pluralRules) {
gMacros._pluralRules = getPluralRules(gLanguage);
}
+
var index = '[' + gMacros._pluralRules(n) + ']';
+
if (n === 0 && key + '[zero]' in gL10nData) {
str = gL10nData[key + '[zero]'][prop];
} else if (n == 1 && key + '[one]' in gL10nData) {
@@ -12802,26 +14888,35 @@ document.webL10n = function (window, document, undefined) {
} else if (key + '[other]' in gL10nData) {
str = gL10nData[key + '[other]'][prop];
}
+
return str;
};
+
function getL10nData(key, args, fallback) {
var data = gL10nData[key];
+
if (!data) {
console.warn('#' + key + ' is undefined.');
+
if (!fallback) {
return null;
}
+
data = fallback;
}
+
var rv = {};
+
for (var prop in data) {
var str = data[prop];
str = substIndexes(str, args, key, prop);
str = substArguments(str, args, key);
rv[prop] = str;
}
+
return rv;
}
+
function substIndexes(str, args, key, prop) {
var reIndex = /\{\[\s*([a-zA-Z]+)\(([a-zA-Z]+)\)\s*\]\}/;
var reMatch = reIndex.exec(str);
@@ -12829,44 +14924,54 @@ document.webL10n = function (window, document, undefined) {
var macroName = reMatch[1];
var paramName = reMatch[2];
var param;
+
if (args && paramName in args) {
param = args[paramName];
} else if (paramName in gL10nData) {
param = gL10nData[paramName];
}
+
if (macroName in gMacros) {
var macro = gMacros[macroName];
str = macro(str, param, key, prop);
}
+
return str;
}
+
function substArguments(str, args, key) {
var reArgs = /\{\{\s*(.+?)\s*\}\}/g;
return str.replace(reArgs, function (matched_text, arg) {
if (args && arg in args) {
return args[arg];
}
+
if (arg in gL10nData) {
return gL10nData[arg];
}
+
console.log('argument {{' + arg + '}} for #' + key + ' is undefined.');
return matched_text;
});
}
+
function translateElement(element) {
var l10n = getL10nAttributes(element);
if (!l10n.id) return;
var data = getL10nData(l10n.id, l10n.args);
+
if (!data) {
console.warn('#' + l10n.id + ' is undefined.');
return;
}
+
if (data[gTextProp]) {
if (getChildElementCount(element) === 0) {
element[gTextProp] = data[gTextProp];
} else {
var children = element.childNodes;
var found = false;
+
for (var i = 0, l = children.length; i < l; i++) {
if (children[i].nodeType === 3 && /\S/.test(children[i].nodeValue)) {
if (found) {
@@ -12877,56 +14982,74 @@ document.webL10n = function (window, document, undefined) {
}
}
}
+
if (!found) {
var textNode = document.createTextNode(data[gTextProp]);
element.insertBefore(textNode, element.firstChild);
}
}
+
delete data[gTextProp];
}
+
for (var k in data) {
element[k] = data[k];
}
}
+
function getChildElementCount(element) {
if (element.children) {
return element.children.length;
}
+
if (typeof element.childElementCount !== 'undefined') {
return element.childElementCount;
}
+
var count = 0;
+
for (var i = 0; i < element.childNodes.length; i++) {
count += element.nodeType === 1 ? 1 : 0;
}
+
return count;
}
+
function translateFragment(element) {
element = element || document.documentElement;
var children = getTranslatableChildren(element);
var elementCount = children.length;
+
for (var i = 0; i < elementCount; i++) {
translateElement(children[i]);
}
+
translateElement(element);
}
+
return {
get: function get(key, args, fallbackString) {
var index = key.lastIndexOf('.');
var prop = gTextProp;
+
if (index > 0) {
prop = key.substring(index + 1);
key = key.substring(0, index);
}
+
var fallback;
+
if (fallbackString) {
fallback = {};
fallback[prop] = fallbackString;
}
+
var data = getL10nData(key, args, fallback);
+
if (data && prop in data) {
return data[prop];
}
+
return '{{' + key + '}}';
},
getData: function getData() {
@@ -12979,7 +15102,7 @@ document.webL10n = function (window, document, undefined) {
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.PDFPrintService = undefined;
+exports.PDFPrintService = PDFPrintService;
var _ui_utils = __webpack_require__(6);
@@ -12989,6 +15112,7 @@ var _pdfjsLib = __webpack_require__(7);
var activeService = null;
var overlayManager = null;
+
function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size) {
var scratchCanvas = activeService.scratchCanvas;
var PRINT_RESOLUTION = 150;
@@ -13006,7 +15130,10 @@ function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size) {
var renderContext = {
canvasContext: ctx,
transform: [PRINT_UNITS, 0, 0, PRINT_UNITS, 0, 0],
- viewport: pdfPage.getViewport(1, size.rotation),
+ viewport: pdfPage.getViewport({
+ scale: 1,
+ rotation: size.rotation
+ }),
intent: 'print'
};
return pdfPage.render(renderContext).promise;
@@ -13017,6 +15144,7 @@ function renderPage(activeServiceOnEntry, pdfDocument, pageNumber, size) {
};
});
}
+
function PDFPrintService(pdfDocument, pagesOverview, printContainer, l10n) {
this.pdfDocument = pdfDocument;
this.pagesOverview = pagesOverview;
@@ -13026,6 +15154,7 @@ function PDFPrintService(pdfDocument, pagesOverview, printContainer, l10n) {
this.currentPage = -1;
this.scratchCanvas = document.createElement('canvas');
}
+
PDFPrintService.prototype = {
layout: function layout() {
this.throwIfInactive();
@@ -13034,9 +15163,11 @@ PDFPrintService.prototype = {
var hasEqualPageSizes = this.pagesOverview.every(function (size) {
return size.width === this.pagesOverview[0].width && size.height === this.pagesOverview[0].height;
}, this);
+
if (!hasEqualPageSizes) {
console.warn('Not all pages have the same size. The printed ' + 'result may be incorrect!');
}
+
this.pageStyleSheet = document.createElement('style');
var pageSize = this.pagesOverview[0];
this.pageStyleSheet.textContent = '@supports ((size:A4) and (size:1pt 1pt)) {' + '@page { size: ' + pageSize.width + 'pt ' + pageSize.height + 'pt;}' + '}';
@@ -13046,11 +15177,14 @@ PDFPrintService.prototype = {
if (activeService !== this) {
return;
}
+
this.printContainer.textContent = '';
+
if (this.pageStyleSheet) {
this.pageStyleSheet.remove();
this.pageStyleSheet = null;
}
+
this.scratchCanvas.width = this.scratchCanvas.height = 0;
this.scratchCanvas = null;
activeService = null;
@@ -13058,6 +15192,7 @@ PDFPrintService.prototype = {
if (overlayManager.active !== 'printServiceOverlay') {
return;
}
+
overlayManager.close('printServiceOverlay');
});
},
@@ -13065,19 +15200,23 @@ PDFPrintService.prototype = {
var _this = this;
var pageCount = this.pagesOverview.length;
+
var renderNextPage = function renderNextPage(resolve, reject) {
_this.throwIfInactive();
+
if (++_this.currentPage >= pageCount) {
renderProgress(pageCount, pageCount, _this.l10n);
resolve();
return;
}
+
var index = _this.currentPage;
renderProgress(index, pageCount, _this.l10n);
renderPage(_this, _this.pdfDocument, index + 1, _this.pagesOverview[index]).then(_this.useRenderedPage.bind(_this)).then(function () {
renderNextPage(resolve, reject);
}, reject);
};
+
return new Promise(renderNextPage);
},
useRenderedPage: function useRenderedPage(printItem) {
@@ -13086,6 +15225,7 @@ PDFPrintService.prototype = {
img.style.width = printItem.width;
img.style.height = printItem.height;
var scratchCanvas = this.scratchCanvas;
+
if ('toBlob' in scratchCanvas && !this.disableCreateObjectURL) {
scratchCanvas.toBlob(function (blob) {
img.src = _pdfjsLib.URL.createObjectURL(blob);
@@ -13093,6 +15233,7 @@ PDFPrintService.prototype = {
} else {
img.src = scratchCanvas.toDataURL();
}
+
var wrapper = document.createElement('div');
wrapper.appendChild(img);
this.printContainer.appendChild(wrapper);
@@ -13111,6 +15252,7 @@ PDFPrintService.prototype = {
resolve();
return;
}
+
print.call(window);
setTimeout(resolve, 20);
}, 0);
@@ -13120,6 +15262,7 @@ PDFPrintService.prototype = {
get active() {
return this === activeService;
},
+
throwIfInactive: function throwIfInactive() {
if (!this.active) {
throw new Error('This print request was cancelled or completed.');
@@ -13127,16 +15270,19 @@ PDFPrintService.prototype = {
}
};
var print = window.print;
+
window.print = function print() {
if (activeService) {
console.warn('Ignored window.print() because of a pending print job.');
return;
}
+
ensureOverlay().then(function () {
if (activeService) {
overlayManager.open('printServiceOverlay');
}
});
+
try {
dispatchEvent('beforeprint');
} finally {
@@ -13149,6 +15295,7 @@ window.print = function print() {
});
return;
}
+
var activeServiceOnEntry = activeService;
activeService.renderPages().then(function () {
return activeServiceOnEntry.performPrint();
@@ -13159,85 +15306,105 @@ window.print = function print() {
});
}
};
+
function dispatchEvent(eventType) {
var event = document.createEvent('CustomEvent');
event.initCustomEvent(eventType, false, false, 'custom');
window.dispatchEvent(event);
}
+
function abort() {
if (activeService) {
activeService.destroy();
dispatchEvent('afterprint');
}
}
+
function renderProgress(index, total, l10n) {
var progressContainer = document.getElementById('printServiceOverlay');
var progress = Math.round(100 * index / total);
var progressBar = progressContainer.querySelector('progress');
var progressPerc = progressContainer.querySelector('.relative-progress');
progressBar.value = progress;
- l10n.get('print_progress_percent', { progress: progress }, progress + '%').then(function (msg) {
+ l10n.get('print_progress_percent', {
+ progress: progress
+ }, progress + '%').then(function (msg) {
progressPerc.textContent = msg;
});
}
+
var hasAttachEvent = !!document.attachEvent;
window.addEventListener('keydown', function (event) {
if (event.keyCode === 80 && (event.ctrlKey || event.metaKey) && !event.altKey && (!event.shiftKey || window.chrome || window.opera)) {
window.print();
+
if (hasAttachEvent) {
return;
}
+
event.preventDefault();
+
if (event.stopImmediatePropagation) {
event.stopImmediatePropagation();
} else {
event.stopPropagation();
}
+
return;
}
}, true);
+
if (hasAttachEvent) {
document.attachEvent('onkeydown', function (event) {
event = event || window.event;
+
if (event.keyCode === 80 && event.ctrlKey) {
event.keyCode = 0;
return false;
}
});
}
+
if ('onbeforeprint' in window) {
var stopPropagationIfNeeded = function stopPropagationIfNeeded(event) {
if (event.detail !== 'custom' && event.stopImmediatePropagation) {
event.stopImmediatePropagation();
}
};
+
window.addEventListener('beforeprint', stopPropagationIfNeeded);
window.addEventListener('afterprint', stopPropagationIfNeeded);
}
-var overlayPromise = void 0;
+
+var overlayPromise;
+
function ensureOverlay() {
if (!overlayPromise) {
overlayManager = _app.PDFViewerApplication.overlayManager;
+
if (!overlayManager) {
throw new Error('The overlay manager has not yet been initialized.');
}
+
overlayPromise = overlayManager.register('printServiceOverlay', document.getElementById('printServiceOverlay'), abort, true);
document.getElementById('printCancel').onclick = abort;
}
+
return overlayPromise;
}
+
_app.PDFPrintServiceFactory.instance = {
supportsPrinting: true,
createPrintService: function createPrintService(pdfDocument, pagesOverview, printContainer, l10n) {
if (activeService) {
throw new Error('The print service is created and active.');
}
+
activeService = new PDFPrintService(pdfDocument, pagesOverview, printContainer, l10n);
return activeService;
}
};
-exports.PDFPrintService = PDFPrintService;
/***/ })
/******/ ]);
-//# sourceMappingURL=viewer.js.map
+//# sourceMappingURL=viewer.js.map
\ No newline at end of file
|
chore
|
update pdf js
|
581da51d662de0edc97b58a96c903c94feb5bed6
|
2020-04-19 21:13:34
|
crimx
|
refactor(options): add link to dict titles
| false
|
diff --git a/src/options/components/Entries/Dictionaries/DictTitle/_style.scss b/src/options/components/Entries/Dictionaries/DictTitle/_style.scss
index 9afba3d31..6f1063f50 100644
--- a/src/options/components/Entries/Dictionaries/DictTitle/_style.scss
+++ b/src/options/components/Entries/Dictionaries/DictTitle/_style.scss
@@ -5,6 +5,10 @@
vertical-align: text-bottom;
}
+.saladict-dict-title {
+ color: currentColor;
+}
+
.saladict-dict-langs-char {
margin-left: 5px;
padding: 0 2px;
diff --git a/src/options/components/Entries/Dictionaries/DictTitle/index.tsx b/src/options/components/Entries/Dictionaries/DictTitle/index.tsx
index c6f713566..d3c0a1e31 100644
--- a/src/options/components/Entries/Dictionaries/DictTitle/index.tsx
+++ b/src/options/components/Entries/Dictionaries/DictTitle/index.tsx
@@ -1,5 +1,6 @@
import React, { FC } from 'react'
import { useTranslate } from '@/_helpers/i18n'
+import { message } from '@/_helpers/browser-api'
import { DictID } from '@/app-config'
import './_style.scss'
@@ -23,7 +24,17 @@ export const DictTitle: FC<DictTitleProps> = ({ dictID, dictLangs }) => {
src={require('@/components/dictionaries/' + dictID + '/favicon.png')}
alt={`logo ${title}`}
/>
- {title}
+ <a
+ className="saladict-dict-title"
+ href="#"
+ onClick={e => {
+ e.stopPropagation()
+ e.preventDefault()
+ openDictSrcPage(dictID, dictLangs)
+ }}
+ >
+ {title}
+ </a>
{dictLangs.split('').map((c, i) =>
+c ? (
<span className="saladict-dict-langs-char" key={langCodes[i]}>
@@ -36,3 +47,23 @@ export const DictTitle: FC<DictTitleProps> = ({ dictID, dictLangs }) => {
}
export const DictTitleMemo = React.memo(DictTitle)
+
+function openDictSrcPage(dictID: DictID, dictLangs: string) {
+ const text = +dictLangs[0]
+ ? 'salad'
+ : +dictLangs[1] || +dictLangs[2]
+ ? '沙拉'
+ : +dictLangs[3]
+ ? 'サラダ'
+ : +dictLangs[4]
+ ? '샐러드'
+ : 'salad'
+
+ message.send({
+ type: 'OPEN_DICT_SRC_PAGE',
+ payload: {
+ id: dictID,
+ text
+ }
+ })
+}
|
refactor
|
add link to dict titles
|
73de4a3008ade6920ca4d7f5aa588ee3f4272e7a
|
2019-06-11 07:16:41
|
CRIMX
|
refactor: fetch machine translation if not selected
| false
|
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
index dbafeceb2..d449782c5 100644
--- a/src/content/redux/modules/dictionaries.ts
+++ b/src/content/redux/modules/dictionaries.ts
@@ -356,15 +356,17 @@ export function searchText (
const pSearchResponses = toStart.map(doSearch)
+ const { cn, en, machine } = state.config.autopron
+
// dict with auto pronunciation but not searching
- const autopronChs = state.config.autopron.cn.dict
- if (autopronChs && !toStart.includes(autopronChs)) {
- pSearchResponses.push(requestDictResult(autopronChs))
- } else {
- const autopronEng = state.config.autopron.en.dict
- if (autopronEng && !toStart.includes(autopronEng)) {
- pSearchResponses.push(requestDictResult(autopronEng))
- }
+ if (cn.dict && !toStart.includes(cn.dict)) {
+ pSearchResponses.push(requestDictResult(cn.dict))
+ }
+ if (en.dict && !toStart.includes(en.dict)) {
+ pSearchResponses.push(requestDictResult(en.dict))
+ }
+ if (machine.dict && !toStart.includes(machine.dict)) {
+ pSearchResponses.push(requestDictResult(machine.dict))
}
// handle auto pronunciation
@@ -373,8 +375,6 @@ export function searchText (
pSearchResponse.then(({ id, result, audio }) => {
if (hasPlayed) { return }
- const { cn, en, machine } = state.config.autopron
-
if (audio) {
if (id === cn.dict && audio.py) {
message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src: audio.py })
diff --git a/src/options/components/options/Dictionaries/DictForm.tsx b/src/options/components/options/Dictionaries/DictForm.tsx
index 7080ed8f8..1ea8ad623 100644
--- a/src/options/components/options/Dictionaries/DictForm.tsx
+++ b/src/options/components/options/Dictionaries/DictForm.tsx
@@ -70,7 +70,6 @@ export class DictForm extends React.Component<DictFormProps> {
<Form.Item
{...formItemLayout}
label={t('opt_autopron_machine')}
- help={config.autopron.machine.dict && t('opt_autopron_machine_src_help')}
>{
getFieldDecorator('config#autopron#machine#dict', {
initialValue: config.autopron.machine.dict,
|
refactor
|
fetch machine translation if not selected
|
a3c6f2132ee469252ba4f8bbb021cf72e6197d50
|
2020-04-27 09:21:10
|
crimx
|
refactor(pdf): use es5 version of PDF.js
| false
|
diff --git a/scripts/pdf.js b/scripts/pdf.js
index 11aa4f6b5..7fb9742a6 100644
--- a/scripts/pdf.js
+++ b/scripts/pdf.js
@@ -1,4 +1,4 @@
-/**!
+/** !
* Upgrade PDF.js
*/
@@ -11,7 +11,8 @@ if (!shell.which('git')) {
shell.exit(1)
}
-const repoRoot = 'pdf'
+const cacheDir = 'pdf'
+const repoRoot = 'pdf/es5'
const publicPDFRoot = path.join(__dirname, '../assets/pdf')
const pdfFiles = [
'build/pdf.js',
@@ -26,14 +27,14 @@ const files = [...pdfFiles, ...pdfDirs]
shell.cd(path.resolve(__dirname))
-shell.rm('-rf', repoRoot)
+shell.rm('-rf', cacheDir)
exec(
- `git clone https://github.com/mozilla/pdf.js.git ${repoRoot} --single-branch --branch gh-pages --depth 1 --progress --verbose`,
+ `git clone https://github.com/mozilla/pdf.js.git ${cacheDir} --single-branch --branch gh-pages --depth 1 --progress --verbose`,
'Error: Git clone failed'
)
-shell.cd('./' + repoRoot)
+shell.cd('./' + cacheDir)
startUpgrade()
@@ -161,9 +162,9 @@ async function cloneFiles() {
path.join(publicPDFRoot, 'web/locale/locale.properties')
)
- const locales = (await fs.readdir(
- path.join(__dirname, repoRoot, 'web/locale')
- )).filter(
+ const locales = (
+ await fs.readdir(path.join(__dirname, repoRoot, 'web/locale'))
+ ).filter(
name =>
name.startsWith('en') ||
name.startsWith('zh') ||
|
refactor
|
use es5 version of PDF.js
|
46c0114b43a703f4f5fee65f6d9a26dc74af505e
|
2018-09-02 22:28:39
|
CRIMX
|
test(helpers): remove strip script
| false
|
diff --git a/test/specs/_helpers/strip-script.spec.ts b/test/specs/_helpers/strip-script.spec.ts
deleted file mode 100644
index 355b382c4..000000000
--- a/test/specs/_helpers/strip-script.spec.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import stripScript from '@/_helpers/strip-script'
-
-describe('Strip Script', () => {
- const expectedEl = document.createElement('div') as HTMLDivElement
- expectedEl.innerHTML = `
- <p class="p" id="p">
- <a href="https://e.c/" target="_blank">
- <img src="https://e.c/g.jpg" alt="logo" />
- <span>hello</span>
- </a>
- </p>
- `
-
- it('should be the same with snaitized element', () => {
- const sanEl = stripScript(expectedEl)
- expect(sanEl).toBeInstanceOf(HTMLElement)
- scanElm(expectedEl, sanEl as HTMLElement)
- })
- it('should remove unsupported properties', () => {
- const div = document.createElement('div') as HTMLDivElement
- div.innerHTML = `
- <p data-c="p" class="p" id="p">
- <a onmouseover="alert" href="https://e.c/" target="_blank">
- <img onload="alert" src="https://e.c/g.jpg" alt="logo" />
- <span color="red">hello</span>
- </a>
- </p>
- `
- const sanEl = stripScript(div)
- expect(sanEl).toBeInstanceOf(HTMLElement)
- scanElm(expectedEl, sanEl as HTMLElement)
- })
- it('should remove unsupported tags', () => {
- const div = document.createElement('div') as HTMLDivElement
- div.innerHTML = `
- <p class="p" id="p">
- <a href="https://e.c/" target="_blank">
- <img src="https://e.c/g.jpg" alt="logo" />
- <span>hello</span>
- </a>
- <script>alert()</script>
- <object></object>
- <iframe src="https://e.c/" />
- <a href="javascript:alert">bad url</a>
- <img src="javascript:alert"/>
- </p>
- `
- const sanEl = stripScript(div)
- expect(sanEl).toBeInstanceOf(HTMLElement)
- scanElm(expectedEl, sanEl as HTMLElement)
- })
-})
-
-function scanElm (el1: HTMLElement, el2: HTMLElement): void {
- const attrs1 = el1.attributes
- const attrs2 = el2.attributes
- expect(attrs1.length).toBe(attrs2.length)
- if (attrs1.length > 0) {
- for (let i = 0; i < attrs1.length; i++) {
- expect(attrs1[i].value).toBe(el2.getAttribute(attrs1[i].name))
- }
- }
- const children1 = el1.children
- const children2 = el2.children
- expect(children1.length).toBe(children2.length)
- if (children1.length > 0) {
- for (let i = 0; i < children1.length; i++) {
- scanElm(children1[i] as HTMLElement, children2[i] as HTMLElement)
- }
- }
-}
|
test
|
remove strip script
|
3709e3f696a913b5482c5d1c0cd76d0c6355387b
|
2018-05-15 23:19:08
|
CRIMX
|
fix(static): use browser instead of chrome
| false
|
diff --git a/public/static/fanyi.youdao.2.0/main.js b/public/static/fanyi.youdao.2.0/main.js
index 320012ab2..d828661f4 100644
--- a/public/static/fanyi.youdao.2.0/main.js
+++ b/public/static/fanyi.youdao.2.0/main.js
@@ -2,7 +2,7 @@
;(function () {
var JSONDAO, TR;
- if(this.JSON&&this.JSON.stringify.toString().indexOf("[native code]")!==-1){JSONDAO=this.JSON}else{JSONDAO={}}(function(){function f(n){return n<10?"0"+n:n}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+string+'"'}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==="object"&&typeof value.toJSON==="function"){value=value.toJSON(key)}if(typeof rep==="function"){value=rep.call(holder,key,value)}switch(typeof value){case"string":return quote(value);case"number":return isFinite(value)?String(value):"null";case"boolean":case"null":return String(value);case"object":if(!value){return"null"}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==="[object Array]"){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||"null"}v=partial.length===0?"[]":gap?"[\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"]":"["+partial.join(",")+"]";gap=mind;return v}if(rep&&typeof rep==="object"){length=rep.length;for(i=0;i<length;i+=1){k=rep[i];if(typeof k==="string"){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}else{for(k in value){if(Object.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}v=partial.length===0?"{}":gap?"{\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"}":"{"+partial.join(",")+"}";gap=mind;return v}}if(typeof JSONDAO.stringify!=="function"){JSONDAO.stringify=function(value,replacer,space){var i;gap="";indent="";if(typeof space==="number"){for(i=0;i<space;i+=1){indent+=" "}}else{if(typeof space==="string"){indent=space}}rep=replacer;if(replacer&&typeof replacer!=="function"&&(typeof replacer!=="object"||typeof replacer.length!=="number")){throw new Error("JSONDAO.stringify")}return str("",{"":value})}}if(typeof JSONDAO.parse!=="function"){JSONDAO.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSONDAO.parse")}}}());(function(){var a={browser:function(){var e={};var c=navigator.userAgent.toLowerCase();var d;(d=c.match(/msie ([\d.]+)/))?e.msie=d[1]:(d=c.match(/firefox\/([\d.]+)/))?e.firefox=d[1]:(d=c.match(/chrome\/([\d.]+)/))?e.chrome=d[1]:(d=c.match(/opera.([\d.]+)/))?e.opera=d[1]:(d=c.match(/version\/([\d.]+).*safari/))?e.safari=d[1]:0;return e}(),isDOM:function(c){return Boolean(c&&c.nodeType===1)},isArray:function(c){return Object.prototype.toString.call(c)==="[object Array]"},isFunction:function(c){return Object.prototype.toString.call(c)==="[object Function]"},each:function(d,g,f){if(d===undefined||d===null){return}if(d.length===undefined||a.isFunction(d)){for(var c in d){if(d.hasOwnProperty(c)){if(g.call(f||d[c],c,d[c])===false){break}}}}else{for(var e=0;e<d.length;e++){if(g.call(f||d[e],e,d[e])===false){break}}}return d},indexOf:function b(d,e){if(d.indexOf){return d.indexOf(e)}else{var c=-1;a.each(d,function(f){if(this===e){c=f;return false}});return c}},bind:function(d,c,e){if(!e){return}if(d.addEventListener){d.addEventListener(c,e,false)}else{if(d.attachEvent){d.attachEvent("on"+c,e)}else{d["on"+c]=e}}return this},unbind:function(d,c,e){if(!e){return}if(d.removeEventListener){d.removeEventListener(c,e,false)}else{if(d.detachEvent){d.detachEvent("on"+c,e)}else{d["on"+c]=function(){}}}return this},param:function(c){if(typeof c==="string"){return c}var d=[];a.each(c,function(e,f){if(f){f=encodeURIComponent(f);if(a.browser.firefox){f=encodeURIComponent(unescape(f))}d.push(encodeURIComponent(e)+"="+f)}});return d.join("&")},makeArray:function(c){return Array.prototype.slice.call(c,0)},getDocumentCharset:function(){a.log("document.characterSet || document.charset:::"+document.characterSet||document.charset);return document.characterSet||document.charset},log:function(){},css:function(){var c=function(h,d){var i="";if(d=="float"){document.defaultView?d="float":d="styleFloat"}if(h.style[d]){i=h.style[d]}else{if(h.currentStyle){i=h.currentStyle[d]}else{if(document.defaultView&&document.defaultView.getComputedStyle){d=d.replace(/([A-Z])/g,"-$1").toLowerCase();var f=document.defaultView.getComputedStyle(h,"");i=f&&f.getPropertyValue(d)}else{i=null}}}if((i=="auto"||i.indexOf("%")!==-1)&&("width"===d.toLowerCase()||"height"===d.toLowerCase())&&h.style.display!="none"&&i.indexOf("%")!==-1){i=h["offset"+d.charAt(0).toUpperCase()+d.substring(1).toLowerCase()]+"px"}if(d=="opacity"){try{i=h.filters["DXImageTransform.Microsoft.Alpha"].opacity;i=i/100}catch(j){try{i=h.filters("alpha").opacity}catch(g){}}}return i};return function(e,d){if(typeof d==="string"){return c(e,d)}else{a.each(d,function(f,g){e.style[f]=g})}}}(),getPageSize:function(){var g,c;if(window.innerHeight&&window.scrollMaxY){g=document.body.scrollWidth;c=window.innerHeight+window.scrollMaxY}else{g=Math.max(document.body.scrollWidth,document.body.offsetWidth);c=Math.max(document.body.scrollHeight,document.body.offsetHeight)}var e,h;e=document.documentElement.clientWidth||document.body.clientWidth;h=document.documentElement.clientHeight||document.body.clientHeight;var f=Math.max(c,h);var d=Math.max(g,e);return{page:{width:d,height:f},window:{width:e,height:h}}},findPos:function(c){var d={x:0,y:0};if(!!document.documentElement.getBoundingClientRect()){d.x=c.getBoundingClientRect().left+a.scroll().left;d.y=c.getBoundingClientRect().top+a.scroll().top}else{while(c){d.x+=c.offsetLeft;d.y+=c.offsetTop;c=c.offsetParent}}return d},textPos:function(e,h){var i=e||window.event;var g={};var j={};var d=h.h;var f=h.v||"bottom";if(window.getSelection){g=window.getSelection().getRangeAt(0)}else{if(document.selection){g=document.selection.createRange()}}if(!!d){j.x=c[d]+a.scroll().left}else{if(i.pageX||i.pageY){j.x=i.pageX}else{if(i.clientX||i.clientY){j.x=i.clientX+a.scroll().left}}}if(!!g.getBoundingClientRect){var c=g.getBoundingClientRect();j.y=c[f]+a.scroll().top}else{if(i.pageX||i.pageY){j.y=i.pageY}else{if(i.clientX||i.clientY){j.y=i.clientY+a.scroll().top}}}return j},scroll:function(){return{left:document.documentElement.scrollLeft+document.body.scrollLeft,top:document.documentElement.scrollTop+document.body.scrollTop}},walkTheDOM:function walkTheDOM(e,d,c){if(c&&!c(e)){return}d(e);if(e.tagName==="NOSCRIPT"){return}else{if(e.tagName==="IFRAME"||e.tagName==="FRAME"){return}else{e=e.firstChild}}while(e){walkTheDOM(e,d,c);e=e.nextSibling}},getTextNodes:function(e,c){var d=[];a.walkTheDOM(e,function(f){if(f.nodeType===3&&a.trim(f.nodeValue)){d.push(f)}},c);return d},getElementsByClassName:function(e,d){if(e.getElementsByClassName){return e.getElementsByClassName(d)}else{var c=[];a.walkTheDOM(e,function(f){if(a.hasClass(f,d)){c.push(f)}});return c}},query:function(e,f){var d=new RegExp("(?:(?:\\.([^()]+))?)(?:(?:#([^()]+))?)");var c=d.exec(e);var i=f||document;if(!c){return null}else{if(!!c[1]){var h=c[1];if(i.getElementsByClassName){return i.getElementsByClassName(h)}else{var g=[];a.walkTheDOM(i,function(j){if(a.hasClass(j,h)){g.push(j)}});return g}}if(!!c[2]){return i.getElementById(c[2])}}},trim:function(c){return c.replace(/^\s*/,"").replace(/\s*$/,"")},formatTemplate:function(f,g){var d=document.createElement("div");for(var e in g){if(g.hasOwnProperty(e)){f=f.replace(new RegExp("{"+e+"}","g"),g[e])}}d.innerHTML=f;var c=d.firstChild;d.removeChild(c);return c},hasClass:function(g,f){if(a.isDOM(g)){if(g.className===f){return true}var e=g.className.split(" "),d=0,c=e.length;for(;d<c;d++){if(f===e[d]){return true}}}return false},loadCSS:function(e,d){var c=function(j){if(e&&e.createElement){var i=Date.parse(new Date()),g=e.createElement("link");var f=j;g.setAttribute("rel","stylesheet");g.setAttribute("href",f);g.setAttribute("type","text/css");var h=e.getElementsByTagName("head")[0]||e.body;h.appendChild(g)}};if(a.isArray(d)){a.each(d,function(f,g){c(g)})}else{if(typeof d==="string"){c(d)}}},addClass:function(g,f){if(a.isDOM(g)){var e=g.className.split(" "),d=0,c=e.length;for(;d<c;d++){if(f===e[d]){return}}e[d]=f;g.className=e.join(" ")}},removeClass:function(g,f){if(a.isDOM(g)){var e=g.className.split(" "),d=0,c=e.length,h=[];for(;d<c;d++){if(f!==e[d]){h.push(e[d])}}g.className=h.join(" ")}},toggleClass:function(g,f){if(a.isDOM(g)){var e=g.className.split(" "),d=0,c=e.length,j=[],h="add";for(;d<c;d++){if(f===e[d]){h="remove"}else{j.push(e[d])}}if(h==="add"){e[d]=f}else{e=j}g.className=e.join(" ")}},guid:function(){var c=function(){return(((1+Math.random())*65536)|0).toString(16).substring(1)};return function(){return(c()+c()+"-"+c()+"-"+c()+"-"+c()+"-"+c()+c()+c())}}(),protoExtend:function(e,c){var d=a.isFunction(c)?c:function(){};d.prototype=e;return new d()},stopPropagation:function(d){var c=d||window.event;if(c.stopPropagation){c.stopPropagation()}c.cancelBubble=true;return c},storage:function(d,f){var e=function(h,i){var g=window.localStorage;if(i===undefined){return g.getItem(h)}if(h!==undefined&&i!==undefined){g.setItem(h,i);return i}};var c=function(h,i){var g=document.documentElement;g.addBehavior("#default#userData");if(i===undefined){g.load("fanyiweb2");return g.getAttribute(h)}if(h!==undefined&&i!==undefined){g.setAttribute(h,i);g.save("fanyiweb2");return i}};if(!!window.localStorage){return e(d,f)}if(!!document.documentElement.addBehavior){return c(d,f)}},cookie:function(c,f){function d(g,i){var h=30;var j=new Date();j.setTime(j.getTime()+h*24*60*60*1000);document.cookie=g+"="+i+";expire*="+j.toGMTString()}function e(h){var g=document.cookie.match(new RegExp("(^| )"+h+"=([^;]*)(;|$)"));if(g!=null){return decodeURIComponent(g[2])}return null}if(!!f){d(c,f)}else{return e(c)}},parseData:function(){var c={json:function(d){try{return d=JSONDAO.parse(d)}catch(f){a.log("[Error]","Invalid JSON data:",d)}},xml:function(e){if(window.DOMParser){return(new DOMParser()).parseFromString(e,"text/xml")}else{var d=new ActiveXObject("Microsoft.XMLDOM");d.async="false";d.loadXML(e);return d}}};return function(d,e){if(d===undefined){return e}if(a.isFunction(d)){return d(e)}if(!!d&&!c[d]){a.log("[Error]","Function parseData() dosen't support this type:",d);return e}return c[d](e)}}(),once:function(c){return function(){if(a.isFunction(c)){c.apply(this,arguments)}c=function(){}}}};window.J=a})();(function(a){var b=function(e,d,c){return new b.prototype.init(e,d,c)};b.prototype={init:function(c,f,g){var d=this;var e=[];var h=function(i){d.ajax=i;while(e.length>0){i(e.pop())}};if(!!window.postMessage){this.createMessageChannel(c,f,g,h)}else{this.createJTRAssist(c,h)}this.ajax=function(i){e.push(i);return this};return this},createMessageChannel:function(d,f,h,i){var e=this;var c=(function(){if(a.isDOM(a.query("#"+d))){throw new Error("Existed CDA iFrame element")}if(f&&h){var j=document.createElement("iframe");j.setAttribute("id",d);j.className=("OUTFOX_JTR_CONN");j.style.display="none";j.setAttribute("src",h);document.body.appendChild(j);return j.contentWindow}else{throw new Error("Empty domain is not allowed")}})();var g=(function(){var k=[];var l=0;var j={transferStationReady:function(){i(function(m){m.data=a.param(m.data);m.index=l++;k[m.index]={dataType:m.dataType,callback:m.callback};delete m.callback;c.postMessage(JSONDAO.stringify(m),'*');return e})},dataBack:function(n){if(!!n&&!!k[n.index]){var m=k[n.index];if(a.isFunction(m.callback)){m.callback(a.parseData(m.dataType,n.response))}delete k[n.index]}}};return function(n){var m=JSONDAO.parse(n.data);j[m.handler](JSONDAO.parse(n.data))}})();a.bind(window,"message",function(j){g.call(e,j)})},createJTRAssist:function(h,e){var k=this;var d="http://fanyi.youdao.com/web2/JTRAssist.swf?"+(+new Date());var j=function(){if(!!a.query("#"+h)){return}var l=document.createElement("div");if(a.browser.msie==="6.0"||a.browser.msie==="7.0"){l.innerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="1" height="1" id="'+h+'"><param name="allowScriptAccess" value="always" /><param name="movie" value="'+d+'" /></object>'}else{l.innerHTML='<object height="1" width="1" id="'+h+'" data="'+d+'"><param name="allowScriptAccess" value="always"></object>'}document.body.appendChild(l)};var c="outfox_jtr_fproxy_callback_",f=0;var g=function(m){var l=c+(f++);window[l]=function(n){m.callback.call(k,a.parseData(m.dataType,decodeURI(n)))};a.query("#"+h).load(m.url,m.data,m.type||"POST",'window["'+l+'"]')};var i=function(n){var l=n.data.key,m=n.data.value;if(m===undefined){if(a.isFunction(n.callback)){n.callback(a.parseData(n.dataType,a.query("#"+h).getItem(l)))}}else{a.query("#"+h).setItem(l,m)}};j();window.JTRAssistIsReady=function(){e(function(l){switch(l.handler){case"translate":l.data=a.param(l.data);g(l);break;case"localStorage":i(l);break;default:throw new Error("Unsupported request type :"+l.handler)}return k})}}};b.prototype.init.prototype=b.prototype;a.CDA=b})(J);(function(a){TR=function(d,b,g,c){this._manager=c;this._reqSize=b.reqSize;this._onStatusChange=b.onStatusChange||function(){};this._url=b.url;this.conn=g;this._context=d;this._request=function(i,j,k){g.ajax({url:i,handler:"translate",type:"POST",data:j,callback:k,dataType:"json"})};var h=new a.Page(d);var f=[];var e=h.getMainArticle();if(e){f=a.getTextNodes(e.elem,TR.isInclude)}this.mainNodeLength=f.length||null;this._nodeIndex=[];f=f.concat(a.getTextNodes(d,function(i){return(i!==(e&&e.elem))&&TR.isInclude(i)}));a.each(f,function(i,j){this._nodeIndex.push(this._manager.addNode(j))},this);this.workingThread=0;this.guid=b.guid||a.guid()};TR.prototype={doTrans:function(){var d=++this.workingThread;var h={ue:a.getDocumentCharset()||null,data:null,relatedUrl:document.location.href,guid:this.guid,mainLength:this.mainNodeLength,requestId:a.guid()};var j=[];var f=0;for(var g=0;g<this._nodeIndex.length;g++){if(this._manager.transResults[g]){if(d===this.workingThread){this._manager.replaceTrans(g)}}else{var e=null;if(j[parseInt(f/this._reqSize,10)]){e=j[parseInt(f++/this._reqSize,10)]}else{e=j[parseInt(f++/this._reqSize,10)]={}}var i=null;try{i=this._manager.nodes[g].parentNode&&this._manager.nodes[g].parentNode.tagName||null}catch(c){}e[g]={src:this._manager.originals[g],tag:i}}}if(j.length===0){this._onStatusChange({id:d,action:"TRANS",level:"0",status:"finish"});return}var k=this,b=function(l){k._onStatusChange({id:d,action:"TRANS",level:"0",status:"busy",data:[l,j.length]});h.data=JSONDAO.stringify(j[l]);k._request(k._url.textTrans,h,function(m){k._updateTrans(m,d);if(++l<j.length){b(l)}else{k._onStatusChange({id:d,action:"TRANS",level:"0",status:"finish"})}})};b(0)},revertTrans:function(){var c=++this.workingThread;for(var b=0;b<this._nodeIndex.length;b++){if(c===this.workingThread){this._manager.revertTrans(this._nodeIndex[b])}}},_updateTrans:function(b,c){if(!!!b){return}if(b.errorCode===40&&b.errorCode===30){a.log("Get Error Code:",b.errorCode);return}a.each(b.data,function(d,e){this._manager.transResults[d]=e.tst;if(c===this.workingThread){this._manager.replaceTrans(d)}},this)},doTips:function(b){var e=++this.workingThread;var i={type:"X",ue:a.getDocumentCharset()||null,data:null,relatedUrl:document.location.href,mainLength:this.mainNodeLength,guid:this.guid};var k=[];var g=0;for(var h=0;h<this._nodeIndex.length;h++){if(this._manager.tipsResults[h]){if(e===this.workingThread){this._manager.replaceTips(h,b)}}else{var f=null;if(k[parseInt(g/this._reqSize,10)]){f=k[parseInt(g++/this._reqSize,10)]}else{f=k[parseInt(g++/this._reqSize,10)]={}}var j=null;try{j=this._manager.nodes[h].parentNode&&this._manager.nodes[h].parentNode.tagName||null}catch(d){}f[h]={src:this._manager.originals[h],tag:j}}}if(k.length===0){this._onStatusChange({id:e,action:"TIPS",level:b,status:"finish"});return}var l=this;var c=function(m){a.log("Send:",k[m]);l._onStatusChange({id:e,action:"TIPS",level:b,data:[m,k.length],status:"busy"});i.data=JSONDAO.stringify(k[m]);l._request(l._url.tips,i,function(n){l._updateTips(n,e,b);if(++m<k.length){c(m)}else{l._onStatusChange({id:e,action:"TIPS",level:b,status:"finish"})}})};c(0)},revertTips:function(){var c=++this.workingThread;for(var b=0;b<this._nodeIndex.length;b++){if(c===this.workingThread){this._manager.revertTips(this._nodeIndex[b])}}},_updateTips:function(e,d,c){if(!!!e){return}if(e.errorCode===40&&e.errorCode===30){a.log("Get Error Code:",e.errorCode);return}var b=function(g,f){return g.start>f.start};a.each(e.data,function(f,g){if(g.length>0){this._bubbleSort(g,b);this._manager.tipsResults[f]=g;if(d===this.workingThread){this._manager.replaceTips(f,c)}}else{this._manager.tipsResults[f]=[]}},this)},_bubbleSort:function(c,f){for(var d=c.length-2;d>=0;d--){for(var b=0;b<=d;b++){if(f(c[b+1],c[b])){var e=c[b];c[b]=c[b+1];c[b+1]=e}}}return c}};TR.isInclude=function(b){return !(b.tagName==="SCRIPT"||b.tagName==="STYLE"||b.tagName==="PRE"||(b.className&&/OUTFOX_JTR_/.test(b.className)))};a.TR=TR})(J);if(!J||!J.bind){throw new Error("swipe extension need J.bind support")}(function(h){var g="http://fanyi.youdao.com",f=g+"/fsearch",b=g+"/translate";var j=function(k){return'<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="15px" height="15px" align="absmiddle" id="speach_flash"><param name="allowScriptAccess" value="sameDomain" /><param name="movie" value="http://cidian.youdao.com/chromeplus/voice.swf" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="high" /><param name="wmode" value="transparent"><param name="FlashVars" value="audio='+k+'"><embed wmode="transparent" play="false" src="http://cidian.youdao.com/chromeplus/voice.swf" loop="false" menu="false" quality="high" bgcolor="#ffffff" width="15" height="15" align="absmiddle" allowScriptAccess="sameDomain" FlashVars="audio='+k+'" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /></object>'};var c=function(k){return k.split&&k.split(" ").length||0};var e={isJapanese:function(k){return !Boolean(/[^\u0800-\u4e00]/.test(k))},isContainJapanese:function(k){var m=0;for(var l=0;l<k.length;l++){if(this.isJapanese(k.charAt(l))){m++}}return m>2},isKoera:function(k){for(i=0;i<k.length;i++){if(((k.charCodeAt(i)>12592&&k.charCodeAt(i)<12687)||(k.charCodeAt(i)>=44032&&k.charCodeAt(i)<=55203))){return true}}return false},isContainKoera:function(k){var m=0;for(var l=0;l<k.length;l++){if(this.isKoera(k.charAt(l))){m++}}return m>0},isChinese:function(k){return !Boolean(/[^\u4e00-\u9fa5]/.test(k))},isContainChinese:function(k){var m=0;for(var l=0;l<k.length;l++){if(this.isChinese(k.charAt(l))){m++}}return m>5}};var a=function(k,l){return new a.fn.init(k,l)};a.fn=a.prototype={init:function(l,m){var k=this;this.wrapper=a.createFrameWrapper();this.conn=a.initConnection(m);this.context=l;h.bind(document.body,"click",function(o){var n=o||window.event;k.wrapper.style.display="none";k.wrapper.style.position="absolute";k.wrapper.innerHTML=""})},enableSwipe:function(){if(!this._swipeListener){var k=this;this._swipeListener=function(l){k._onSwipe.call(k,l)};h.bind(this.context,"mouseup",this._swipeListener)}},disableSwipe:function(){if(this._swipeListener){h.unbind(this.context,"mouseup",this._swipeListener);delete this._swipeListener}},_onSwipe:function(l){var k="",n="";var m={};if(window.getSelection){k=window.getSelection()}else{if(document.selection){k=document.selection.createRange()}}if(k.toString){n=k.toString()}else{if(k.text){n=k.text.toString()}}var o=h.textPos(l,{});n=h.trim(n);if(!a.validateSwipeWord(n)){return}this.swipeWord(n,o.x,o.y);if(this.onSwipeCallback){this.onSwipeCallback(n)}},swipeWord:function(p,k,q,o,n){var l=this;var m=null;this.wrapper.innerHTML="";if((!e.isContainChinese(p)&&c(p)>=3)||(e.isContainChinese(p)||e.isContainJapanese(p)&&p.length>4)){m="translate"}else{m="dict"}this.conn.request({action:m,word:p},function(r){l.wrapper.innerHTML="";l._onResponse.call(l,r);a.initWrapper(l.wrapper,k,q,o,n)})},_onResponse:function(l){var m=l.firstChild,k=null;if(!m){return}else{if(m.baseName&&m.baseName=="xml"){m=m.nextSibling}}switch(m.tagName){case"response":k=a.processXmlTransData(l);break;case"yodaodict":k=a.processXmlDictData(l);break;default:throw new Error("Incorrect xml data")}if(k){this.wrapper.appendChild(k);this.wrapper.style.display="block"}}};a.createFrameWrapper=function(){var k=document.createElement("div");k.id="yddWrapper";h.bind(k,"click",function(l){h.stopPropagation(l)});h.bind(k,"mouseup",function(l){h.stopPropagation(l)});document.body.appendChild(k);return k};a.validateSwipeWord=function(k){return !(k===""||k.length>2000)};a.initConnection=function(k){var n=null;var m=function(q){var p=null,r=null;if(q.action=="dict"){r={client:"JTRHelper",keyfrom:"JTRHelper.bookmark",q:q.word,pos:-1,doctype:"xml",xmlVersion:"3.2",dogVersion:"1.0",vendor:"jtr",le:"eng"};p=f}else{r={client:"JTRHelper",keyfrom:"JTRHelper.bookmark",i:q.word,doctype:"xml",xmlVersion:"1.1",dogVersion:"1.0"};p=b}return[p,r]};if(window.chrome&&window.chrome.extension&&window.chrome.extension.sendRequest){n={request:function(p,q){window.chrome.extension.sendRequest(p,function(r){if(r){q((new DOMParser()).parseFromString(r,"text/xml"))}})}};return n}else{if(k){n={request:function(q,r){var p=m(q);k.ajax({url:p[0],handler:"translate",data:p[1],callback:r,dataType:"xml",type:"POST"})}};return n}else{if(h.CDA){var l=null;try{l=h.CDA("_OUTFOX_JTR_SWIPE_CONN",g,CONN_FILE_PATH)}catch(o){throw new Error("Unable to get cross-domain ajax file.")}n={request:function(q,r){var p=m(q);l.ajax({url:p[0],handler:"translate",data:p[1],callback:r,dataType:"xml",type:"POST"})}};return n}else{throw new Error("Unable to initialize cross-domain connection port.")}}}};a.initWrapper=function(p,t,s,q,D){var n=0,v=0,B=50,l=h.scroll().top,z=h.scroll().left,u=p.clientHeight,C=p.clientWidth,w=h.getPageSize().window.height,F=h.getPageSize().window.width;q=q||0;D=D||0;if(s-u>=l+B){v=s-u}else{v=s+D}if(t+C<=F+z){n=t+q}else{n=F+z-C}var r=!!(h.css(document.body,"position")!=="static");var A=h.css(document.body,"marginLeft");var o=h.css(document.body,"marginRight");if(A==="auto"&&o==="auto"){var E=h.getPageSize().page.width;var k=parseInt(h.css(document.body,"width"));if(E>k){A=(E-k)/2}else{A=0}}A=r?parseInt(A):0;var m=r?parseInt(h.css(document.body,"marginTop")):0;h.css(p,{position:"absolute",left:(n-A)+"px",top:(v-m)+"px"})};a.processXmlTransData=function(r){var l=(r.getElementsByTagName("input")[0].childNodes[1]||r.getElementsByTagName("input")[0].childNodes[0]).nodeValue,q=(r.getElementsByTagName("translation")[0].childNodes[1]||r.getElementsByTagName("translation")[0].childNodes[0]).nodeValue,p=r.getElementsByTagName("response")[0].getAttribute("errorCode")-0,n=h.trim(q),m=h.trim(l);if((e.isContainChinese(m)||e.isContainJapanese(m)||e.isContainKoera(m))&&m.length>15){m=m.substring(0,8)+" ..."}else{if(m.length>25){m=m.substring(0,15)+" ..."}}if(m==n){return null}var o="http://fanyi.youdao.com/translate?i="+encodeURIComponent(l)+"&keyfrom=chrome";var k='<div class="ydd-container"> <div class="ydd-top-wrapper"> <div class="ydd-top"> </div> </div> <div class="ydd-body-wrapper"> <div class="ydd-lb"></div> <div class="ydd-rb"></div> <div class="ydd-body"> <div class="ydd-titile"> <span>{input}</span> <span><a href="{searchURL}" target="_blank">详细››</a></span> </div> <div class="ydd-middle"> <div class="ydd-trans-wrapper ydd-simple-trans"> <div class="ydd-trans-container">{trans}</div> </div> </div> </div> </div> <div class="ydd-bottom-wrapper"><div class="ydd-bottom"></div></div> <div class="ydd-bg-top"></div></div> </div>';return h.formatTemplate(k,{searchURL:o,input:a.escapeHTML(m),trans:a.escapeHTML(q)})};a.processXmlDictData=function(D){var l=null,n=null,q=[],z=[],x="",v="",F="",r="",w=0;var t=function(H){try{return D.getElementsByTagName(H)[0].firstChild.nodeValue}catch(G){return""}};x=t("return-phrase");v=t("dictcn-speach");F=t("lang");r=t("phonetic-symbol");if((n=D.getElementsByTagName("translation"))&&n.length>0){for(w=0;w<n.length;w++){q.push(n[w].getElementsByTagName("content")[0].firstChild.nodeValue)}}if((l=D.getElementsByTagName("web-translation"))&&l.length>0){for(w=0;w<l.length-1;w++){z.push({key:l[w].getElementsByTagName("key")[0].firstChild.nodeValue,value:l[w].getElementsByTagName("trans")[0].getElementsByTagName("value")[0].firstChild.nodeValue})}}var B="http://dict.youdao.com/search?q="+encodeURIComponent(x)+"&keyfrom=chrome.extension"+F,E=x,A="",o="",m="",u=null,C="http://www.youdao.com/search?q={title}&keyfrom=fanyi.jtr",s="";s='<div class="ydd-container"> <div class="ydd-top-wrapper"> <div class="ydd-top"></div> </div> <div class="ydd-body-wrapper"> <div class="ydd-lb"></div> <div class="ydd-rb"></div> <div class="ydd-body"> <div class="ydd-titile"> <span class="ydd-key-title">{title}</span> <span class="ydd-phonetic">{phonetic}</span> {speechHTML} <span class="ydd-detail"><a href="{searchURL}" target="_blank">详细››</a></span> </div> <div class="ydd-middle"> <div class="ydd-trans-wrapper ydd-base-trans"> <div class="ydd-tabs"><span class="ydd-tab">基本翻译</span></div>{baseTransHTML}</div> <div class="ydd-trans-wrapper ydd-web-trans"> <div class="ydd-tabs"><span class="ydd-tab">网络释义</span></div>{webTransHTML}</div> </div> </div> </div> <div class="ydd-bottom-wrapper"> <div class="ydd-bottom"><a href="'+C+'" target="_blank" title="使用有道搜索 {title}">搜索 {title}</a></div> </div> <div class="ydd-bg-top"></div> </div> </div>';if((e.isContainChinese(E)||e.isContainJapanese(E)||e.isContainKoera(E))&&E.length>15){E=E.substring(0,10)+"..."}else{if(E.length>25){E=E.substring(0,15)+" ..."}}if(q.length+z.length>0&&v){A='<span class="ydd-voice">'+j("http://dict.youdao.com/speech?audio="+v,"test","CLICK","dictcn_speech")+"</span>"}for(w=0;w<q.length;w++){o+='<div class="ydd-trans-container">'+q[w]+"</div>"}for(w=0;w<z.length;w++){var p="http://dict.youdao.com/search?q="+encodeURIComponent(z[w].key)+"&keyfrom=chrome.extension"+F;m+='<div class="ydd-trans-container"><a href="'+p+'" target="_blank">'+z[w].key+":</a> "+z[w].value+"</div>"}u=h.formatTemplate(s,{phonetic:r?"["+r+"]":"",title:E,searchURL:B,speechHTML:A,baseTransHTML:o,webTransHTML:m});var k=h.query(".ydd-middle",u)[0];n=h.query(".ydd-base-trans",k)[0];l=h.query(".ydd-web-trans",k)[0];if(q.length+z.length===0){k.innerHTML='<p class="ydd-no-result">没有英汉互译结果</p>'}try{if(q.length===0){k.removeChild(n)}else{if(z.length===0){k.removeChild(l)}}}catch(y){}return u};var d={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};a.escapeHTML=function(k){return String(k).replace(/[&<>"'\/]/g,function(l){return d[l]})};a.fn.init.prototype=a.fn;h.Swipe=a})(J);(function(a){var b=function(d,c,f){var e=this;if(!a.isDOM(d)){throw Error("Invalid slider container element")}this.container=d;if(!a.isDOM(c)){throw Error("Invalid slider controller block element")}this.controller=c;for(var g=this.container;g;g=g.parentNode){if(g.nodeType===9){this.document=g;break}}if(!g){throw Error("Can't find parent Document element of container, container dom node should insert to document first")}if(a.isDOM(f.bar)){this.bar=f.bar}else{this.bar=null}this.range=Number(f.max-f.min);if(!(this.range&&this.range>0)){throw Error("range must greater than 0")}if(a.isFunction(f.callback)){this.callback=function(h){f.callback.call(e,h)}}this.borderFix=Number(f.borderFix)||0;this.mousemove=function(h){e._mousemove(h)};this.mouseup=function(h){e._mouseup(h)};this.mousedown=function(h){e._mousedown(h)}};b.prototype={enable:function(){a.bind(this.container,"mousedown",this.mousedown)},disable:function(){a.unbind(this.container,"mousedown",this.mousedown)},to:function(e,d){var c=this,f=null;tempFunc=function(){if(!c.container.offsetHeight||!c.container.clientWidth){f=setTimeout(tempFunc,200);return}var g=c.container.clientWidth-c.controller.clientWidth-2*c.borderFix;pos=e/c.range*g;c._valueChange(pos/g*c.range,pos)};tempFunc()},_mousemove:function(d){var c=d||window.event;this._moveHandler(c,false)},_mouseup:function(d){var c=d||window.event;this._moveHandler(c,true);a.unbind(this.document,"mouseup",this.mouseup);a.unbind(this.document,"mousemove",this.mousemove);this.container.style.cursor="pointer"},_mousedown:function(d){var c=d||window.event;this._moveHandler(c,false);a.bind(this.document,"mouseup",this.mouseup);a.bind(this.document,"mousemove",this.mousemove);if(c.preventDefault){c.preventDefault()}c.returnValue=false},_moveHandler:function(e,i){var f=e.clientX-1/2*this.controller.clientWidth-a.findPos(this.container).x-this.borderFix,h=this.container.clientWidth-this.controller.clientWidth-2*this.borderFix,g=h/this.range,c=g/2,d=f%g,j=0;if(f<0){f=0;d=0}else{if(f>h){f=h;d=0}}if(i&&d<c){j=f-d}else{if(i&&d>g-c){j=f-d+g}else{j=f}}this._valueChange(j/h*this.range,j)},_valueChange:function(c,d){this.callback(c);this.controller.style.left=d+this.borderFix+"px";if(this.bar){this.bar.style.width=d+this.controller.clientWidth/2+"px"}}};a.Slider=b})(J);(function(a){var b=function(){this.nodes=[];this.originals={};this.transResults={};this.tipsResults={}};b.prototype={addNode:function(e,c){var d=0;if(!c){for(;d<this.nodes.length;d++){if(this.nodes[d]===e){return d}}}this.nodes.push(e);this.originals[d]=e.nodeValue;return d},replaceTrans:function(d){if(this.nodes[d]&&this.transResults[d]){var f=this.nodes[d],h=document.createElement("font"),c=this.transResults[d];try{if(f.nodeValue===c){return false}if(!f.parentNode){return}}catch(g){return}f.nodeValue="";h.className="OUTFOX_JTR_TRANS_NODE";h.id="OUTFOX_JTR_TRANS_NODE-"+d;h.setAttribute("rel",d);h.innerHTML=c;try{f.parentNode.insertBefore(h,f.nextSibling)}catch(e){}}},revertTrans:function(c){if(this.nodes[c]&&this.originals[c]){var e=a.query("#OUTFOX_JTR_TRANS_NODE-"+c);if(e&&e.parentNode){e.parentNode.removeChild(e)}try{this.nodes[c].nodeValue=this.originals[c]}catch(d){}}},replaceTips:function(d,c){var e=c||-1;if(this.nodes[d]&&this.tipsResults[d]){a.each(this.tipsResults[d],function(q,n){if(n.level&&n.level<e){return}var k=this.nodes[d],i=n.start,m=n.end,o=n.explain;if(typeof k.parentNode===undefined){return}var h=document.createElement("font");h.className="OUTFOX_NANCI_WRAPPER";try{var p=k.nodeValue.substr(0,i),g=k.nodeValue.substr(i,m-i),f=k.nodeValue.substr(m);k.nodeValue=p;h.innerHTML=g;k.parentNode.insertBefore(document.createTextNode(f),k.nextSibling);k.parentNode.insertBefore(h,k.nextSibling);var j=document.createElement("font");j.className="OUTFOX_NANCI_TIPS";j.setAttribute("rel",d);j.innerHTML="("+o+")";h.parentNode.insertBefore(j,h.nextSibling)}catch(l){}},this)}},revertTips:function(c){if(this.nodes[c]){var d;do{try{d=!this.revertTip(this.nodes[c].nextSibling)}catch(e){d=true}}while(!d)}},revertTip:function(d){if(a.hasClass(d,"OUTFOX_NANCI_WRAPPER")&&d.firstChild){var c=d.nextSibling;if(a.hasClass(c,"OUTFOX_NANCI_TIPS")){c.parentNode.removeChild(c)}if(d.nextSibling&&d.nextSibling.nodeType===3){d.firstChild.nodeValue+=d.nextSibling.nodeValue;d.parentNode.removeChild(d.nextSibling)}if(d.previousSibling&&d.previousSibling.nodeType===3){d.previousSibling.nodeValue+=d.firstChild.nodeValue;d.parentNode.removeChild(d)}return true}else{return false}},countTips:function(d){var c=0;a.each(this.tipsResults,function(g,e){for(var f=0;f<e.length;f++){if(e[f].level>=d){c++}}},this);return c}};a.NodeManager=b})(J);(function(a){var b=function(){this.map={};this.dataMap={}};b.prototype={getId:function(c){var d=null;a.each(this.map,function(f,e){if(e===c){d=f;return false}});if(d===null){d=a.guid();this.map[d]=c}return d},data:function(g,c,f){var h=this.getId(g);if(arguments.length===3){if(!this.dataMap[h]){this.dataMap[h]={}}this.dataMap[h][c]=f;return f}else{var e=null;try{e=this.dataMap[h][c]}catch(d){e=undefined}return e}}};a.Cache=b})(J);(function(a){var b=function(d){this.contentDocument=d;this.cache=new a.Cache()};b.prototype={IGNORE_TAGS:["HTML","HEAD","META","TITLE","SCRIPT","STYLE","LINK","IMG","FORM","INPUT","BUTTON","TEXTAREA","SELECT","OPTION","LABEL","IFRAME","UL","OL","LI","DD","DT","A","OBJECT","PARAM","EMBED","NOSCRIPT","EM","B","STRONG","I","INS","BR","HR","PRE","H1","H2","H3","H4","H5","CITE"],getMainArticle:function(){return null;var g=null,e="";if(!!location){e=location.hostname}if(/\b(google|facebook|twitter)\b/i.test(e)){return null}var d=this._getAllArticle();if(!(d&&d.length)){return null}d.sort(function(i,h){return !!(h.weight-i.weight)});for(var f=2;f>0;f--){g=d[0];d.splice(0,1);break}return g},_getAllArticle:function(){var f=this.contentDocument.getElementsByTagName("*"),e=[];for(var d=0,h=f.length>100?100:f.length;d<h;d++){var g=f[d];if(this._checkTagName(g)&&this._checkSize(g)&&this._checkVisibility(g)){e[e.length]=new c(g)}}return e},_checkTagName:function(d){return a.indexOf(this.IGNORE_TAGS,d.tagName)==-1},_checkVisibility:function(d){return !(a.css(d,"visibility")=="hidden"||a.css(d,"display")=="none"||parseInt(a.css(d,"height"))<=0||parseInt(a.css(d,"width"))<=0)},_checkSize:function(d){return d.offsetWidth>300&&d.offsetHeight>200}};var c=function(d){this.elem=d;this._texts=this._getAllTexts();this.weight=this.calcWeight()};c.prototype={IGNORE_TAGS:["A","DD","DT","OL","OPTION","PRE","SCRIPT","STYLE","UL","IFRAME"],MINOR_REGEXP:/comment|combx|disqus|foot|header|menu|rss|shoutbox|sidebar|sponsor/i,MAJOR_REGEXP:/article|entry|post|body|column|main|content/i,TINY_REGEXP:/comment/i,BLANK_REGEXP:/\S/i,_getAllTexts:function(){var g=[],d=a.getTextNodes(this.elem);for(var h=0,f=d.length;h<f;h++){var j=d[h];if(this._checkTagName(j)&&this._checkLength(j)){var e=j.parentNode||{},i=e.parentNode||{};if(!(this._checkMinorContent(e)||this._checkMinorContent(i))){g.push(j)}}}return g},calcStructWeight:function(){var d=0;for(var i=0,e=this._texts.length;i<e;i++){var j=this._texts[i],g=j.nodeValue.length,h=1;if(g>20){continue}for(var f=j.parentNode;f&&f!=this.elem;f=f.parentNode){h-=0.1}d+=Math.pow(g*h,1.25)}return d},calcContentWeight:function(){var d=1;for(var e=this.elem;e;e=e.parentNode){var f=e.id+" "+e.className;if(this.MAJOR_REGEXP.test(f)){d+=0.4}if(this.MINOR_REGEXP.test(f)){d-=0.8}}return d},calcWeight:function(){return this.calcStructWeight()*this.calcContentWeight()},_checkTagName:function(d){return a.indexOf(this.IGNORE_TAGS,d.tagName)==-1},_checkLength:function(d){return Boolean(this.BLANK_REGEXP.test(d.nodeValue))},_checkMinorContent:function(d){return Boolean(this.TINY_REGEXP.test(d.id+" "+d.className))}};a.Page=b})(J);(function(a){var b={runCount:0,swipe:true,mode:"TIPS",level:1};var c={0:["TIPS",3],1:["TIPS",2],2:["TIPS",1],3:["TRANS","0"],4:["NONE","NONE"]};a.TR.UI=function(e,f){var d=this;this.initLogger(f.logURL);this.log({action:"start"});this.guid=a.guid();this.context=e;this.conn=a.CDA("OUTFOX_JTR_CDA",f.domain,f.connFilePath);this.update=f.update;this.updateTipMsg=f.updateTipMsg;this.updateDate=f.updateDate;this.manager=new a.NodeManager();this.barHeight=50;this.permissionDenied="由于该网页存在安全性限制, 无法加载有道网页翻译2.0";this.translator=new a.TR(e,{reqSize:f.reqSize,onStatusChange:function(){d._trStatusChangeCallback.apply(d,arguments)},url:{textTrans:f.transURL,tips:f.tipsURL},guid:this.guid},this.conn,this.manager);this.queue={TRANS:{0:{currentThread:-1}},TIPS:{1:{currentThread:-1},2:{currentThread:-1},3:{currentThread:-1}},NONE:{NONE:{}}};this.mode=null;this.level=null;this.initFrame(f.cssURL,function(){var h="";var g=this;if(location){h=location.href}this.movePage(g.barHeight);this.frame.body.innerHTML=' <div id="wrapper"> <a href="http://fanyi.youdao.com/web2/?keyfrom=headerLogo" target="_blank"> <h1 id="headerLogo" class="logo"></h1> </a> <div id="sliderLabel">翻译级别</div> <div id="sliderWrapper" class="slider-wrapper"> <div id="levelLabel"> <label id="level-3" rel="0"><a>专 家</a></label> <label id="level-2" rel="1"><a>进 阶</a></label> <label id="level-1" rel="2"><a>入 门</a></label> <label id="level-0" rel="3"><a>全文翻译</a></label> </div> <div id="sliderContainer" class="slider-container"> <div id="sliderBackground"><div class="slider-background"></div></div> <a id="slider" href="javascript:void(0);" class="slider"></a> </div> </div> <div id="status"></div> <div id="switchWrapper"><a id="switch" href="javascript:void(0);"></a></div> </div> <a id="OUTFOX_JTR_BAR_CLOSE" href="javascript:void(0);" class="OUTFOX_JTR_BAR_CLOSE"></a> <div id="OUTFOX_JTR_BAR_UPDATE_SHADE"></div> <div id="OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP"> <div id="OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT"></div> </div>';this.initTipContent();this.initBarClose();this.initSwitch();this.initSlider();this.initLabel();this.initTipsCtrl();this.initTransTip();this.initSwipe();var i=function(j){g.loadSetting(j);g.enable();g.writeSettings({runCount:g.settings.runCount+1});a.each(c,function(k,l){if(g.mode===l[0]&&g.level===l[1]){g.slider.to(k)}})};this.conn.ajax({handler:"localStorage",data:{key:"settings"},dataType:"json",callback:function(j){i(j)}})})};a.TR.UI.prototype={positionElementInViewPort:function(k){var n=k.tip;var x=k.target;var l=!!(a.css(document.body,"position")!=="static");var r=a.css(document.body,"marginLeft");var h=a.css(document.body,"marginRight");if(r==="auto"&&h==="auto"){var w=a.getPageSize().page.width;var d=parseInt(a.css(document.body,"width"));if(w>d){r=(w-d)/2}else{r=0}}r=l?parseInt(r):0;var f=l?parseInt(a.css(document.body,"marginTop")):0;var j=a.findPos(x),p=0,g=0,e=a.scroll().top,s=a.scroll().left,t=j.x,m=j.y,i=x.offsetHeight,o=n.clientHeight,u=n.clientWidth,q=a.getPageSize().window.height,v=a.getPageSize().window.width;if(m-o>=e+this.barHeight){p=m-o}else{p=m+i}if(t+u<=v+s){g=t}else{g=v+s-u}a.css(k.tip,{position:"absolute",top:(p-f)+"px",left:(g-r)+"px"})},disable:function(){this.changeMode("NONE","NONE");this.slider.disable();this.frame.body.className="disable";this.disabled=true;this.updateStatus();this.switchElem.innerHTML="重新翻译"},enable:function(){this.changeMode(this.settings.mode,this.settings.level);this.slider.enable();a.removeClass(this.frame.body,"disable");a.addClass(this.frame.body,"enable");this.disabled=false;this.updateStatus();this.switchElem.innerHTML="取消翻译"},_trStatusChangeCallback:function(e){if(!e.id||!e.action||!e.level){return}var d=this.queue[e.action][e.level];if(d.currentThread<=e.id){d.currentThread=e.id;d.status=e.status;d.data=e.data||null;if(e.action===this.mode&&e.level===this.level){this.updateStatus()}}},updateStatus:function(){var f=this.queue[this.mode][this.level];a.removeClass(this.statusElem.parentNode,"statistic");if(f.status==="busy"&&f.data){this.switchElem.style.visibility="hidden";var d=parseInt(f.data[0]*100/f.data[1],10);if(this.mode==="TRANS"){this.statusElem.innerHTML="正在翻译 "+d+"% ..."}else{this.statusElem.innerHTML="正在分析 "+d+"% ..."}this.statusElem.className="busy"}else{if(f.status==="finish"){this.switchElem.style.visibility="inherit";if(this.mode==="TRANS"){this.statusElem.innerHTML="翻译完成"}else{var e=this.manager.countTips(this.level);if(e!==0){a.addClass(this.statusElem.parentNode,"statistic");this.statusElem.innerHTML='共注释<span class="OUTFOX_BAR_TOTAL_NUM">'+e+"</span>个难词"}else{this.statusElem.innerHTML="恭喜您！该网页上没有难词~"}}this.statusElem.className="finish"}else{this.switchElem.style.visibility="inherit";this.statusElem.innerHTML="翻译助手已关闭";this.statusElem.className="finish"}}},initLogger:function(d){this.logURL=d;this._logImgCache=[]},log:function(e){/*if(this.logURL){e.relatedURL=document.location.href;e.guid=this.guid;var d=new Image();d.src=this.logURL+"?"+a.param(e)+"&"+(new Date()).getTime();this._logImgCache[this._logImgCache.length]=d}*/},initSwipe:function(){var d=this;this.swipe=a.Swipe(this.context,this.conn);this.swipe.onSwipeCallback=function(e){d.log({action:"swipeWord",word:e})}},movePage:function(d){if(a.browser.msie){var f=a.css(this.context,"paddingTop");try{f=parseInt(f)}catch(e){f=0}this.context.style.cssText+=";padding-top:"+(d+f)+"px !important;"}else{var g=a.css(this.context,"marginTop");try{g=parseInt(g)}catch(e){g=0}if(a.css(this.context,"position")==="static"){a.css(this.context,{position:"relative"})}this.context.style.cssText+=";margin-top:"+(d+g)+"px !important;"}},initFrame:function(f,i){var d=this;var h=document.createElement("div");h.id="OUTFOX_BAR_WRAPPER";this.context.appendChild(h);this.wrapper=h;function g(k){k.innerHTML='<iframe id="OUTFOX_JTR_BAR" src="" style="display:none;"></iframe>';var j=a.query("#OUTFOX_JTR_BAR");j.setAttribute("frameBorder",0);if(a.browser.msie&&document.domain!=window.location.hostname){j.src="javascript:void(document.write(\"<script>document.domain='"+document.domain+"';<\/script><body></body>\"))"}if(a.browser.msie&&!(a.browser.msie==="8.0"&&document.compatMode==="CSS1Compat")){a.css(j,{width:a.getPageSize().window.width+"px"});a.bind(window,"resize",function(l){a.css(j,{width:a.getPageSize().window.width+"px"})})}return j}var e=g(h);this.iframe=e;setTimeout(function(){try{d.frame=e.contentDocument||e.contentWindow.document}catch(j){d.log({action:"secRestrict",relatedURL:window.location.href});alert(d.permissionDenied);return}a.css(e,{display:"block"});a.addClass(e,"OUTFOX_JTR_BAR");a.loadCSS(d.frame,f);d.frame.body.id="OUTFOX_JTR_BAR_BODY";a.addClass(d.frame.body,"forbid-select");d.frame.body.onselectstart=d.frame.body.ondrag=function(){return false};i.call(d)},100)},initBarClose:function(){var d=this;var e=this.frame.getElementById("OUTFOX_JTR_BAR_CLOSE");a.addClass(e,"OUTFOX_JTR_BAR_CLOSE");a.bind(window,"resize",function(f){a.css(e,{top:1+"px",right:1+"px"})});a.bind(e,"click",function(){d.disable();d.movePage(-d.barHeight);d.context.removeChild(d.wrapper);d.context.removeChild(a.query("#OUTFOX_JTR_CDA"));d.context.removeChild(a.query("#yddWrapper"));d.context.removeChild(a.query("#outfox_seed_js"))})},initTipContent:function(){if(!this.update){return}var d=this;var e=function(){var i=a.query("#OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT",d.frame);var f=a.query("#OUTFOX_JTR_BAR_UPDATE_SHADE",d.frame);var h=a.query("#OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP",d.frame);i.innerHTML="更新提示：<br/>"+d.updateTipMsg+'<span class="update-date">'+d.updateDate+'</span><a href="javascript:void(0);" id="OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT_CLOSE"></a>';var g=a.query("#OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT_CLOSE",d.frame);a.css(f,{display:"block"});a.css(h,{display:"block"});a.bind(g,"click",function(){a.css(f,{display:"none"});a.css(h,{display:"none"})})};d.conn.ajax({handler:"localStorage",data:{key:"date"},callback:function(f){if(f!==d.updateDate){e();d.conn.ajax({handler:"localStorage",data:{key:"date",value:d.updateDate}})}}})},initSwitch:function(){var d=this;this.statusElem=a.query("#status",this.frame);this.switchElem=a.query("#switch",this.frame);a.bind(this.switchElem,"click",function(f){if(d.disabled){d.enable()}else{d.disable()}})},initLabel:function(){this.labels=[];var d=this;var f=function(i){var g=i||window.event,h=g.target||g.srcElement,j=h.parentNode.getAttribute("rel");if(d.disabled){return}if(j){d.changeMode(c[j][0],c[j][1]);a.each(c,function(k,l){if(d.mode===l[0]&&d.level===l[1]){d.slider.to(k)}})}};for(var e=0;e<4;e++){this.labels[e]=a.query("#level-"+e,this.frame);a.bind(this.labels[e],"click",f)}},initSlider:function(){var e=a.query("#sliderContainer",this.frame);var d=a.query("#slider",this.frame);var f=this,h=null,g=10;this.slider=new a.Slider(e,d,{bar:a.query("#sliderBackground",this.frame),max:3,min:0,step:1,borderFix:-3,callback:function(i){clearTimeout(h);h=setTimeout(function(){f._valueChange(i)},g)}})},loadSetting:function(f){var e={};if(f===null||Object.prototype.toString.call(f)!=="[object Object]"){this.conn.ajax({handler:"localStorage",dataType:"json",data:{key:"settings",value:JSONDAO.stringify(b)}});e=b}else{for(var d in b){if(b.hasOwnProperty(d)){e[d]=f.hasOwnProperty(d)?f[d]:b[d]}}}e.mode=e.mode||b.mode;e.level=e.level||b.level;a.log("Load Settings:",e);this.settings=e},_valueChange:function(f){var g=Math.round(f),e=c[g][0],d=c[g][1];if(e!==this.mode){this.changeMode(e,d)}else{if(d!==this.level){this.changeLevel(d)}}},changeMode:function(e,f){if(this.mode==="TIPS"){for(var d=1;d<=3;d++){this.labels[d].className="deactive"}this.translator.revertTips()}else{if(this.mode==="TRANS"){this.labels[0].className="deactive";this.translator.revertTrans()}}this.swipe.disableSwipe();this.disableTransTip();this.disableTipsCtrl();this.mode=e;this.changeLevel(f)},changeLevel:function(e){a.log("Change level to:",e);if(this.level===null){this.log({action:"view",level:e})}else{this.log({action:"changeLevel",oldLevel:this.level,newLevel:e})}this.level=e;if(this.mode==="TIPS"){this.swipe.enableSwipe();for(var d=1;d<=3;d++){this.labels[d].className=d==e?"active":"deactive"}this.translator.revertTips();this.translator.doTips(this.level);this.enableTipsCtrl()}else{if(this.mode==="TRANS"){this.labels[0].className="active";this.translator.doTrans();this.enableTransTip()}}if(this.mode!=="NONE"){this.writeSettings({mode:this.mode,level:this.level})}},writeSettings:function(d){a.each(d,function(e,f){this.settings[e]=f},this);this.conn.ajax({handler:"localStorage",dataType:"json",data:{key:"settings",value:JSONDAO.stringify(this.settings)}})},initTipsCtrl:function(){var d=this,f=this.initTipsCtrlElem();var e=null;this.tipsTarget=null;this.tipsCtrlHandler=function(j){var h=j||window.evt,i=h.target||h.srcElement,g=0,k=0;clearTimeout(e);if(i===d.tipsTarget||i.className&&i.className.indexOf("OUTFOX_JTR_NANCI_")!==-1){return}e=setTimeout(function(){if(f.parentNode){f.parentNode.removeChild(f)}if(a.hasClass(i,"OUTFOX_NANCI_TIPS")){var t=a.findPos(i),l=a.query(".OUTFOX_JTR_NANCI_CTRL_WORD",f)[0],m=null;d.context.appendChild(f);l.innerHTML=i.innerHTML;var v=a.css(i,"fontSize");var r=a.css(i,"fontFamily");try{if(v.indexOf("em")!=-1){}else{if(parseInt(v)<12){v="12px"}}}catch(q){v="12px"}var w=!!(a.css(document.body,"position")!=="static");var o=a.css(document.body,"marginLeft");var s=a.css(document.body,"marginRight");if(o==="auto"&&s==="auto"){var u=a.getPageSize().page.width;var p=parseInt(a.css(document.body,"width"));if(u>p){o=(u-p)/2}else{o=0}}o=w?parseInt(o):0;var n=w?parseInt(a.css(document.body,"marginTop")):0;a.css(l,{fontSize:v});a.css(l,{fontFamily:r});a.css(f,{left:(t.x-o)+"px",top:(t.y-n)+"px",position:"absolute"});d.tipsTarget=i}else{d.tipsTarget=null}},200)}},initTipsCtrlElem:function(){var j=document.createElement("span"),g=document.createElement("span"),h=document.createElement("a"),i=document.createElement("span"),k=document.createElement("a"),d=document.createElement("span"),l=this;d.className="OUTFOX_JTR_NANCI_CTRL_WORD";j.appendChild(d);h.className="OUTFOX_JTR_NANCI_CTRL_DETAIL";h.setAttribute("title","查看详细解释");h.innerHTML="详解";g.appendChild(h);g.className="OUTFOX_JTR_NANCI_CTRL_DETAIL_BG";j.appendChild(g);k.className="OUTFOX_JTR_NANCI_CTRL_CLOSE";k.setAttribute("title","我知道了");k.innerHTML="关闭";i.appendChild(k);i.className="OUTFOX_JTR_NANCI_CTRL_CLOSE_BG";j.appendChild(i);j.className="OUTFOX_JTR_NANCI_BAR";var f=function(){var m=null;try{m=l.tipsTarget.previousSibling}catch(n){}return m};var e=function(o){var m=null;if(document.createRange){var n=window.getSelection();m=document.createRange();n.removeAllRanges();m.selectNode(o);n.addRange(m)}else{if(document.body.createTextRange){m=document.body.createTextRange();m.moveToElementText(o);m.select()}}};a.bind(h,"click",function(o){var q=f();if(q&&l.swipe){l.log({action:"viewDetail",word:q.innerHTML});e(q);var p=document.createElement("font");p.innerHTML=" ";q.appendChild(p);var n=a.findPos(p),m=p.offsetHeight;q.removeChild(p);l.swipe.swipeWord(q.firstChild.nodeValue,n.x,n.y,0,m)}j.parentNode.removeChild(j);a.removeClass(l.tipsTarget,"on")});a.bind(k,"click",function(m){var n=j.getAttribute("rel"),o=f();if(o){l.log({action:"closeTip",word:o.innerHTML,tip:l.tipsTarget.innerHTML});l.translator._manager.revertTip(o)}j.parentNode.removeChild(j);a.removeClass(l.tipsTarget,"on")});return j},_findTipCtrlPosition:function(e,t){var u=e.firstChild,n=u.nodeValue,p=u.nodeValue.length,k=document.createElement("font"),f=document.createTextNode(""),r=[0,0],j=null,h=null,q=null,o=0,m=0,d=0,s=p,g=null;a.css(k,{border:"none",padding:0,margin:0});for(var l=0;l<=p;l++){f.nodeValue=u.nodeValue.substr(l);u.nodeValue=u.nodeValue.substr(0,l);e.insertBefore(f,u.nextSibling);e.insertBefore(k,u.nextSibling);q=a.findPos(k);o=q.x-t[0];m=q.y-t[1];if(m<=0&&(h===null||m>h)){g=h=m;r[0]=q.x;r[1]=q.y;j=null;d=l}if(m!==g){s=l;g=m}u.nodeValue=n;e.removeChild(f);e.removeChild(k)}k.innerHTML=u.nodeValue.substr(d,s);u.nodeValue=u.nodeValue.substr(0,d);e.insertBefore(k,u.nextSibling);r[0]+=k.offsetWidth;e.removeChild(k);u.nodeValue=n;return r},preventClose:function(){a.css(a.query("#OUTFOX_JTR_BAR_CLOSE",this.frame),{display:"none"})},enableTipsCtrl:function(){a.bind(this.context,"mouseover",this.tipsCtrlHandler)},disableTipsCtrl:function(){a.unbind(this.context,"mouseover",this.tipsCtrlHandler)},enableTransTip:function(){a.bind(this.context,"mouseover",this.transTipHandler)},disableTransTip:function(){a.unbind(this.context,"mouseover",this.transTipHandler)},initTransTip:function(d){var f=this,g=null,e=null;this.initTransTipElem("","");this.transTipHandler=function(j){var h=j||window.event,i=h.target||h.srcElement;clearTimeout(e);e=setTimeout(function(){if(g===i||i.className&&(i.className.indexOf("OUTFOX_JTR_TRANSTIP_")!==-1||i.className.indexOf("ydd-")!==-1)){return}if(g){g.style.textDecoration="none"}if(f.transTipElem.elem.parentNode){f.transTipElem.elem.parentNode.removeChild(f.transTipElem.elem)}if(a.hasClass(i,"OUTFOX_JTR_TRANS_NODE")){g=i;var k=i.getAttribute("rel"),l=f.translator._manager;f.resetTransTipElem(l.originals[k],l.transResults[k],k);f.context.appendChild(f.transTipElem.elem);f.positionElementInViewPort({target:i,tip:f.transTipElem.elem});i.style.textDecoration="underline"}else{g=null}},200)}},initTransTipElem:function(){var k=this,g=document.createElement("div");g.className="OUTFOX_JTR_TRANSTIP_WRAPPER";var m=document.createTextNode("");var e=document.createTextNode("");g.innerHTML+='<div class="OUTFOX_JTR_TRANSTIP_ORIGIN"> <div class="ydd-container"> <div class="ydd-top-wrapper"> <div class="ydd-top"> </div> </div> <div class="ydd-body-wrapper"> <div class="ydd-lb"></div> <div class="ydd-rb"></div> <div class="ydd-body"> <div class="ydd-title"> <strong>原文：</strong> </div> <div class="ydd-middle"> <div class="OUTFOX_JTR_TRANSTIP_ORIGIN_TEXT"></div> <div class="OUTFOX_JTR_TRANSTIP_ADVISE"> <textarea class="OUTFOX_JTR_TRANSTIP_ADVISE_TEXT"></textarea> <a class="OUTFOX_JTR_TRANSTIP_ADVISE_SUBMIT" href="javascript:void(0);">提交翻译建议</a> </div> </div> </div> </div> <div class="ydd-bottom-wrapper"> <div class="ydd-bottom"> <a class="OUTFOX_JTR_TRANSTIP_ADVISE_TOGGLE">更好的翻译建议</a> <span class="OUTFOX_JTR_TRANSTIP_ADVISE_THANK">感谢您为有道提供建议^_^</span> </div> </div> <div class="ydd-bg-top"></div> </div> </div>';a.query(".OUTFOX_JTR_TRANSTIP_ORIGIN_TEXT",g)[0].appendChild(e);a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_TEXT",g)[0].appendChild(m);var f=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_TOGGLE",g)[0],i=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_SUBMIT",g)[0],l=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE",g)[0],d=a.query(".ydd-bottom",g)[0],h=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_TEXT",g)[0];i.hideFocus=true;a.bind(f,"click",function(){a.toggleClass(l,"expand");a.css(f,{display:"none"})});var j=function(n){n=n.replace(/</g,"<").replace(/>/g,">");return n};a.bind(i,"click",function(){var o=h.value;if(o===""){alert("翻译建议不能为空，请您输入内容后再次提交");return}o=j(o);a.addClass(l,"finish");a.removeClass(l,"expand");a.addClass(d,"OUTFOX_JTR_TRANSTIP_ADVISE_THANK_TIP");var n=k.transTipElem.index;if(n&&k.manager.transResults[n]){k.manager.transResults[n]=o;k.manager.revertTrans(n);k.manager.replaceTrans(n)}});this.transTipElem={elem:g,transTextContainer:h,trans:m,original:e,toggle:f,submit:i,advise:l,bottom:d,index:null}},resetTransTipElem:function(d,f,e){a.removeClass(this.transTipElem.advise,"finish");a.removeClass(this.transTipElem.advise,"expand");a.removeClass(this.transTipElem.bottom,"OUTFOX_JTR_TRANSTIP_ADVISE_THANK_TIP");this.transTipElem.toggle.innerHTML="提交翻译建议";a.css(this.transTipElem.toggle,{display:""});this.transTipElem.transTextContainer.value=f;this.transTipElem.original.nodeValue=d;this.transTipElem.index=e}}})(J);(function(d){var f="http://fanyi.youdao.com/web2";var g="http://fanyi.youdao.com";var h=chrome.runtime.getURL("assets/fanyi.youdao.2.0/conn.html");var c=f+"/index.do";var a=g+"/jtr";var e=f+"/rl.do";var b=chrome.runtime.getURL("assets/fanyi.youdao.2.0/all-packed.css");d.loadCSS(document,b);window.OUTFOX_JavascriptTranslatoR=new d.TR.UI(document.body,{domain:g,update:false,updateTipMsg:"修复链接错误",updateDate:"2013-12-24",cssURL:b,tipsURL:c,transURL:a,logURL:e,connFilePath:h,reqSize:20})})(J);
+ if(this.JSON&&this.JSON.stringify.toString().indexOf("[native code]")!==-1){JSONDAO=this.JSON}else{JSONDAO={}}(function(){function f(n){return n<10?"0"+n:n}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(key){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+string+'"'}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==="object"&&typeof value.toJSON==="function"){value=value.toJSON(key)}if(typeof rep==="function"){value=rep.call(holder,key,value)}switch(typeof value){case"string":return quote(value);case"number":return isFinite(value)?String(value):"null";case"boolean":case"null":return String(value);case"object":if(!value){return"null"}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==="[object Array]"){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||"null"}v=partial.length===0?"[]":gap?"[\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"]":"["+partial.join(",")+"]";gap=mind;return v}if(rep&&typeof rep==="object"){length=rep.length;for(i=0;i<length;i+=1){k=rep[i];if(typeof k==="string"){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}else{for(k in value){if(Object.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?": ":":")+v)}}}}v=partial.length===0?"{}":gap?"{\n"+gap+partial.join(",\n"+gap)+"\n"+mind+"}":"{"+partial.join(",")+"}";gap=mind;return v}}if(typeof JSONDAO.stringify!=="function"){JSONDAO.stringify=function(value,replacer,space){var i;gap="";indent="";if(typeof space==="number"){for(i=0;i<space;i+=1){indent+=" "}}else{if(typeof space==="string"){indent=space}}rep=replacer;if(replacer&&typeof replacer!=="function"&&(typeof replacer!=="object"||typeof replacer.length!=="number")){throw new Error("JSONDAO.stringify")}return str("",{"":value})}}if(typeof JSONDAO.parse!=="function"){JSONDAO.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==="object"){for(k in value){if(Object.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v}else{delete value[k]}}}}return reviver.call(holder,key,value)}text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSONDAO.parse")}}}());(function(){var a={browser:function(){var e={};var c=navigator.userAgent.toLowerCase();var d;(d=c.match(/msie ([\d.]+)/))?e.msie=d[1]:(d=c.match(/firefox\/([\d.]+)/))?e.firefox=d[1]:(d=c.match(/chrome\/([\d.]+)/))?e.chrome=d[1]:(d=c.match(/opera.([\d.]+)/))?e.opera=d[1]:(d=c.match(/version\/([\d.]+).*safari/))?e.safari=d[1]:0;return e}(),isDOM:function(c){return Boolean(c&&c.nodeType===1)},isArray:function(c){return Object.prototype.toString.call(c)==="[object Array]"},isFunction:function(c){return Object.prototype.toString.call(c)==="[object Function]"},each:function(d,g,f){if(d===undefined||d===null){return}if(d.length===undefined||a.isFunction(d)){for(var c in d){if(d.hasOwnProperty(c)){if(g.call(f||d[c],c,d[c])===false){break}}}}else{for(var e=0;e<d.length;e++){if(g.call(f||d[e],e,d[e])===false){break}}}return d},indexOf:function b(d,e){if(d.indexOf){return d.indexOf(e)}else{var c=-1;a.each(d,function(f){if(this===e){c=f;return false}});return c}},bind:function(d,c,e){if(!e){return}if(d.addEventListener){d.addEventListener(c,e,false)}else{if(d.attachEvent){d.attachEvent("on"+c,e)}else{d["on"+c]=e}}return this},unbind:function(d,c,e){if(!e){return}if(d.removeEventListener){d.removeEventListener(c,e,false)}else{if(d.detachEvent){d.detachEvent("on"+c,e)}else{d["on"+c]=function(){}}}return this},param:function(c){if(typeof c==="string"){return c}var d=[];a.each(c,function(e,f){if(f){f=encodeURIComponent(f);if(a.browser.firefox){f=encodeURIComponent(unescape(f))}d.push(encodeURIComponent(e)+"="+f)}});return d.join("&")},makeArray:function(c){return Array.prototype.slice.call(c,0)},getDocumentCharset:function(){a.log("document.characterSet || document.charset:::"+document.characterSet||document.charset);return document.characterSet||document.charset},log:function(){},css:function(){var c=function(h,d){var i="";if(d=="float"){document.defaultView?d="float":d="styleFloat"}if(h.style[d]){i=h.style[d]}else{if(h.currentStyle){i=h.currentStyle[d]}else{if(document.defaultView&&document.defaultView.getComputedStyle){d=d.replace(/([A-Z])/g,"-$1").toLowerCase();var f=document.defaultView.getComputedStyle(h,"");i=f&&f.getPropertyValue(d)}else{i=null}}}if((i=="auto"||i.indexOf("%")!==-1)&&("width"===d.toLowerCase()||"height"===d.toLowerCase())&&h.style.display!="none"&&i.indexOf("%")!==-1){i=h["offset"+d.charAt(0).toUpperCase()+d.substring(1).toLowerCase()]+"px"}if(d=="opacity"){try{i=h.filters["DXImageTransform.Microsoft.Alpha"].opacity;i=i/100}catch(j){try{i=h.filters("alpha").opacity}catch(g){}}}return i};return function(e,d){if(typeof d==="string"){return c(e,d)}else{a.each(d,function(f,g){e.style[f]=g})}}}(),getPageSize:function(){var g,c;if(window.innerHeight&&window.scrollMaxY){g=document.body.scrollWidth;c=window.innerHeight+window.scrollMaxY}else{g=Math.max(document.body.scrollWidth,document.body.offsetWidth);c=Math.max(document.body.scrollHeight,document.body.offsetHeight)}var e,h;e=document.documentElement.clientWidth||document.body.clientWidth;h=document.documentElement.clientHeight||document.body.clientHeight;var f=Math.max(c,h);var d=Math.max(g,e);return{page:{width:d,height:f},window:{width:e,height:h}}},findPos:function(c){var d={x:0,y:0};if(!!document.documentElement.getBoundingClientRect()){d.x=c.getBoundingClientRect().left+a.scroll().left;d.y=c.getBoundingClientRect().top+a.scroll().top}else{while(c){d.x+=c.offsetLeft;d.y+=c.offsetTop;c=c.offsetParent}}return d},textPos:function(e,h){var i=e||window.event;var g={};var j={};var d=h.h;var f=h.v||"bottom";if(window.getSelection){g=window.getSelection().getRangeAt(0)}else{if(document.selection){g=document.selection.createRange()}}if(!!d){j.x=c[d]+a.scroll().left}else{if(i.pageX||i.pageY){j.x=i.pageX}else{if(i.clientX||i.clientY){j.x=i.clientX+a.scroll().left}}}if(!!g.getBoundingClientRect){var c=g.getBoundingClientRect();j.y=c[f]+a.scroll().top}else{if(i.pageX||i.pageY){j.y=i.pageY}else{if(i.clientX||i.clientY){j.y=i.clientY+a.scroll().top}}}return j},scroll:function(){return{left:document.documentElement.scrollLeft+document.body.scrollLeft,top:document.documentElement.scrollTop+document.body.scrollTop}},walkTheDOM:function walkTheDOM(e,d,c){if(c&&!c(e)){return}d(e);if(e.tagName==="NOSCRIPT"){return}else{if(e.tagName==="IFRAME"||e.tagName==="FRAME"){return}else{e=e.firstChild}}while(e){walkTheDOM(e,d,c);e=e.nextSibling}},getTextNodes:function(e,c){var d=[];a.walkTheDOM(e,function(f){if(f.nodeType===3&&a.trim(f.nodeValue)){d.push(f)}},c);return d},getElementsByClassName:function(e,d){if(e.getElementsByClassName){return e.getElementsByClassName(d)}else{var c=[];a.walkTheDOM(e,function(f){if(a.hasClass(f,d)){c.push(f)}});return c}},query:function(e,f){var d=new RegExp("(?:(?:\\.([^()]+))?)(?:(?:#([^()]+))?)");var c=d.exec(e);var i=f||document;if(!c){return null}else{if(!!c[1]){var h=c[1];if(i.getElementsByClassName){return i.getElementsByClassName(h)}else{var g=[];a.walkTheDOM(i,function(j){if(a.hasClass(j,h)){g.push(j)}});return g}}if(!!c[2]){return i.getElementById(c[2])}}},trim:function(c){return c.replace(/^\s*/,"").replace(/\s*$/,"")},formatTemplate:function(f,g){var d=document.createElement("div");for(var e in g){if(g.hasOwnProperty(e)){f=f.replace(new RegExp("{"+e+"}","g"),g[e])}}d.innerHTML=f;var c=d.firstChild;d.removeChild(c);return c},hasClass:function(g,f){if(a.isDOM(g)){if(g.className===f){return true}var e=g.className.split(" "),d=0,c=e.length;for(;d<c;d++){if(f===e[d]){return true}}}return false},loadCSS:function(e,d){var c=function(j){if(e&&e.createElement){var i=Date.parse(new Date()),g=e.createElement("link");var f=j;g.setAttribute("rel","stylesheet");g.setAttribute("href",f);g.setAttribute("type","text/css");var h=e.getElementsByTagName("head")[0]||e.body;h.appendChild(g)}};if(a.isArray(d)){a.each(d,function(f,g){c(g)})}else{if(typeof d==="string"){c(d)}}},addClass:function(g,f){if(a.isDOM(g)){var e=g.className.split(" "),d=0,c=e.length;for(;d<c;d++){if(f===e[d]){return}}e[d]=f;g.className=e.join(" ")}},removeClass:function(g,f){if(a.isDOM(g)){var e=g.className.split(" "),d=0,c=e.length,h=[];for(;d<c;d++){if(f!==e[d]){h.push(e[d])}}g.className=h.join(" ")}},toggleClass:function(g,f){if(a.isDOM(g)){var e=g.className.split(" "),d=0,c=e.length,j=[],h="add";for(;d<c;d++){if(f===e[d]){h="remove"}else{j.push(e[d])}}if(h==="add"){e[d]=f}else{e=j}g.className=e.join(" ")}},guid:function(){var c=function(){return(((1+Math.random())*65536)|0).toString(16).substring(1)};return function(){return(c()+c()+"-"+c()+"-"+c()+"-"+c()+"-"+c()+c()+c())}}(),protoExtend:function(e,c){var d=a.isFunction(c)?c:function(){};d.prototype=e;return new d()},stopPropagation:function(d){var c=d||window.event;if(c.stopPropagation){c.stopPropagation()}c.cancelBubble=true;return c},storage:function(d,f){var e=function(h,i){var g=window.localStorage;if(i===undefined){return g.getItem(h)}if(h!==undefined&&i!==undefined){g.setItem(h,i);return i}};var c=function(h,i){var g=document.documentElement;g.addBehavior("#default#userData");if(i===undefined){g.load("fanyiweb2");return g.getAttribute(h)}if(h!==undefined&&i!==undefined){g.setAttribute(h,i);g.save("fanyiweb2");return i}};if(!!window.localStorage){return e(d,f)}if(!!document.documentElement.addBehavior){return c(d,f)}},cookie:function(c,f){function d(g,i){var h=30;var j=new Date();j.setTime(j.getTime()+h*24*60*60*1000);document.cookie=g+"="+i+";expire*="+j.toGMTString()}function e(h){var g=document.cookie.match(new RegExp("(^| )"+h+"=([^;]*)(;|$)"));if(g!=null){return decodeURIComponent(g[2])}return null}if(!!f){d(c,f)}else{return e(c)}},parseData:function(){var c={json:function(d){try{return d=JSONDAO.parse(d)}catch(f){a.log("[Error]","Invalid JSON data:",d)}},xml:function(e){if(window.DOMParser){return(new DOMParser()).parseFromString(e,"text/xml")}else{var d=new ActiveXObject("Microsoft.XMLDOM");d.async="false";d.loadXML(e);return d}}};return function(d,e){if(d===undefined){return e}if(a.isFunction(d)){return d(e)}if(!!d&&!c[d]){a.log("[Error]","Function parseData() dosen't support this type:",d);return e}return c[d](e)}}(),once:function(c){return function(){if(a.isFunction(c)){c.apply(this,arguments)}c=function(){}}}};window.J=a})();(function(a){var b=function(e,d,c){return new b.prototype.init(e,d,c)};b.prototype={init:function(c,f,g){var d=this;var e=[];var h=function(i){d.ajax=i;while(e.length>0){i(e.pop())}};if(!!window.postMessage){this.createMessageChannel(c,f,g,h)}else{this.createJTRAssist(c,h)}this.ajax=function(i){e.push(i);return this};return this},createMessageChannel:function(d,f,h,i){var e=this;var c=(function(){if(a.isDOM(a.query("#"+d))){throw new Error("Existed CDA iFrame element")}if(f&&h){var j=document.createElement("iframe");j.setAttribute("id",d);j.className=("OUTFOX_JTR_CONN");j.style.display="none";j.setAttribute("src",h);document.body.appendChild(j);return j.contentWindow}else{throw new Error("Empty domain is not allowed")}})();var g=(function(){var k=[];var l=0;var j={transferStationReady:function(){i(function(m){m.data=a.param(m.data);m.index=l++;k[m.index]={dataType:m.dataType,callback:m.callback};delete m.callback;c.postMessage(JSONDAO.stringify(m),'*');return e})},dataBack:function(n){if(!!n&&!!k[n.index]){var m=k[n.index];if(a.isFunction(m.callback)){m.callback(a.parseData(m.dataType,n.response))}delete k[n.index]}}};return function(n){var m=JSONDAO.parse(n.data);j[m.handler](JSONDAO.parse(n.data))}})();a.bind(window,"message",function(j){g.call(e,j)})},createJTRAssist:function(h,e){var k=this;var d="http://fanyi.youdao.com/web2/JTRAssist.swf?"+(+new Date());var j=function(){if(!!a.query("#"+h)){return}var l=document.createElement("div");if(a.browser.msie==="6.0"||a.browser.msie==="7.0"){l.innerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="1" height="1" id="'+h+'"><param name="allowScriptAccess" value="always" /><param name="movie" value="'+d+'" /></object>'}else{l.innerHTML='<object height="1" width="1" id="'+h+'" data="'+d+'"><param name="allowScriptAccess" value="always"></object>'}document.body.appendChild(l)};var c="outfox_jtr_fproxy_callback_",f=0;var g=function(m){var l=c+(f++);window[l]=function(n){m.callback.call(k,a.parseData(m.dataType,decodeURI(n)))};a.query("#"+h).load(m.url,m.data,m.type||"POST",'window["'+l+'"]')};var i=function(n){var l=n.data.key,m=n.data.value;if(m===undefined){if(a.isFunction(n.callback)){n.callback(a.parseData(n.dataType,a.query("#"+h).getItem(l)))}}else{a.query("#"+h).setItem(l,m)}};j();window.JTRAssistIsReady=function(){e(function(l){switch(l.handler){case"translate":l.data=a.param(l.data);g(l);break;case"localStorage":i(l);break;default:throw new Error("Unsupported request type :"+l.handler)}return k})}}};b.prototype.init.prototype=b.prototype;a.CDA=b})(J);(function(a){TR=function(d,b,g,c){this._manager=c;this._reqSize=b.reqSize;this._onStatusChange=b.onStatusChange||function(){};this._url=b.url;this.conn=g;this._context=d;this._request=function(i,j,k){g.ajax({url:i,handler:"translate",type:"POST",data:j,callback:k,dataType:"json"})};var h=new a.Page(d);var f=[];var e=h.getMainArticle();if(e){f=a.getTextNodes(e.elem,TR.isInclude)}this.mainNodeLength=f.length||null;this._nodeIndex=[];f=f.concat(a.getTextNodes(d,function(i){return(i!==(e&&e.elem))&&TR.isInclude(i)}));a.each(f,function(i,j){this._nodeIndex.push(this._manager.addNode(j))},this);this.workingThread=0;this.guid=b.guid||a.guid()};TR.prototype={doTrans:function(){var d=++this.workingThread;var h={ue:a.getDocumentCharset()||null,data:null,relatedUrl:document.location.href,guid:this.guid,mainLength:this.mainNodeLength,requestId:a.guid()};var j=[];var f=0;for(var g=0;g<this._nodeIndex.length;g++){if(this._manager.transResults[g]){if(d===this.workingThread){this._manager.replaceTrans(g)}}else{var e=null;if(j[parseInt(f/this._reqSize,10)]){e=j[parseInt(f++/this._reqSize,10)]}else{e=j[parseInt(f++/this._reqSize,10)]={}}var i=null;try{i=this._manager.nodes[g].parentNode&&this._manager.nodes[g].parentNode.tagName||null}catch(c){}e[g]={src:this._manager.originals[g],tag:i}}}if(j.length===0){this._onStatusChange({id:d,action:"TRANS",level:"0",status:"finish"});return}var k=this,b=function(l){k._onStatusChange({id:d,action:"TRANS",level:"0",status:"busy",data:[l,j.length]});h.data=JSONDAO.stringify(j[l]);k._request(k._url.textTrans,h,function(m){k._updateTrans(m,d);if(++l<j.length){b(l)}else{k._onStatusChange({id:d,action:"TRANS",level:"0",status:"finish"})}})};b(0)},revertTrans:function(){var c=++this.workingThread;for(var b=0;b<this._nodeIndex.length;b++){if(c===this.workingThread){this._manager.revertTrans(this._nodeIndex[b])}}},_updateTrans:function(b,c){if(!!!b){return}if(b.errorCode===40&&b.errorCode===30){a.log("Get Error Code:",b.errorCode);return}a.each(b.data,function(d,e){this._manager.transResults[d]=e.tst;if(c===this.workingThread){this._manager.replaceTrans(d)}},this)},doTips:function(b){var e=++this.workingThread;var i={type:"X",ue:a.getDocumentCharset()||null,data:null,relatedUrl:document.location.href,mainLength:this.mainNodeLength,guid:this.guid};var k=[];var g=0;for(var h=0;h<this._nodeIndex.length;h++){if(this._manager.tipsResults[h]){if(e===this.workingThread){this._manager.replaceTips(h,b)}}else{var f=null;if(k[parseInt(g/this._reqSize,10)]){f=k[parseInt(g++/this._reqSize,10)]}else{f=k[parseInt(g++/this._reqSize,10)]={}}var j=null;try{j=this._manager.nodes[h].parentNode&&this._manager.nodes[h].parentNode.tagName||null}catch(d){}f[h]={src:this._manager.originals[h],tag:j}}}if(k.length===0){this._onStatusChange({id:e,action:"TIPS",level:b,status:"finish"});return}var l=this;var c=function(m){a.log("Send:",k[m]);l._onStatusChange({id:e,action:"TIPS",level:b,data:[m,k.length],status:"busy"});i.data=JSONDAO.stringify(k[m]);l._request(l._url.tips,i,function(n){l._updateTips(n,e,b);if(++m<k.length){c(m)}else{l._onStatusChange({id:e,action:"TIPS",level:b,status:"finish"})}})};c(0)},revertTips:function(){var c=++this.workingThread;for(var b=0;b<this._nodeIndex.length;b++){if(c===this.workingThread){this._manager.revertTips(this._nodeIndex[b])}}},_updateTips:function(e,d,c){if(!!!e){return}if(e.errorCode===40&&e.errorCode===30){a.log("Get Error Code:",e.errorCode);return}var b=function(g,f){return g.start>f.start};a.each(e.data,function(f,g){if(g.length>0){this._bubbleSort(g,b);this._manager.tipsResults[f]=g;if(d===this.workingThread){this._manager.replaceTips(f,c)}}else{this._manager.tipsResults[f]=[]}},this)},_bubbleSort:function(c,f){for(var d=c.length-2;d>=0;d--){for(var b=0;b<=d;b++){if(f(c[b+1],c[b])){var e=c[b];c[b]=c[b+1];c[b+1]=e}}}return c}};TR.isInclude=function(b){return !(b.tagName==="SCRIPT"||b.tagName==="STYLE"||b.tagName==="PRE"||(b.className&&/OUTFOX_JTR_/.test(b.className)))};a.TR=TR})(J);if(!J||!J.bind){throw new Error("swipe extension need J.bind support")}(function(h){var g="http://fanyi.youdao.com",f=g+"/fsearch",b=g+"/translate";var j=function(k){return'<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="15px" height="15px" align="absmiddle" id="speach_flash"><param name="allowScriptAccess" value="sameDomain" /><param name="movie" value="http://cidian.youdao.com/chromeplus/voice.swf" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="high" /><param name="wmode" value="transparent"><param name="FlashVars" value="audio='+k+'"><embed wmode="transparent" play="false" src="http://cidian.youdao.com/chromeplus/voice.swf" loop="false" menu="false" quality="high" bgcolor="#ffffff" width="15" height="15" align="absmiddle" allowScriptAccess="sameDomain" FlashVars="audio='+k+'" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /></object>'};var c=function(k){return k.split&&k.split(" ").length||0};var e={isJapanese:function(k){return !Boolean(/[^\u0800-\u4e00]/.test(k))},isContainJapanese:function(k){var m=0;for(var l=0;l<k.length;l++){if(this.isJapanese(k.charAt(l))){m++}}return m>2},isKoera:function(k){for(i=0;i<k.length;i++){if(((k.charCodeAt(i)>12592&&k.charCodeAt(i)<12687)||(k.charCodeAt(i)>=44032&&k.charCodeAt(i)<=55203))){return true}}return false},isContainKoera:function(k){var m=0;for(var l=0;l<k.length;l++){if(this.isKoera(k.charAt(l))){m++}}return m>0},isChinese:function(k){return !Boolean(/[^\u4e00-\u9fa5]/.test(k))},isContainChinese:function(k){var m=0;for(var l=0;l<k.length;l++){if(this.isChinese(k.charAt(l))){m++}}return m>5}};var a=function(k,l){return new a.fn.init(k,l)};a.fn=a.prototype={init:function(l,m){var k=this;this.wrapper=a.createFrameWrapper();this.conn=a.initConnection(m);this.context=l;h.bind(document.body,"click",function(o){var n=o||window.event;k.wrapper.style.display="none";k.wrapper.style.position="absolute";k.wrapper.innerHTML=""})},enableSwipe:function(){if(!this._swipeListener){var k=this;this._swipeListener=function(l){k._onSwipe.call(k,l)};h.bind(this.context,"mouseup",this._swipeListener)}},disableSwipe:function(){if(this._swipeListener){h.unbind(this.context,"mouseup",this._swipeListener);delete this._swipeListener}},_onSwipe:function(l){var k="",n="";var m={};if(window.getSelection){k=window.getSelection()}else{if(document.selection){k=document.selection.createRange()}}if(k.toString){n=k.toString()}else{if(k.text){n=k.text.toString()}}var o=h.textPos(l,{});n=h.trim(n);if(!a.validateSwipeWord(n)){return}this.swipeWord(n,o.x,o.y);if(this.onSwipeCallback){this.onSwipeCallback(n)}},swipeWord:function(p,k,q,o,n){var l=this;var m=null;this.wrapper.innerHTML="";if((!e.isContainChinese(p)&&c(p)>=3)||(e.isContainChinese(p)||e.isContainJapanese(p)&&p.length>4)){m="translate"}else{m="dict"}this.conn.request({action:m,word:p},function(r){l.wrapper.innerHTML="";l._onResponse.call(l,r);a.initWrapper(l.wrapper,k,q,o,n)})},_onResponse:function(l){var m=l.firstChild,k=null;if(!m){return}else{if(m.baseName&&m.baseName=="xml"){m=m.nextSibling}}switch(m.tagName){case"response":k=a.processXmlTransData(l);break;case"yodaodict":k=a.processXmlDictData(l);break;default:throw new Error("Incorrect xml data")}if(k){this.wrapper.appendChild(k);this.wrapper.style.display="block"}}};a.createFrameWrapper=function(){var k=document.createElement("div");k.id="yddWrapper";h.bind(k,"click",function(l){h.stopPropagation(l)});h.bind(k,"mouseup",function(l){h.stopPropagation(l)});document.body.appendChild(k);return k};a.validateSwipeWord=function(k){return !(k===""||k.length>2000)};a.initConnection=function(k){var n=null;var m=function(q){var p=null,r=null;if(q.action=="dict"){r={client:"JTRHelper",keyfrom:"JTRHelper.bookmark",q:q.word,pos:-1,doctype:"xml",xmlVersion:"3.2",dogVersion:"1.0",vendor:"jtr",le:"eng"};p=f}else{r={client:"JTRHelper",keyfrom:"JTRHelper.bookmark",i:q.word,doctype:"xml",xmlVersion:"1.1",dogVersion:"1.0"};p=b}return[p,r]};if(window.chrome&&window.chrome.extension&&window.chrome.extension.sendRequest){n={request:function(p,q){window.chrome.extension.sendRequest(p,function(r){if(r){q((new DOMParser()).parseFromString(r,"text/xml"))}})}};return n}else{if(k){n={request:function(q,r){var p=m(q);k.ajax({url:p[0],handler:"translate",data:p[1],callback:r,dataType:"xml",type:"POST"})}};return n}else{if(h.CDA){var l=null;try{l=h.CDA("_OUTFOX_JTR_SWIPE_CONN",g,CONN_FILE_PATH)}catch(o){throw new Error("Unable to get cross-domain ajax file.")}n={request:function(q,r){var p=m(q);l.ajax({url:p[0],handler:"translate",data:p[1],callback:r,dataType:"xml",type:"POST"})}};return n}else{throw new Error("Unable to initialize cross-domain connection port.")}}}};a.initWrapper=function(p,t,s,q,D){var n=0,v=0,B=50,l=h.scroll().top,z=h.scroll().left,u=p.clientHeight,C=p.clientWidth,w=h.getPageSize().window.height,F=h.getPageSize().window.width;q=q||0;D=D||0;if(s-u>=l+B){v=s-u}else{v=s+D}if(t+C<=F+z){n=t+q}else{n=F+z-C}var r=!!(h.css(document.body,"position")!=="static");var A=h.css(document.body,"marginLeft");var o=h.css(document.body,"marginRight");if(A==="auto"&&o==="auto"){var E=h.getPageSize().page.width;var k=parseInt(h.css(document.body,"width"));if(E>k){A=(E-k)/2}else{A=0}}A=r?parseInt(A):0;var m=r?parseInt(h.css(document.body,"marginTop")):0;h.css(p,{position:"absolute",left:(n-A)+"px",top:(v-m)+"px"})};a.processXmlTransData=function(r){var l=(r.getElementsByTagName("input")[0].childNodes[1]||r.getElementsByTagName("input")[0].childNodes[0]).nodeValue,q=(r.getElementsByTagName("translation")[0].childNodes[1]||r.getElementsByTagName("translation")[0].childNodes[0]).nodeValue,p=r.getElementsByTagName("response")[0].getAttribute("errorCode")-0,n=h.trim(q),m=h.trim(l);if((e.isContainChinese(m)||e.isContainJapanese(m)||e.isContainKoera(m))&&m.length>15){m=m.substring(0,8)+" ..."}else{if(m.length>25){m=m.substring(0,15)+" ..."}}if(m==n){return null}var o="http://fanyi.youdao.com/translate?i="+encodeURIComponent(l)+"&keyfrom=chrome";var k='<div class="ydd-container"> <div class="ydd-top-wrapper"> <div class="ydd-top"> </div> </div> <div class="ydd-body-wrapper"> <div class="ydd-lb"></div> <div class="ydd-rb"></div> <div class="ydd-body"> <div class="ydd-titile"> <span>{input}</span> <span><a href="{searchURL}" target="_blank">详细››</a></span> </div> <div class="ydd-middle"> <div class="ydd-trans-wrapper ydd-simple-trans"> <div class="ydd-trans-container">{trans}</div> </div> </div> </div> </div> <div class="ydd-bottom-wrapper"><div class="ydd-bottom"></div></div> <div class="ydd-bg-top"></div></div> </div>';return h.formatTemplate(k,{searchURL:o,input:a.escapeHTML(m),trans:a.escapeHTML(q)})};a.processXmlDictData=function(D){var l=null,n=null,q=[],z=[],x="",v="",F="",r="",w=0;var t=function(H){try{return D.getElementsByTagName(H)[0].firstChild.nodeValue}catch(G){return""}};x=t("return-phrase");v=t("dictcn-speach");F=t("lang");r=t("phonetic-symbol");if((n=D.getElementsByTagName("translation"))&&n.length>0){for(w=0;w<n.length;w++){q.push(n[w].getElementsByTagName("content")[0].firstChild.nodeValue)}}if((l=D.getElementsByTagName("web-translation"))&&l.length>0){for(w=0;w<l.length-1;w++){z.push({key:l[w].getElementsByTagName("key")[0].firstChild.nodeValue,value:l[w].getElementsByTagName("trans")[0].getElementsByTagName("value")[0].firstChild.nodeValue})}}var B="http://dict.youdao.com/search?q="+encodeURIComponent(x)+"&keyfrom=chrome.extension"+F,E=x,A="",o="",m="",u=null,C="http://www.youdao.com/search?q={title}&keyfrom=fanyi.jtr",s="";s='<div class="ydd-container"> <div class="ydd-top-wrapper"> <div class="ydd-top"></div> </div> <div class="ydd-body-wrapper"> <div class="ydd-lb"></div> <div class="ydd-rb"></div> <div class="ydd-body"> <div class="ydd-titile"> <span class="ydd-key-title">{title}</span> <span class="ydd-phonetic">{phonetic}</span> {speechHTML} <span class="ydd-detail"><a href="{searchURL}" target="_blank">详细››</a></span> </div> <div class="ydd-middle"> <div class="ydd-trans-wrapper ydd-base-trans"> <div class="ydd-tabs"><span class="ydd-tab">基本翻译</span></div>{baseTransHTML}</div> <div class="ydd-trans-wrapper ydd-web-trans"> <div class="ydd-tabs"><span class="ydd-tab">网络释义</span></div>{webTransHTML}</div> </div> </div> </div> <div class="ydd-bottom-wrapper"> <div class="ydd-bottom"><a href="'+C+'" target="_blank" title="使用有道搜索 {title}">搜索 {title}</a></div> </div> <div class="ydd-bg-top"></div> </div> </div>';if((e.isContainChinese(E)||e.isContainJapanese(E)||e.isContainKoera(E))&&E.length>15){E=E.substring(0,10)+"..."}else{if(E.length>25){E=E.substring(0,15)+" ..."}}if(q.length+z.length>0&&v){A='<span class="ydd-voice">'+j("http://dict.youdao.com/speech?audio="+v,"test","CLICK","dictcn_speech")+"</span>"}for(w=0;w<q.length;w++){o+='<div class="ydd-trans-container">'+q[w]+"</div>"}for(w=0;w<z.length;w++){var p="http://dict.youdao.com/search?q="+encodeURIComponent(z[w].key)+"&keyfrom=chrome.extension"+F;m+='<div class="ydd-trans-container"><a href="'+p+'" target="_blank">'+z[w].key+":</a> "+z[w].value+"</div>"}u=h.formatTemplate(s,{phonetic:r?"["+r+"]":"",title:E,searchURL:B,speechHTML:A,baseTransHTML:o,webTransHTML:m});var k=h.query(".ydd-middle",u)[0];n=h.query(".ydd-base-trans",k)[0];l=h.query(".ydd-web-trans",k)[0];if(q.length+z.length===0){k.innerHTML='<p class="ydd-no-result">没有英汉互译结果</p>'}try{if(q.length===0){k.removeChild(n)}else{if(z.length===0){k.removeChild(l)}}}catch(y){}return u};var d={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"};a.escapeHTML=function(k){return String(k).replace(/[&<>"'\/]/g,function(l){return d[l]})};a.fn.init.prototype=a.fn;h.Swipe=a})(J);(function(a){var b=function(d,c,f){var e=this;if(!a.isDOM(d)){throw Error("Invalid slider container element")}this.container=d;if(!a.isDOM(c)){throw Error("Invalid slider controller block element")}this.controller=c;for(var g=this.container;g;g=g.parentNode){if(g.nodeType===9){this.document=g;break}}if(!g){throw Error("Can't find parent Document element of container, container dom node should insert to document first")}if(a.isDOM(f.bar)){this.bar=f.bar}else{this.bar=null}this.range=Number(f.max-f.min);if(!(this.range&&this.range>0)){throw Error("range must greater than 0")}if(a.isFunction(f.callback)){this.callback=function(h){f.callback.call(e,h)}}this.borderFix=Number(f.borderFix)||0;this.mousemove=function(h){e._mousemove(h)};this.mouseup=function(h){e._mouseup(h)};this.mousedown=function(h){e._mousedown(h)}};b.prototype={enable:function(){a.bind(this.container,"mousedown",this.mousedown)},disable:function(){a.unbind(this.container,"mousedown",this.mousedown)},to:function(e,d){var c=this,f=null;tempFunc=function(){if(!c.container.offsetHeight||!c.container.clientWidth){f=setTimeout(tempFunc,200);return}var g=c.container.clientWidth-c.controller.clientWidth-2*c.borderFix;pos=e/c.range*g;c._valueChange(pos/g*c.range,pos)};tempFunc()},_mousemove:function(d){var c=d||window.event;this._moveHandler(c,false)},_mouseup:function(d){var c=d||window.event;this._moveHandler(c,true);a.unbind(this.document,"mouseup",this.mouseup);a.unbind(this.document,"mousemove",this.mousemove);this.container.style.cursor="pointer"},_mousedown:function(d){var c=d||window.event;this._moveHandler(c,false);a.bind(this.document,"mouseup",this.mouseup);a.bind(this.document,"mousemove",this.mousemove);if(c.preventDefault){c.preventDefault()}c.returnValue=false},_moveHandler:function(e,i){var f=e.clientX-1/2*this.controller.clientWidth-a.findPos(this.container).x-this.borderFix,h=this.container.clientWidth-this.controller.clientWidth-2*this.borderFix,g=h/this.range,c=g/2,d=f%g,j=0;if(f<0){f=0;d=0}else{if(f>h){f=h;d=0}}if(i&&d<c){j=f-d}else{if(i&&d>g-c){j=f-d+g}else{j=f}}this._valueChange(j/h*this.range,j)},_valueChange:function(c,d){this.callback(c);this.controller.style.left=d+this.borderFix+"px";if(this.bar){this.bar.style.width=d+this.controller.clientWidth/2+"px"}}};a.Slider=b})(J);(function(a){var b=function(){this.nodes=[];this.originals={};this.transResults={};this.tipsResults={}};b.prototype={addNode:function(e,c){var d=0;if(!c){for(;d<this.nodes.length;d++){if(this.nodes[d]===e){return d}}}this.nodes.push(e);this.originals[d]=e.nodeValue;return d},replaceTrans:function(d){if(this.nodes[d]&&this.transResults[d]){var f=this.nodes[d],h=document.createElement("font"),c=this.transResults[d];try{if(f.nodeValue===c){return false}if(!f.parentNode){return}}catch(g){return}f.nodeValue="";h.className="OUTFOX_JTR_TRANS_NODE";h.id="OUTFOX_JTR_TRANS_NODE-"+d;h.setAttribute("rel",d);h.innerHTML=c;try{f.parentNode.insertBefore(h,f.nextSibling)}catch(e){}}},revertTrans:function(c){if(this.nodes[c]&&this.originals[c]){var e=a.query("#OUTFOX_JTR_TRANS_NODE-"+c);if(e&&e.parentNode){e.parentNode.removeChild(e)}try{this.nodes[c].nodeValue=this.originals[c]}catch(d){}}},replaceTips:function(d,c){var e=c||-1;if(this.nodes[d]&&this.tipsResults[d]){a.each(this.tipsResults[d],function(q,n){if(n.level&&n.level<e){return}var k=this.nodes[d],i=n.start,m=n.end,o=n.explain;if(typeof k.parentNode===undefined){return}var h=document.createElement("font");h.className="OUTFOX_NANCI_WRAPPER";try{var p=k.nodeValue.substr(0,i),g=k.nodeValue.substr(i,m-i),f=k.nodeValue.substr(m);k.nodeValue=p;h.innerHTML=g;k.parentNode.insertBefore(document.createTextNode(f),k.nextSibling);k.parentNode.insertBefore(h,k.nextSibling);var j=document.createElement("font");j.className="OUTFOX_NANCI_TIPS";j.setAttribute("rel",d);j.innerHTML="("+o+")";h.parentNode.insertBefore(j,h.nextSibling)}catch(l){}},this)}},revertTips:function(c){if(this.nodes[c]){var d;do{try{d=!this.revertTip(this.nodes[c].nextSibling)}catch(e){d=true}}while(!d)}},revertTip:function(d){if(a.hasClass(d,"OUTFOX_NANCI_WRAPPER")&&d.firstChild){var c=d.nextSibling;if(a.hasClass(c,"OUTFOX_NANCI_TIPS")){c.parentNode.removeChild(c)}if(d.nextSibling&&d.nextSibling.nodeType===3){d.firstChild.nodeValue+=d.nextSibling.nodeValue;d.parentNode.removeChild(d.nextSibling)}if(d.previousSibling&&d.previousSibling.nodeType===3){d.previousSibling.nodeValue+=d.firstChild.nodeValue;d.parentNode.removeChild(d)}return true}else{return false}},countTips:function(d){var c=0;a.each(this.tipsResults,function(g,e){for(var f=0;f<e.length;f++){if(e[f].level>=d){c++}}},this);return c}};a.NodeManager=b})(J);(function(a){var b=function(){this.map={};this.dataMap={}};b.prototype={getId:function(c){var d=null;a.each(this.map,function(f,e){if(e===c){d=f;return false}});if(d===null){d=a.guid();this.map[d]=c}return d},data:function(g,c,f){var h=this.getId(g);if(arguments.length===3){if(!this.dataMap[h]){this.dataMap[h]={}}this.dataMap[h][c]=f;return f}else{var e=null;try{e=this.dataMap[h][c]}catch(d){e=undefined}return e}}};a.Cache=b})(J);(function(a){var b=function(d){this.contentDocument=d;this.cache=new a.Cache()};b.prototype={IGNORE_TAGS:["HTML","HEAD","META","TITLE","SCRIPT","STYLE","LINK","IMG","FORM","INPUT","BUTTON","TEXTAREA","SELECT","OPTION","LABEL","IFRAME","UL","OL","LI","DD","DT","A","OBJECT","PARAM","EMBED","NOSCRIPT","EM","B","STRONG","I","INS","BR","HR","PRE","H1","H2","H3","H4","H5","CITE"],getMainArticle:function(){return null;var g=null,e="";if(!!location){e=location.hostname}if(/\b(google|facebook|twitter)\b/i.test(e)){return null}var d=this._getAllArticle();if(!(d&&d.length)){return null}d.sort(function(i,h){return !!(h.weight-i.weight)});for(var f=2;f>0;f--){g=d[0];d.splice(0,1);break}return g},_getAllArticle:function(){var f=this.contentDocument.getElementsByTagName("*"),e=[];for(var d=0,h=f.length>100?100:f.length;d<h;d++){var g=f[d];if(this._checkTagName(g)&&this._checkSize(g)&&this._checkVisibility(g)){e[e.length]=new c(g)}}return e},_checkTagName:function(d){return a.indexOf(this.IGNORE_TAGS,d.tagName)==-1},_checkVisibility:function(d){return !(a.css(d,"visibility")=="hidden"||a.css(d,"display")=="none"||parseInt(a.css(d,"height"))<=0||parseInt(a.css(d,"width"))<=0)},_checkSize:function(d){return d.offsetWidth>300&&d.offsetHeight>200}};var c=function(d){this.elem=d;this._texts=this._getAllTexts();this.weight=this.calcWeight()};c.prototype={IGNORE_TAGS:["A","DD","DT","OL","OPTION","PRE","SCRIPT","STYLE","UL","IFRAME"],MINOR_REGEXP:/comment|combx|disqus|foot|header|menu|rss|shoutbox|sidebar|sponsor/i,MAJOR_REGEXP:/article|entry|post|body|column|main|content/i,TINY_REGEXP:/comment/i,BLANK_REGEXP:/\S/i,_getAllTexts:function(){var g=[],d=a.getTextNodes(this.elem);for(var h=0,f=d.length;h<f;h++){var j=d[h];if(this._checkTagName(j)&&this._checkLength(j)){var e=j.parentNode||{},i=e.parentNode||{};if(!(this._checkMinorContent(e)||this._checkMinorContent(i))){g.push(j)}}}return g},calcStructWeight:function(){var d=0;for(var i=0,e=this._texts.length;i<e;i++){var j=this._texts[i],g=j.nodeValue.length,h=1;if(g>20){continue}for(var f=j.parentNode;f&&f!=this.elem;f=f.parentNode){h-=0.1}d+=Math.pow(g*h,1.25)}return d},calcContentWeight:function(){var d=1;for(var e=this.elem;e;e=e.parentNode){var f=e.id+" "+e.className;if(this.MAJOR_REGEXP.test(f)){d+=0.4}if(this.MINOR_REGEXP.test(f)){d-=0.8}}return d},calcWeight:function(){return this.calcStructWeight()*this.calcContentWeight()},_checkTagName:function(d){return a.indexOf(this.IGNORE_TAGS,d.tagName)==-1},_checkLength:function(d){return Boolean(this.BLANK_REGEXP.test(d.nodeValue))},_checkMinorContent:function(d){return Boolean(this.TINY_REGEXP.test(d.id+" "+d.className))}};a.Page=b})(J);(function(a){var b={runCount:0,swipe:true,mode:"TIPS",level:1};var c={0:["TIPS",3],1:["TIPS",2],2:["TIPS",1],3:["TRANS","0"],4:["NONE","NONE"]};a.TR.UI=function(e,f){var d=this;this.initLogger(f.logURL);this.log({action:"start"});this.guid=a.guid();this.context=e;this.conn=a.CDA("OUTFOX_JTR_CDA",f.domain,f.connFilePath);this.update=f.update;this.updateTipMsg=f.updateTipMsg;this.updateDate=f.updateDate;this.manager=new a.NodeManager();this.barHeight=50;this.permissionDenied="由于该网页存在安全性限制, 无法加载有道网页翻译2.0";this.translator=new a.TR(e,{reqSize:f.reqSize,onStatusChange:function(){d._trStatusChangeCallback.apply(d,arguments)},url:{textTrans:f.transURL,tips:f.tipsURL},guid:this.guid},this.conn,this.manager);this.queue={TRANS:{0:{currentThread:-1}},TIPS:{1:{currentThread:-1},2:{currentThread:-1},3:{currentThread:-1}},NONE:{NONE:{}}};this.mode=null;this.level=null;this.initFrame(f.cssURL,function(){var h="";var g=this;if(location){h=location.href}this.movePage(g.barHeight);this.frame.body.innerHTML=' <div id="wrapper"> <a href="http://fanyi.youdao.com/web2/?keyfrom=headerLogo" target="_blank"> <h1 id="headerLogo" class="logo"></h1> </a> <div id="sliderLabel">翻译级别</div> <div id="sliderWrapper" class="slider-wrapper"> <div id="levelLabel"> <label id="level-3" rel="0"><a>专 家</a></label> <label id="level-2" rel="1"><a>进 阶</a></label> <label id="level-1" rel="2"><a>入 门</a></label> <label id="level-0" rel="3"><a>全文翻译</a></label> </div> <div id="sliderContainer" class="slider-container"> <div id="sliderBackground"><div class="slider-background"></div></div> <a id="slider" href="javascript:void(0);" class="slider"></a> </div> </div> <div id="status"></div> <div id="switchWrapper"><a id="switch" href="javascript:void(0);"></a></div> </div> <a id="OUTFOX_JTR_BAR_CLOSE" href="javascript:void(0);" class="OUTFOX_JTR_BAR_CLOSE"></a> <div id="OUTFOX_JTR_BAR_UPDATE_SHADE"></div> <div id="OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP"> <div id="OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT"></div> </div>';this.initTipContent();this.initBarClose();this.initSwitch();this.initSlider();this.initLabel();this.initTipsCtrl();this.initTransTip();this.initSwipe();var i=function(j){g.loadSetting(j);g.enable();g.writeSettings({runCount:g.settings.runCount+1});a.each(c,function(k,l){if(g.mode===l[0]&&g.level===l[1]){g.slider.to(k)}})};this.conn.ajax({handler:"localStorage",data:{key:"settings"},dataType:"json",callback:function(j){i(j)}})})};a.TR.UI.prototype={positionElementInViewPort:function(k){var n=k.tip;var x=k.target;var l=!!(a.css(document.body,"position")!=="static");var r=a.css(document.body,"marginLeft");var h=a.css(document.body,"marginRight");if(r==="auto"&&h==="auto"){var w=a.getPageSize().page.width;var d=parseInt(a.css(document.body,"width"));if(w>d){r=(w-d)/2}else{r=0}}r=l?parseInt(r):0;var f=l?parseInt(a.css(document.body,"marginTop")):0;var j=a.findPos(x),p=0,g=0,e=a.scroll().top,s=a.scroll().left,t=j.x,m=j.y,i=x.offsetHeight,o=n.clientHeight,u=n.clientWidth,q=a.getPageSize().window.height,v=a.getPageSize().window.width;if(m-o>=e+this.barHeight){p=m-o}else{p=m+i}if(t+u<=v+s){g=t}else{g=v+s-u}a.css(k.tip,{position:"absolute",top:(p-f)+"px",left:(g-r)+"px"})},disable:function(){this.changeMode("NONE","NONE");this.slider.disable();this.frame.body.className="disable";this.disabled=true;this.updateStatus();this.switchElem.innerHTML="重新翻译"},enable:function(){this.changeMode(this.settings.mode,this.settings.level);this.slider.enable();a.removeClass(this.frame.body,"disable");a.addClass(this.frame.body,"enable");this.disabled=false;this.updateStatus();this.switchElem.innerHTML="取消翻译"},_trStatusChangeCallback:function(e){if(!e.id||!e.action||!e.level){return}var d=this.queue[e.action][e.level];if(d.currentThread<=e.id){d.currentThread=e.id;d.status=e.status;d.data=e.data||null;if(e.action===this.mode&&e.level===this.level){this.updateStatus()}}},updateStatus:function(){var f=this.queue[this.mode][this.level];a.removeClass(this.statusElem.parentNode,"statistic");if(f.status==="busy"&&f.data){this.switchElem.style.visibility="hidden";var d=parseInt(f.data[0]*100/f.data[1],10);if(this.mode==="TRANS"){this.statusElem.innerHTML="正在翻译 "+d+"% ..."}else{this.statusElem.innerHTML="正在分析 "+d+"% ..."}this.statusElem.className="busy"}else{if(f.status==="finish"){this.switchElem.style.visibility="inherit";if(this.mode==="TRANS"){this.statusElem.innerHTML="翻译完成"}else{var e=this.manager.countTips(this.level);if(e!==0){a.addClass(this.statusElem.parentNode,"statistic");this.statusElem.innerHTML='共注释<span class="OUTFOX_BAR_TOTAL_NUM">'+e+"</span>个难词"}else{this.statusElem.innerHTML="恭喜您！该网页上没有难词~"}}this.statusElem.className="finish"}else{this.switchElem.style.visibility="inherit";this.statusElem.innerHTML="翻译助手已关闭";this.statusElem.className="finish"}}},initLogger:function(d){this.logURL=d;this._logImgCache=[]},log:function(e){/*if(this.logURL){e.relatedURL=document.location.href;e.guid=this.guid;var d=new Image();d.src=this.logURL+"?"+a.param(e)+"&"+(new Date()).getTime();this._logImgCache[this._logImgCache.length]=d}*/},initSwipe:function(){var d=this;this.swipe=a.Swipe(this.context,this.conn);this.swipe.onSwipeCallback=function(e){d.log({action:"swipeWord",word:e})}},movePage:function(d){if(a.browser.msie){var f=a.css(this.context,"paddingTop");try{f=parseInt(f)}catch(e){f=0}this.context.style.cssText+=";padding-top:"+(d+f)+"px !important;"}else{var g=a.css(this.context,"marginTop");try{g=parseInt(g)}catch(e){g=0}if(a.css(this.context,"position")==="static"){a.css(this.context,{position:"relative"})}this.context.style.cssText+=";margin-top:"+(d+g)+"px !important;"}},initFrame:function(f,i){var d=this;var h=document.createElement("div");h.id="OUTFOX_BAR_WRAPPER";this.context.appendChild(h);this.wrapper=h;function g(k){k.innerHTML='<iframe id="OUTFOX_JTR_BAR" src="" style="display:none;"></iframe>';var j=a.query("#OUTFOX_JTR_BAR");j.setAttribute("frameBorder",0);if(a.browser.msie&&document.domain!=window.location.hostname){j.src="javascript:void(document.write(\"<script>document.domain='"+document.domain+"';<\/script><body></body>\"))"}if(a.browser.msie&&!(a.browser.msie==="8.0"&&document.compatMode==="CSS1Compat")){a.css(j,{width:a.getPageSize().window.width+"px"});a.bind(window,"resize",function(l){a.css(j,{width:a.getPageSize().window.width+"px"})})}return j}var e=g(h);this.iframe=e;setTimeout(function(){try{d.frame=e.contentDocument||e.contentWindow.document}catch(j){d.log({action:"secRestrict",relatedURL:window.location.href});alert(d.permissionDenied);return}a.css(e,{display:"block"});a.addClass(e,"OUTFOX_JTR_BAR");a.loadCSS(d.frame,f);d.frame.body.id="OUTFOX_JTR_BAR_BODY";a.addClass(d.frame.body,"forbid-select");d.frame.body.onselectstart=d.frame.body.ondrag=function(){return false};i.call(d)},100)},initBarClose:function(){var d=this;var e=this.frame.getElementById("OUTFOX_JTR_BAR_CLOSE");a.addClass(e,"OUTFOX_JTR_BAR_CLOSE");a.bind(window,"resize",function(f){a.css(e,{top:1+"px",right:1+"px"})});a.bind(e,"click",function(){d.disable();d.movePage(-d.barHeight);d.context.removeChild(d.wrapper);d.context.removeChild(a.query("#OUTFOX_JTR_CDA"));d.context.removeChild(a.query("#yddWrapper"));d.context.removeChild(a.query("#outfox_seed_js"))})},initTipContent:function(){if(!this.update){return}var d=this;var e=function(){var i=a.query("#OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT",d.frame);var f=a.query("#OUTFOX_JTR_BAR_UPDATE_SHADE",d.frame);var h=a.query("#OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP",d.frame);i.innerHTML="更新提示：<br/>"+d.updateTipMsg+'<span class="update-date">'+d.updateDate+'</span><a href="javascript:void(0);" id="OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT_CLOSE"></a>';var g=a.query("#OUTFOX_JTR_BAR_CLOSE_UPDATE_TIP_CONTENT_CLOSE",d.frame);a.css(f,{display:"block"});a.css(h,{display:"block"});a.bind(g,"click",function(){a.css(f,{display:"none"});a.css(h,{display:"none"})})};d.conn.ajax({handler:"localStorage",data:{key:"date"},callback:function(f){if(f!==d.updateDate){e();d.conn.ajax({handler:"localStorage",data:{key:"date",value:d.updateDate}})}}})},initSwitch:function(){var d=this;this.statusElem=a.query("#status",this.frame);this.switchElem=a.query("#switch",this.frame);a.bind(this.switchElem,"click",function(f){if(d.disabled){d.enable()}else{d.disable()}})},initLabel:function(){this.labels=[];var d=this;var f=function(i){var g=i||window.event,h=g.target||g.srcElement,j=h.parentNode.getAttribute("rel");if(d.disabled){return}if(j){d.changeMode(c[j][0],c[j][1]);a.each(c,function(k,l){if(d.mode===l[0]&&d.level===l[1]){d.slider.to(k)}})}};for(var e=0;e<4;e++){this.labels[e]=a.query("#level-"+e,this.frame);a.bind(this.labels[e],"click",f)}},initSlider:function(){var e=a.query("#sliderContainer",this.frame);var d=a.query("#slider",this.frame);var f=this,h=null,g=10;this.slider=new a.Slider(e,d,{bar:a.query("#sliderBackground",this.frame),max:3,min:0,step:1,borderFix:-3,callback:function(i){clearTimeout(h);h=setTimeout(function(){f._valueChange(i)},g)}})},loadSetting:function(f){var e={};if(f===null||Object.prototype.toString.call(f)!=="[object Object]"){this.conn.ajax({handler:"localStorage",dataType:"json",data:{key:"settings",value:JSONDAO.stringify(b)}});e=b}else{for(var d in b){if(b.hasOwnProperty(d)){e[d]=f.hasOwnProperty(d)?f[d]:b[d]}}}e.mode=e.mode||b.mode;e.level=e.level||b.level;a.log("Load Settings:",e);this.settings=e},_valueChange:function(f){var g=Math.round(f),e=c[g][0],d=c[g][1];if(e!==this.mode){this.changeMode(e,d)}else{if(d!==this.level){this.changeLevel(d)}}},changeMode:function(e,f){if(this.mode==="TIPS"){for(var d=1;d<=3;d++){this.labels[d].className="deactive"}this.translator.revertTips()}else{if(this.mode==="TRANS"){this.labels[0].className="deactive";this.translator.revertTrans()}}this.swipe.disableSwipe();this.disableTransTip();this.disableTipsCtrl();this.mode=e;this.changeLevel(f)},changeLevel:function(e){a.log("Change level to:",e);if(this.level===null){this.log({action:"view",level:e})}else{this.log({action:"changeLevel",oldLevel:this.level,newLevel:e})}this.level=e;if(this.mode==="TIPS"){this.swipe.enableSwipe();for(var d=1;d<=3;d++){this.labels[d].className=d==e?"active":"deactive"}this.translator.revertTips();this.translator.doTips(this.level);this.enableTipsCtrl()}else{if(this.mode==="TRANS"){this.labels[0].className="active";this.translator.doTrans();this.enableTransTip()}}if(this.mode!=="NONE"){this.writeSettings({mode:this.mode,level:this.level})}},writeSettings:function(d){a.each(d,function(e,f){this.settings[e]=f},this);this.conn.ajax({handler:"localStorage",dataType:"json",data:{key:"settings",value:JSONDAO.stringify(this.settings)}})},initTipsCtrl:function(){var d=this,f=this.initTipsCtrlElem();var e=null;this.tipsTarget=null;this.tipsCtrlHandler=function(j){var h=j||window.evt,i=h.target||h.srcElement,g=0,k=0;clearTimeout(e);if(i===d.tipsTarget||i.className&&i.className.indexOf("OUTFOX_JTR_NANCI_")!==-1){return}e=setTimeout(function(){if(f.parentNode){f.parentNode.removeChild(f)}if(a.hasClass(i,"OUTFOX_NANCI_TIPS")){var t=a.findPos(i),l=a.query(".OUTFOX_JTR_NANCI_CTRL_WORD",f)[0],m=null;d.context.appendChild(f);l.innerHTML=i.innerHTML;var v=a.css(i,"fontSize");var r=a.css(i,"fontFamily");try{if(v.indexOf("em")!=-1){}else{if(parseInt(v)<12){v="12px"}}}catch(q){v="12px"}var w=!!(a.css(document.body,"position")!=="static");var o=a.css(document.body,"marginLeft");var s=a.css(document.body,"marginRight");if(o==="auto"&&s==="auto"){var u=a.getPageSize().page.width;var p=parseInt(a.css(document.body,"width"));if(u>p){o=(u-p)/2}else{o=0}}o=w?parseInt(o):0;var n=w?parseInt(a.css(document.body,"marginTop")):0;a.css(l,{fontSize:v});a.css(l,{fontFamily:r});a.css(f,{left:(t.x-o)+"px",top:(t.y-n)+"px",position:"absolute"});d.tipsTarget=i}else{d.tipsTarget=null}},200)}},initTipsCtrlElem:function(){var j=document.createElement("span"),g=document.createElement("span"),h=document.createElement("a"),i=document.createElement("span"),k=document.createElement("a"),d=document.createElement("span"),l=this;d.className="OUTFOX_JTR_NANCI_CTRL_WORD";j.appendChild(d);h.className="OUTFOX_JTR_NANCI_CTRL_DETAIL";h.setAttribute("title","查看详细解释");h.innerHTML="详解";g.appendChild(h);g.className="OUTFOX_JTR_NANCI_CTRL_DETAIL_BG";j.appendChild(g);k.className="OUTFOX_JTR_NANCI_CTRL_CLOSE";k.setAttribute("title","我知道了");k.innerHTML="关闭";i.appendChild(k);i.className="OUTFOX_JTR_NANCI_CTRL_CLOSE_BG";j.appendChild(i);j.className="OUTFOX_JTR_NANCI_BAR";var f=function(){var m=null;try{m=l.tipsTarget.previousSibling}catch(n){}return m};var e=function(o){var m=null;if(document.createRange){var n=window.getSelection();m=document.createRange();n.removeAllRanges();m.selectNode(o);n.addRange(m)}else{if(document.body.createTextRange){m=document.body.createTextRange();m.moveToElementText(o);m.select()}}};a.bind(h,"click",function(o){var q=f();if(q&&l.swipe){l.log({action:"viewDetail",word:q.innerHTML});e(q);var p=document.createElement("font");p.innerHTML=" ";q.appendChild(p);var n=a.findPos(p),m=p.offsetHeight;q.removeChild(p);l.swipe.swipeWord(q.firstChild.nodeValue,n.x,n.y,0,m)}j.parentNode.removeChild(j);a.removeClass(l.tipsTarget,"on")});a.bind(k,"click",function(m){var n=j.getAttribute("rel"),o=f();if(o){l.log({action:"closeTip",word:o.innerHTML,tip:l.tipsTarget.innerHTML});l.translator._manager.revertTip(o)}j.parentNode.removeChild(j);a.removeClass(l.tipsTarget,"on")});return j},_findTipCtrlPosition:function(e,t){var u=e.firstChild,n=u.nodeValue,p=u.nodeValue.length,k=document.createElement("font"),f=document.createTextNode(""),r=[0,0],j=null,h=null,q=null,o=0,m=0,d=0,s=p,g=null;a.css(k,{border:"none",padding:0,margin:0});for(var l=0;l<=p;l++){f.nodeValue=u.nodeValue.substr(l);u.nodeValue=u.nodeValue.substr(0,l);e.insertBefore(f,u.nextSibling);e.insertBefore(k,u.nextSibling);q=a.findPos(k);o=q.x-t[0];m=q.y-t[1];if(m<=0&&(h===null||m>h)){g=h=m;r[0]=q.x;r[1]=q.y;j=null;d=l}if(m!==g){s=l;g=m}u.nodeValue=n;e.removeChild(f);e.removeChild(k)}k.innerHTML=u.nodeValue.substr(d,s);u.nodeValue=u.nodeValue.substr(0,d);e.insertBefore(k,u.nextSibling);r[0]+=k.offsetWidth;e.removeChild(k);u.nodeValue=n;return r},preventClose:function(){a.css(a.query("#OUTFOX_JTR_BAR_CLOSE",this.frame),{display:"none"})},enableTipsCtrl:function(){a.bind(this.context,"mouseover",this.tipsCtrlHandler)},disableTipsCtrl:function(){a.unbind(this.context,"mouseover",this.tipsCtrlHandler)},enableTransTip:function(){a.bind(this.context,"mouseover",this.transTipHandler)},disableTransTip:function(){a.unbind(this.context,"mouseover",this.transTipHandler)},initTransTip:function(d){var f=this,g=null,e=null;this.initTransTipElem("","");this.transTipHandler=function(j){var h=j||window.event,i=h.target||h.srcElement;clearTimeout(e);e=setTimeout(function(){if(g===i||i.className&&(i.className.indexOf("OUTFOX_JTR_TRANSTIP_")!==-1||i.className.indexOf("ydd-")!==-1)){return}if(g){g.style.textDecoration="none"}if(f.transTipElem.elem.parentNode){f.transTipElem.elem.parentNode.removeChild(f.transTipElem.elem)}if(a.hasClass(i,"OUTFOX_JTR_TRANS_NODE")){g=i;var k=i.getAttribute("rel"),l=f.translator._manager;f.resetTransTipElem(l.originals[k],l.transResults[k],k);f.context.appendChild(f.transTipElem.elem);f.positionElementInViewPort({target:i,tip:f.transTipElem.elem});i.style.textDecoration="underline"}else{g=null}},200)}},initTransTipElem:function(){var k=this,g=document.createElement("div");g.className="OUTFOX_JTR_TRANSTIP_WRAPPER";var m=document.createTextNode("");var e=document.createTextNode("");g.innerHTML+='<div class="OUTFOX_JTR_TRANSTIP_ORIGIN"> <div class="ydd-container"> <div class="ydd-top-wrapper"> <div class="ydd-top"> </div> </div> <div class="ydd-body-wrapper"> <div class="ydd-lb"></div> <div class="ydd-rb"></div> <div class="ydd-body"> <div class="ydd-title"> <strong>原文：</strong> </div> <div class="ydd-middle"> <div class="OUTFOX_JTR_TRANSTIP_ORIGIN_TEXT"></div> <div class="OUTFOX_JTR_TRANSTIP_ADVISE"> <textarea class="OUTFOX_JTR_TRANSTIP_ADVISE_TEXT"></textarea> <a class="OUTFOX_JTR_TRANSTIP_ADVISE_SUBMIT" href="javascript:void(0);">提交翻译建议</a> </div> </div> </div> </div> <div class="ydd-bottom-wrapper"> <div class="ydd-bottom"> <a class="OUTFOX_JTR_TRANSTIP_ADVISE_TOGGLE">更好的翻译建议</a> <span class="OUTFOX_JTR_TRANSTIP_ADVISE_THANK">感谢您为有道提供建议^_^</span> </div> </div> <div class="ydd-bg-top"></div> </div> </div>';a.query(".OUTFOX_JTR_TRANSTIP_ORIGIN_TEXT",g)[0].appendChild(e);a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_TEXT",g)[0].appendChild(m);var f=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_TOGGLE",g)[0],i=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_SUBMIT",g)[0],l=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE",g)[0],d=a.query(".ydd-bottom",g)[0],h=a.query(".OUTFOX_JTR_TRANSTIP_ADVISE_TEXT",g)[0];i.hideFocus=true;a.bind(f,"click",function(){a.toggleClass(l,"expand");a.css(f,{display:"none"})});var j=function(n){n=n.replace(/</g,"<").replace(/>/g,">");return n};a.bind(i,"click",function(){var o=h.value;if(o===""){alert("翻译建议不能为空，请您输入内容后再次提交");return}o=j(o);a.addClass(l,"finish");a.removeClass(l,"expand");a.addClass(d,"OUTFOX_JTR_TRANSTIP_ADVISE_THANK_TIP");var n=k.transTipElem.index;if(n&&k.manager.transResults[n]){k.manager.transResults[n]=o;k.manager.revertTrans(n);k.manager.replaceTrans(n)}});this.transTipElem={elem:g,transTextContainer:h,trans:m,original:e,toggle:f,submit:i,advise:l,bottom:d,index:null}},resetTransTipElem:function(d,f,e){a.removeClass(this.transTipElem.advise,"finish");a.removeClass(this.transTipElem.advise,"expand");a.removeClass(this.transTipElem.bottom,"OUTFOX_JTR_TRANSTIP_ADVISE_THANK_TIP");this.transTipElem.toggle.innerHTML="提交翻译建议";a.css(this.transTipElem.toggle,{display:""});this.transTipElem.transTextContainer.value=f;this.transTipElem.original.nodeValue=d;this.transTipElem.index=e}}})(J);(function(d){var f="http://fanyi.youdao.com/web2";var g="http://fanyi.youdao.com";var h=browser.runtime.getURL("static/fanyi.youdao.2.0/conn.html");var c=f+"/index.do";var a=g+"/jtr";var e=f+"/rl.do";var b=browser.runtime.getURL("static/fanyi.youdao.2.0/all-packed.css");d.loadCSS(document,b);window.OUTFOX_JavascriptTranslatoR=new d.TR.UI(document.body,{domain:g,update:false,updateTipMsg:"修复链接错误",updateDate:"2013-12-24",cssURL:b,tipsURL:c,transURL:a,logURL:e,connFilePath:h,reqSize:20})})(J);
return 1; // so that chrome.tabs.executeScript knows everything is fine
})()
|
fix
|
use browser instead of chrome
|
a2750047805484c67cc5b3c0c1eada179d63919e
|
2020-03-14 21:07:28
|
crimx
|
chore(release): 7.9.2
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9702d2742..e4774535a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+### [7.9.2](https://github.com/crimx/ext-saladict/compare/v7.9.1...v7.9.2) (2020-03-14)
+
+
+### Bug Fixes
+
+* **dicts:** wrong dict config ([551a0b3](https://github.com/crimx/ext-saladict/commit/551a0b30db29c14dd093d33f01c440d669846fc4))
+
### [7.9.1](https://github.com/crimx/ext-saladict/compare/v7.9.0...v7.9.1) (2020-03-10)
diff --git a/package.json b/package.json
index a287fa9b7..c0345d0ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "7.9.1",
+ "version": "7.9.2",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
7.9.2
|
e2c224a502c9ae8097fd56da3d115ad2d2e94055
|
2019-08-05 22:04:06
|
crimx
|
refactor(storybook): handle DICT_ENGINE_METHOD
| false
|
diff --git a/src/components/dictionaries/dictionaries.stories.tsx b/src/components/dictionaries/dictionaries.stories.tsx
index 8b73797d9..03a9962f2 100644
--- a/src/components/dictionaries/dictionaries.stories.tsx
+++ b/src/components/dictionaries/dictionaries.stories.tsx
@@ -3,14 +3,12 @@ import axios from 'axios'
import AxiosMockAdapter from 'axios-mock-adapter'
import { storiesOf } from '@storybook/react'
import { action } from '@storybook/addon-actions'
+import { withKnobs, select, number, boolean } from '@storybook/addon-knobs'
import {
- withKnobs,
- select,
- number,
- object,
- boolean
-} from '@storybook/addon-knobs'
-import { withi18nNS, withSaladictPanel } from '@/_helpers/storybook'
+ withSaladictPanel,
+ withSideEffect,
+ browser
+} from '@/_helpers/storybook'
import { DictItem } from '@/content/components/DictItem/DictItem'
import { getDefaultConfig, DictID } from '@/app-config'
import { getDefaultProfile } from '@/app-config/profiles'
@@ -18,6 +16,7 @@ import { SearchFunction, MockRequest } from './helpers'
import { getAllDicts } from '@/app-config/dicts'
import { useTranslate } from '@/_helpers/i18n'
import { timer } from '@/_helpers/promise-more'
+import { Message } from '@/typings/message'
const stories = storiesOf('Content Scripts|Dictionaries', module)
.addParameters({
@@ -27,6 +26,28 @@ const stories = storiesOf('Content Scripts|Dictionaries', module)
]
})
.addDecorator(withKnobs)
+ .addDecorator(
+ withSideEffect(() => {
+ browser.runtime.sendMessage.callsFake((message: Message) => {
+ if (message.type === 'DICT_ENGINE_METHOD') {
+ action('Calling DICT_ENGINE_METHOD')(message.payload)
+ return new Promise(resolve => {
+ setTimeout(() => {
+ const method = require('@/components/dictionaries/' +
+ message.payload.id +
+ '/engine.ts')[message.payload.method]
+ resolve(method(...(message.payload.args || [])))
+ }, Math.random() * 2000)
+ })
+ }
+ return Promise.resolve()
+ })
+
+ return () => {
+ browser.runtime.sendMessage.callsFake(() => Promise.resolve())
+ }
+ })
+ )
.addDecorator(
withSaladictPanel(
<style>
@@ -34,7 +55,6 @@ const stories = storiesOf('Content Scripts|Dictionaries', module)
</style>
)
)
- .addDecorator(withi18nNS('content'))
Object.keys(getAllDicts()).forEach(id => {
// @ts-ignore: wrong storybook typing
|
refactor
|
handle DICT_ENGINE_METHOD
|
944cd1ebb91d8e708488925c680c2d3e6fa661c2
|
2019-08-04 16:40:04
|
crimx
|
refactor(dicts): liangan
| false
|
diff --git a/src/components/dictionaries/liangan/View.tsx b/src/components/dictionaries/liangan/View.tsx
index 49c543b56..aa082716e 100644
--- a/src/components/dictionaries/liangan/View.tsx
+++ b/src/components/dictionaries/liangan/View.tsx
@@ -1,5 +1,7 @@
-import GuoYu from '../guoyu/View'
+import { DictGuoyu } from '../guoyu/View'
-export default class LiangAn extends GuoYu {
- displayName = 'LiangAn'
-}
+export const DictLiangAn = DictGuoyu
+
+DictLiangAn.displayName = 'LiangAn'
+
+export default DictLiangAn
diff --git a/src/components/dictionaries/liangan/_style.scss b/src/components/dictionaries/liangan/_style.scss
deleted file mode 100644
index d1ca9fc3e..000000000
--- a/src/components/dictionaries/liangan/_style.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../guoyu/_style';
diff --git a/src/components/dictionaries/liangan/_style.shadow.scss b/src/components/dictionaries/liangan/_style.shadow.scss
new file mode 100644
index 000000000..d66e06b57
--- /dev/null
+++ b/src/components/dictionaries/liangan/_style.shadow.scss
@@ -0,0 +1 @@
+@import '../guoyu/_style.shadow.scss';
diff --git a/src/components/dictionaries/liangan/engine.ts b/src/components/dictionaries/liangan/engine.ts
index bff33384f..9a4ed15ff 100644
--- a/src/components/dictionaries/liangan/engine.ts
+++ b/src/components/dictionaries/liangan/engine.ts
@@ -1,26 +1,35 @@
-import { SearchFunction, GetSrcPageFunction } from '../helpers'
+import {
+ SearchFunction,
+ GetSrcPageFunction,
+ DictSearchResult
+} from '../helpers'
import chsToChz from '@/_helpers/chs-to-chz'
-import { DictSearchResult } from '@/typings/server'
import { moedictSearch, GuoYuResult } from '../guoyu/engine'
-export const getSrcPage: GetSrcPageFunction = (text) => {
+export const getSrcPage: GetSrcPageFunction = text => {
return `https://www.moedict.tw/~${chsToChz(text)}`
}
export type LiangAnResult = GuoYuResult
-export const search: SearchFunction<DictSearchResult<LiangAnResult>> = (
- text, config, profile, payload
+export const search: SearchFunction<LiangAnResult> = (
+ text,
+ config,
+ profile,
+ payload
) => {
- return moedictSearch<LiangAnResult>('c', encodeURIComponent(text.replace(/\s+/g, '')), config)
- .then(result => {
- if (result.result.h) {
- result.result.h.forEach(h => {
- if (h.p) {
- h.p = h.p.replace('<br>陸⃝', ' [大陆]: ')
- }
- })
- }
- return result
- })
+ return moedictSearch<LiangAnResult>(
+ 'c',
+ encodeURIComponent(text.replace(/\s+/g, '')),
+ config
+ ).then(result => {
+ if (result.result.h) {
+ result.result.h.forEach(h => {
+ if (h.p) {
+ h.p = h.p.replace('<br>陸⃝', ' [大陆]: ')
+ }
+ })
+ }
+ return result
+ })
}
diff --git a/test/specs/components/dictionaries/liangan/requests.mock.ts b/test/specs/components/dictionaries/liangan/requests.mock.ts
new file mode 100644
index 000000000..c428570f2
--- /dev/null
+++ b/test/specs/components/dictionaries/liangan/requests.mock.ts
@@ -0,0 +1 @@
+export { mockSearchTexts, mockRequest } from '../guoyu/requests.mock'
|
refactor
|
liangan
|
6ff73e75a0c7df21632652152224504bfe7df5be
|
2021-05-23 21:51:54
|
dependabot[bot]
|
build(deps): bump dompurify from 2.0.7 to 2.0.17 (#1159)
| false
|
diff --git a/package.json b/package.json
index a5f1fc41..1f95f5ef 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
"axios": "^0.21.1",
"classnames": "^2.2.6",
"dexie": "^2.0.4",
- "dompurify": "^2.0.7",
+ "dompurify": "^2.0.17",
"get-selection-more": "^1.0.2",
"i18next": "^17.0.6",
"lodash": "^4.17.14",
diff --git a/yarn.lock b/yarn.lock
index c53de91b..406cbf5f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6201,10 +6201,10 @@ domhandler@^2.3.0:
dependencies:
domelementtype "1"
-dompurify@^2.0.7:
- version "2.0.7"
- resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.7.tgz#f8266ad38fe1602fb5b3222f31eedbf5c16c4fd5"
- integrity sha512-S3O0lk6rFJtO01ZTzMollCOGg+WAtCwS3U5E2WSDY/x/sy7q70RjEC4Dmrih5/UqzLLB9XoKJ8KqwBxaNvBu4A==
+dompurify@^2.0.17:
+ version "2.0.17"
+ resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.17.tgz#505ffa126a580603df4007e034bdc9b6b738668e"
+ integrity sha512-nNwwJfW55r8akD8MSFz6k75bzyT2y6JEa1O3JrZFBf+Y5R9JXXU4OsRl0B9hKoPgHTw2b7ER5yJ5Md97MMUJPg==
[email protected]:
version "1.5.1"
|
build
|
bump dompurify from 2.0.7 to 2.0.17 (#1159)
|
e939e92ef93743ae15465806098064bd7ed405bd
|
2019-08-17 10:24:38
|
crimx
|
refactor(storybook): dict list
| false
|
diff --git a/src/content/components/DictItem/DictItem.stories.tsx b/src/content/components/DictItem/DictItem.stories.tsx
index 8f090efbf..4c7d16d92 100644
--- a/src/content/components/DictItem/DictItem.stories.tsx
+++ b/src/content/components/DictItem/DictItem.stories.tsx
@@ -5,6 +5,7 @@ import { withPropsTable } from 'storybook-addon-react-docgen'
import { action } from '@storybook/addon-actions'
import { withKnobs, select, text, number, array } from '@storybook/addon-knobs'
import { withi18nNS, withSaladictPanel } from '@/_helpers/storybook'
+import faker from 'faker'
import { DictItem } from './DictItem'
storiesOf('Content Scripts|Dict Panel', module)
@@ -38,16 +39,13 @@ storiesOf('Content Scripts|Dict Panel', module)
{ IDLE: 'IDLE', SEARCHING: 'SEARCHING', FINISH: 'FINISH' },
'FINISH'
)}
- searchResult={array(
- 'Search Result',
- Array(5).fill(
- 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Incidunt eum ratione assumenda accusantium vel numquam voluptate nam ab laborum ut aliquam illum alias nemo perspiciatis rem distinctio illo, expedita nihil sint! Non distinctio, cum quam esse quod, possimus itaque velit reiciendis dolor, et aut minima? Quas quae laudantium doloremque unde.'
- )
- )}
- dictComp={({ result }: { result: string[] }) => (
+ searchResult={{
+ count: number('Paragraphs', 5)
+ }}
+ dictComp={({ result }: { result: { count: number } }) => (
<>
- {result.map((line, i) => (
- <p key={i}>{line}</p>
+ {[...Array(result.count)].map((line, i) => (
+ <p key={i}>{faker.lorem.paragraph()}</p>
))}
</>
)}
diff --git a/src/content/components/DictList/DictList.stories.tsx b/src/content/components/DictList/DictList.stories.tsx
new file mode 100644
index 000000000..88730dd4c
--- /dev/null
+++ b/src/content/components/DictList/DictList.stories.tsx
@@ -0,0 +1,67 @@
+import React from 'react'
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
+import { jsxDecorator } from 'storybook-addon-jsx'
+import { withPropsTable } from 'storybook-addon-react-docgen'
+import { withKnobs, number, boolean } from '@storybook/addon-knobs'
+import { withSaladictPanel } from '@/_helpers/storybook'
+import faker from 'faker'
+import { DictList } from './DictList'
+import { getAllDicts } from '@/app-config/dicts'
+import { DictID } from '@/app-config'
+
+const allDicts = getAllDicts()
+const dicts = Object.keys(allDicts).map(id => ({
+ dictID: id as DictID,
+ preferredHeight: allDicts[id].preferredHeight
+}))
+const searchStatus = ['IDLE', 'SEARCHING', 'FINISH'] as [
+ 'IDLE',
+ 'SEARCHING',
+ 'FINISH'
+]
+
+storiesOf('Content Scripts|Dict Panel', module)
+ .addParameters({
+ backgrounds: [
+ { name: 'Saladict', value: '#5caf9e', default: true },
+ { name: 'Black', value: '#000' }
+ ]
+ })
+ .addDecorator(withPropsTable)
+ .addDecorator(jsxDecorator)
+ .addDecorator(withKnobs)
+ .addDecorator(
+ withSaladictPanel({
+ head: <style>{require('./DictList.scss').toString()}</style>,
+ height: 'auto'
+ })
+ )
+ .add('DictList', () => (
+ <DictList
+ text="love"
+ fontSize={number('Font Size', 13)}
+ withAnimation={boolean('Enable Animation', true)}
+ dicts={[...Array(faker.random.number({ min: 3, max: 10 }))].map(() => ({
+ ...faker.random.arrayElement(dicts),
+ searchStatus: faker.random.arrayElement(searchStatus),
+ searchResult: {
+ paragraphs: faker.lorem.paragraphs(
+ faker.random.number({ min: 1, max: 4 })
+ )
+ },
+ dictComp: TestComp
+ }))}
+ searchText={action('Search Text')}
+ />
+ ))
+
+function TestComp({ result }: { result: { paragraphs: string } }) {
+ return (
+ <>
+ {result.paragraphs.split('\n').map((line, i) => (
+ <p key={i}>{line}</p>
+ ))}
+ </>
+ )
+}
diff --git a/src/content/components/DictList/DictList.tsx b/src/content/components/DictList/DictList.tsx
index 343f10c06..c22cd1109 100644
--- a/src/content/components/DictList/DictList.tsx
+++ b/src/content/components/DictList/DictList.tsx
@@ -10,7 +10,11 @@ export interface DictListProps {
dicts: Array<
Pick<
DictItemProps,
- 'dictID' | 'preferredHeight' | 'searchStatus' | 'searchResult'
+ | 'dictID'
+ | 'preferredHeight'
+ | 'searchStatus'
+ | 'searchResult'
+ | 'dictComp'
>
>
|
refactor
|
dict list
|
d0fe83a1f6f693d3647d58d9450dcd9e23e7a5a4
|
2019-08-05 09:37:48
|
crimx
|
refactor(dicts): oald
| false
|
diff --git a/src/components/dictionaries/oald/View.tsx b/src/components/dictionaries/oald/View.tsx
index 391a3ddb3..36667fdb6 100644
--- a/src/components/dictionaries/oald/View.tsx
+++ b/src/components/dictionaries/oald/View.tsx
@@ -1,56 +1,74 @@
-import React from 'react'
+import React, { FC } from 'react'
import Speaker from '@/components/Speaker'
import { OALDResult, OALDResultLex, OALDResultRelated } from './engine'
import { ViewPorps } from '@/components/dictionaries/helpers'
-export default class DictOALD extends React.PureComponent<ViewPorps<OALDResult>> {
- handleEntryClick = (e: React.MouseEvent<HTMLElement>) => {
- const target = e.nativeEvent.target as HTMLSpanElement
- if (target.classList && target.classList.contains('heading')) {
- (target.parentElement as HTMLDivElement).classList.toggle('is-active')
- this.props.recalcBodyHeight()
- }
- }
-
- renderLex (result: OALDResultLex) {
- return result.items.map(entry => (
- <section key={entry.title} className='dictOALD-Entry' onClick={this.handleEntryClick}>
- <header className='dictOALD-Header'>
- <div className='webtop-g' dangerouslySetInnerHTML={{ __html: entry.title }} />
- {entry.prons.length > 0 &&
- <div className='pron-gs ei-g'>
- {entry.prons.map(p => (
- <React.Fragment key={p.phsym}>
- <span className='pron-g' dangerouslySetInnerHTML={{ __html: p.phsym }} />
- <Speaker src={p.pron} />
- </React.Fragment>
- ))}
- </div>
- }
- </header>
- <span className='h-g' dangerouslySetInnerHTML={{ __html: entry.defs }} />
- </section>
- ))
+export const DictOALD: FC<ViewPorps<OALDResult>> = ({ result }) => {
+ switch (result.type) {
+ case 'lex':
+ return renderLex(result)
+ case 'related':
+ return renderRelated(result)
+ default:
+ return null
}
+}
- renderRelated (result: OALDResultRelated) {
- return (
- <>
- <p>Did you mean:</p>
- <ul className='dictOALD-Related' dangerouslySetInnerHTML={{ __html: result.list }} />
- </>
- )
- }
+function renderLex(result: OALDResultLex) {
+ return (
+ <>
+ {result.items.map(entry => (
+ <section
+ key={entry.title}
+ className="dictOALD-Entry"
+ onClick={e => {
+ const target = e.nativeEvent.target as HTMLSpanElement
+ if (target.classList && target.classList.contains('heading')) {
+ ;(target.parentElement as HTMLDivElement).classList.toggle(
+ 'is-active'
+ )
+ }
+ }}
+ >
+ <header className="dictOALD-Header">
+ <div
+ className="webtop-g"
+ dangerouslySetInnerHTML={{ __html: entry.title }}
+ />
+ {entry.prons.length > 0 && (
+ <div className="pron-gs ei-g">
+ {entry.prons.map(p => (
+ <React.Fragment key={p.phsym}>
+ <span
+ className="pron-g"
+ dangerouslySetInnerHTML={{ __html: p.phsym }}
+ />
+ <Speaker src={p.pron} />
+ </React.Fragment>
+ ))}
+ </div>
+ )}
+ </header>
+ <span
+ className="h-g"
+ dangerouslySetInnerHTML={{ __html: entry.defs }}
+ />
+ </section>
+ ))}
+ </>
+ )
+}
- render () {
- const { result } = this.props
- switch (result.type) {
- case 'lex':
- return this.renderLex(result)
- case 'related':
- return this.renderRelated(result)
- default:
- return null
- }
- }
+function renderRelated(result: OALDResultRelated) {
+ return (
+ <>
+ <p>Did you mean:</p>
+ <ul
+ className="dictOALD-Related"
+ dangerouslySetInnerHTML={{ __html: result.list }}
+ />
+ </>
+ )
}
+
+export default DictOALD
diff --git a/src/components/dictionaries/oald/_style.scss b/src/components/dictionaries/oald/_style.scss
deleted file mode 100644
index 7b3c24f5b..000000000
--- a/src/components/dictionaries/oald/_style.scss
+++ /dev/null
@@ -1,3532 +0,0 @@
-.dictOALD-Header {
- .z {
- display: none;
- }
-}
-
-.dictOALD-Entry {
- ol {
- list-style-type: decimal;
- padding-left: 20px
- }
-
- img.icon {
- vertical-align: text-bottom;
- margin-top: 0;
- margin-right: 2px;
- margin-left: 0;
- margin-bottom: 0
- }
-
- div.icon {
- display: inline;
- font-weight: lighter;
- font-size: 7pt;
- text-transform: uppercase;
- color: #FFF;
- padding: 0 .6em .2em .6em
- }
-
- div.icon-helpsym {
- background-color: transparent;
- font-weight: bold;
- color: #276E98;
- font-variant: small-caps
- }
-
- div.icon-pvsym {
- font-weight: lighter;
- color: #078d8f;
- font-size: 1.38em;
- text-indent: -1em
- }
-
- div.icon-oppsym {
- color: #C00B19;
- background-color: transparent;
- font-size: 0.85em;
- padding: 0;
- text-transform: lowercase
- }
-
- div.icon-idsym {
- font-weight: lighter;
- color: #35338a;
- font-size: 1.46em
- }
-
- div.icon-synsym {
- background-color: transparent;
- font-weight: normal !important;
- color: #C00B19;
- text-transform: lowercase;
- font-size: 0.85em;
- padding: 0 !important
- }
-
- .labelsAbout {
- text-align: left;
- border: 0px none;
- width: 100%
- }
-
- .labelsAbout .pron-usonly:hover {
- background-repeat: no-repeat;
- background-position: left bottom
- }
-
- .labelsAbout .pron-usonly {
- width: 29px;
- height: 30px;
- border: 0;
- background-repeat: no-repeat;
- background-position: left top
- }
-
- .sup,sup {
- vertical-align: super;
- font-size: 65%
- }
-
- .sub {
- vertical-align: sub;
- font-size: 65%
- }
-
- button.key {
- height: 15px;
- width: 8px;
- padding: 0px;
- margin: 0px;
- cursor: normal;
- padding: 0px;
- border: 0px;
- margin-right: 5px;
- margin-top: 5px;
- background-repeat: no-repeat;
- vertical-align: top
- }
-
- .block-g {
- float: right
- }
-
- .clear {
- clear: both;
- height: 2px
- }
-
- #entryContent .side {
- float: right;
- width: 164px;
- text-align: center;
- margin-bottom: 0px
- }
-
- .ColloPanel,.ThesPanel {
- font-size: 80%;
- text-align: left;
- display: block;
- border-radius: 9px 9px 9px 9px;
- border-style: solid;
- border-color: blue;
- margin: 15px;
- border-width: 1px;
- padding: 3px;
- column-count: 3;
- column-gap: 0em;
- -moz-column-count: 3;
- -moz-column-gap: 0em;
- -webkit-column-count: 3;
- -webkit-column-gap: 0em;
- background-color: #FFF
- }
-
- ul.sketch {
- margin-top: 0px;
- margin-left: -20px
- }
-
- .ColloPanel .xr,.ThesPanel .xr {
- font-weight: bold;
- font-size: 130%;
- display: list-item;
- list-style-type: square;
- color: #5BA7DA;
- margin-left: 20px
- }
-
- .CorpusHeader {
- display: block;
- padding: 3px;
- font-size: 120%;
- background-color: #00315A;
- color: white;
- border-top-left-radius: 9px
- }
-
- .ColloHeader {
- display: block;
- color: white;
- font-weight: bold;
- background-color: #5BA7DA;
- font-size: 100%;
- text-transform: uppercase;
- margin-left: 2px;
- margin-top: 2px;
- padding: 3px
- }
-
- .search-term {
- font-weight: bold
- }
-
- #results-container-all ul li {
- margin-bottom: 7px
- }
-
- #browse>div {
- margin-bottom: 7px
- }
-
- #browse #result ul {
- padding: 0
- }
-
- #browse_lists {
- margin-top: 16px
- }
-
- #browse_lists ul {
- margin-bottom: 10px
- }
-
- .grey-grad,.idsym-g,.ui-grad dt,.z_idsym {
- box-shadow: 0 50px 50px -30px white inset;
- background-color: #cccccc;
- border: 1px solid #cccccc
- }
-
- .webtop-g h2 {
- font-size: 1.5em;
- font-weight: bold;
- padding: 0;
- display: inline-block
- }
-
- .top-container {
- background-color: #ecf5ff;
- margin-right: -250px;
- margin-left: -28px;
- margin-bottom: 10px;
- padding: 0 250px 0 28px;
- clear: both
- }
-
- .btn.prac-pron {
- display: none
- }
-
- .oxford3000,.academic {
- display: inline-block;
- background-size: 100%;
- background-repeat: no-repeat;
- width: 30px;
- height: 30px;
- margin: 0 0 -8px;
- position: relative;
- top: -5px
- }
-
- .oxford3000:hover,.academic:hover {
- text-decoration: none
- }
-
- .entry-header .share-this-entry {
- margin: 0;
- padding-top: 0;
- display: table
- }
-
- .entry-header .responsive_entry_center_left {
- margin-bottom: 0 !important;
- display: table-cell;
- float: none
- }
-
- .entry-header .responsive_entry_center_left_premium {
- margin-bottom: 0 !important;
- display: table-cell;
- float: none
- }
-
- .entry-header {
- margin: 7px 0;
- display: table
- }
-
- .responsive_entry_center p.definition-title,.responsive_entry_center_left_premium p.definition-title {
- font-size: 0.85em;
- padding-bottom: 0px;
- margin-bottom: 0;
- display: table-cell;
- vertical-align: bottom
- }
-
- .share-this-entry .right-colum {
- margin: 0;
- padding-top: 0 !important
- }
-
- .share-this-entry .col_middle_left,.share-this-entry .right-colum {
- display: table-cell
- }
-
- .social-wrap {
- width: 180px;
- height: 28px;
- padding: 2px 0
- }
-
- .social-wrap a {
- display: inline-block;
- width: 24px;
- height: 24px;
- padding: 0;
- margin: 1px 0 0 0;
- border: 0;
- background: #4577bf;
- background-size: auto 100%;
- cursor: pointer;
- border-radius: 30px
- }
-
- .social-wrap a:hover {
- background-color: #0d3880
- }
-
- #plusone-box {
- display: inline-block;
- vertical-align: top;
- margin: 1px 0 0 1px
- }
-
- .stumbleupon-btn {
- background-position: -48px 0 !important
- }
-
- .diigo-btn {
- background-position: -72px 0 !important
- }
-
- .email-btn {
- background-position: -96px 0 !important
- }
-
- #ox-enlarge {
- float: right;
- position: relative;
- z-index: 10;
- clear: both
- }
-
- #ox-enlarge a.topic {
- display: block;
- text-align: right;
- position: relative;
- padding: 2px;
- margin: 0 0 12px 12px;
- }
-
- #ox-enlarge a.topic:hover {
- text-decoration: none;
- outline: none;
- }
-
- #ox-enlarge .ox-enlarge-label {
- display: none;
- }
-
- .relatedentries {
- max-height: 200px;
- text-align: left;
- color: #8f0610;
- }
-
- .relatedentries ul {
- margin: 0;
- padding: 0 0 0 10px
- }
-
- .relatedentries a {
- color: #000
- }
-
- #rightcolumn h4.no-rule {
- margin-top: 0;
- border-bottom: 0 none
- }
-
- .no-rule {
- border-bottom: 0;
- margin-bottom: 0
- }
-
- dd {
- overflow: hidden;
- -webkit-transition: max-height 0.5s;
- -moz-transition: max-height 0.5s;
- transition: max-height 0.5s;
- max-height: 4000px
- }
-
- dd.deep {
- max-height: 9000px
- }
-
- .hide+dd,.hide+dd.deep {
- max-height: 0
- }
-
- .ui-grad dt,.ui-grad dd {
- margin-top: -1px
- }
-
- .ui-grad ul {
- margin-left: 14px;
- margin-right: 14px;
- padding: 0
- }
-
- .ui-grad dd {
- border: 1px solid #cccccc
- }
-
- .ui-grad dt:first-child {
- border-radius: 8px 8px 0 0;
- margin-top: 0
- }
-
- .ui-grad dt {
- padding: 5px 6px 5px 6px;
- color: #444444
- }
-
- .ui-grad dt.hide:hover {
- cursor: pointer
- }
-
- .ui-grad dt:not(.hide):before {
- content: none
- }
-
- .ui-grad dt:not(.hide) {
- padding: 6px 14px 5px
- }
-
- .accordion dl {
- margin: 0
- }
-
- .accordion .more {
- display: none
- }
-
- .accordion .show .more {
- display: block
- }
-
- .accordion dt:before {
- vertical-align: baseline;
- content: "";
- display: inline-block;
- margin-right: 6px;
- margin-left: -2px;
- margin-bottom: -1px;
- width: 13px;
- height: 13px
- }
-
- .see-more {
- display: block;
- padding: 6px;
- text-align: center;
- border-top: 1px solid #aaaaaa;
- color: grey
- }
-
- .list-col a,.list-col span.selected {
- display: block;
- padding-top: 3px;
- padding-bottom: 4px;
- font-weight: normal
- }
-
- .list-col {
- padding-left: 0
- }
-
- .list-col .selected {
- color: #282828;
- padding-left: 7px;
- padding-right: 7px;
- background-color: #dddddd;
- border-radius: 4px;
- margin: 3px -7px 4px
- }
-
- .list-col h6 {
- border-bottom: 1px solid silver
- }
-
- .topic-explore p {
- color: rgba(0,0,0,0.7);
- font-size: 1.15em
- }
-
- .topic-explore>h3 {
- font-size: 1.31em;
- font-weight: bold;
- margin: 0 0 7px;
- padding: 0
- }
-
- .topic-explore h4 {
- border-top: 1px solid #C0C0C0;
- border-bottom: 1px solid #C0C0C0;
- padding: 8px 0
- }
-
- .topic-explore ul {
- padding-left: 0px
- }
-
- .topic-explore h6 {
- border: 0px none;
- margin: 8px 0px 0px 0px
- }
-
- .topic-explore h6 a {
- font-size: 1.15em;
- font-weight: bold;
- color: rgba(0,0,0,0.7)
- }
-
- .list-nested>li {
- display: inline-block;
- padding-right: 15px
- }
-
- .list-nested-pool>li {
- background-color: grey;
- border-bottom: 1px solid white
- }
-
- .list-nested-pool ul {
- padding: 3px 0 4px;
- background: #efefef;
- background: white
- }
-
- .wordpool {
- margin-top: 14px;
- padding-left: 8px
- }
-
- .wordpool li {
- display: inline-block;
- margin: 0;
- padding: 0 14px 7px 0
- }
-
- .wordpool a,.wordpool span {
- font-weight: normal
- }
-
- .wordpool-active span {
- font-weight: bold
- }
-
- .section.partner {
- margin-top: 2em
- }
-
- .wordlist-page p {
- max-width: 700px
- }
-
- .wordlist-info-page {
- margin-bottom: 14px
- }
-
- .wordlist-info-page .oxford3000-blue,.wordlist-info-page .academic-blue {
- width: 20px;
- height: 20px
- }
-
- .wordlist-info-page ul {
- padding-left: 20px;
- list-style-type: disc;
- margin-bottom: 7px
- }
-
- .middle_wrap>h1 {
- margin-top: 7px
- }
-
- .open-close dt:hover {
- color: #0d3880
- }
-
- .ui-plain {
- max-width: 700px
- }
-
- .ui-plain dl:first-child {
- border-top: 1px solid grey
- }
-
- .ui-plain dt {
- padding: 7px 7px 7px 21px;
- color: #282828;
- font-weight: bold;
- cursor: pointer
- }
-
- .ui-plain dt:before {
- content: "";
- position: absolute;
- width: 13px;
- height: 24px;
- margin: -7px 0 0 -21px
- }
-
- .ui-plain dt.hide:before {
- background-position: 0 -50px
- }
-
- .ui-plain dd {
- border-bottom: 1px solid silver
- }
-
- .ui-plain dt:before {
- position: relative;
- margin-right: 8px;
- display: inline-block
- }
-
- .topic-desc {
- max-width: 750px
- }
-
- .oxford3000-blue,.academic-blue {
- display: inline-block;
- background-size: 100%;
- background-repeat: no-repeat;
- width: 30px;
- height: 30px;
- margin: -8px 0 -5px
- }
-
- .topic-dt .side-selector__left ul ul ul ul li>a {
- margin-left: -62px;
- padding-left: 40px;
- margin-top: 2px;
- text-decoration: none;
- background-color: #efefef;
- background-color: white
- }
-
- .side-selector {
- border-radius: 7px;
- overflow: hidden;
- background-color: #eee;
- border: 1px solid #cccccc
- }
-
- .side-selector__left,.side-selector__right {
- padding: 0 0;
- width: 40%;
- float: left
- }
-
- .side-selector__right {
- width: 60%;
- float: left;
- background-color: white
- }
-
- .side-selector__right .sound.audio_play_button {
- margin: 0
- }
-
- .side-selector__left ul ul ul ul li.is-revealed>a {
- background-color: #4577bf;
- color: white
- }
-
- .side-selector__left .ei-g {
- margin-top: 0
- }
-
- .side-selector__left .top-container {
- margin: 0;
- padding: 0;
- background-color: transparent
- }
-
- .side-selector__left .top-g {
- padding: 0
- }
-
- .side-selector__left .webtop-g {
- margin: 0 -7px;
- padding: 6px 7px
- }
-
- .side-selector__left .link-right {
- padding-top: 7px
- }
-
- #entries-selector {
- padding: 7px
- }
-
- #entries-selector ul {
- list-style-type: none;
- padding: 0
- }
-
- #entries-selector .wl-select {
- padding: 0 7px 0 21px;
- margin: -7px;
- }
-
- #entries-selector a,#entries-selector span {
- padding: 7px 14px;
- margin-bottom: 2px;
- display: block;
- text-decoration: none;
- text-align: center;
- border-radius: 7px;
- font-weight: bold
- }
-
- #entries-selector a:hover {
- background-color: #4577bf;
- color: white
- }
-
- #entries-selector .currentpage a,#entries-selector .currentpage span {
- background-color: #07255e;
- color: white
- }
-
- #entries-selector select {
- appearance: none;
- border: none;
- font-size: 1.15em;
- outline: none;
- margin: 0;
- padding: 8px 15px 9px;
- background-color: transparent;
- width: 100%;
- color: white
- }
-
- .hideoverflow {
- overflow: hidden
- }
-
- .outer {
- position: relative;
- left: 50%;
- float: left
- }
-
- .inner {
- position: relative;
- left: -50%;
- float: left
- }
-
- .wl-nav {
- border-color: silver;
- border: 0
- }
-
- .wl-nav a,.wl-nav span {
- display: inline-block;
- padding: 10px 15px;
- border-right: 1px solid silver;
- color: #444444;
- font-weight: normal
- }
-
- .wl-nav li:hover {
- box-shadow: 0 -50px 50px -30px white inset;
- background-color: #cccccc
- }
-
- .wl-nav li:hover a {
- text-decoration: none
- }
-
- .wl-nav li.activepage {
- background-color: white
- }
-
- .wl-nav li.activepage:hover {
- background-color: white !important;
- box-shadow: none
- }
-
- .currentpage a {
- color: #890017
- }
-
- .currentpage a .pos {
- font-weight: normal
- }
-
- .paging_links {
- padding: 0
- }
-
- .paging_links li:last-child a {
- border-right: 0
- }
-
- .paging_links .page_range {
- font-weight: bolder;
- margin-right: 30px;
- display: inline-block
- }
-
- .paging_links .page_info {
- display: inline-block;
- margin-right: 30px
- }
-
- #entrylist1 a {
- font-weight: bold
- }
-
- .result-list1 {
- padding: 4px 0;
- list-style-type: none
- }
-
- .wordlist-oxford3000 li {
- padding: 7px
- }
-
- .soundList {
- display: inline
- }
-
- .lang-study-page .pron-g {
- white-space: normal
- }
-
- .lang-col {
- width: 48%;
- float: left;
- padding-right: 12px
- }
-
- .mid-grad-bottom,.wl-table tr:first-child {
- background: #00123c;
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #07255e), color-stop(100%, #00123c));
- background: -webkit-linear-gradient(top, #07255e 0%, #00123c 100%);
- background: -moz-linear-gradient(top, #07255e 0%, #00123c 100%);
- background: -ms-linear-gradient(top, #07255e 0%, #00123c 100%);
- background: linear-gradient(to bottom, #07255e 0%, #00123c 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$blue2', endColorstr='$blue1', GradientType=0)
- }
-
- .pale-grad,.wl-table tr {
- background: #ffffff;
- background: -moz-linear-gradient(top, white 0%, #eee 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #eee));
- background: -webkit-linear-gradient(top, white 0%, #eee 100%);
- background: -o-linear-gradient(top, white 0%, #eee 100%);
- background: -ms-linear-gradient(top, white 0%, #eee 100%);
- background: linear-gradient(to bottom, white 0%, #eee 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0)
- }
-
- .wl-table .delete-btn a:before {
- pointer-events: all
- }
-
- .wl-table .btn.delete-btn:hover a:before {
- background-position: -1px bottom
- }
-
- .wl-sub-head {
- background: #4577bf;
- background: -moz-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #4577bf), color-stop(100%, #345c95));
- background: -webkit-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: -o-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: -ms-linear-gradient(top, #4577bf 0%, #345c95 100%);
- background: linear-gradient(to bottom, #4577bf 0%, #345c95 100%);
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4577bf', endColorstr='#345c95', GradientType=0);
- color: #ffffff
- }
-
- .btn.test-btn a,.btn.delete-btn a {
- padding-left: 28px
- }
-
- .wl-table {
- width: 100%;
- margin-top: 10px;
- margin-bottom: 12px;
- border: 1px solid #cccccc;
- border-collapse: separate
- }
-
- .wl-table .wl-col1 {
- text-align: left;
- font-size: 1.23em
- }
-
- .wl-table tr th {
- color: white;
- vertical-align: middle
- }
-
- .wl-table th,.wl-table td {
- text-align: center;
- padding: 12px
- }
-
- .wl-table.wl-edit .wl-col2 {
- font-style: italic
- }
-
- .wl-table.wl-edit .wl-col3 {
- text-align: left
- }
-
- .wl-table .wl-col1 a {
- padding-right: 12px;
- text-align: left;
- font-size: 1.23em;
- font-weight: bold
- }
-
- .entry-word {
- font-weight: bold;
- color: #4577bf;
- margin-left: 10px
- }
-
- .hide-delete-icon {
- display: none
- }
-
- .premium .hide-delete-icon {
- display: block
- }
-
- h1.my-wordlist-titles {
- margin: 7px 0 21px
- }
-
- h2.my-wordlist-titles {
- font-size: 2.77em;
- color: #4577bf;
- font-weight: bold;
- padding-left: 0;
- margin-top: 6px;
- margin-bottom: 24px;
- }
-
- h3.my-wordlist-titles {
- font-size: 1.23em;
- font-weight: bold;
- margin: 0;
- padding: 0;
- color: #0d3880
- }
-
- h4.my-wordlist-titles {
- font-weight: bold;
- margin-bottom: 6px
- }
-
- h5.my-wordlist-titles {
- font-size: 1.38em;
- margin: 0 0 7px;
- font-weight: bold
- }
-
- .mywordlist-container {
- padding-left: 15px
- }
-
- .mywordlist-container>.entry>span.h {
- display: none
- }
-
- .senseinfo {
- margin-bottom: 6px
- }
-
- .senseinfo .sense_check_box {
- margin-right: 6px
- }
-
- #wordlist-select {
- margin-bottom: 7px
- }
-
- .test__question-count {
- margin: -7px -14px 14px;
- padding: 5px 12px;
- background-color: #4577bf;
- color: white
- }
-
- .test__definition {
- font-size: 1.69em;
- color: #07255e;
- max-width: 650px;
- font-size: 1.38em
- }
-
- .test__definition__wrap {
- margin-top: 14px;
- margin-bottom: 14px
- }
-
- .test__definition__wrap .pos {
- margin-bottom: 6px;
- font-size: 1.15em;
- font-weight: normal
- }
-
- .test__definition__wrap p {
- display: table-cell;
- padding-right: 14px
- }
-
- .test__form,#add-wordlist {
- display: table;
- width: 100%;
- margin-bottom: 0;
- vertical-align: top;
- padding-bottom: 10px
- }
-
- .test__form .test__answer {
- font-size: 1.15em;
- width: 350px;
- float: left;
- margin-bottom: 7px;
- margin-right: 14px
- }
-
- .test_submit_testme {
- float: left
- }
-
- .test__form input[type='text'] {
- border: none;
- font-size: 1.23em;
- padding: 0 10px;
- height: 30px;
- border-radius: 6px;
- background-color: white;
- box-shadow: 2px 2px 5px rgba(0,0,0,0.5) inset;
- color: grey;
- width: 100%
- }
-
- .test__form #add-wordlist .test__submit {
- float: left
- }
-
- .result {
- display: table-cell;
- vertical-align: middle
- }
-
- .test__attempt,.test__useranswer,.test__skipped {
- display: inline-block;
- font-size: 2.00em;
- font-weight: bold;
- width: 100%;
- margin-left: -30px;
- padding-left: 30px
- }
-
- .test__skipped {
- font-size: 1.85em
- }
-
- .test__attempt {
- color: #C1272D
- }
-
- .test__useranswer {
- color: #037531
- }
-
- .test__correctanswer {
- font-weight: bold;
- color: #07255E
- }
-
- .test__incorrect,.test__correct {
- width: 24px;
- height: 24px;
- background: #C1272D;
- background-size: 100%;
- border-radius: 24px;
- border: 2px solid white;
- vertical-align: top;
- text-indent: -9999px;
- display: inline-block;
- margin-right: 5px
- }
-
- .test__correct {
- background-color: #037531;
- }
-
- .test__skipped,.test__correcthead {
- text-transform: capitalize
- }
-
- .test__form .test__answer,.test__form .test__submit,.test__form .test__skip,#check-answer .test__form .test__next,#check-answer .test__form .test__quit {
- display: table-cell;
- vertical-align: top
- }
-
- .test__form .test__submit,.test__form .test__next {
- padding-right: 5px
- }
-
- .test__next,.test__quit {
- float: left
- }
-
- .mywordlist-warnings,.error {
- display: none;
- color: #c73b2a
- }
-
- .mywordlist-warnings#wait,.mywordlist-warnings#test-loading,.mywordlist-warnings#test-saving-score,.mywordlist-warnings#supp {
- color: #00123c
- }
-
- .mywordlist-warnings#wait:before,.mywordlist-warnings#test-loading:before,.mywordlist-warnings#test-saving-score:before,.mywordlist-warnings#supp:before {
- bottom: -2px;
- content: '';
- display: inline-block;
- margin-right: 8px;
- position: relative
- }
-
- .mywordlist-warnings#wait:before {
- content: ''
- }
-
- #pronunciation .responsive_row:first-child {
- margin-bottom: 0
- }
-
- .entry-source {
- color: white
- }
-
- h2.entry-word {
- font-weight: bold;
- color: #4577bf;
- font-size: 2.77em;
- margin-bottom: 7px;
- margin-top: 18px;
- display: block
- }
-
- h2 .pos {
- margin-bottom: 6px;
- font-size: 1.15em;
- font-weight: normal
- }
-
- .pron__wrap h3,.pron_row {
- max-width: 700px
- }
-
- .pron__wrap h3 {
- font-size: 1.38em;
- color: #4577bf;
- margin-top: 12px;
- margin-bottom: 0;
- padding-bottom: 3px;
- padding-left: 0px;
- border-bottom: 1px solid silver
- }
-
- .pron__wrap {
- max-width: 700px
- }
-
- .pron__wrap h5 {
- margin-top: 12px;
- margin-bottom: 0;
- padding-bottom: 3px;
- padding-left: 0px;
- border-bottom: 1px solid silver
- }
-
- .pron_row {
- padding: 0;
- height: 39px
- }
-
- .pron_row .sound {
- vertical-align: middle
- }
-
- .pron_row * {
- display: inline-block
- }
-
- .pron_row .pron_button {
- border: 1px solid black;
- padding: 4px;
- margin-right: 15px
- }
-
- .pron_row .pron_button .pron_button_icon {
- border: 1px solid black;
- width: 30px;
- height: 20px
- }
-
- .pron_row .pron_button_wrapper {
- padding: 4px;
- display: inline-block;
- background-color: #00123c;
- height: 34px;
- margin-left: 7px;
- border-radius: 18px;
- display: none;
- vertical-align: middle;
- box-shadow: 0 38px 38px -38px #e0f2fd inset
- }
-
- .pron_row .btn:hover,.pron_row input[type='submit']:hover,.pron_row .btn.inactive,.pron_row input.inactive[type='submit'] {
- box-shadow: none;
- border-width: 0
- }
-
- .pron_row .pron_button_record,.pron_row .pron_button_play,.pron_row .pron_button_stop,.pron_row .pron_record_stop,.pron_row .pron_play_stop {
- width: 24px;
- height: 24px;
- display: block;
- float: left;
- margin-right: 6px;
- background-repeat: no-repeat;
- background-position: center center;
- border-radius: 12px;
- background-color: silver
- }
-
- .pron_row .button_is_active {
- background-color: #0d3880;
- box-shadow: 0 30px 30px -30px #45689f inset
- }
-
- .pron_row .button_is_playing {
- background-color: #579a27;
- box-shadow: 0 30px 30px -30px #45689f inset
- }
-
- .pron_row .button_is_active.pron_button_record:hover,.pron_row .button_is_active.pron_button_play:hover,.pron_row .button_is_active.pron_button_stop:hover {
- background-color: #00123c
- }
-
- .pron_row.active .pron_button_wrapper {
- display: inline-block
- }
-
- #pronunciation xr-gs,#pronunciation res-g {
- display: none
- }
-
- #topic-list dd ul {
- padding-left: 0
- }
-
- #topic-list dd ul li {
- padding-bottom: 7px
- }
-
- #topic-list dd {
- border: none;
- margin-left: 21px
- }
-
- #topic-list dt {
- font-weight: normal
- }
-
- .topic-desc {
- margin: 7px 0 7px 0
- }
-
- .word-list li {
- display: inline-block;
- padding: 0 14px 7px 0
- }
-
- .video-page-wrap h4 {
- margin: 14px 0 7px
- }
-
- .video-player,.video-player__text {
- display: table-cell;
- vertical-align: middle
- }
-
- .video-player__text {
- padding-right: 7px
- }
-
- .video-player {
- padding-right: 14px;
- height: 130px;
- width: 230px
- }
-
- .video-player iframe {
- display: block
- }
-
- .video__wrap {
- display: table-row;
- width: 100%;
- float: left;
- margin-bottom: 3px;
- background-color: #efefef
- }
-
- .video__wrap p {
- margin-bottom: 0
- }
-
- .video__wrap a {
- display: block
- }
-
- .video__wrap:last-child {
- margin-bottom: 0
- }
-
- .video__wrap.full-width {
- width: 100%;
- display: block;
- float: none
- }
-
- .premium-h {
- position: relative;
- margin-bottom: 12px
- }
-
- .premium-h .h {
- position: absolute;
- color: #ffffff;
- left: 20px;
- bottom: 10px
- }
-
- .premium-h-img {
- width: 100%;
- height: auto
- }
-
- .res-g>.unbox {
- background-color: rgba(199,110,6,0.1);
- display: block;
- margin: 12px 0 18px 0;
- position: relative;
- overflow: hidden;
- border-left: 3px solid #C76E06
- }
-
- .res-g>.unbox>.heading {
- background-color: rgba(199,110,6,0.2);
- display: block;
- padding: 6px 12px 6px 12px;
- font-size: 1.19em;
- position: relative;
- overflow: hidden
- }
-
- .res-g>.unbox>.body {
- display: block;
- padding: 12px 18px 12px 18px;
- position: relative;
- overflow: hidden
- }
-
- .main-container #wotd-box {
- max-width: 300px;
- margin-left: auto;
- margin-right: auto
- }
-
- *,*:before,*:after {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box
- }
-
- .entry {
- font-size: 1.15em;
- color: #333;
- margin-bottom: 15px
- }
-
- .entry a:hover {
- font-weight: normal
- }
-
- .sans-italic,.etym_i,.geo,.pos,.reg,.subj,.wfp,.xpos,.webtop-g .pos+.pnc,.collapse .ff,.collapse[title^="AWL Collocations"] .er {
- font-style: italic
- }
-
- .sans-rom,.def,.dh,.dtxt,.footer,.frac-g,.gl,.gram,.li,li.sn-g:before,.ndv,.shcut,.st,.td,.use,.xr-g,.wfo .wrap,.wfo pnc.wrap,.vp .prefix,.vp pnc.prefix {
- font-weight: normal;
- font-style: normal
- }
-
- .sans-bold,.cf,.dhb,.dr,.id,.idm,.if,.pv,.th,.v,.ve,.vp,.wfo,.wfw,.xh,.xw {
- font-weight: bold;
- font-style: normal
- }
-
- .sans-bolditalic {
- font-weight: bold;
- font-style: italic
- }
-
- .sans-sc,.sc,.xr-gs .prefix,.xr-gs pnc.prefix {
- font-variant: small-caps
- }
-
- .serif-bolditalic,.cl,.x .eb {
- font-weight: bold;
- font-style: italic
- }
-
- .serif-italic,.wx {
- font-style: italic
- }
-
- .serif-rom,.def-qt {
- font-weight: normal;
- font-style: normal
- }
-
- .italic,.ei {
- font-style: italic
- }
-
- .bold,.eb {
- font-weight: bold;
- font-style: normal
- }
-
- .bolditalic,.ebi {
- font-weight: bold;
- font-style: italic
- }
-
- .entry-box-style,.un,.collapse {
- background-color: rgba(199,110,6,0.1);
- display: block;
- margin: 12px 0 18px 0;
- position: relative;
- overflow: hidden
- }
-
- #entryContent:not(.ocoll) .top-container .entry-box-style,#entryContent:not(.ocoll) .top-container .un,#entryContent:not(.ocoll) .top-container .collapse {
- background-color: rgba(69,119,191,0.1);
- border-left: 3px solid #4577bf
- }
-
- #entryContent:not(.ocoll) .top-container .entry-box-style-heading:hover,#entryContent:not(.ocoll) .top-container .collapse .heading:hover,.collapse #entryContent:not(.ocoll) .top-container .heading:hover,#entryContent:not(.ocoll) .top-container .entry-box-style-heading:active,#entryContent:not(.ocoll) .top-container .collapse .heading:active,.collapse #entryContent:not(.ocoll) .top-container .heading:active,#entryContent:not(.ocoll) .top-container .unbox.is-active .heading,.unbox.is-active #entryContent:not(.ocoll) .top-container .heading,#entryContent:not(.ocoll) .top-container .entry-box-style-heading:focus,#entryContent:not(.ocoll) .top-container .collapse .heading:focus,.collapse #entryContent:not(.ocoll) .top-container .heading:focus {
- background-color: rgba(69,119,191,0.2)
- }
-
- #entryContent:not(.ocoll) .top-container .unbox.is-active .heading:before {
- background-position: center -92px
- }
-
- .entry-box-style-heading,.collapse .heading,.collapse pnc.heading {
- padding: 6px 12px 6px 12px;
- margin: -12px -18px -12px -18px;
- font-size: 1.19em;
- user-select: none;
- }
-
- .entry-box-style-heading:hover,.collapse .heading:hover,.entry-box-style-heading:active,.collapse .heading:active,.unbox.is-active .heading,.unbox.is-active pnc.heading,.entry-box-style-heading:focus,.collapse .heading:focus {
- background-color: rgba(199,110,6,0.2)
- }
-
- .blockquote {
- background-color: rgba(199,110,6,0.1);
- display: block;
- padding: 12px 18px 12px 18px;
- margin: 18px;
- position: relative
- }
-
- .bre,.name {
- display: none
- }
-
- .cf {
- display: inline
- }
-
- .def {
- display: inline
- }
-
- .dr {
- font-size: 1.23em
- }
-
- .dr-g {
- display: block;
- margin-top: 18px;
- margin-left: 16px;
- position: relative
- }
-
- .dr-g:before {
- content: "";
- left: -18px;
- position: absolute;
- top: 5px;
- width: 14px;
- height: 14px;
- background-size: 14px auto
- }
-
- .dr-gs {
- display: block
- }
-
- .eph {
- display: inline-block
- }
-
- .esu {
- font-size: smaller;
- vertical-align: super
- }
-
- .footer {
- font-size: 1.00em
- }
-
- .frac-g {
- position: relative;
- top: -3px
- }
-
- .frac-g:before {
- content: '/';
- position: absolute;
- left: 4px;
- top: -3px
- }
-
- .gram-g {
- color: #767676
- }
-
- .h-g {
- margin-bottom: 15px
- }
-
- .hm,pnc.hm,.xhm {
- font-size: smaller;
- margin-left: 1px;
- position: relative;
- top: -5.25px
- }
-
- .hm-g {
- display: block
- }
-
- .idm {
- font-size: 1.23em
- }
-
- .idm-g,.pv-g {
- margin: 12px 18px 12px 18px;
- display: block
- }
-
- .idm-gs,.pv-gs,.wf-g {
- border: 1px solid rgba(199,110,6,0.4);
- border-radius: 10px 10px 0 0;
- display: block;
- margin: 18px 10px 18px 0;
- overflow: hidden
- }
-
- .label-g {
- color: #767676;
- font-weight: normal
- }
-
- li.sn-g:before {
- color: #00123c;
- padding-right: 6px;
- position: absolute;
- text-align: right;
- left: -8px;
- width: 24px
- }
-
- .ndv {
- color: #00837d
- }
-
- .pron-g {
- white-space: nowrap
- }
-
- .pron-g[geo~=br] .prefix {
- color: #07255e
- }
-
- .pron-g[geo~=n_am] .prefix {
- color: #8f0610
- }
-
- .pron-gs {
- display: inline
- }
-
- .pv {
- display: inline;
- font-size: 1.23em
- }
-
- .pvarr:before {
- content: "";
- width: 15px;
- height: 11px;
- background-size: 15px auto;
- display: inline-block
- }
-
- .shcut {
- font-size: 1.26em;
- display: block;
- margin-top: 1em;
- border-bottom: 1px solid rgba(199,110,6,0.5)
- }
-
- .sn-g {
- display: block;
- position: relative;
- margin-top: 12px
- }
-
- .sn-g[ox3000="y"] .oxford3000 {
- background-color: #4577bf;
- border-radius: 12px;
- width: 20px;
- height: 20px;
- margin: 0 6px 3px 0;
- position: static;
- vertical-align: middle
- }
-
- .sn-gs,.res-g {
- display: block
- }
-
- .un {
- padding: 12px 18px 12px 18px;
- text-indent: 0
- }
-
- .vp {
- margin-right: 12px
- }
-
- .vp-g {
- display: block
- }
-
- .wf-g {
- border-color: rgba(69,119,191,0.4);
- margin: 6px 0 6px 0;
- padding: 6px 12px 6px 12px;
- display: inline-block
- }
-
- .wfw-g {
- display: block
- }
-
- .wx {
- text-decoration: line-through
- }
-
- .x-g {
- display: block;
- position: relative;
- margin-top: 6px;
- margin-left: 1em;
- padding-left: 1em;
- }
-
- .x-g:before {
- content: "\2022";
- left: 0;
- position: absolute;
- }
-
- .x-gs {
- display: block
- }
-
- .xr-gs {
- display: block;
- margin-top: 6px
- }
-
- .z_n {
- padding-right: 6px !important
- }
-
- .nbsp,.side-panel>div,.vp-gs>div,.top-g .pos-g,.z_n+.z,.z_gr_br,#ox-enlarge+.z,.h-g+.z,.pron-gs .wrap,li.sn-g>.num,span[hide~="y"],.top-container br {
- display: none
- }
-
- .entry-in-other-dict a {
- font-weight: normal
- }
-
- .webtop-g .pos {
- margin-left: 6px;
- }
-
- .webtop-g a:last-of-type {
- margin-right: 4px
- }
-
- .top-g .clear {
- margin-top: 6px
- }
-
- .top-g .btn {
- margin-bottom: 13px
- }
-
- .top-g .btn:hover:not(.inactive) a:before {
- background-position: 0 bottom
- }
-
- .top-g .def {
- display: block
- }
-
- .top-g>.pron-gs {
- display: block
- }
-
- .top-g .v-gs:not([type~="sym"]) {
- display: block
- }
-
- .top-container+.pv-gs,.top-container+.wf-g {
- border-width: 0;
- margin: -12px 0 0 0;
- overflow: auto
- }
-
- .top-container+.pv-gs .pv-g,.top-container+.wf-g .pv-g {
- margin: 12px 0 18px 0
- }
-
- .top-container+.pv-gs .pv,.top-container+.wf-g .pv {
- margin-left: 0
- }
-
- .top-container+.pv-gs>.heading,.top-container+.wf-g>.heading {
- display: none
- }
-
- .top-container+.pv-gs .heading,.top-container+.wf-g .heading {
- color: #333;
- font-size: 1.19em;
- padding: 6px 12px 6px 12px
- }
-
- .top-container+.pv-gs .xr-gs,.top-container+.wf-g .xr-gs {
- margin-top: 6px
- }
-
- .top-container+.pv-gs .xr-gs:before,.top-container+.wf-g .xr-gs:before {
- display: inline
- }
-
- .top-container+.pv-gs .Ref,.top-container+.wf-g .Ref {
- display: inline;
- margin: 0
- }
-
- .if-g .pron-gs {
- display: inline
- }
-
- ol.h-g,ol.pv-g,ol.idm-g {
- list-style-type: none;
- padding-left: 0;
- counter-reset: num
- }
-
- ol.h-g li.sn-g,ol.pv-g li.sn-g,ol.idm-g li.sn-g {
- padding-left: 24px
- }
-
- ol.h-g li.sn-g:before,ol.pv-g li.sn-g:before,ol.idm-g li.sn-g:before {
- content: counter(num) " ";
- counter-increment: num
- }
-
- ol.h-g>.res-g,ol.h-g .sn-gs>.xr-gs,ol.pv-g>.res-g,ol.pv-g .sn-gs>.xr-gs,ol.idm-g>.res-g,ol.idm-g .sn-gs>.xr-gs {
- margin-left: 24px
- }
-
- .def .xr-gs {
- display: inline
- }
-
- .def .xr-gs:before {
- display: none
- }
-
- .x-g .cf {
- margin-right: 6px
- }
-
- .xr-gs:before {
- content: "";
- margin-right: 4px;
- position: relative;
- top: -1px;
- width: 13px;
- height: 9px;
- background-size: 13px auto;
- display: inline-block
- }
-
- .xr-gs[xref_type="external"]:before {
- background-repeat: no-repeat;
- height: 18px;
- width: 18px;
- background-size: 18px auto;
- vertical-align: middle;
- margin-right: 8px
- }
-
- .xr-gs[xref_type="external"] .prefix {
- font-variant: inherit
- }
-
- .ndv .xh {
- font-weight: normal
- }
-
- .sep+.sep {
- display: none
- }
-
- .idm-gs>.heading,.idm-gs pnc.heading,.pv-gs>.heading,.pv-gs pnc.heading {
- display: block;
- font-size: 1.38em;
- padding: 12px 18px 0 18px;
- color: #C76E06
- }
-
- .idm-gs>.xr-gs,.pv-gs>.xr-gs {
- margin: 12px 0 12px 0
- }
-
- .idm-gs .un,.pv-gs .un {
- margin-left: 18px;
- margin-right: 18px
- }
-
- .pv-gs>.xr-gs {
- margin-top: 0
- }
-
- .pv-gs>.xr-gs:before {
- display: none
- }
-
- .pv-gs .xr-gs>.heading {
- margin-bottom: 6px;
- display: block;
- font-size: 1.38em;
- padding: 12px 18px 0 18px;
- color: #C76E06
- }
-
- .pv-gs>.xr-gs .Ref {
- display: block;
- margin: 6px 18px
- }
-
- .pv-gs>.xr-gs .Ref .pvarr:before {
- content: "";
- width: 15px;
- height: 11px;
- background-size: 15px auto;
- display: inline-block
- }
-
- .idm-g .top-container,.pv-g .top-container {
- padding: 0;
- margin: 0 0 -6px 0;
- background-color: transparent
- }
-
- .idm-g .top-container .clear,.idm-g .top-container .btn,.idm-g .top-container br,.pv-g .top-container .clear,.pv-g .top-container .btn,.pv-g .top-container br {
- display: none
- }
-
- .idm-g .v-gs,.pv-g .v-gs {
- display: block
- }
-
- .idm-g .idm+.label-g,.pv-g .idm+.label-g {
- margin-left: 6px
- }
-
- .wfo .sym_first:after,.wfo pnc.sym_first:after {
- content: " "
- }
-
- .blockquote .p {
- display: block;
- margin: 0
- }
-
- .blockquote .wrap {
- display: none
- }
-
- .blockquote:before,.blockquote:after,.blockquote pnc.wrap_open,.blockquote pnc.wrap_close {
- color: #C76E06;
- font-size: 6.15em;
- position: absolute
- }
-
- .blockquote:before,.blockquote pnc.wrap_open {
- left: -20px;
- position: absolute;
- top: 24px
- }
-
- .blockquote:after,.blockquote pnc.wrap_close {
- right: -20px;
- bottom: 0
- }
-
- .blockquote:before {
- content: "\201C"
- }
-
- .blockquote:after {
- content: "\201D"
- }
-
- .frac-g .num {
- font-size: smaller;
- position: relative;
- top: -5px;
- margin-right: 3px
- }
-
- .frac-g .den {
- font-size: smaller;
- vertical-align: sub
- }
-
- .un .x-gs {
- display: inline
- }
-
- .dr-gs .top-container {
- background-color: transparent;
- margin: 0;
- padding: 0
- }
-
- .dr-gs .clear {
- display: none
- }
-
- .dr-gs .sn-g {
- margin-top: 6px
- }
-
- .dr-gs .sym_first {
- margin-right: 6px
- }
-
- .dr-gs .oxford3000 {
- width: 25px;
- height: 25px;
- top: -2px
- }
-
- .dr-gs .academic {
- width: 25px;
- height: 25px;
- top: -2px
- }
-
- .dr-gs .pos-g {
- display: inline
- }
-
- .dr-gs .top-g>span {
- margin-right: 4px
- }
-
- .entry[dict~="oaad"] .collapse[title^="Grammar"] .p {
- margin-top: 3px;
- margin-left: 16px;
- position: relative;
- display: block
- }
-
- .entry[dict~="oaad"] .collapse[title^="Grammar"] .p:before {
- content: "";
- position: absolute;
- left: -15px;
- top: 9px;
- width: 7px;
- height: 7px;
- background-size: 7px auto
- }
-
- .collapse {
- padding: 12px 18px 12px 18px;
- border-left: 3px solid #C76E06;
- }
-
- .collapse .heading,.collapse pnc.heading,.collapse .body,.collapse .h1,.collapse .li,.collapse .inline {
- display: block
- }
-
- .collapse .heading:hover,.collapse pnc.heading:hover {
- cursor: pointer
- }
-
- .collapse .heading:before,.collapse pnc.heading:before {
- width: 14px;
- height: 14px;
- background-size: 100% auto;
- background-position: center bottom;
- content: "+";
- display: inline-block;
- position: relative;
- top: 1px
- }
-
- .collapse .body,.collapse .heading+.def {
- display: none
- }
-
- .collapse .h1 {
- color: #C76E06;
- font-size: 1.5em;
- margin: 12px 0 6px 0;
- font-weight: bold;
- display: block
- }
-
- .collapse .h3,.collapse .h2 {
- font-size: 1.26em;
- margin: 6px 0 3px 0;
- font-weight: bold;
- display: block;
- border-bottom: 1px solid rgba(199,110,6,0.5);
- color: #333
- }
-
- .collapse .li .x-gs {
- display: inline
- }
-
- .collapse .x-gs {
- margin-bottom: 6px
- }
-
- .collapse .p {
- margin: 0;
- display: block
- }
-
- .collapse .p .xr-gs {
- display: inline;
- margin: 0
- }
-
- .collapse .p .xr-gs[type~="pdf"] {
- display: none
- }
-
- .collapse .inline,.collapse ul.inline {
- display: block;
- font-size: 1.26em;
- margin-bottom: 12px
- }
-
- .collapse .inline .li,.collapse ul.inline .li {
- display: inline-block;
- font-weight: bold
- }
-
- .collapse .inline .li:not(:last-of-type):after,.collapse ul.inline .li:not(:last-of-type):after {
- content: "";
- margin-left: 5px;
- position: relative;
- top: -2px;
- width: 6px;
- height: 6px;
- background-size: 6px auto;
- display: inline-block
- }
-
- .collapse .deflist .li,.collapse ul.deflist .li {
- margin-top: 6px
- }
-
- .collapse .deflist .li>.eb,.collapse ul.deflist .li>.eb {
- color: #C76E06;
- font-size: 1.23em
- }
-
- .collapse .bullet,.collapse ul.bullet {
- display: block;
- margin: 6px 0 12px 0
- }
-
- .collapse .bullet .li,.collapse ul.bullet .li {
- margin-top: 3px;
- margin-left: 16px;
- position: relative;
- display: block
- }
-
- .collapse .bullet .li:before,.collapse ul.bullet .li:before {
- content: "\2022";
- position: absolute;
- left: -15px;
- }
-
- .collapse .table {
- margin: 12px;
- display: table
- }
-
- .collapse .th,.collapse .td {
- padding: 2px 12px 2px 12px;
- border-bottom: 1px solid rgba(199,110,6,0.5);
- display: table-cell
- }
-
- .collapse .th {
- background-color: rgba(199,110,6,0.2)
- }
-
- .collapse .tr {
- display: table-row
- }
-
- .collapse[title^="Wordfinder"] .xr-gs:before {
- display: none
- }
-
- .collapse[title^="Extra examples"] .x-gs .x-g {
- margin-left: 0;
- }
-
- .collapse[title^="More Like This"] .inline .li {
- font-weight: normal;
- font-size: 1.15em
- }
-
- .collapse[title^="More Like This"] .sep {
- display: none
- }
-
- .collapse[title^="AWL Collocations"] .er {
- font-weight: normal
- }
-
- .collapse[title^="AWL Collocations"] .h3 {
- border-bottom: 0
- }
-
- .collapse[title^="AWL Collocations"] .h3 .inline {
- margin-bottom: 0;
- font-size: 1.15em
- }
-
- .unbox.is-active .heading,.unbox.is-active pnc.heading {
- margin-bottom: 12px
- }
-
- .unbox.is-active .heading:hover,.unbox.is-active pnc.heading:hover {
- cursor: pointer
- }
-
- .unbox.is-active .body,.unbox.is-active .heading+.def {
- display: block
- }
-
- .snippet .collapse {
- border-left-color: #A9222D;
- background-color: transparent;
- }
-
- .snippet .collapse .shcut {
- border-bottom: none
- }
-
- .snippet .collapse .heading {
- background-color: rgba(169,34,45,0.1);
- }
-
- .snippet .collapse .heading:hover {
- background-color: rgba(169,34,45,0.2)
- }
-
- .snippet .collapse .shcut {
- margin-top: 12px;
- font-size: 1.1em;
- }
-
- .snippet .collapse .sn-g {
- margin-top: 0
- }
-
- .snippet .collapse .coll-g:before {
- content: "\2022";
- font-size: 1.54em;
- line-height: 1;
- padding-top: 2px;
- margin-right: 6px;
- display: inline-block;
- position: relative;
- top: 2px;
- color: silver
- }
-
- .snippet .collapse .coll-gs .sep {
- display: none
- }
-
- .peu-grammar-home .box {
- background: white
- }
-
- .block {
- display: block
- }
-
- .bold,.eb,.eb,.title_bold {
- font-weight: bold
- }
-
- .boldItalic,.ebi {
- font-style: italic;
- font-weight: bold
- }
-
- .caption {
- font-size: 0.92em;
- padding-left: 20px
- }
-
- .commentary {
- font-style: normal;
- font-weight: normal;
- font-variant: normal
- }
-
- .construct {
- font-weight: bold
- }
-
- .constructGroup .construct {
- font-weight: normal;
- display: inline-block;
- padding: 3px 8px;
- background-color: #c6d9f9;
- margin-bottom: .4em
- }
-
- .context {
- font-style: normal;
- font-weight: normal;
- font-variant: normal
- }
-
- .dialogue {
- font-style: italic
- }
-
- .dialogue .speaker {
- font-style: normal
- }
-
- .equivalent {
- font-style: normal;
- font-weight: normal;
- font-variant: normal
- }
-
- .example {
- display: block;
- font-style: italic;
- padding-left: 12px;
- text-indent: -12px
- }
-
- .example * {
- text-indent: 0
- }
-
- .exampleGroup {
- padding-left: 20px;
- display: block;
- position: relative
- }
-
- .exampleGroupSet {
- display: block
- }
-
- .example_runon {
- margin-left: 6px
- }
-
- .grammarEntry .h {
- font-weight: bold
- }
-
- .hang {
- min-width: 30px;
- display: table-cell
- }
-
- .indent {
- display: table-cell
- }
-
- .italic,.ei,.ei {
- font-style: italic
- }
-
- .list_keyword {
- font-weight: bold;
- display: inline-block;
- margin-top: 8px
- }
-
- .locution {
- display: inline
- }
-
- .locution:not(:last-child) {
- margin-right: 6px
- }
-
- .note {
- font-size: 0.80em;
- }
-
- .note .a {
- font-size: 111.35%;
- }
-
- .notes {
- display: block;
- margin-top: 11px;
- border-left: 4px solid silver;
- padding-left: 8px
- }
-
- .notPertinent {
- font-style: normal;
- font-weight: normal;
- font-variant: normal
- }
-
- .pertinent {
- font-style: italic
- }
-
- .phons {
- font-style: normal
- }
-
- .roman {
- font-style: normal
- }
-
- .smallCaps,.esc {
- font-variant: small-caps;
- font-variant: all-small-caps;
- font-size: 1.20em;
- text-transform: lowercase
- }
-
- .strikethrough,.estrike {
- text-decoration: line-through
- }
-
- .strikethrough .eph,.estrike .eph {
- text-decoration: line-through
- }
-
- .strikethrough .noStrike,.estrike .noStrike {
- display: inline-block
- }
-
- .subtitle {
- font-weight: normal
- }
-
- .subtitle .ebi {
- font-weight: normal
- }
-
- .superSectionIntro {
- display: block;
- margin: 1em 0
- }
-
- .tabular {
- display: block
- }
-
- .title {
- color: #0d3880;
- display: block;
- font-weight: bold;
- font-size: 1.20em
- }
-
- .title .subtitle .ei {
- font-weight: normal
- }
-
- .underline {
- text-decoration: underline
- }
-
- .vocabBox {
- background-color: #c6d9f9;
- padding: 3px 20px;
- margin-bottom: .4em;
- margin-top: .4em;
- display: inline-block
- }
-
- .grammarEntry .wx-gs {
- display: block;
- border: 1px solid #0d3880;
- padding: 8px;
- margin-top: 14px
- }
-
- .grammarEntry .wx-gs .title {
- padding-bottom: 8px;
- font-weight: bold;
- font-size: 1.38em
- }
-
- .grammarEntry .wx-gs .wx {
- font-style: normal;
- text-decoration: none;
- display: block;
- padding: 2px 0 2px 26px;
- position: relative
- }
-
- .grammarEntry .wx-gs .wx:before {
- content: "";
- display: inline-block;
- width: 12px;
- height: 16px;
- position: absolute;
- top: 6px;
- left: 0;
- background-size: 12px 16px
- }
-
- .xh {
- font-variant: small-caps
- }
-
- .xref {
- color: #0d3880;
- white-space: nowrap
- }
-
- .xref:before {
- content: "";
- display: inline-block;
- position: relative;
- border-top: 0.35em solid transparent;
- border-bottom: 0.35em solid transparent;
- border-left: 0.7em solid #0d3880;
- margin-right: 4px;
- margin-left: 1px
- }
-
- .grammarEntry .xr-gs .xr-g {
- display: block
- }
-
- .grammarEntry .Ref .xr-gs {
- display: inline-block
- }
-
- .peu-btns {
- padding-top: 10px;
- display: block
- }
-
- .peu-btns:after {
- content: "";
- display: table;
- clear: both
- }
-
- .peu-btns a {
- display: block;
- position: relative;
- min-width: 90px;
- padding: 0 12px;
- background-color: #004aac;
- color: white;
- font-variant: normal;
- text-transform: lowercase;
- font-size: 0.92em;
- font-weight: normal;
- border-radius: 15px
- }
-
- .peu-btns a:before,.peu-btns a:after {
- display: inline-block;
- vertical-align: middle;
- width: 11px;
- height: 30px
- }
-
- .peu-btns a:hover {
- background-color: #00123c
- }
-
- .peu-btns .xr-g {
- display: block
- }
-
- .peu-btns .xr-g:first-child a {
- float: left
- }
-
- .peu-btns .xr-g:first-child a:before {
- content: "";
- margin-right: 6px
- }
-
- .peu-btns .xr-g:last-child a {
- float: right;
- text-align: right
- }
-
- .peu-btns .xr-g:last-child a:after {
- content: "";
- background-position: right top;
- margin-left: 6px
- }
-
- .peu-btns .xr-g:last-child a:before {
- content: none
- }
-
- .page-head,.grammarEntry>.title,.introduction>.title {
- font-size: 1.60em;
- font-weight: bold;
- margin-bottom: 1em
- }
-
- .grammarEntry {
- display: block;
- clear: both
- }
-
- .grammarEntry>.title[section="yes"] {
- font-size: 1.80em;
- font-weight: bold;
- margin-bottom: 1em
- }
-
- .grammarEntry>.title .hang {
- padding-right: 20px
- }
-
- .grammarEntry>.title .indent .notPertinent {
- font-weight: inherit
- }
-
- .grammarEntry .breadcrumb {
- display: none
- }
-
- .grammarEntry>.breadcrumb {
- font-size: 0.80em;
- display: block;
- margin-top: -10px;
- margin-bottom: 4px
- }
-
- .grammarEntry>.breadcrumb:before {
- content: "PEU";
- font-weight: bold
- }
-
- .grammarEntry>.breadcrumb .l1 {
- padding-left: 23px;
- background-size: 14px 15px
- }
-
- .grammarEntry .xr-gs:before,.grammarEntry .institle,.grammarEntry .arl {
- display: none
- }
-
- .grammarEntry .example_runon {
- display: block;
- margin-left: 0
- }
-
- .grammarEntry .exampleGroup {
- padding-left: 12px
- }
-
- .grammarEntry .exampleGroup .hang {
- left: 12px
- }
-
- .grammarEntry .exampleGroup .hang+.indent {
- padding-left: 10px;
- display: block
- }
-
- .grammarEntry .constructGroup {
- padding-left: 12px
- }
-
- .author-name {
- color: #4d4c4c;
- font-size: 1.38em
- }
-
- .peu-home-logo {
- display: inline-block;
- margin: -10px 0 -10px
- }
-
- .peu-home-un-authorized {
- padding-bottom: 20px
- }
-
- .peu-home-un-authorized h1 {
- font-size: 2.15em;
- margin-top: 0;
- margin-bottom: 8px
- }
-
- .peu-home-un-authorized h1:after {
- content: "";
- display: inline-block;
- width: 26px;
- height: 28px;
- background-size: 26px 28px;
- margin-left: 8px;
- margin-top: -4px;
- vertical-align: middle
- }
-
- .peu-home-un-authorized #generaltext h2 {
- font-size: 1.23em;
- margin-top: 24px
- }
-
- .peu-home-un-authorized #generaltext .open-close h2 {
- color: #0d3880
- }
-
- .peu-home-un-authorized #generaltext .open-close h2:first-child {
- margin-top: 0
- }
-
- .peu-home-un-authorized h3 {
- font-size: 1.23em;
- font-weight: bold;
- }
-
- .peu-home-un-authorized h3+h3 {
- margin-top: -7px
- }
-
- .peu-home-un-authorized .peu-quote {
- text-align: right;
- font-size: 1.08em;
- margin: 4px 0
- }
-
- .peu-home-authorized h3 {
- padding-bottom: 0
- }
-
- .peu-sales-box {
- border: 1px solid #8f0610;
- padding: 12px 16px 10px;
- margin-bottom: 20px;
- margin-top: 20px
- }
-
- .peu-sales-box .bgtn-premium {
- margin-top: 6px
- }
-
- .grammarEntry[type="interstitial"] .title {
- color: #333;
- font-weight: bold
- }
-
- .grammarEntry[type="interstitial"]>.title+.section {
- margin-bottom: 8px
- }
-
- .grammarEntry[type="interstitial"] .section .title {
- display: inline;
- }
-
- .grammarEntry[type="interstitial"] .section {
- margin-bottom: 6px
- }
-
- .grammarEntry[type="interstitial"]>.section {
- margin-top: 24px
- }
-
- .grammarEntry[type="interstitial"] .subtitle {
- font-weight: bold
- }
-
- .grammarEntry[type="interstitial"] .title .indent {
- font-size: 1.15em;
- font-weight: normal;
- display: inline
- }
-
- .grammarEntry[type="interstitial"] .title+.block {
- display: inline-block;
- padding-left: 18px;
- margin-top: 0
- }
-
- .grammarEntry[type="interstitial"] .title+.block .xr-gs {
- display: inline-block;
- margin-top: 0
- }
-
- .section {
- display: block
- }
-
- .section>.title {
- margin-top: 1em
- }
-
- .section>.section>.title {
- font-size: 1.00em;
- font-weight: normal
- }
-
- .grammarEntry>.section[section_num]>span:not(.title):not(.pnc),.grammarEntry>.section>.section[section_num]>span:not(.title):not(.pnc) {
- margin-left: 30px
- }
-
- .grammarEntry>.section[section_num]+.notes,.grammarEntry>.section>.section[section_num]+.notes {
- margin-top: 24px;
- margin-left: 30px;
- border-left: 12px solid silver
- }
-
- .section>.block,.section>.constructGroup,.section>.notes,.section>.lettered,.section>.bulleted,.section>.numbered {
- display: block;
- margin-top: .4em
- }
-
- .section .title {
- display: table
- }
-
- .section .title .indent,.section .title .indent .ebi {
- font-weight: normal
- }
-
- .exampleGroup .hang {
- position: absolute;
- left: 0
- }
-
- .example .pertinent {
- font-weight: bold
- }
-
- .example .commentary .pertinent {
- font-weight: normal
- }
-
- .example .commentary .example .pertinent {
- font-weight: bold
- }
-
- .block .example,.commentary .example {
- display: inline;
- padding-left: 0;
- text-indent: 0
- }
-
- .vocabBox .example {
- display: inline
- }
-
- table span {
- margin-left: 0 !important
- }
-
- table .exampleGroup,table .example {
- padding-left: 0
- }
-
- table td {
- padding: 0 1em 0 0;
- vertical-align: top
- }
-
- table .block {
- margin: 0
- }
-
- .frame_all_,.frame_none_,.frame_no_row_,.frame_never_,.frame__,.frame_none_0 {
- margin-top: .8em;
- margin-bottom: .4em
- }
-
- .frame_all_ th,.frame_none_ th,.frame_no_row_ th,.frame_never_ th,.frame__ th,.frame_none_0 th {
- text-align: left;
- font-weight: bold
- }
-
- .frame_all_ tr,.frame_no_row_ tr {
- border: 1px black solid
- }
-
- .frame_all_ th,.frame_no_row_ th {
- padding: 2px 6px
- }
-
- .frame_all_ td,.frame_no_row_ td {
- padding: 2px 6px 2px 16px;
- text-indent: -10px
- }
-
- .frame_no_row_ tr {
- border-width: 0 1px
- }
-
- .frame_no_row_ tr:last-child {
- border-bottom-width: 1px
- }
-
- .frame_no_row_ tr:first-child {
- border-top-width: 1px;
- border-bottom-width: 1px
- }
-
- .frame_none_ th,.frame_none_0 th,.frame__ th {
- text-align: left;
- padding-right: 15px
- }
-
- .plain {
- display: block
- }
-
- .plain .indent {
- display: block
- }
-
- .plain .exampleGroup {
- padding-left: 20px
- }
-
- .plain .example {
- padding-left: 0
- }
-
- .plain .block {
- margin: 0
- }
-
- .bulleted,.lettered,.numbered {
- padding-left: 20px;
- position: relative
- }
-
- .bulleted .li:before,.lettered .li:before,.numbered .li:before {
- position: absolute;
- left: 0;
- font-weight: bold
- }
-
- .bulleted .li:before {
- content: "\2022"
- }
-
- .lettered {
- counter-reset: letter-counter
- }
-
- .lettered .li:before {
- content: counter(letter-counter, lower-alpha);
- counter-increment: letter-counter
- }
-
- .numbered {
- counter-reset: number-counter
- }
-
- .numbered .li:before {
- content: counter(number-counter);
- counter-increment: number-counter
- }
-
- .numbered .bulleted {
- display: block
- }
-
- .numbered .bulleted .li:before {
- content: "\2022" !important;
- counter-increment: none
- }
-
- .peu-contents-full {
- margin-bottom: 10px
- }
-
- .peu-contents-full li a {
- padding: 7px 0 7px 25px;
- }
-
- .peu-contents-full ul>li>div>a {
- color: #333
- }
-
- .peu-contents-full ul ul>li>div>a {
- color: #004aac;
- padding: 4px 0 4px 25px
- }
-
- .peu-contents-full ul ul ul>li>div>a {
- color: #333;
- padding: 4px 0 4px 25px
- }
-
- .peu-contents-full .section .section[subsection="1"]:not(:first-child) .title:before {
- content: "- "
- }
-
- #rightcolumn .toc_header {
- border-bottom: 1px solid #cccccc
- }
-
- #rightcolumn .toc_header h4 {
- padding-left: 26px;
- font-size: 1.15em
- }
-
- #rightcolumn .toc_content {
- padding-right: 8px
- }
-
- #rightcolumn .toc_content>a {
- margin-top: 8px;
- display: inline-block
- }
-
- #rightcolumn .relatedBlock ul ul div a {
- padding: 4px;
- margin-left: 16px;
- color: #004aac
- }
-
- #rightcolumn .relatedBlock ul ul .icon-plus,#rightcolumn .relatedBlock ul ul .icon-minus {
- display: none
- }
-
- #rightcolumn .relatedBlock ul ul ul[style] {
- display: none !important
- }
-
- .grammarEntry .pron-gs {
- border: none;
- padding: 0 4px;
- vertical-align: top;
- margin-top: 0;
- display: inline-block
- }
-
- .grammarEntry .pron-gs .sound {
- display: block
- }
-
- .lang-study-page h3,.peu-introduction-page h3 {
- margin: 14px 0 0
- }
-
- .peu-link-nav,#browse-letters {
- margin-top: 16px
- }
-
- .peu-link-nav:after,#browse-letters:after {
- content: "";
- display: table;
- clear: both
- }
-
- .peu-link-nav a,#browse-letters a {
- display: block;
- float: left;
- padding: 0 8px;
- min-width: 34px;
- text-align: center;
- margin-right: 8px;
- margin-bottom: 8px;
- border: 2px solid #cccccc;
- border-radius: 8px
- }
-
- .peu-link-nav a:hover,#browse-letters a:hover {
- background-color: #ebebeb;
- text-decoration: none;
- color: black
- }
-
- .definition-wrap {
- margin-left: 22px;
- text-indent: -22px;
- margin-bottom: 8px
- }
-
- .phon-table td {
- height: 30px
- }
-
- .phon-table td:first-child {
- width: 35px
- }
-
- .story-behind-peu .float-right {
- float: right;
- margin: 5px 0 10px 10px
- }
-
- .story-behind-peu .float-left {
- float: left;
- margin: 5px 10px 10px 0
- }
-
- .story-behind-peu .float-right,.story-behind-peu .float-left {
- max-width: 50%;
- height: auto
- }
-
- .entry-unauthorised .restrictedLock {
- color: #333;
- margin-bottom: 18px
- }
-
- .entry-unauthorised .restrictedImg img {
- width: 14px
- }
-
- .entry-unauthorised .restrictedLinks table {
- margin-bottom: 20px;
- position: relative
- }
-
- .entry-unauthorised .restrictedLinks td {
- display: block;
- float: left;
- }
-
- .entry-unauthorised .restrictedLinks td:first-child {
- font-size: 1.38em;
- font-weight: bold
- }
-
- .introduction>.title {
- margin-bottom: 0
- }
-
- .introduction>.title .hang {
- display: inline-block;
- padding-right: 20px;
- font-weight: normal
- }
-
- .introduction>.title .indent {
- display: inline-block;
- font-weight: bold
- }
-
- .introduction>.title .indent .ei,.introduction>.title .indent .notPertinent {
- font-weight: bold
- }
-
- .superSectionIntro,.title_contents {
- text-transform: uppercase;
- color: #333;
- font-size: 1.85em;
- margin-top: 1em;
- margin-bottom: 10px;
- display: block;
- font-weight: normal
- }
-
- #simple-present-forms__16 tr,#passive-structures-and-verb-forms__23 tr {
- border-width: 0 1px 0 1px
- }
-
- #simple-present-forms__16 tr:first-child,#passive-structures-and-verb-forms__23 tr:first-child {
- border-width: 1px
- }
-
- #simple-present-forms__16 tr:last-child,#passive-structures-and-verb-forms__23 tr:last-child {
- border-width: 0 1px 1px 1px
- }
-
- #abbreviations__164 td,#prefixes-and-suffixes__997 td,#prefixes-and-suffixes__1024 td,#prefixes-and-suffixes__798 td,#special-rules-and-exceptions__724 td {
- padding-left: 10px;
- text-indent: -10px
- }
-
- #numbers_1__853 {
- margin-left: 15px
- }
-
- #numbers_1__803 td>span {
- display: block;
- padding-left: 10px;
- text-indent: -10px
- }
-
- #numbers_1__803 td:first-child {
- white-space: nowrap
- }
-
- #headlines__203 .esc {
- display: block;
- padding-left: 15px
- }
-
- #special-rules-and-exceptions__724 td .ei:nth-child(2),#special-rules-and-exceptions__724 td .ei:nth-child(3) {
- display: block;
- padding-left: 10px
- }
-
- #special-rules-and-exceptions__724 .example_runon {
- padding-left: 10px
- }
-
- #numbers_1__846 td:first-child {
- white-space: nowrap
- }
-
- #spelling-of-plurals__30 tr:nth-child(2) td .ebi,#spelling-of-plurals__128 tr:nth-child(2) td .ebi,#if-introduction__45 tr:nth-child(2) td .ebi,#if-introduction__63 tr:nth-child(2) td .ebi,#if-introduction__81 tr:nth-child(2) td .ebi {
- padding: 3px 8px;
- background-color: #c6d9f9
- }
-
- #if-introduction__45 tr:nth-child(2) td,#if-introduction__63 tr:nth-child(2) td,#if-introduction__81 tr:nth-child(2) td {
- text-align: left
- }
-
- #if-introduction__45 tr:nth-child(2) td .ebi,#if-introduction__45 tr:nth-child(2) td .eb,#if-introduction__63 tr:nth-child(2) td .ebi,#if-introduction__63 tr:nth-child(2) td .eb,#if-introduction__81 tr:nth-child(2) td .ebi,#if-introduction__81 tr:nth-child(2) td .eb {
- font-weight: normal
- }
-
- #if-introduction__45 td:first-child,#if-introduction__63 td:first-child,#if-introduction__81 td:first-child {
- min-width: 170px
- }
-
-
- #formal-and-informal-vocabulary__9 .exampleGroup .context {
- width: 150px;
- display: inline-block
- }
-
- #capital-letters_1__9 {
- counter-reset: letter-counter;
- position: relative
- }
-
- #capital-letters_1__9 .section:before {
- content: counter(letter-counter, lower-alpha);
- counter-increment: letter-counter;
- position: absolute;
- left: 0;
- font-weight: bold
- }
-
- #spelling-and-pronunciation__134 .example {
- display: inline-block
- }
-
- #comparative-and-superlative-adjectives__311,#comparative-and-superlative-adjectives__340,#american-and-british-english__212,#american-and-british-english__24 {
- border: none
- }
-
- #comparative-and-superlative-adjectives__311 tr,#comparative-and-superlative-adjectives__340 tr,#american-and-british-english__212 tr,#american-and-british-english__24 tr {
- border: none
- }
-
- #comparative-and-superlative-adjectives__311 td,#comparative-and-superlative-adjectives__340 td,#american-and-british-english__212 td,#american-and-british-english__24 td {
- padding-left: 12px;
- text-indent: -12px
- }
-
- #prepositions-before-particular-words-and-expressions__9 .plain {
- margin-top: 16px
- }
-
- #prepositions-before-particular-words-and-expressions__9 .plain .indent {
- margin-top: 8px
- }
-
- #prepositions-after-particular-words-and-expressions__9 .plain .indent {
- margin-top: 8px
- }
-
- #spelling-and-pronunciation__1176 .sound {
- display: inline-block
- }
-
- .swb-home-logo {
- display: inline-block;
- margin: -10px 0 -10px
- }
-
- h2 .oxford3000 {
- top: 0
- }
-
- .unbox .p {
- display: block
- }
-
- .unbox .p+.p {
- margin-top: 18px
- }
-
- .trans-page .v_alt {
- font-weight: bold
- }
-
- .trans-page .prefix_adv,.trans-page .ds,.trans-page .dtxt {
- font-style: italic
- }
-
- .trans-page .tx {
- display: block;
- color: #008900;
- font-size: 1.08em
- }
-
- .trans-page .unbox,.trans-page .bf-gs {
- border: 1px solid rgba(199,110,6,0.4);
- border-radius: 10px 10px 0 0;
- display: block;
- margin: 18px 0 18px 0;
- overflow: hidden;
- padding: 9px 18px
- }
-
- .trans-page .unbox {
- border-color: #333
- }
-
- .trans-page .unbox .h1 {
- font-size: 1.54em;
- padding: 10px 0 6px;
- display: block
- }
-
- .trans-page .top-g .unbox {
- border: none;
- display: inline;
- padding: 0;
- margin: 0
- }
-
- .trans-page .idm-gs {
- border-color: #C76E06
- }
-
- .trans-page .idm-gs>.unbox {
- margin-left: 18px;
- margin-right: 18px
- }
-
- .trans-page .idm-gs>.prefix {
- display: block;
- font-size: 1.38em;
- padding: 12px 18px 0 18px;
- color: #C76E06
- }
-
- .trans-page .bf-gs .top-container {
- margin-left: 0;
- margin-right: 0;
- margin-bottom: 0;
- background-color: transparent;
- padding: 0
- }
-
- .trans-page .bf-gs .top-container .top-g .clear {
- display: none
- }
-
- .trans-page .bf-gs .prefix {
- color: #C76E06
- }
-
- .schulwoerterbuch_German-English .clear {
- display: none
- }
-
- .audio .icon-audio {
- background-repeat: no-repeat;
- background-position: left top !important;
- background-size: 100%;
- width: 24px;
- height: 24px;
- margin-right: 4px;
- display: inline-block
- }
-
- .audio .icon-audio:hover {
- background-position: left bottom !important
- }
-
- .shcut-red,.snippet .collapse .shcut,.ocoll .shcut,.collapse[title="Collocations"] .shcut,.collapse[title="All Collocations"] .shcut {
- text-transform: uppercase;
- font-weight: bold;
- border-bottom: none;
- margin-top: 1em;
- color: #A9222D
- }
-
- .ocoll .top-container {
- background-color: transparent;
- margin-right: 0;
- margin-left: 0;
- margin-bottom: 0;
- padding: 0;
- clear: none
- }
-
- .ocoll .num {
- display: inline-block;
- width: 20px
- }
-
- .ocoll .colldef {
- font-size: 1.23em
- }
-
- .ocoll .pos-g+.colldef {
- display: block
- }
-
- .ocoll .subentry-g .top-container,.ocoll .subentry-g .top-g {
- display: inline
- }
-
- .ocoll .subentry-g .top-g .clear {
- display: none
- }
-
- .ocoll .subentry-g {
- display: block
- }
-
- .ocoll .subentry-g+.subentry-g {
- margin-top: 30px
- }
-
- .ocoll .top-container+.sn-gs>.shcut-g:first-child .shcut {
- margin-top: 9px
- }
-
- .ocoll .top-container .v-gs {
- display: inline-block
- }
-
- .ocoll .shcut-g {
- padding-left: 20px;
- display: block
- }
-
- .ocoll .coll_un:before {
- content: "("
- }
-
- .ocoll .coll_un:after {
- content: ")"
- }
-
- .ocoll .coll_un[un="note"] {
- font-weight: normal
- }
-
- .ocoll .sn-g {
- padding-left: 18px;
- margin-top: 8px;
- margin-bottom: 8px
- }
-
- .ocoll .sn-g.sn-g:before {
- content: "\2022";
- color: silver;
- font-size: 1.69em;
- padding-right: 6px;
- position: absolute;
- text-align: right;
- left: -8px;
- width: 24px
- }
-
- .ocoll .coll-gs:not(.x-gs) {
- font-weight: bold
- }
-
- .ocoll .x-gs {
- margin-top: 2px;
- font-weight: normal
- }
-
- .ocoll .x-gs .x-g {
- margin-left: 0;
- margin-top: 0
- }
-
- .ocoll .xr-gs {
- padding-left: 21px
- }
-
- .ocoll .collapse .coll-gs {
- padding-left: 20px;
- display: block;
- position: relative
- }
-
- .ocoll .collapse .coll-g:before {
- content: "\2022";
- color: silver;
- font-size: 1.23em;
- padding-right: 6px;
- position: absolute;
- text-align: right;
- left: -8px;
- width: 24px
- }
-
- .col-home-logo {
- display: inline-block;
- margin: -10px 0 -10px;
- width: 44px;
- height: 44px
- }
-
- .eul {
- text-decoration: underline
- }
-
- .collapse[title="Collocations"] .shcut,.collapse[title="All Collocations"] .shcut {
- color: #333;
- margin-top: 12px
- }
-
- .collapse[title="Collocations"] .sn-g,.collapse[title="All Collocations"] .sn-g {
- margin-top: 0
- }
-
- .collapse[title="Collocations"] .colsep,.collapse[title="All Collocations"] .colsep {
- color: silver
- }
-
- .prefix+.Ref {
- display: inline;
- margin: 0
- }
-
- .audio_play_button,
- .responsive_display_inline_on_smartphone,
- .oxford3000 {
- display: none;
- }
-}
-
-.dictOALD-Related {
- a {
- margin-left: 2em;
- color: #16a085;
- }
-}
diff --git a/src/components/dictionaries/oald/_style.shadow.scss b/src/components/dictionaries/oald/_style.shadow.scss
new file mode 100644
index 000000000..3daf75ce1
--- /dev/null
+++ b/src/components/dictionaries/oald/_style.shadow.scss
@@ -0,0 +1,3857 @@
+@import '@/_sass_global/_reset.scss';
+@import '@/components/Speaker/Speaker.scss';
+
+ol {
+ list-style-type: decimal;
+ padding-left: 20px;
+}
+
+img.icon {
+ vertical-align: text-bottom;
+ margin-top: 0;
+ margin-right: 2px;
+ margin-left: 0;
+ margin-bottom: 0;
+}
+
+div.icon {
+ display: inline;
+ font-weight: lighter;
+ font-size: 7pt;
+ text-transform: uppercase;
+ color: #fff;
+ padding: 0 0.6em 0.2em 0.6em;
+}
+
+div.icon-helpsym {
+ background-color: transparent;
+ font-weight: bold;
+ color: #276e98;
+ font-variant: small-caps;
+}
+
+div.icon-pvsym {
+ font-weight: lighter;
+ color: #078d8f;
+ font-size: 1.38em;
+ text-indent: -1em;
+}
+
+div.icon-oppsym {
+ color: #c00b19;
+ background-color: transparent;
+ font-size: 0.85em;
+ padding: 0;
+ text-transform: lowercase;
+}
+
+div.icon-idsym {
+ font-weight: lighter;
+ color: #35338a;
+ font-size: 1.46em;
+}
+
+div.icon-synsym {
+ background-color: transparent;
+ font-weight: normal !important;
+ color: #c00b19;
+ text-transform: lowercase;
+ font-size: 0.85em;
+ padding: 0 !important;
+}
+
+.labelsAbout {
+ text-align: left;
+ border: 0px none;
+ width: 100%;
+}
+
+.labelsAbout .pron-usonly:hover {
+ background-repeat: no-repeat;
+ background-position: left bottom;
+}
+
+.labelsAbout .pron-usonly {
+ width: 29px;
+ height: 30px;
+ border: 0;
+ background-repeat: no-repeat;
+ background-position: left top;
+}
+
+.sup,
+sup {
+ vertical-align: super;
+ font-size: 65%;
+}
+
+.sub {
+ vertical-align: sub;
+ font-size: 65%;
+}
+
+button.key {
+ height: 15px;
+ width: 8px;
+ padding: 0px;
+ margin: 0px;
+ cursor: normal;
+ padding: 0px;
+ border: 0px;
+ margin-right: 5px;
+ margin-top: 5px;
+ background-repeat: no-repeat;
+ vertical-align: top;
+}
+
+.block-g {
+ float: right;
+}
+
+.clear {
+ clear: both;
+ height: 2px;
+}
+
+#entryContent .side {
+ float: right;
+ width: 164px;
+ text-align: center;
+ margin-bottom: 0px;
+}
+
+.ColloPanel,
+.ThesPanel {
+ font-size: 80%;
+ text-align: left;
+ display: block;
+ border-radius: 9px 9px 9px 9px;
+ border-style: solid;
+ border-color: blue;
+ margin: 15px;
+ border-width: 1px;
+ padding: 3px;
+ column-count: 3;
+ column-gap: 0em;
+ -moz-column-count: 3;
+ -moz-column-gap: 0em;
+ -webkit-column-count: 3;
+ -webkit-column-gap: 0em;
+ background-color: #fff;
+}
+
+ul.sketch {
+ margin-top: 0px;
+ margin-left: -20px;
+}
+
+.ColloPanel .xr,
+.ThesPanel .xr {
+ font-weight: bold;
+ font-size: 130%;
+ display: list-item;
+ list-style-type: square;
+ color: #5ba7da;
+ margin-left: 20px;
+}
+
+.CorpusHeader {
+ display: block;
+ padding: 3px;
+ font-size: 120%;
+ background-color: #00315a;
+ color: white;
+ border-top-left-radius: 9px;
+}
+
+.ColloHeader {
+ display: block;
+ color: white;
+ font-weight: bold;
+ background-color: #5ba7da;
+ font-size: 100%;
+ text-transform: uppercase;
+ margin-left: 2px;
+ margin-top: 2px;
+ padding: 3px;
+}
+
+.search-term {
+ font-weight: bold;
+}
+
+#results-container-all ul li {
+ margin-bottom: 7px;
+}
+
+#browse > div {
+ margin-bottom: 7px;
+}
+
+#browse #result ul {
+ padding: 0;
+}
+
+#browse_lists {
+ margin-top: 16px;
+}
+
+#browse_lists ul {
+ margin-bottom: 10px;
+}
+
+.grey-grad,
+.idsym-g,
+.ui-grad dt,
+.z_idsym {
+ box-shadow: 0 50px 50px -30px white inset;
+ background-color: #cccccc;
+ border: 1px solid #cccccc;
+}
+
+.webtop-g h2 {
+ font-size: 1.5em;
+ font-weight: bold;
+ padding: 0;
+ display: inline-block;
+}
+
+.top-container {
+ background-color: #ecf5ff;
+ margin-right: -250px;
+ margin-left: -28px;
+ margin-bottom: 10px;
+ padding: 0 250px 0 28px;
+ clear: both;
+}
+
+.btn.prac-pron {
+ display: none;
+}
+
+.oxford3000,
+.academic {
+ display: inline-block;
+ background-size: 100%;
+ background-repeat: no-repeat;
+ width: 30px;
+ height: 30px;
+ margin: 0 0 -8px;
+ position: relative;
+ top: -5px;
+}
+
+.oxford3000:hover,
+.academic:hover {
+ text-decoration: none;
+}
+
+.entry-header .share-this-entry {
+ margin: 0;
+ padding-top: 0;
+ display: table;
+}
+
+.entry-header .responsive_entry_center_left {
+ margin-bottom: 0 !important;
+ display: table-cell;
+ float: none;
+}
+
+.entry-header .responsive_entry_center_left_premium {
+ margin-bottom: 0 !important;
+ display: table-cell;
+ float: none;
+}
+
+.entry-header {
+ margin: 7px 0;
+ display: table;
+}
+
+.responsive_entry_center p.definition-title,
+.responsive_entry_center_left_premium p.definition-title {
+ font-size: 0.85em;
+ padding-bottom: 0px;
+ margin-bottom: 0;
+ display: table-cell;
+ vertical-align: bottom;
+}
+
+.share-this-entry .right-colum {
+ margin: 0;
+ padding-top: 0 !important;
+}
+
+.share-this-entry .col_middle_left,
+.share-this-entry .right-colum {
+ display: table-cell;
+}
+
+.social-wrap {
+ width: 180px;
+ height: 28px;
+ padding: 2px 0;
+}
+
+.social-wrap a {
+ display: inline-block;
+ width: 24px;
+ height: 24px;
+ padding: 0;
+ margin: 1px 0 0 0;
+ border: 0;
+ background: #4577bf;
+ background-size: auto 100%;
+ cursor: pointer;
+ border-radius: 30px;
+}
+
+.social-wrap a:hover {
+ background-color: #0d3880;
+}
+
+#plusone-box {
+ display: inline-block;
+ vertical-align: top;
+ margin: 1px 0 0 1px;
+}
+
+.stumbleupon-btn {
+ background-position: -48px 0 !important;
+}
+
+.diigo-btn {
+ background-position: -72px 0 !important;
+}
+
+.email-btn {
+ background-position: -96px 0 !important;
+}
+
+#ox-enlarge {
+ float: right;
+ position: relative;
+ z-index: 10;
+ clear: both;
+}
+
+#ox-enlarge a.topic {
+ display: block;
+ text-align: right;
+ position: relative;
+ padding: 2px;
+ margin: 0 0 12px 12px;
+}
+
+#ox-enlarge a.topic:hover {
+ text-decoration: none;
+ outline: none;
+}
+
+#ox-enlarge .ox-enlarge-label {
+ display: none;
+}
+
+.relatedentries {
+ max-height: 200px;
+ text-align: left;
+ color: #8f0610;
+}
+
+.relatedentries ul {
+ margin: 0;
+ padding: 0 0 0 10px;
+}
+
+.relatedentries a {
+ color: #000;
+}
+
+#rightcolumn h4.no-rule {
+ margin-top: 0;
+ border-bottom: 0 none;
+}
+
+.no-rule {
+ border-bottom: 0;
+ margin-bottom: 0;
+}
+
+dd {
+ overflow: hidden;
+ -webkit-transition: max-height 0.5s;
+ -moz-transition: max-height 0.5s;
+ transition: max-height 0.5s;
+ max-height: 4000px;
+}
+
+dd.deep {
+ max-height: 9000px;
+}
+
+.hide + dd,
+.hide + dd.deep {
+ max-height: 0;
+}
+
+.ui-grad dt,
+.ui-grad dd {
+ margin-top: -1px;
+}
+
+.ui-grad ul {
+ margin-left: 14px;
+ margin-right: 14px;
+ padding: 0;
+}
+
+.ui-grad dd {
+ border: 1px solid #cccccc;
+}
+
+.ui-grad dt:first-child {
+ border-radius: 8px 8px 0 0;
+ margin-top: 0;
+}
+
+.ui-grad dt {
+ padding: 5px 6px 5px 6px;
+ color: #444444;
+}
+
+.ui-grad dt.hide:hover {
+ cursor: pointer;
+}
+
+.ui-grad dt:not(.hide):before {
+ content: none;
+}
+
+.ui-grad dt:not(.hide) {
+ padding: 6px 14px 5px;
+}
+
+.accordion dl {
+ margin: 0;
+}
+
+.accordion .more {
+ display: none;
+}
+
+.accordion .show .more {
+ display: block;
+}
+
+.accordion dt:before {
+ vertical-align: baseline;
+ content: '';
+ display: inline-block;
+ margin-right: 6px;
+ margin-left: -2px;
+ margin-bottom: -1px;
+ width: 13px;
+ height: 13px;
+}
+
+.see-more {
+ display: block;
+ padding: 6px;
+ text-align: center;
+ border-top: 1px solid #aaaaaa;
+ color: grey;
+}
+
+.list-col a,
+.list-col span.selected {
+ display: block;
+ padding-top: 3px;
+ padding-bottom: 4px;
+ font-weight: normal;
+}
+
+.list-col {
+ padding-left: 0;
+}
+
+.list-col .selected {
+ color: #282828;
+ padding-left: 7px;
+ padding-right: 7px;
+ background-color: #dddddd;
+ border-radius: 4px;
+ margin: 3px -7px 4px;
+}
+
+.list-col h6 {
+ border-bottom: 1px solid silver;
+}
+
+.topic-explore p {
+ color: rgba(0, 0, 0, 0.7);
+ font-size: 1.15em;
+}
+
+.topic-explore > h3 {
+ font-size: 1.31em;
+ font-weight: bold;
+ margin: 0 0 7px;
+ padding: 0;
+}
+
+.topic-explore h4 {
+ border-top: 1px solid #c0c0c0;
+ border-bottom: 1px solid #c0c0c0;
+ padding: 8px 0;
+}
+
+.topic-explore ul {
+ padding-left: 0px;
+}
+
+.topic-explore h6 {
+ border: 0px none;
+ margin: 8px 0px 0px 0px;
+}
+
+.topic-explore h6 a {
+ font-size: 1.15em;
+ font-weight: bold;
+ color: rgba(0, 0, 0, 0.7);
+}
+
+.list-nested > li {
+ display: inline-block;
+ padding-right: 15px;
+}
+
+.list-nested-pool > li {
+ background-color: grey;
+ border-bottom: 1px solid white;
+}
+
+.list-nested-pool ul {
+ padding: 3px 0 4px;
+ background: #efefef;
+ background: white;
+}
+
+.wordpool {
+ margin-top: 14px;
+ padding-left: 8px;
+}
+
+.wordpool li {
+ display: inline-block;
+ margin: 0;
+ padding: 0 14px 7px 0;
+}
+
+.wordpool a,
+.wordpool span {
+ font-weight: normal;
+}
+
+.wordpool-active span {
+ font-weight: bold;
+}
+
+.section.partner {
+ margin-top: 2em;
+}
+
+.wordlist-page p {
+ max-width: 700px;
+}
+
+.wordlist-info-page {
+ margin-bottom: 14px;
+}
+
+.wordlist-info-page .oxford3000-blue,
+.wordlist-info-page .academic-blue {
+ width: 20px;
+ height: 20px;
+}
+
+.wordlist-info-page ul {
+ padding-left: 20px;
+ list-style-type: disc;
+ margin-bottom: 7px;
+}
+
+.middle_wrap > h1 {
+ margin-top: 7px;
+}
+
+.open-close dt:hover {
+ color: #0d3880;
+}
+
+.ui-plain {
+ max-width: 700px;
+}
+
+.ui-plain dl:first-child {
+ border-top: 1px solid grey;
+}
+
+.ui-plain dt {
+ padding: 7px 7px 7px 21px;
+ color: #282828;
+ font-weight: bold;
+ cursor: pointer;
+}
+
+.ui-plain dt:before {
+ content: '';
+ position: absolute;
+ width: 13px;
+ height: 24px;
+ margin: -7px 0 0 -21px;
+}
+
+.ui-plain dt.hide:before {
+ background-position: 0 -50px;
+}
+
+.ui-plain dd {
+ border-bottom: 1px solid silver;
+}
+
+.ui-plain dt:before {
+ position: relative;
+ margin-right: 8px;
+ display: inline-block;
+}
+
+.topic-desc {
+ max-width: 750px;
+}
+
+.oxford3000-blue,
+.academic-blue {
+ display: inline-block;
+ background-size: 100%;
+ background-repeat: no-repeat;
+ width: 30px;
+ height: 30px;
+ margin: -8px 0 -5px;
+}
+
+.topic-dt .side-selector__left ul ul ul ul li > a {
+ margin-left: -62px;
+ padding-left: 40px;
+ margin-top: 2px;
+ text-decoration: none;
+ background-color: #efefef;
+ background-color: white;
+}
+
+.side-selector {
+ border-radius: 7px;
+ overflow: hidden;
+ background-color: #eee;
+ border: 1px solid #cccccc;
+}
+
+.side-selector__left,
+.side-selector__right {
+ padding: 0 0;
+ width: 40%;
+ float: left;
+}
+
+.side-selector__right {
+ width: 60%;
+ float: left;
+ background-color: white;
+}
+
+.side-selector__right .sound.audio_play_button {
+ margin: 0;
+}
+
+.side-selector__left ul ul ul ul li.is-revealed > a {
+ background-color: #4577bf;
+ color: white;
+}
+
+.side-selector__left .ei-g {
+ margin-top: 0;
+}
+
+.side-selector__left .top-container {
+ margin: 0;
+ padding: 0;
+ background-color: transparent;
+}
+
+.side-selector__left .top-g {
+ padding: 0;
+}
+
+.side-selector__left .webtop-g {
+ margin: 0 -7px;
+ padding: 6px 7px;
+}
+
+.side-selector__left .link-right {
+ padding-top: 7px;
+}
+
+#entries-selector {
+ padding: 7px;
+}
+
+#entries-selector ul {
+ list-style-type: none;
+ padding: 0;
+}
+
+#entries-selector .wl-select {
+ padding: 0 7px 0 21px;
+ margin: -7px;
+}
+
+#entries-selector a,
+#entries-selector span {
+ padding: 7px 14px;
+ margin-bottom: 2px;
+ display: block;
+ text-decoration: none;
+ text-align: center;
+ border-radius: 7px;
+ font-weight: bold;
+}
+
+#entries-selector a:hover {
+ background-color: #4577bf;
+ color: white;
+}
+
+#entries-selector .currentpage a,
+#entries-selector .currentpage span {
+ background-color: #07255e;
+ color: white;
+}
+
+#entries-selector select {
+ appearance: none;
+ border: none;
+ font-size: 1.15em;
+ outline: none;
+ margin: 0;
+ padding: 8px 15px 9px;
+ background-color: transparent;
+ width: 100%;
+ color: white;
+}
+
+.hideoverflow {
+ overflow: hidden;
+}
+
+.outer {
+ position: relative;
+ left: 50%;
+ float: left;
+}
+
+.inner {
+ position: relative;
+ left: -50%;
+ float: left;
+}
+
+.wl-nav {
+ border-color: silver;
+ border: 0;
+}
+
+.wl-nav a,
+.wl-nav span {
+ display: inline-block;
+ padding: 10px 15px;
+ border-right: 1px solid silver;
+ color: #444444;
+ font-weight: normal;
+}
+
+.wl-nav li:hover {
+ box-shadow: 0 -50px 50px -30px white inset;
+ background-color: #cccccc;
+}
+
+.wl-nav li:hover a {
+ text-decoration: none;
+}
+
+.wl-nav li.activepage {
+ background-color: white;
+}
+
+.wl-nav li.activepage:hover {
+ background-color: white !important;
+ box-shadow: none;
+}
+
+.currentpage a {
+ color: #890017;
+}
+
+.currentpage a .pos {
+ font-weight: normal;
+}
+
+.paging_links {
+ padding: 0;
+}
+
+.paging_links li:last-child a {
+ border-right: 0;
+}
+
+.paging_links .page_range {
+ font-weight: bolder;
+ margin-right: 30px;
+ display: inline-block;
+}
+
+.paging_links .page_info {
+ display: inline-block;
+ margin-right: 30px;
+}
+
+#entrylist1 a {
+ font-weight: bold;
+}
+
+.result-list1 {
+ padding: 4px 0;
+ list-style-type: none;
+}
+
+.wordlist-oxford3000 li {
+ padding: 7px;
+}
+
+.soundList {
+ display: inline;
+}
+
+.lang-study-page .pron-g {
+ white-space: normal;
+}
+
+.lang-col {
+ width: 48%;
+ float: left;
+ padding-right: 12px;
+}
+
+.mid-grad-bottom,
+.wl-table tr:first-child {
+ background: #00123c;
+ background: -webkit-gradient(
+ linear,
+ left top,
+ left bottom,
+ color-stop(0%, #07255e),
+ color-stop(100%, #00123c)
+ );
+ background: -webkit-linear-gradient(top, #07255e 0%, #00123c 100%);
+ background: -moz-linear-gradient(top, #07255e 0%, #00123c 100%);
+ background: -ms-linear-gradient(top, #07255e 0%, #00123c 100%);
+ background: linear-gradient(to bottom, #07255e 0%, #00123c 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$blue2', endColorstr='$blue1', GradientType=0);
+}
+
+.pale-grad,
+.wl-table tr {
+ background: #ffffff;
+ background: -moz-linear-gradient(top, white 0%, #eee 100%);
+ background: -webkit-gradient(
+ linear,
+ left top,
+ left bottom,
+ color-stop(0%, white),
+ color-stop(100%, #eee)
+ );
+ background: -webkit-linear-gradient(top, white 0%, #eee 100%);
+ background: -o-linear-gradient(top, white 0%, #eee 100%);
+ background: -ms-linear-gradient(top, white 0%, #eee 100%);
+ background: linear-gradient(to bottom, white 0%, #eee 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);
+}
+
+.wl-table .delete-btn a:before {
+ pointer-events: all;
+}
+
+.wl-table .btn.delete-btn:hover a:before {
+ background-position: -1px bottom;
+}
+
+.wl-sub-head {
+ background: #4577bf;
+ background: -moz-linear-gradient(top, #4577bf 0%, #345c95 100%);
+ background: -webkit-gradient(
+ linear,
+ left top,
+ left bottom,
+ color-stop(0%, #4577bf),
+ color-stop(100%, #345c95)
+ );
+ background: -webkit-linear-gradient(top, #4577bf 0%, #345c95 100%);
+ background: -o-linear-gradient(top, #4577bf 0%, #345c95 100%);
+ background: -ms-linear-gradient(top, #4577bf 0%, #345c95 100%);
+ background: linear-gradient(to bottom, #4577bf 0%, #345c95 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4577bf', endColorstr='#345c95', GradientType=0);
+ color: #ffffff;
+}
+
+.btn.test-btn a,
+.btn.delete-btn a {
+ padding-left: 28px;
+}
+
+.wl-table {
+ width: 100%;
+ margin-top: 10px;
+ margin-bottom: 12px;
+ border: 1px solid #cccccc;
+ border-collapse: separate;
+}
+
+.wl-table .wl-col1 {
+ text-align: left;
+ font-size: 1.23em;
+}
+
+.wl-table tr th {
+ color: white;
+ vertical-align: middle;
+}
+
+.wl-table th,
+.wl-table td {
+ text-align: center;
+ padding: 12px;
+}
+
+.wl-table.wl-edit .wl-col2 {
+ font-style: italic;
+}
+
+.wl-table.wl-edit .wl-col3 {
+ text-align: left;
+}
+
+.wl-table .wl-col1 a {
+ padding-right: 12px;
+ text-align: left;
+ font-size: 1.23em;
+ font-weight: bold;
+}
+
+.entry-word {
+ font-weight: bold;
+ color: #4577bf;
+ margin-left: 10px;
+}
+
+.hide-delete-icon {
+ display: none;
+}
+
+.premium .hide-delete-icon {
+ display: block;
+}
+
+h1.my-wordlist-titles {
+ margin: 7px 0 21px;
+}
+
+h2.my-wordlist-titles {
+ font-size: 2.77em;
+ color: #4577bf;
+ font-weight: bold;
+ padding-left: 0;
+ margin-top: 6px;
+ margin-bottom: 24px;
+}
+
+h3.my-wordlist-titles {
+ font-size: 1.23em;
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+ color: #0d3880;
+}
+
+h4.my-wordlist-titles {
+ font-weight: bold;
+ margin-bottom: 6px;
+}
+
+h5.my-wordlist-titles {
+ font-size: 1.38em;
+ margin: 0 0 7px;
+ font-weight: bold;
+}
+
+.mywordlist-container {
+ padding-left: 15px;
+}
+
+.mywordlist-container > .entry > span.h {
+ display: none;
+}
+
+.senseinfo {
+ margin-bottom: 6px;
+}
+
+.senseinfo .sense_check_box {
+ margin-right: 6px;
+}
+
+#wordlist-select {
+ margin-bottom: 7px;
+}
+
+.test__question-count {
+ margin: -7px -14px 14px;
+ padding: 5px 12px;
+ background-color: #4577bf;
+ color: white;
+}
+
+.test__definition {
+ font-size: 1.69em;
+ color: #07255e;
+ max-width: 650px;
+ font-size: 1.38em;
+}
+
+.test__definition__wrap {
+ margin-top: 14px;
+ margin-bottom: 14px;
+}
+
+.test__definition__wrap .pos {
+ margin-bottom: 6px;
+ font-size: 1.15em;
+ font-weight: normal;
+}
+
+.test__definition__wrap p {
+ display: table-cell;
+ padding-right: 14px;
+}
+
+.test__form,
+#add-wordlist {
+ display: table;
+ width: 100%;
+ margin-bottom: 0;
+ vertical-align: top;
+ padding-bottom: 10px;
+}
+
+.test__form .test__answer {
+ font-size: 1.15em;
+ width: 350px;
+ float: left;
+ margin-bottom: 7px;
+ margin-right: 14px;
+}
+
+.test_submit_testme {
+ float: left;
+}
+
+.test__form input[type='text'] {
+ border: none;
+ font-size: 1.23em;
+ padding: 0 10px;
+ height: 30px;
+ border-radius: 6px;
+ background-color: white;
+ box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5) inset;
+ color: grey;
+ width: 100%;
+}
+
+.test__form #add-wordlist .test__submit {
+ float: left;
+}
+
+.result {
+ display: table-cell;
+ vertical-align: middle;
+}
+
+.test__attempt,
+.test__useranswer,
+.test__skipped {
+ display: inline-block;
+ font-size: 2em;
+ font-weight: bold;
+ width: 100%;
+ margin-left: -30px;
+ padding-left: 30px;
+}
+
+.test__skipped {
+ font-size: 1.85em;
+}
+
+.test__attempt {
+ color: #c1272d;
+}
+
+.test__useranswer {
+ color: #037531;
+}
+
+.test__correctanswer {
+ font-weight: bold;
+ color: #07255e;
+}
+
+.test__incorrect,
+.test__correct {
+ width: 24px;
+ height: 24px;
+ background: #c1272d;
+ background-size: 100%;
+ border-radius: 24px;
+ border: 2px solid white;
+ vertical-align: top;
+ text-indent: -9999px;
+ display: inline-block;
+ margin-right: 5px;
+}
+
+.test__correct {
+ background-color: #037531;
+}
+
+.test__skipped,
+.test__correcthead {
+ text-transform: capitalize;
+}
+
+.test__form .test__answer,
+.test__form .test__submit,
+.test__form .test__skip,
+#check-answer .test__form .test__next,
+#check-answer .test__form .test__quit {
+ display: table-cell;
+ vertical-align: top;
+}
+
+.test__form .test__submit,
+.test__form .test__next {
+ padding-right: 5px;
+}
+
+.test__next,
+.test__quit {
+ float: left;
+}
+
+.mywordlist-warnings,
+.error {
+ display: none;
+ color: #c73b2a;
+}
+
+.mywordlist-warnings#wait,
+.mywordlist-warnings#test-loading,
+.mywordlist-warnings#test-saving-score,
+.mywordlist-warnings#supp {
+ color: #00123c;
+}
+
+.mywordlist-warnings#wait:before,
+.mywordlist-warnings#test-loading:before,
+.mywordlist-warnings#test-saving-score:before,
+.mywordlist-warnings#supp:before {
+ bottom: -2px;
+ content: '';
+ display: inline-block;
+ margin-right: 8px;
+ position: relative;
+}
+
+.mywordlist-warnings#wait:before {
+ content: '';
+}
+
+#pronunciation .responsive_row:first-child {
+ margin-bottom: 0;
+}
+
+.entry-source {
+ color: white;
+}
+
+h2.entry-word {
+ font-weight: bold;
+ color: #4577bf;
+ font-size: 2.77em;
+ margin-bottom: 7px;
+ margin-top: 18px;
+ display: block;
+}
+
+h2 .pos {
+ margin-bottom: 6px;
+ font-size: 1.15em;
+ font-weight: normal;
+}
+
+.pron__wrap h3,
+.pron_row {
+ max-width: 700px;
+}
+
+.pron__wrap h3 {
+ font-size: 1.38em;
+ color: #4577bf;
+ margin-top: 12px;
+ margin-bottom: 0;
+ padding-bottom: 3px;
+ padding-left: 0px;
+ border-bottom: 1px solid silver;
+}
+
+.pron__wrap {
+ max-width: 700px;
+}
+
+.pron__wrap h5 {
+ margin-top: 12px;
+ margin-bottom: 0;
+ padding-bottom: 3px;
+ padding-left: 0px;
+ border-bottom: 1px solid silver;
+}
+
+.pron_row {
+ padding: 0;
+ height: 39px;
+}
+
+.pron_row .sound {
+ vertical-align: middle;
+}
+
+.pron_row * {
+ display: inline-block;
+}
+
+.pron_row .pron_button {
+ border: 1px solid black;
+ padding: 4px;
+ margin-right: 15px;
+}
+
+.pron_row .pron_button .pron_button_icon {
+ border: 1px solid black;
+ width: 30px;
+ height: 20px;
+}
+
+.pron_row .pron_button_wrapper {
+ padding: 4px;
+ display: inline-block;
+ background-color: #00123c;
+ height: 34px;
+ margin-left: 7px;
+ border-radius: 18px;
+ display: none;
+ vertical-align: middle;
+ box-shadow: 0 38px 38px -38px #e0f2fd inset;
+}
+
+.pron_row .btn:hover,
+.pron_row input[type='submit']:hover,
+.pron_row .btn.inactive,
+.pron_row input.inactive[type='submit'] {
+ box-shadow: none;
+ border-width: 0;
+}
+
+.pron_row .pron_button_record,
+.pron_row .pron_button_play,
+.pron_row .pron_button_stop,
+.pron_row .pron_record_stop,
+.pron_row .pron_play_stop {
+ width: 24px;
+ height: 24px;
+ display: block;
+ float: left;
+ margin-right: 6px;
+ background-repeat: no-repeat;
+ background-position: center center;
+ border-radius: 12px;
+ background-color: silver;
+}
+
+.pron_row .button_is_active {
+ background-color: #0d3880;
+ box-shadow: 0 30px 30px -30px #45689f inset;
+}
+
+.pron_row .button_is_playing {
+ background-color: #579a27;
+ box-shadow: 0 30px 30px -30px #45689f inset;
+}
+
+.pron_row .button_is_active.pron_button_record:hover,
+.pron_row .button_is_active.pron_button_play:hover,
+.pron_row .button_is_active.pron_button_stop:hover {
+ background-color: #00123c;
+}
+
+.pron_row.active .pron_button_wrapper {
+ display: inline-block;
+}
+
+#pronunciation xr-gs,
+#pronunciation res-g {
+ display: none;
+}
+
+#topic-list dd ul {
+ padding-left: 0;
+}
+
+#topic-list dd ul li {
+ padding-bottom: 7px;
+}
+
+#topic-list dd {
+ border: none;
+ margin-left: 21px;
+}
+
+#topic-list dt {
+ font-weight: normal;
+}
+
+.topic-desc {
+ margin: 7px 0 7px 0;
+}
+
+.word-list li {
+ display: inline-block;
+ padding: 0 14px 7px 0;
+}
+
+.video-page-wrap h4 {
+ margin: 14px 0 7px;
+}
+
+.video-player,
+.video-player__text {
+ display: table-cell;
+ vertical-align: middle;
+}
+
+.video-player__text {
+ padding-right: 7px;
+}
+
+.video-player {
+ padding-right: 14px;
+ height: 130px;
+ width: 230px;
+}
+
+.video-player iframe {
+ display: block;
+}
+
+.video__wrap {
+ display: table-row;
+ width: 100%;
+ float: left;
+ margin-bottom: 3px;
+ background-color: #efefef;
+}
+
+.video__wrap p {
+ margin-bottom: 0;
+}
+
+.video__wrap a {
+ display: block;
+}
+
+.video__wrap:last-child {
+ margin-bottom: 0;
+}
+
+.video__wrap.full-width {
+ width: 100%;
+ display: block;
+ float: none;
+}
+
+.premium-h {
+ position: relative;
+ margin-bottom: 12px;
+}
+
+.premium-h .h {
+ position: absolute;
+ color: #ffffff;
+ left: 20px;
+ bottom: 10px;
+}
+
+.premium-h-img {
+ width: 100%;
+ height: auto;
+}
+
+.res-g > .unbox {
+ background-color: rgba(199, 110, 6, 0.1);
+ display: block;
+ margin: 12px 0 18px 0;
+ position: relative;
+ overflow: hidden;
+ border-left: 3px solid #c76e06;
+}
+
+.res-g > .unbox > .heading {
+ background-color: rgba(199, 110, 6, 0.2);
+ display: block;
+ padding: 6px 12px 6px 12px;
+ font-size: 1.19em;
+ position: relative;
+ overflow: hidden;
+}
+
+.res-g > .unbox > .body {
+ display: block;
+ padding: 12px 18px 12px 18px;
+ position: relative;
+ overflow: hidden;
+}
+
+.main-container #wotd-box {
+ max-width: 300px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+*,
+*:before,
+*:after {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.entry {
+ font-size: 1.15em;
+ color: #333;
+ margin-bottom: 15px;
+}
+
+.entry a:hover {
+ font-weight: normal;
+}
+
+.sans-italic,
+.etym_i,
+.geo,
+.pos,
+.reg,
+.subj,
+.wfp,
+.xpos,
+.webtop-g .pos + .pnc,
+.collapse .ff,
+.collapse[title^='AWL Collocations'] .er {
+ font-style: italic;
+}
+
+.sans-rom,
+.def,
+.dh,
+.dtxt,
+.footer,
+.frac-g,
+.gl,
+.gram,
+.li,
+li.sn-g:before,
+.ndv,
+.shcut,
+.st,
+.td,
+.use,
+.xr-g,
+.wfo .wrap,
+.wfo pnc.wrap,
+.vp .prefix,
+.vp pnc.prefix {
+ font-weight: normal;
+ font-style: normal;
+}
+
+.sans-bold,
+.cf,
+.dhb,
+.dr,
+.id,
+.idm,
+.if,
+.pv,
+.th,
+.v,
+.ve,
+.vp,
+.wfo,
+.wfw,
+.xh,
+.xw {
+ font-weight: bold;
+ font-style: normal;
+}
+
+.sans-bolditalic {
+ font-weight: bold;
+ font-style: italic;
+}
+
+.sans-sc,
+.sc,
+.xr-gs .prefix,
+.xr-gs pnc.prefix {
+ font-variant: small-caps;
+}
+
+.serif-bolditalic,
+.cl,
+.x .eb {
+ font-weight: bold;
+ font-style: italic;
+}
+
+.serif-italic,
+.wx {
+ font-style: italic;
+}
+
+.serif-rom,
+.def-qt {
+ font-weight: normal;
+ font-style: normal;
+}
+
+.italic,
+.ei {
+ font-style: italic;
+}
+
+.bold,
+.eb {
+ font-weight: bold;
+ font-style: normal;
+}
+
+.bolditalic,
+.ebi {
+ font-weight: bold;
+ font-style: italic;
+}
+
+.entry-box-style,
+.un,
+.collapse {
+ background-color: rgba(199, 110, 6, 0.1);
+ display: block;
+ margin: 12px 0 18px 0;
+ position: relative;
+ overflow: hidden;
+}
+
+#entryContent:not(.ocoll) .top-container .entry-box-style,
+#entryContent:not(.ocoll) .top-container .un,
+#entryContent:not(.ocoll) .top-container .collapse {
+ background-color: rgba(69, 119, 191, 0.1);
+ border-left: 3px solid #4577bf;
+}
+
+#entryContent:not(.ocoll) .top-container .entry-box-style-heading:hover,
+#entryContent:not(.ocoll) .top-container .collapse .heading:hover,
+.collapse #entryContent:not(.ocoll) .top-container .heading:hover,
+#entryContent:not(.ocoll) .top-container .entry-box-style-heading:active,
+#entryContent:not(.ocoll) .top-container .collapse .heading:active,
+.collapse #entryContent:not(.ocoll) .top-container .heading:active,
+#entryContent:not(.ocoll) .top-container .unbox.is-active .heading,
+.unbox.is-active #entryContent:not(.ocoll) .top-container .heading,
+#entryContent:not(.ocoll) .top-container .entry-box-style-heading:focus,
+#entryContent:not(.ocoll) .top-container .collapse .heading:focus,
+.collapse #entryContent:not(.ocoll) .top-container .heading:focus {
+ background-color: rgba(69, 119, 191, 0.2);
+}
+
+#entryContent:not(.ocoll) .top-container .unbox.is-active .heading:before {
+ background-position: center -92px;
+}
+
+.entry-box-style-heading,
+.collapse .heading,
+.collapse pnc.heading {
+ padding: 6px 12px 6px 12px;
+ margin: -12px -18px -12px -18px;
+ font-size: 1.19em;
+ user-select: none;
+}
+
+.entry-box-style-heading:hover,
+.collapse .heading:hover,
+.entry-box-style-heading:active,
+.collapse .heading:active,
+.unbox.is-active .heading,
+.unbox.is-active pnc.heading,
+.entry-box-style-heading:focus,
+.collapse .heading:focus {
+ background-color: rgba(199, 110, 6, 0.2);
+}
+
+.blockquote {
+ background-color: rgba(199, 110, 6, 0.1);
+ display: block;
+ padding: 12px 18px 12px 18px;
+ margin: 18px;
+ position: relative;
+}
+
+.bre,
+.name {
+ display: none;
+}
+
+.cf {
+ display: inline;
+}
+
+.def {
+ display: inline;
+}
+
+.dr {
+ font-size: 1.23em;
+}
+
+.dr-g {
+ display: block;
+ margin-top: 18px;
+ margin-left: 16px;
+ position: relative;
+}
+
+.dr-g:before {
+ content: '';
+ left: -18px;
+ position: absolute;
+ top: 5px;
+ width: 14px;
+ height: 14px;
+ background-size: 14px auto;
+}
+
+.dr-gs {
+ display: block;
+}
+
+.eph {
+ display: inline-block;
+}
+
+.esu {
+ font-size: smaller;
+ vertical-align: super;
+}
+
+.footer {
+ font-size: 1em;
+}
+
+.frac-g {
+ position: relative;
+ top: -3px;
+}
+
+.frac-g:before {
+ content: '/';
+ position: absolute;
+ left: 4px;
+ top: -3px;
+}
+
+.gram-g {
+ color: #767676;
+}
+
+.h-g {
+ margin-bottom: 15px;
+}
+
+.hm,
+pnc.hm,
+.xhm {
+ font-size: smaller;
+ margin-left: 1px;
+ position: relative;
+ top: -5.25px;
+}
+
+.hm-g {
+ display: block;
+}
+
+.idm {
+ font-size: 1.23em;
+}
+
+.idm-g,
+.pv-g {
+ margin: 12px 18px 12px 18px;
+ display: block;
+}
+
+.idm-gs,
+.pv-gs,
+.wf-g {
+ border: 1px solid rgba(199, 110, 6, 0.4);
+ border-radius: 10px 10px 0 0;
+ display: block;
+ margin: 18px 10px 18px 0;
+ overflow: hidden;
+}
+
+.label-g {
+ color: #767676;
+ font-weight: normal;
+}
+
+li.sn-g:before {
+ color: #00123c;
+ padding-right: 6px;
+ position: absolute;
+ text-align: right;
+ left: -8px;
+ width: 24px;
+}
+
+.ndv {
+ color: #00837d;
+}
+
+.pron-g {
+ white-space: nowrap;
+}
+
+.pron-g[geo~='br'] .prefix {
+ color: #07255e;
+}
+
+.pron-g[geo~='n_am'] .prefix {
+ color: #8f0610;
+}
+
+.pron-gs {
+ display: inline;
+}
+
+.pv {
+ display: inline;
+ font-size: 1.23em;
+}
+
+.pvarr:before {
+ content: '';
+ width: 15px;
+ height: 11px;
+ background-size: 15px auto;
+ display: inline-block;
+}
+
+.shcut {
+ font-size: 1.26em;
+ display: block;
+ margin-top: 1em;
+ border-bottom: 1px solid rgba(199, 110, 6, 0.5);
+}
+
+.sn-g {
+ display: block;
+ position: relative;
+ margin-top: 12px;
+}
+
+.sn-g[ox3000='y'] .oxford3000 {
+ background-color: #4577bf;
+ border-radius: 12px;
+ width: 20px;
+ height: 20px;
+ margin: 0 6px 3px 0;
+ position: static;
+ vertical-align: middle;
+}
+
+.sn-gs,
+.res-g {
+ display: block;
+}
+
+.un {
+ padding: 12px 18px 12px 18px;
+ text-indent: 0;
+}
+
+.vp {
+ margin-right: 12px;
+}
+
+.vp-g {
+ display: block;
+}
+
+.wf-g {
+ border-color: rgba(69, 119, 191, 0.4);
+ margin: 6px 0 6px 0;
+ padding: 6px 12px 6px 12px;
+ display: inline-block;
+}
+
+.wfw-g {
+ display: block;
+}
+
+.wx {
+ text-decoration: line-through;
+}
+
+.x-g {
+ display: block;
+ position: relative;
+ margin-top: 6px;
+ margin-left: 1em;
+ padding-left: 1em;
+}
+
+.x-g:before {
+ content: '\2022';
+ left: 0;
+ position: absolute;
+}
+
+.x-gs {
+ display: block;
+}
+
+.xr-gs {
+ display: block;
+ margin-top: 6px;
+}
+
+.z_n {
+ padding-right: 6px !important;
+}
+
+.nbsp,
+.side-panel > div,
+.vp-gs > div,
+.top-g .pos-g,
+.z_n + .z,
+.z_gr_br,
+#ox-enlarge + .z,
+.h-g + .z,
+.pron-gs .wrap,
+li.sn-g > .num,
+span[hide~='y'],
+.top-container br {
+ display: none;
+}
+
+.entry-in-other-dict a {
+ font-weight: normal;
+}
+
+.webtop-g .pos {
+ margin-left: 6px;
+}
+
+.webtop-g a:last-of-type {
+ margin-right: 4px;
+}
+
+.top-g .clear {
+ margin-top: 6px;
+}
+
+.top-g .btn {
+ margin-bottom: 13px;
+}
+
+.top-g .btn:hover:not(.inactive) a:before {
+ background-position: 0 bottom;
+}
+
+.top-g .def {
+ display: block;
+}
+
+.top-g > .pron-gs {
+ display: block;
+}
+
+.top-g .v-gs:not([type~='sym']) {
+ display: block;
+}
+
+.top-container + .pv-gs,
+.top-container + .wf-g {
+ border-width: 0;
+ margin: -12px 0 0 0;
+ overflow: auto;
+}
+
+.top-container + .pv-gs .pv-g,
+.top-container + .wf-g .pv-g {
+ margin: 12px 0 18px 0;
+}
+
+.top-container + .pv-gs .pv,
+.top-container + .wf-g .pv {
+ margin-left: 0;
+}
+
+.top-container + .pv-gs > .heading,
+.top-container + .wf-g > .heading {
+ display: none;
+}
+
+.top-container + .pv-gs .heading,
+.top-container + .wf-g .heading {
+ color: #333;
+ font-size: 1.19em;
+ padding: 6px 12px 6px 12px;
+}
+
+.top-container + .pv-gs .xr-gs,
+.top-container + .wf-g .xr-gs {
+ margin-top: 6px;
+}
+
+.top-container + .pv-gs .xr-gs:before,
+.top-container + .wf-g .xr-gs:before {
+ display: inline;
+}
+
+.top-container + .pv-gs .Ref,
+.top-container + .wf-g .Ref {
+ display: inline;
+ margin: 0;
+}
+
+.if-g .pron-gs {
+ display: inline;
+}
+
+ol.h-g,
+ol.pv-g,
+ol.idm-g {
+ list-style-type: none;
+ padding-left: 0;
+ counter-reset: num;
+}
+
+ol.h-g li.sn-g,
+ol.pv-g li.sn-g,
+ol.idm-g li.sn-g {
+ padding-left: 24px;
+}
+
+ol.h-g li.sn-g:before,
+ol.pv-g li.sn-g:before,
+ol.idm-g li.sn-g:before {
+ content: counter(num) ' ';
+ counter-increment: num;
+}
+
+ol.h-g > .res-g,
+ol.h-g .sn-gs > .xr-gs,
+ol.pv-g > .res-g,
+ol.pv-g .sn-gs > .xr-gs,
+ol.idm-g > .res-g,
+ol.idm-g .sn-gs > .xr-gs {
+ margin-left: 24px;
+}
+
+.def .xr-gs {
+ display: inline;
+}
+
+.def .xr-gs:before {
+ display: none;
+}
+
+.x-g .cf {
+ margin-right: 6px;
+}
+
+.xr-gs:before {
+ content: '';
+ margin-right: 4px;
+ position: relative;
+ top: -1px;
+ width: 13px;
+ height: 9px;
+ background-size: 13px auto;
+ display: inline-block;
+}
+
+.xr-gs[xref_type='external']:before {
+ background-repeat: no-repeat;
+ height: 18px;
+ width: 18px;
+ background-size: 18px auto;
+ vertical-align: middle;
+ margin-right: 8px;
+}
+
+.xr-gs[xref_type='external'] .prefix {
+ font-variant: inherit;
+}
+
+.ndv .xh {
+ font-weight: normal;
+}
+
+.sep + .sep {
+ display: none;
+}
+
+.idm-gs > .heading,
+.idm-gs pnc.heading,
+.pv-gs > .heading,
+.pv-gs pnc.heading {
+ display: block;
+ font-size: 1.38em;
+ padding: 12px 18px 0 18px;
+ color: #c76e06;
+}
+
+.idm-gs > .xr-gs,
+.pv-gs > .xr-gs {
+ margin: 12px 0 12px 0;
+}
+
+.idm-gs .un,
+.pv-gs .un {
+ margin-left: 18px;
+ margin-right: 18px;
+}
+
+.pv-gs > .xr-gs {
+ margin-top: 0;
+}
+
+.pv-gs > .xr-gs:before {
+ display: none;
+}
+
+.pv-gs .xr-gs > .heading {
+ margin-bottom: 6px;
+ display: block;
+ font-size: 1.38em;
+ padding: 12px 18px 0 18px;
+ color: #c76e06;
+}
+
+.pv-gs > .xr-gs .Ref {
+ display: block;
+ margin: 6px 18px;
+}
+
+.pv-gs > .xr-gs .Ref .pvarr:before {
+ content: '';
+ width: 15px;
+ height: 11px;
+ background-size: 15px auto;
+ display: inline-block;
+}
+
+.idm-g .top-container,
+.pv-g .top-container {
+ padding: 0;
+ margin: 0 0 -6px 0;
+ background-color: transparent;
+}
+
+.idm-g .top-container .clear,
+.idm-g .top-container .btn,
+.idm-g .top-container br,
+.pv-g .top-container .clear,
+.pv-g .top-container .btn,
+.pv-g .top-container br {
+ display: none;
+}
+
+.idm-g .v-gs,
+.pv-g .v-gs {
+ display: block;
+}
+
+.idm-g .idm + .label-g,
+.pv-g .idm + .label-g {
+ margin-left: 6px;
+}
+
+.wfo .sym_first:after,
+.wfo pnc.sym_first:after {
+ content: ' ';
+}
+
+.blockquote .p {
+ display: block;
+ margin: 0;
+}
+
+.blockquote .wrap {
+ display: none;
+}
+
+.blockquote:before,
+.blockquote:after,
+.blockquote pnc.wrap_open,
+.blockquote pnc.wrap_close {
+ color: #c76e06;
+ font-size: 6.15em;
+ position: absolute;
+}
+
+.blockquote:before,
+.blockquote pnc.wrap_open {
+ left: -20px;
+ position: absolute;
+ top: 24px;
+}
+
+.blockquote:after,
+.blockquote pnc.wrap_close {
+ right: -20px;
+ bottom: 0;
+}
+
+.blockquote:before {
+ content: '\201C';
+}
+
+.blockquote:after {
+ content: '\201D';
+}
+
+.frac-g .num {
+ font-size: smaller;
+ position: relative;
+ top: -5px;
+ margin-right: 3px;
+}
+
+.frac-g .den {
+ font-size: smaller;
+ vertical-align: sub;
+}
+
+.un .x-gs {
+ display: inline;
+}
+
+.dr-gs .top-container {
+ background-color: transparent;
+ margin: 0;
+ padding: 0;
+}
+
+.dr-gs .clear {
+ display: none;
+}
+
+.dr-gs .sn-g {
+ margin-top: 6px;
+}
+
+.dr-gs .sym_first {
+ margin-right: 6px;
+}
+
+.dr-gs .oxford3000 {
+ width: 25px;
+ height: 25px;
+ top: -2px;
+}
+
+.dr-gs .academic {
+ width: 25px;
+ height: 25px;
+ top: -2px;
+}
+
+.dr-gs .pos-g {
+ display: inline;
+}
+
+.dr-gs .top-g > span {
+ margin-right: 4px;
+}
+
+.entry[dict~='oaad'] .collapse[title^='Grammar'] .p {
+ margin-top: 3px;
+ margin-left: 16px;
+ position: relative;
+ display: block;
+}
+
+.entry[dict~='oaad'] .collapse[title^='Grammar'] .p:before {
+ content: '';
+ position: absolute;
+ left: -15px;
+ top: 9px;
+ width: 7px;
+ height: 7px;
+ background-size: 7px auto;
+}
+
+.collapse {
+ padding: 12px 18px 12px 18px;
+ border-left: 3px solid #c76e06;
+}
+
+.collapse .heading,
+.collapse pnc.heading,
+.collapse .body,
+.collapse .h1,
+.collapse .li,
+.collapse .inline {
+ display: block;
+}
+
+.collapse .heading:hover,
+.collapse pnc.heading:hover {
+ cursor: pointer;
+}
+
+.collapse .heading:before,
+.collapse pnc.heading:before {
+ width: 14px;
+ height: 14px;
+ background-size: 100% auto;
+ background-position: center bottom;
+ content: '+';
+ display: inline-block;
+ position: relative;
+ top: 1px;
+}
+
+.collapse .body,
+.collapse .heading + .def {
+ display: none;
+}
+
+.collapse .h1 {
+ color: #c76e06;
+ font-size: 1.5em;
+ margin: 12px 0 6px 0;
+ font-weight: bold;
+ display: block;
+}
+
+.collapse .h3,
+.collapse .h2 {
+ font-size: 1.26em;
+ margin: 6px 0 3px 0;
+ font-weight: bold;
+ display: block;
+ border-bottom: 1px solid rgba(199, 110, 6, 0.5);
+ color: #333;
+}
+
+.collapse .li .x-gs {
+ display: inline;
+}
+
+.collapse .x-gs {
+ margin-bottom: 6px;
+}
+
+.collapse .p {
+ margin: 0;
+ display: block;
+}
+
+.collapse .p .xr-gs {
+ display: inline;
+ margin: 0;
+}
+
+.collapse .p .xr-gs[type~='pdf'] {
+ display: none;
+}
+
+.collapse .inline,
+.collapse ul.inline {
+ display: block;
+ font-size: 1.26em;
+ margin-bottom: 12px;
+}
+
+.collapse .inline .li,
+.collapse ul.inline .li {
+ display: inline-block;
+ font-weight: bold;
+}
+
+.collapse .inline .li:not(:last-of-type):after,
+.collapse ul.inline .li:not(:last-of-type):after {
+ content: '';
+ margin-left: 5px;
+ position: relative;
+ top: -2px;
+ width: 6px;
+ height: 6px;
+ background-size: 6px auto;
+ display: inline-block;
+}
+
+.collapse .deflist .li,
+.collapse ul.deflist .li {
+ margin-top: 6px;
+}
+
+.collapse .deflist .li > .eb,
+.collapse ul.deflist .li > .eb {
+ color: #c76e06;
+ font-size: 1.23em;
+}
+
+.collapse .bullet,
+.collapse ul.bullet {
+ display: block;
+ margin: 6px 0 12px 0;
+}
+
+.collapse .bullet .li,
+.collapse ul.bullet .li {
+ margin-top: 3px;
+ margin-left: 16px;
+ position: relative;
+ display: block;
+}
+
+.collapse .bullet .li:before,
+.collapse ul.bullet .li:before {
+ content: '\2022';
+ position: absolute;
+ left: -15px;
+}
+
+.collapse .table {
+ margin: 12px;
+ display: table;
+}
+
+.collapse .th,
+.collapse .td {
+ padding: 2px 12px 2px 12px;
+ border-bottom: 1px solid rgba(199, 110, 6, 0.5);
+ display: table-cell;
+}
+
+.collapse .th {
+ background-color: rgba(199, 110, 6, 0.2);
+}
+
+.collapse .tr {
+ display: table-row;
+}
+
+.collapse[title^='Wordfinder'] .xr-gs:before {
+ display: none;
+}
+
+.collapse[title^='Extra examples'] .x-gs .x-g {
+ margin-left: 0;
+}
+
+.collapse[title^='More Like This'] .inline .li {
+ font-weight: normal;
+ font-size: 1.15em;
+}
+
+.collapse[title^='More Like This'] .sep {
+ display: none;
+}
+
+.collapse[title^='AWL Collocations'] .er {
+ font-weight: normal;
+}
+
+.collapse[title^='AWL Collocations'] .h3 {
+ border-bottom: 0;
+}
+
+.collapse[title^='AWL Collocations'] .h3 .inline {
+ margin-bottom: 0;
+ font-size: 1.15em;
+}
+
+.unbox.is-active .heading,
+.unbox.is-active pnc.heading {
+ margin-bottom: 12px;
+}
+
+.unbox.is-active .heading:hover,
+.unbox.is-active pnc.heading:hover {
+ cursor: pointer;
+}
+
+.unbox.is-active .body,
+.unbox.is-active .heading + .def {
+ display: block;
+}
+
+.snippet .collapse {
+ border-left-color: #a9222d;
+ background-color: transparent;
+}
+
+.snippet .collapse .shcut {
+ border-bottom: none;
+}
+
+.snippet .collapse .heading {
+ background-color: rgba(169, 34, 45, 0.1);
+}
+
+.snippet .collapse .heading:hover {
+ background-color: rgba(169, 34, 45, 0.2);
+}
+
+.snippet .collapse .shcut {
+ margin-top: 12px;
+ font-size: 1.1em;
+}
+
+.snippet .collapse .sn-g {
+ margin-top: 0;
+}
+
+.snippet .collapse .coll-g:before {
+ content: '\2022';
+ font-size: 1.54em;
+ line-height: 1;
+ padding-top: 2px;
+ margin-right: 6px;
+ display: inline-block;
+ position: relative;
+ top: 2px;
+ color: silver;
+}
+
+.snippet .collapse .coll-gs .sep {
+ display: none;
+}
+
+.peu-grammar-home .box {
+ background: white;
+}
+
+.block {
+ display: block;
+}
+
+.bold,
+.eb,
+.eb,
+.title_bold {
+ font-weight: bold;
+}
+
+.boldItalic,
+.ebi {
+ font-style: italic;
+ font-weight: bold;
+}
+
+.caption {
+ font-size: 0.92em;
+ padding-left: 20px;
+}
+
+.commentary {
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+}
+
+.construct {
+ font-weight: bold;
+}
+
+.constructGroup .construct {
+ font-weight: normal;
+ display: inline-block;
+ padding: 3px 8px;
+ background-color: #c6d9f9;
+ margin-bottom: 0.4em;
+}
+
+.context {
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+}
+
+.dialogue {
+ font-style: italic;
+}
+
+.dialogue .speaker {
+ font-style: normal;
+}
+
+.equivalent {
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+}
+
+.example {
+ display: block;
+ font-style: italic;
+ padding-left: 12px;
+ text-indent: -12px;
+}
+
+.example * {
+ text-indent: 0;
+}
+
+.exampleGroup {
+ padding-left: 20px;
+ display: block;
+ position: relative;
+}
+
+.exampleGroupSet {
+ display: block;
+}
+
+.example_runon {
+ margin-left: 6px;
+}
+
+.grammarEntry .h {
+ font-weight: bold;
+}
+
+.hang {
+ min-width: 30px;
+ display: table-cell;
+}
+
+.indent {
+ display: table-cell;
+}
+
+.italic,
+.ei,
+.ei {
+ font-style: italic;
+}
+
+.list_keyword {
+ font-weight: bold;
+ display: inline-block;
+ margin-top: 8px;
+}
+
+.locution {
+ display: inline;
+}
+
+.locution:not(:last-child) {
+ margin-right: 6px;
+}
+
+.note {
+ font-size: 0.8em;
+}
+
+.note .a {
+ font-size: 111.35%;
+}
+
+.notes {
+ display: block;
+ margin-top: 11px;
+ border-left: 4px solid silver;
+ padding-left: 8px;
+}
+
+.notPertinent {
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+}
+
+.pertinent {
+ font-style: italic;
+}
+
+.phons {
+ font-style: normal;
+}
+
+.roman {
+ font-style: normal;
+}
+
+.smallCaps,
+.esc {
+ font-variant: small-caps;
+ font-variant: all-small-caps;
+ font-size: 1.2em;
+ text-transform: lowercase;
+}
+
+.strikethrough,
+.estrike {
+ text-decoration: line-through;
+}
+
+.strikethrough .eph,
+.estrike .eph {
+ text-decoration: line-through;
+}
+
+.strikethrough .noStrike,
+.estrike .noStrike {
+ display: inline-block;
+}
+
+.subtitle {
+ font-weight: normal;
+}
+
+.subtitle .ebi {
+ font-weight: normal;
+}
+
+.superSectionIntro {
+ display: block;
+ margin: 1em 0;
+}
+
+.tabular {
+ display: block;
+}
+
+.title {
+ color: #0d3880;
+ display: block;
+ font-weight: bold;
+ font-size: 1.2em;
+}
+
+.title .subtitle .ei {
+ font-weight: normal;
+}
+
+.underline {
+ text-decoration: underline;
+}
+
+.vocabBox {
+ background-color: #c6d9f9;
+ padding: 3px 20px;
+ margin-bottom: 0.4em;
+ margin-top: 0.4em;
+ display: inline-block;
+}
+
+.grammarEntry .wx-gs {
+ display: block;
+ border: 1px solid #0d3880;
+ padding: 8px;
+ margin-top: 14px;
+}
+
+.grammarEntry .wx-gs .title {
+ padding-bottom: 8px;
+ font-weight: bold;
+ font-size: 1.38em;
+}
+
+.grammarEntry .wx-gs .wx {
+ font-style: normal;
+ text-decoration: none;
+ display: block;
+ padding: 2px 0 2px 26px;
+ position: relative;
+}
+
+.grammarEntry .wx-gs .wx:before {
+ content: '';
+ display: inline-block;
+ width: 12px;
+ height: 16px;
+ position: absolute;
+ top: 6px;
+ left: 0;
+ background-size: 12px 16px;
+}
+
+.xh {
+ font-variant: small-caps;
+}
+
+.xref {
+ color: #0d3880;
+ white-space: nowrap;
+}
+
+.xref:before {
+ content: '';
+ display: inline-block;
+ position: relative;
+ border-top: 0.35em solid transparent;
+ border-bottom: 0.35em solid transparent;
+ border-left: 0.7em solid #0d3880;
+ margin-right: 4px;
+ margin-left: 1px;
+}
+
+.grammarEntry .xr-gs .xr-g {
+ display: block;
+}
+
+.grammarEntry .Ref .xr-gs {
+ display: inline-block;
+}
+
+.peu-btns {
+ padding-top: 10px;
+ display: block;
+}
+
+.peu-btns:after {
+ content: '';
+ display: table;
+ clear: both;
+}
+
+.peu-btns a {
+ display: block;
+ position: relative;
+ min-width: 90px;
+ padding: 0 12px;
+ background-color: #004aac;
+ color: white;
+ font-variant: normal;
+ text-transform: lowercase;
+ font-size: 0.92em;
+ font-weight: normal;
+ border-radius: 15px;
+}
+
+.peu-btns a:before,
+.peu-btns a:after {
+ display: inline-block;
+ vertical-align: middle;
+ width: 11px;
+ height: 30px;
+}
+
+.peu-btns a:hover {
+ background-color: #00123c;
+}
+
+.peu-btns .xr-g {
+ display: block;
+}
+
+.peu-btns .xr-g:first-child a {
+ float: left;
+}
+
+.peu-btns .xr-g:first-child a:before {
+ content: '';
+ margin-right: 6px;
+}
+
+.peu-btns .xr-g:last-child a {
+ float: right;
+ text-align: right;
+}
+
+.peu-btns .xr-g:last-child a:after {
+ content: '';
+ background-position: right top;
+ margin-left: 6px;
+}
+
+.peu-btns .xr-g:last-child a:before {
+ content: none;
+}
+
+.page-head,
+.grammarEntry > .title,
+.introduction > .title {
+ font-size: 1.6em;
+ font-weight: bold;
+ margin-bottom: 1em;
+}
+
+.grammarEntry {
+ display: block;
+ clear: both;
+}
+
+.grammarEntry > .title[section='yes'] {
+ font-size: 1.8em;
+ font-weight: bold;
+ margin-bottom: 1em;
+}
+
+.grammarEntry > .title .hang {
+ padding-right: 20px;
+}
+
+.grammarEntry > .title .indent .notPertinent {
+ font-weight: inherit;
+}
+
+.grammarEntry .breadcrumb {
+ display: none;
+}
+
+.grammarEntry > .breadcrumb {
+ font-size: 0.8em;
+ display: block;
+ margin-top: -10px;
+ margin-bottom: 4px;
+}
+
+.grammarEntry > .breadcrumb:before {
+ content: 'PEU';
+ font-weight: bold;
+}
+
+.grammarEntry > .breadcrumb .l1 {
+ padding-left: 23px;
+ background-size: 14px 15px;
+}
+
+.grammarEntry .xr-gs:before,
+.grammarEntry .institle,
+.grammarEntry .arl {
+ display: none;
+}
+
+.grammarEntry .example_runon {
+ display: block;
+ margin-left: 0;
+}
+
+.grammarEntry .exampleGroup {
+ padding-left: 12px;
+}
+
+.grammarEntry .exampleGroup .hang {
+ left: 12px;
+}
+
+.grammarEntry .exampleGroup .hang + .indent {
+ padding-left: 10px;
+ display: block;
+}
+
+.grammarEntry .constructGroup {
+ padding-left: 12px;
+}
+
+.author-name {
+ color: #4d4c4c;
+ font-size: 1.38em;
+}
+
+.peu-home-logo {
+ display: inline-block;
+ margin: -10px 0 -10px;
+}
+
+.peu-home-un-authorized {
+ padding-bottom: 20px;
+}
+
+.peu-home-un-authorized h1 {
+ font-size: 2.15em;
+ margin-top: 0;
+ margin-bottom: 8px;
+}
+
+.peu-home-un-authorized h1:after {
+ content: '';
+ display: inline-block;
+ width: 26px;
+ height: 28px;
+ background-size: 26px 28px;
+ margin-left: 8px;
+ margin-top: -4px;
+ vertical-align: middle;
+}
+
+.peu-home-un-authorized #generaltext h2 {
+ font-size: 1.23em;
+ margin-top: 24px;
+}
+
+.peu-home-un-authorized #generaltext .open-close h2 {
+ color: #0d3880;
+}
+
+.peu-home-un-authorized #generaltext .open-close h2:first-child {
+ margin-top: 0;
+}
+
+.peu-home-un-authorized h3 {
+ font-size: 1.23em;
+ font-weight: bold;
+}
+
+.peu-home-un-authorized h3 + h3 {
+ margin-top: -7px;
+}
+
+.peu-home-un-authorized .peu-quote {
+ text-align: right;
+ font-size: 1.08em;
+ margin: 4px 0;
+}
+
+.peu-home-authorized h3 {
+ padding-bottom: 0;
+}
+
+.peu-sales-box {
+ border: 1px solid #8f0610;
+ padding: 12px 16px 10px;
+ margin-bottom: 20px;
+ margin-top: 20px;
+}
+
+.peu-sales-box .bgtn-premium {
+ margin-top: 6px;
+}
+
+.grammarEntry[type='interstitial'] .title {
+ color: #333;
+ font-weight: bold;
+}
+
+.grammarEntry[type='interstitial'] > .title + .section {
+ margin-bottom: 8px;
+}
+
+.grammarEntry[type='interstitial'] .section .title {
+ display: inline;
+}
+
+.grammarEntry[type='interstitial'] .section {
+ margin-bottom: 6px;
+}
+
+.grammarEntry[type='interstitial'] > .section {
+ margin-top: 24px;
+}
+
+.grammarEntry[type='interstitial'] .subtitle {
+ font-weight: bold;
+}
+
+.grammarEntry[type='interstitial'] .title .indent {
+ font-size: 1.15em;
+ font-weight: normal;
+ display: inline;
+}
+
+.grammarEntry[type='interstitial'] .title + .block {
+ display: inline-block;
+ padding-left: 18px;
+ margin-top: 0;
+}
+
+.grammarEntry[type='interstitial'] .title + .block .xr-gs {
+ display: inline-block;
+ margin-top: 0;
+}
+
+.section {
+ display: block;
+}
+
+.section > .title {
+ margin-top: 1em;
+}
+
+.section > .section > .title {
+ font-size: 1em;
+ font-weight: normal;
+}
+
+.grammarEntry > .section[section_num] > span:not(.title):not(.pnc),
+.grammarEntry > .section > .section[section_num] > span:not(.title):not(.pnc) {
+ margin-left: 30px;
+}
+
+.grammarEntry > .section[section_num] + .notes,
+.grammarEntry > .section > .section[section_num] + .notes {
+ margin-top: 24px;
+ margin-left: 30px;
+ border-left: 12px solid silver;
+}
+
+.section > .block,
+.section > .constructGroup,
+.section > .notes,
+.section > .lettered,
+.section > .bulleted,
+.section > .numbered {
+ display: block;
+ margin-top: 0.4em;
+}
+
+.section .title {
+ display: table;
+}
+
+.section .title .indent,
+.section .title .indent .ebi {
+ font-weight: normal;
+}
+
+.exampleGroup .hang {
+ position: absolute;
+ left: 0;
+}
+
+.example .pertinent {
+ font-weight: bold;
+}
+
+.example .commentary .pertinent {
+ font-weight: normal;
+}
+
+.example .commentary .example .pertinent {
+ font-weight: bold;
+}
+
+.block .example,
+.commentary .example {
+ display: inline;
+ padding-left: 0;
+ text-indent: 0;
+}
+
+.vocabBox .example {
+ display: inline;
+}
+
+table span {
+ margin-left: 0 !important;
+}
+
+table .exampleGroup,
+table .example {
+ padding-left: 0;
+}
+
+table td {
+ padding: 0 1em 0 0;
+ vertical-align: top;
+}
+
+table .block {
+ margin: 0;
+}
+
+.frame_all_,
+.frame_none_,
+.frame_no_row_,
+.frame_never_,
+.frame__,
+.frame_none_0 {
+ margin-top: 0.8em;
+ margin-bottom: 0.4em;
+}
+
+.frame_all_ th,
+.frame_none_ th,
+.frame_no_row_ th,
+.frame_never_ th,
+.frame__ th,
+.frame_none_0 th {
+ text-align: left;
+ font-weight: bold;
+}
+
+.frame_all_ tr,
+.frame_no_row_ tr {
+ border: 1px black solid;
+}
+
+.frame_all_ th,
+.frame_no_row_ th {
+ padding: 2px 6px;
+}
+
+.frame_all_ td,
+.frame_no_row_ td {
+ padding: 2px 6px 2px 16px;
+ text-indent: -10px;
+}
+
+.frame_no_row_ tr {
+ border-width: 0 1px;
+}
+
+.frame_no_row_ tr:last-child {
+ border-bottom-width: 1px;
+}
+
+.frame_no_row_ tr:first-child {
+ border-top-width: 1px;
+ border-bottom-width: 1px;
+}
+
+.frame_none_ th,
+.frame_none_0 th,
+.frame__ th {
+ text-align: left;
+ padding-right: 15px;
+}
+
+.plain {
+ display: block;
+}
+
+.plain .indent {
+ display: block;
+}
+
+.plain .exampleGroup {
+ padding-left: 20px;
+}
+
+.plain .example {
+ padding-left: 0;
+}
+
+.plain .block {
+ margin: 0;
+}
+
+.bulleted,
+.lettered,
+.numbered {
+ padding-left: 20px;
+ position: relative;
+}
+
+.bulleted .li:before,
+.lettered .li:before,
+.numbered .li:before {
+ position: absolute;
+ left: 0;
+ font-weight: bold;
+}
+
+.bulleted .li:before {
+ content: '\2022';
+}
+
+.lettered {
+ counter-reset: letter-counter;
+}
+
+.lettered .li:before {
+ content: counter(letter-counter, lower-alpha);
+ counter-increment: letter-counter;
+}
+
+.numbered {
+ counter-reset: number-counter;
+}
+
+.numbered .li:before {
+ content: counter(number-counter);
+ counter-increment: number-counter;
+}
+
+.numbered .bulleted {
+ display: block;
+}
+
+.numbered .bulleted .li:before {
+ content: '\2022' !important;
+ counter-increment: none;
+}
+
+.peu-contents-full {
+ margin-bottom: 10px;
+}
+
+.peu-contents-full li a {
+ padding: 7px 0 7px 25px;
+}
+
+.peu-contents-full ul > li > div > a {
+ color: #333;
+}
+
+.peu-contents-full ul ul > li > div > a {
+ color: #004aac;
+ padding: 4px 0 4px 25px;
+}
+
+.peu-contents-full ul ul ul > li > div > a {
+ color: #333;
+ padding: 4px 0 4px 25px;
+}
+
+.peu-contents-full
+ .section
+ .section[subsection='1']:not(:first-child)
+ .title:before {
+ content: '- ';
+}
+
+#rightcolumn .toc_header {
+ border-bottom: 1px solid #cccccc;
+}
+
+#rightcolumn .toc_header h4 {
+ padding-left: 26px;
+ font-size: 1.15em;
+}
+
+#rightcolumn .toc_content {
+ padding-right: 8px;
+}
+
+#rightcolumn .toc_content > a {
+ margin-top: 8px;
+ display: inline-block;
+}
+
+#rightcolumn .relatedBlock ul ul div a {
+ padding: 4px;
+ margin-left: 16px;
+ color: #004aac;
+}
+
+#rightcolumn .relatedBlock ul ul .icon-plus,
+#rightcolumn .relatedBlock ul ul .icon-minus {
+ display: none;
+}
+
+#rightcolumn .relatedBlock ul ul ul[style] {
+ display: none !important;
+}
+
+.grammarEntry .pron-gs {
+ border: none;
+ padding: 0 4px;
+ vertical-align: top;
+ margin-top: 0;
+ display: inline-block;
+}
+
+.grammarEntry .pron-gs .sound {
+ display: block;
+}
+
+.lang-study-page h3,
+.peu-introduction-page h3 {
+ margin: 14px 0 0;
+}
+
+.peu-link-nav,
+#browse-letters {
+ margin-top: 16px;
+}
+
+.peu-link-nav:after,
+#browse-letters:after {
+ content: '';
+ display: table;
+ clear: both;
+}
+
+.peu-link-nav a,
+#browse-letters a {
+ display: block;
+ float: left;
+ padding: 0 8px;
+ min-width: 34px;
+ text-align: center;
+ margin-right: 8px;
+ margin-bottom: 8px;
+ border: 2px solid #cccccc;
+ border-radius: 8px;
+}
+
+.peu-link-nav a:hover,
+#browse-letters a:hover {
+ background-color: #ebebeb;
+ text-decoration: none;
+ color: black;
+}
+
+.definition-wrap {
+ margin-left: 22px;
+ text-indent: -22px;
+ margin-bottom: 8px;
+}
+
+.phon-table td {
+ height: 30px;
+}
+
+.phon-table td:first-child {
+ width: 35px;
+}
+
+.story-behind-peu .float-right {
+ float: right;
+ margin: 5px 0 10px 10px;
+}
+
+.story-behind-peu .float-left {
+ float: left;
+ margin: 5px 10px 10px 0;
+}
+
+.story-behind-peu .float-right,
+.story-behind-peu .float-left {
+ max-width: 50%;
+ height: auto;
+}
+
+.entry-unauthorised .restrictedLock {
+ color: #333;
+ margin-bottom: 18px;
+}
+
+.entry-unauthorised .restrictedImg img {
+ width: 14px;
+}
+
+.entry-unauthorised .restrictedLinks table {
+ margin-bottom: 20px;
+ position: relative;
+}
+
+.entry-unauthorised .restrictedLinks td {
+ display: block;
+ float: left;
+}
+
+.entry-unauthorised .restrictedLinks td:first-child {
+ font-size: 1.38em;
+ font-weight: bold;
+}
+
+.introduction > .title {
+ margin-bottom: 0;
+}
+
+.introduction > .title .hang {
+ display: inline-block;
+ padding-right: 20px;
+ font-weight: normal;
+}
+
+.introduction > .title .indent {
+ display: inline-block;
+ font-weight: bold;
+}
+
+.introduction > .title .indent .ei,
+.introduction > .title .indent .notPertinent {
+ font-weight: bold;
+}
+
+.superSectionIntro,
+.title_contents {
+ text-transform: uppercase;
+ color: #333;
+ font-size: 1.85em;
+ margin-top: 1em;
+ margin-bottom: 10px;
+ display: block;
+ font-weight: normal;
+}
+
+#simple-present-forms__16 tr,
+#passive-structures-and-verb-forms__23 tr {
+ border-width: 0 1px 0 1px;
+}
+
+#simple-present-forms__16 tr:first-child,
+#passive-structures-and-verb-forms__23 tr:first-child {
+ border-width: 1px;
+}
+
+#simple-present-forms__16 tr:last-child,
+#passive-structures-and-verb-forms__23 tr:last-child {
+ border-width: 0 1px 1px 1px;
+}
+
+#abbreviations__164 td,
+#prefixes-and-suffixes__997 td,
+#prefixes-and-suffixes__1024 td,
+#prefixes-and-suffixes__798 td,
+#special-rules-and-exceptions__724 td {
+ padding-left: 10px;
+ text-indent: -10px;
+}
+
+#numbers_1__853 {
+ margin-left: 15px;
+}
+
+#numbers_1__803 td > span {
+ display: block;
+ padding-left: 10px;
+ text-indent: -10px;
+}
+
+#numbers_1__803 td:first-child {
+ white-space: nowrap;
+}
+
+#headlines__203 .esc {
+ display: block;
+ padding-left: 15px;
+}
+
+#special-rules-and-exceptions__724 td .ei:nth-child(2),
+#special-rules-and-exceptions__724 td .ei:nth-child(3) {
+ display: block;
+ padding-left: 10px;
+}
+
+#special-rules-and-exceptions__724 .example_runon {
+ padding-left: 10px;
+}
+
+#numbers_1__846 td:first-child {
+ white-space: nowrap;
+}
+
+#spelling-of-plurals__30 tr:nth-child(2) td .ebi,
+#spelling-of-plurals__128 tr:nth-child(2) td .ebi,
+#if-introduction__45 tr:nth-child(2) td .ebi,
+#if-introduction__63 tr:nth-child(2) td .ebi,
+#if-introduction__81 tr:nth-child(2) td .ebi {
+ padding: 3px 8px;
+ background-color: #c6d9f9;
+}
+
+#if-introduction__45 tr:nth-child(2) td,
+#if-introduction__63 tr:nth-child(2) td,
+#if-introduction__81 tr:nth-child(2) td {
+ text-align: left;
+}
+
+#if-introduction__45 tr:nth-child(2) td .ebi,
+#if-introduction__45 tr:nth-child(2) td .eb,
+#if-introduction__63 tr:nth-child(2) td .ebi,
+#if-introduction__63 tr:nth-child(2) td .eb,
+#if-introduction__81 tr:nth-child(2) td .ebi,
+#if-introduction__81 tr:nth-child(2) td .eb {
+ font-weight: normal;
+}
+
+#if-introduction__45 td:first-child,
+#if-introduction__63 td:first-child,
+#if-introduction__81 td:first-child {
+ min-width: 170px;
+}
+
+#formal-and-informal-vocabulary__9 .exampleGroup .context {
+ width: 150px;
+ display: inline-block;
+}
+
+#capital-letters_1__9 {
+ counter-reset: letter-counter;
+ position: relative;
+}
+
+#capital-letters_1__9 .section:before {
+ content: counter(letter-counter, lower-alpha);
+ counter-increment: letter-counter;
+ position: absolute;
+ left: 0;
+ font-weight: bold;
+}
+
+#spelling-and-pronunciation__134 .example {
+ display: inline-block;
+}
+
+#comparative-and-superlative-adjectives__311,
+#comparative-and-superlative-adjectives__340,
+#american-and-british-english__212,
+#american-and-british-english__24 {
+ border: none;
+}
+
+#comparative-and-superlative-adjectives__311 tr,
+#comparative-and-superlative-adjectives__340 tr,
+#american-and-british-english__212 tr,
+#american-and-british-english__24 tr {
+ border: none;
+}
+
+#comparative-and-superlative-adjectives__311 td,
+#comparative-and-superlative-adjectives__340 td,
+#american-and-british-english__212 td,
+#american-and-british-english__24 td {
+ padding-left: 12px;
+ text-indent: -12px;
+}
+
+#prepositions-before-particular-words-and-expressions__9 .plain {
+ margin-top: 16px;
+}
+
+#prepositions-before-particular-words-and-expressions__9 .plain .indent {
+ margin-top: 8px;
+}
+
+#prepositions-after-particular-words-and-expressions__9 .plain .indent {
+ margin-top: 8px;
+}
+
+#spelling-and-pronunciation__1176 .sound {
+ display: inline-block;
+}
+
+.swb-home-logo {
+ display: inline-block;
+ margin: -10px 0 -10px;
+}
+
+h2 .oxford3000 {
+ top: 0;
+}
+
+.unbox .p {
+ display: block;
+}
+
+.unbox .p + .p {
+ margin-top: 18px;
+}
+
+.trans-page .v_alt {
+ font-weight: bold;
+}
+
+.trans-page .prefix_adv,
+.trans-page .ds,
+.trans-page .dtxt {
+ font-style: italic;
+}
+
+.trans-page .tx {
+ display: block;
+ color: #008900;
+ font-size: 1.08em;
+}
+
+.trans-page .unbox,
+.trans-page .bf-gs {
+ border: 1px solid rgba(199, 110, 6, 0.4);
+ border-radius: 10px 10px 0 0;
+ display: block;
+ margin: 18px 0 18px 0;
+ overflow: hidden;
+ padding: 9px 18px;
+}
+
+.trans-page .unbox {
+ border-color: #333;
+}
+
+.trans-page .unbox .h1 {
+ font-size: 1.54em;
+ padding: 10px 0 6px;
+ display: block;
+}
+
+.trans-page .top-g .unbox {
+ border: none;
+ display: inline;
+ padding: 0;
+ margin: 0;
+}
+
+.trans-page .idm-gs {
+ border-color: #c76e06;
+}
+
+.trans-page .idm-gs > .unbox {
+ margin-left: 18px;
+ margin-right: 18px;
+}
+
+.trans-page .idm-gs > .prefix {
+ display: block;
+ font-size: 1.38em;
+ padding: 12px 18px 0 18px;
+ color: #c76e06;
+}
+
+.trans-page .bf-gs .top-container {
+ margin-left: 0;
+ margin-right: 0;
+ margin-bottom: 0;
+ background-color: transparent;
+ padding: 0;
+}
+
+.trans-page .bf-gs .top-container .top-g .clear {
+ display: none;
+}
+
+.trans-page .bf-gs .prefix {
+ color: #c76e06;
+}
+
+.schulwoerterbuch_German-English .clear {
+ display: none;
+}
+
+.audio .icon-audio {
+ background-repeat: no-repeat;
+ background-position: left top !important;
+ background-size: 100%;
+ width: 24px;
+ height: 24px;
+ margin-right: 4px;
+ display: inline-block;
+}
+
+.audio .icon-audio:hover {
+ background-position: left bottom !important;
+}
+
+.shcut-red,
+.snippet .collapse .shcut,
+.ocoll .shcut,
+.collapse[title='Collocations'] .shcut,
+.collapse[title='All Collocations'] .shcut {
+ text-transform: uppercase;
+ font-weight: bold;
+ border-bottom: none;
+ margin-top: 1em;
+ color: #a9222d;
+}
+
+.ocoll .top-container {
+ background-color: transparent;
+ margin-right: 0;
+ margin-left: 0;
+ margin-bottom: 0;
+ padding: 0;
+ clear: none;
+}
+
+.ocoll .num {
+ display: inline-block;
+ width: 20px;
+}
+
+.ocoll .colldef {
+ font-size: 1.23em;
+}
+
+.ocoll .pos-g + .colldef {
+ display: block;
+}
+
+.ocoll .subentry-g .top-container,
+.ocoll .subentry-g .top-g {
+ display: inline;
+}
+
+.ocoll .subentry-g .top-g .clear {
+ display: none;
+}
+
+.ocoll .subentry-g {
+ display: block;
+}
+
+.ocoll .subentry-g + .subentry-g {
+ margin-top: 30px;
+}
+
+.ocoll .top-container + .sn-gs > .shcut-g:first-child .shcut {
+ margin-top: 9px;
+}
+
+.ocoll .top-container .v-gs {
+ display: inline-block;
+}
+
+.ocoll .shcut-g {
+ padding-left: 20px;
+ display: block;
+}
+
+.ocoll .coll_un:before {
+ content: '(';
+}
+
+.ocoll .coll_un:after {
+ content: ')';
+}
+
+.ocoll .coll_un[un='note'] {
+ font-weight: normal;
+}
+
+.ocoll .sn-g {
+ padding-left: 18px;
+ margin-top: 8px;
+ margin-bottom: 8px;
+}
+
+.ocoll .sn-g.sn-g:before {
+ content: '\2022';
+ color: silver;
+ font-size: 1.69em;
+ padding-right: 6px;
+ position: absolute;
+ text-align: right;
+ left: -8px;
+ width: 24px;
+}
+
+.ocoll .coll-gs:not(.x-gs) {
+ font-weight: bold;
+}
+
+.ocoll .x-gs {
+ margin-top: 2px;
+ font-weight: normal;
+}
+
+.ocoll .x-gs .x-g {
+ margin-left: 0;
+ margin-top: 0;
+}
+
+.ocoll .xr-gs {
+ padding-left: 21px;
+}
+
+.ocoll .collapse .coll-gs {
+ padding-left: 20px;
+ display: block;
+ position: relative;
+}
+
+.ocoll .collapse .coll-g:before {
+ content: '\2022';
+ color: silver;
+ font-size: 1.23em;
+ padding-right: 6px;
+ position: absolute;
+ text-align: right;
+ left: -8px;
+ width: 24px;
+}
+
+.col-home-logo {
+ display: inline-block;
+ margin: -10px 0 -10px;
+ width: 44px;
+ height: 44px;
+}
+
+.eul {
+ text-decoration: underline;
+}
+
+.collapse[title='Collocations'] .shcut,
+.collapse[title='All Collocations'] .shcut {
+ color: #333;
+ margin-top: 12px;
+}
+
+.collapse[title='Collocations'] .sn-g,
+.collapse[title='All Collocations'] .sn-g {
+ margin-top: 0;
+}
+
+.collapse[title='Collocations'] .colsep,
+.collapse[title='All Collocations'] .colsep {
+ color: silver;
+}
+
+.prefix + .Ref {
+ display: inline;
+ margin: 0;
+}
+
+.audio_play_button,
+.responsive_display_inline_on_smartphone,
+.oxford3000 {
+ display: none;
+}
+
+.dictOALD-Header {
+ .z {
+ display: none;
+ }
+}
+
+.dictOALD-Related {
+ a {
+ margin-left: 2em;
+ color: #16a085;
+ }
+}
diff --git a/src/components/dictionaries/oald/engine.ts b/src/components/dictionaries/oald/engine.ts
index fae44f2ef..0ecb0b869 100644
--- a/src/components/dictionaries/oald/engine.ts
+++ b/src/components/dictionaries/oald/engine.ts
@@ -2,20 +2,23 @@ import { fetchDirtyDOM } from '@/_helpers/fetch-dom'
import { reflect } from '@/_helpers/promise-more'
import {
HTMLString,
- getInnerHTMLBuilder,
+ getInnerHTML,
handleNoResult,
handleNetWorkError,
SearchFunction,
GetSrcPageFunction,
+ DictSearchResult
} from '../helpers'
import { DictConfigs } from '@/app-config'
-import { DictSearchResult } from '@/typings/server'
-export const getSrcPage: GetSrcPageFunction = (text) => {
- return `https://www.oxfordlearnersdictionaries.com/definition/english/${text.trim().split(/\s+/).join('-')}`
+export const getSrcPage: GetSrcPageFunction = text => {
+ return `https://www.oxfordlearnersdictionaries.com/definition/english/${text
+ .trim()
+ .split(/\s+/)
+ .join('-')}`
}
-const getInnerHTML = getInnerHTMLBuilder('https://www.oxfordlearnersdictionaries.com/')
+const HOST = 'https://www.oxfordlearnersdictionaries.com'
interface OALDResultItem {
title: HTMLString
@@ -41,32 +44,36 @@ export type OALDResult = OALDResultLex | OALDResultRelated
type OALDSearchResult = DictSearchResult<OALDResult>
type OALDSearchResultLex = DictSearchResult<OALDResultLex>
-export const search: SearchFunction<OALDSearchResult> = (
- text, config, profile, payload
+export const search: SearchFunction<OALDResult> = (
+ text,
+ config,
+ profile,
+ payload
) => {
text = text.toLocaleLowerCase().replace(/[^A-Za-z0-9]+/g, '-')
const options = profile.dicts.all.oald.options
- return fetchDirtyDOM('https://www.oxfordlearnersdictionaries.com/definition/english/' + text)
+ return fetchDirtyDOM(
+ 'https://www.oxfordlearnersdictionaries.com/definition/english/' + text
+ )
.catch(handleNetWorkError)
.then(doc => checkResult(doc, text, options))
}
-function checkResult (
+function checkResult(
doc: Document,
text: string,
- options: DictConfigs['oald']['options'],
+ options: DictConfigs['oald']['options']
): OALDSearchResult | Promise<OALDSearchResult> {
if (doc.querySelector('#entryContent')) {
- return getAllEntries(doc, text)
- .then(handleAllDOMs)
+ return getAllEntries(doc, text).then(handleAllDOMs)
} else if (options.related) {
const $alternative = doc.querySelector('.result-list')
if ($alternative) {
return {
result: {
type: 'related',
- list: getInnerHTML($alternative)
+ list: getInnerHTML(HOST, $alternative)
}
}
}
@@ -74,32 +81,38 @@ function checkResult (
return handleNoResult()
}
-function getAllEntries (
- doc: Document,
- text: string,
-): Promise<Document[]> {
+function getAllEntries(doc: Document, text: string): Promise<Document[]> {
const wordTester = new RegExp(`/${text}_\\d+$`)
- const hrefs = [...doc.querySelectorAll<HTMLAnchorElement>('#relatedentries .list-col a')]
+ const hrefs = [
+ ...doc.querySelectorAll<HTMLAnchorElement>('#relatedentries .list-col a')
+ ]
.map($a => $a.getAttribute('href') || '')
.filter(href => wordTester.test(href))
if (hrefs.length > 0) {
- return reflect(hrefs.map(href => fetchDirtyDOM(href)))
- .then(docs => [doc, ...docs.filter((d): d is Document => d as any as boolean)])
+ return reflect(hrefs.map(href => fetchDirtyDOM(href))).then(docs => [
+ doc,
+ ...docs.filter((d): d is Document => !!d)
+ ])
}
return Promise.resolve([doc])
}
-function handleAllDOMs (
- docs: Document[],
+function handleAllDOMs(
+ docs: Document[]
): OALDSearchResultLex | Promise<OALDSearchResultLex> {
- const results = docs.map(handleDOM)
- .filter((result): result is DictSearchResult<OALDResultItem> => result as any as boolean)
+ const results = docs
+ .map(handleDOM)
+ .filter((result): result is DictSearchResult<OALDResultItem> => !!result)
if (results.length > 0) {
- let resultWithAudio = results.find(({ audio }) => (audio && audio.uk && audio.us) as any as boolean)
+ let resultWithAudio = results.find(
+ ({ audio }) => audio && audio.uk && audio.us
+ )
if (!resultWithAudio) {
- resultWithAudio = results.find(({ audio }) => (audio && (audio.uk || audio.us)) as any as boolean)
+ resultWithAudio = results.find(
+ ({ audio }) => audio && (audio.uk || audio.us)
+ )
}
const audio = resultWithAudio ? resultWithAudio.audio : undefined
return {
@@ -107,35 +120,41 @@ function handleAllDOMs (
type: 'lex',
items: results.map(({ result }) => result)
},
- audio,
+ audio
}
}
return handleNoResult()
}
-function handleDOM (
- doc: Document,
-): null | DictSearchResult<OALDResultItem> {
+function handleDOM(doc: Document): null | DictSearchResult<OALDResultItem> {
const result: OALDResultItem = {
- title: getInnerHTML(doc, '.webtop-g'),
+ title: getInnerHTML(HOST, doc, '.webtop-g'),
prons: [],
- defs: '',
+ defs: ''
}
- const audio: { us?: string, uk?: string } = {}
+ const audio: { us?: string; uk?: string } = {}
const $entry = doc.querySelector('#entryContent .h-g')
- if (!$entry) { return null }
+ if (!$entry) {
+ return null
+ }
const $topCon = $entry.querySelector('.top-container')
- if (!$topCon) { return null }
+ if (!$topCon) {
+ return null
+ }
const $prons = $topCon.querySelector('.pron-gs')
if ($prons) {
$prons.querySelectorAll('.pron-g').forEach($p => {
const $audio = $p.querySelector<HTMLDivElement>('.audio_play_button')
- if (!$audio) { return }
+ if (!$audio) {
+ return
+ }
const mp3 = $audio.dataset.srcMp3
- if (!mp3) { return }
+ if (!mp3) {
+ return
+ }
if ($audio.className.includes('pron-uk')) {
audio.uk = mp3
@@ -143,12 +162,12 @@ function handleDOM (
audio.us = mp3
}
- result.prons.push({ phsym: getInnerHTML($p), pron: mp3 })
+ result.prons.push({ phsym: getInnerHTML(HOST, $p), pron: mp3 })
})
}
$topCon.remove()
- result.defs = getInnerHTML($entry)
+ result.defs = getInnerHTML(HOST, $entry)
if (result.title && result.defs) {
return { result, audio }
diff --git a/test/specs/components/dictionaries/oald/requests.mock.ts b/test/specs/components/dictionaries/oald/requests.mock.ts
new file mode 100644
index 000000000..f860b1819
--- /dev/null
+++ b/test/specs/components/dictionaries/oald/requests.mock.ts
@@ -0,0 +1,20 @@
+import { MockRequest } from '@/components/dictionaries/helpers'
+
+export const mockSearchTexts = ['love', 'jumblish']
+
+export const mockRequest: MockRequest = mock => {
+ mock.onGet(/oxfordlearnersdictionaries/).reply(info => {
+ const wordMatch = /[^\/]+$/.exec(info.url || '')
+ return wordMatch
+ ? [
+ 200,
+ new DOMParser().parseFromString(
+ require(`raw-loader!./response/${decodeURIComponent(
+ wordMatch[0]
+ )}.html`).default,
+ 'text/html'
+ )
+ ]
+ : [404]
+ })
+}
|
refactor
|
oald
|
bafe61c9f7731a7403631d656ce4595dc11083db
|
2019-03-17 09:58:36
|
CRIMX
|
fix(dicts): typings
| false
|
diff --git a/src/background/sync-manager/services/shanbay.ts b/src/background/sync-manager/services/shanbay.ts
index f65025c51..64eb11f41 100644
--- a/src/background/sync-manager/services/shanbay.ts
+++ b/src/background/sync-manager/services/shanbay.ts
@@ -120,12 +120,12 @@ export class Service extends SyncService<SyncConfig> {
var resSearch = await fetch(url).then(r => r.json())
} catch (e) {
this.notifyError('errNetwork', text)
- return Promise.reject()
+ return Promise.reject('network')
}
if (!resSearch || !resSearch.data) {
this.notifyError('errWord', text)
- return Promise.reject()
+ return Promise.reject('word')
}
try {
@@ -138,12 +138,12 @@ export class Service extends SyncService<SyncConfig> {
}).then(r => r.json())
} catch (e) {
this.notifyError('errNetwork', text)
- return Promise.reject()
+ return Promise.reject('network')
}
if (!resLearning || resLearning.status_code !== 0) {
this.notifyError('errLearning', text)
- return Promise.reject()
+ return Promise.reject('learning')
}
}
|
fix
|
typings
|
828f5237c770adc586a2161345dc0d8e010ad924
|
2018-09-01 13:06:00
|
CRIMX
|
chore(release): 6.12.1
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0bc1379d..df40ff475 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.12.1"></a>
+## [6.12.1](https://github.com/crimx/ext-saladict/compare/v6.12.0...v6.12.1) (2018-09-01)
+
+
+### Bug Fixes
+
+* **config:** fix quota bytes per item exceeds ([2a64195](https://github.com/crimx/ext-saladict/commit/2a64195))
+
+
+### Features
+
+* **options:** add profile adding ([22fe8e7](https://github.com/crimx/ext-saladict/commit/22fe8e7))
+
+
+
<a name="6.12.0"></a>
# [6.12.0](https://github.com/crimx/ext-saladict/compare/v6.11.0...v6.12.0) (2018-08-31)
diff --git a/package.json b/package.json
index e15f0e900..7b73376fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.12.0",
+ "version": "6.12.1",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.12.1
|
be307322ae0e9a62ccf4fc346e84f69eca8f0323
|
2019-09-08 02:18:02
|
crimx
|
fix(dicts): axios api
| false
|
diff --git a/src/components/ShadowPortal/index.tsx b/src/components/ShadowPortal/index.tsx
index b876f8f0a..e19ce237d 100644
--- a/src/components/ShadowPortal/index.tsx
+++ b/src/components/ShadowPortal/index.tsx
@@ -60,6 +60,7 @@ export const ShadowPortal = (props: ShadowPortalProps) => {
<CSSTransition
classNames={defaultClassNames}
mountOnEnter
+ unmountOnExit
appear
timeout={defaultTimeout}
{...restProps}
diff --git a/src/components/dictionaries/baidu/engine.ts b/src/components/dictionaries/baidu/engine.ts
index 3e61601a8..a72bcbf24 100644
--- a/src/components/dictionaries/baidu/engine.ts
+++ b/src/components/dictionaries/baidu/engine.ts
@@ -57,6 +57,11 @@ const langcodes: ReadonlyArray<string> = [
type BaiduSearchResult = DictSearchResult<BaiduResult>
+const headers =
+ process.env.NODE_ENV === 'test'
+ ? { cookie: 'BAIDUID=8971CB398A02E6B27F50DFF1DE3164BF:FG=1;' }
+ : {}
+
export const search: SearchFunction<
BaiduResult,
MachineTranslatePayload
@@ -85,14 +90,10 @@ export const search: SearchFunction<
return (
getToken()
.then(({ gtk, token }) =>
- axios.post<BaiduRawResult>('https://fanyi.baidu.com/v2transapi', {
+ axios('https://fanyi.baidu.com/v2transapi', {
+ method: 'post',
withCredentials: true,
- headers: {
- cookie:
- process.env.NODE_ENV === 'test'
- ? 'BAIDUID=8971CB398A02E6B27F50DFF1DE3164BF:FG=1;'
- : ''
- },
+ headers,
data: new URLSearchParams({
from: sl,
to: tl,
@@ -170,13 +171,13 @@ function handleJSON(
}
function remoteLangCheck(text: string): Promise<string> {
- return axios
- .post('https://fanyi.baidu.com/langdetect', {
- withCredentials: false,
- body: new URLSearchParams({
- query: encodeURIComponent(text)
- })
+ return axios('https://fanyi.baidu.com/langdetect', {
+ method: 'post',
+ withCredentials: false,
+ data: new URLSearchParams({
+ query: encodeURIComponent(text)
})
+ })
.then(({ data }) => (data && data.lan) || Promise.reject(data))
.catch(() => 'auto')
}
@@ -184,12 +185,7 @@ function remoteLangCheck(text: string): Promise<string> {
async function getToken(): Promise<{ gtk: string; token: string }> {
const homepage = await fetchPlainText('https://fanyi.baidu.com', {
withCredentials: true,
- headers: {
- cookie:
- process.env.NODE_ENV === 'test'
- ? 'BAIDUID=8971CB398A02E6B27F50DFF1DE3164BF:FG=1;'
- : ''
- }
+ headers
})
return {
@@ -198,14 +194,16 @@ async function getToken(): Promise<{ gtk: string; token: string }> {
}
}
-function sign(text: string, gtk: string) {
+/* eslint-disable */
+// prettier-ignore
+function sign (text: string, gtk: string) {
let o = text.length
- o > 30 &&
- (text =
- '' +
- text.substr(0, 10) +
- text.substr(Math.floor(o / 2) - 5, 10) +
- text.substr(-10, 10))
+ o > 30 && (text =
+ '' +
+ text.substr(0, 10) +
+ text.substr(Math.floor(o / 2) - 5, 10) +
+ text.substr(-10, 10)
+ )
let t = gtk || ''
let e = t.split('.')
@@ -257,3 +255,4 @@ function sign(text: string, gtk: string) {
return r
}
}
+/* eslint-enable */
diff --git a/src/components/dictionaries/caiyun/engine.ts b/src/components/dictionaries/caiyun/engine.ts
index 5187adca3..32c276852 100644
--- a/src/components/dictionaries/caiyun/engine.ts
+++ b/src/components/dictionaries/caiyun/engine.ts
@@ -70,26 +70,26 @@ export const search: SearchFunction<
}
return (
- axios
- .post('https://api.interpreter.caiyunai.com/v1/translator', {
- headers: {
- Accept: 'application/json, text/plain, */*',
- 'Content-Type': 'application/json;charset=UTF-8',
- DNT: '1',
- Origin: 'https://fanyi.caiyunapp.com',
- Referer: 'https://fanyi.caiyunapp.com/',
- 'X-Authorization': await getToken()
- },
- withCredentials: false,
- responseType: 'json',
- data: JSON.stringify({
- media: 'text',
- os_type: 'web',
- request_id: 'web_fanyi',
- source: text,
- trans_type: `${sl}2${tl}`
- })
+ axios('https://api.interpreter.caiyunai.com/v1/translator', {
+ method: 'post',
+ headers: {
+ Accept: 'application/json, text/plain, */*',
+ 'Content-Type': 'application/json;charset=UTF-8',
+ DNT: '1',
+ Origin: 'https://fanyi.caiyunapp.com',
+ Referer: 'https://fanyi.caiyunapp.com/',
+ 'X-Authorization': await getToken()
+ },
+ withCredentials: false,
+ responseType: 'json',
+ data: JSON.stringify({
+ media: 'text',
+ os_type: 'web',
+ request_id: 'web_fanyi',
+ source: text,
+ trans_type: `${sl}2${tl}`
})
+ })
.then(({ data }) => handleJSON(data, sl, tl, text))
// return empty result so that user can still toggle language
.catch(
diff --git a/src/components/dictionaries/sogou/engine.ts b/src/components/dictionaries/sogou/engine.ts
index fd763d62a..ceced1483 100644
--- a/src/components/dictionaries/sogou/engine.ts
+++ b/src/components/dictionaries/sogou/engine.ts
@@ -76,27 +76,27 @@ export const search: SearchFunction<
}
return (
- axios
- .post('https://fanyi.sogou.com/reventondc/translate', {
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- 'X-Requested-With': 'XMLHttpRequest'
- },
- data: new URLSearchParams({
- from: sl,
- to: tl,
- text: encodeURIComponent(text).replace(/%20/g, '+'),
- uuid: getUUID(),
- s: md5('' + sl + tl + text + (await getSogouToken())),
- client: 'pc',
- fr: 'browser_pc',
- useDetect: 'on',
- useDetectResult: 'on',
- needQc: '1',
- oxford: 'on',
- isReturnSugg: 'on'
- })
+ axios('https://fanyi.sogou.com/reventondc/translate', {
+ method: 'post',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'X-Requested-With': 'XMLHttpRequest'
+ },
+ data: new URLSearchParams({
+ from: sl,
+ to: tl,
+ text: encodeURIComponent(text).replace(/%20/g, '+'),
+ uuid: getUUID(),
+ s: md5('' + sl + tl + text + (await getSogouToken())),
+ client: 'pc',
+ fr: 'browser_pc',
+ useDetect: 'on',
+ useDetectResult: 'on',
+ needQc: '1',
+ oxford: 'on',
+ isReturnSugg: 'on'
})
+ })
.then(({ data: { data } }) => handleJSON(data, sl, tl))
// return empty result so that user can still toggle language
.catch(
diff --git a/src/components/dictionaries/tencent/engine.ts b/src/components/dictionaries/tencent/engine.ts
index 4cb966fe9..beaf06c0d 100644
--- a/src/components/dictionaries/tencent/engine.ts
+++ b/src/components/dictionaries/tencent/engine.ts
@@ -76,7 +76,9 @@ export const search: SearchFunction<TencentResult, MachineTranslatePayload> = (
return (
getToken()
.then(({ qtv, qtk }) =>
- axios.post('https://fanyi.qq.com/api/translate', {
+ axios('https://fanyi.qq.com/api/translate', {
+ method: 'post',
+ withCredentials: false,
headers: {
Accept: 'application/json, text/javascript, */*; q=0.01',
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
diff --git a/src/components/dictionaries/tencent/favicon.png b/src/components/dictionaries/tencent/favicon.png
index 75ce72630..693976d29 100644
Binary files a/src/components/dictionaries/tencent/favicon.png and b/src/components/dictionaries/tencent/favicon.png differ
|
fix
|
axios api
|
aefd2b1c76de2c98cd3c93ffc71d13bb238b5424
|
2019-03-09 15:38:42
|
CRIMX
|
fix(dicts): add mp3 playing and fixing styles
| false
|
diff --git a/src/components/dictionaries/cobuild/View.tsx b/src/components/dictionaries/cobuild/View.tsx
index b19e9fe35..42579d657 100644
--- a/src/components/dictionaries/cobuild/View.tsx
+++ b/src/components/dictionaries/cobuild/View.tsx
@@ -3,19 +3,21 @@ import Speaker from '@/components/Speaker'
import StarRates from '@/components/StarRates'
import { COBUILDResult, COBUILDCibaResult, COBUILDColResult } from './engine'
import { ViewPorps } from '@/components/dictionaries/helpers'
+import withStaticSpeaker from '@/components/withStaticSpeaker'
-interface COBUILDState {
+interface COBUILDColState {
curTab: string
}
-export default class DictCOBUILD extends React.PureComponent<ViewPorps<COBUILDResult>, COBUILDState> {
- state: COBUILDState = {
+export class DictCOBUILDCol extends React.Component<ViewPorps<COBUILDColResult>, COBUILDColState> {
+ state: COBUILDColState = {
curTab: ''
}
tabWheelDebounce: any
handleTabClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
+ e.stopPropagation()
e.preventDefault()
this.setState({ curTab: e.currentTarget.dataset.id || '' })
}
@@ -34,43 +36,9 @@ export default class DictCOBUILD extends React.PureComponent<ViewPorps<COBUILDRe
}, 50)
}
- renderCiba (result: COBUILDCibaResult) {
- return (
- <>
- <h1 className='dictCOBUILD-Title'>{result.title}</h1>
- {result.prons &&
- <ul className='dictCOBUILD-Pron'>
- {result.prons.map(p => (
- <li key={p.phsym} className='dictCOBUILD-PronItem'>
- {p.phsym}
- <Speaker src={p.audio} />
- </li>
- ))}
- </ul>
- }
- <div className='dictCOBUILD-Rate'>
- {result.star as number >= 0 &&
- <StarRates rate={result.star} />
- }
- {result.level &&
- <span className='dictCOBUILD-Level'>{result.level}</span>
- }
- </div>
- {result.defs &&
- <ol className='dictCOBUILD-Defs'>
- {result.defs.map((def, i) => (
- <li className='dictCOBUILD-Def'
- key={i}
- dangerouslySetInnerHTML={{ __html: def }}
- />
- ))}
- </ol>
- }
- </>
- )
- }
+ render () {
+ const { result } = this.props
- renderCollins (result: COBUILDColResult) {
const curSec = this.state.curTab
? result.sections.find(({ id }) => id === this.state.curTab) || result.sections[0]
: result.sections[0]
@@ -123,12 +91,52 @@ export default class DictCOBUILD extends React.PureComponent<ViewPorps<COBUILDRe
</main>
)
}
+}
+
+export const DictCOBUILDColWithSpeaker = withStaticSpeaker(DictCOBUILDCol, 'dictCOBUILD-Speaker')
+
+export function DictCOBUILDCiba (result: COBUILDCibaResult) {
+ return (
+ <>
+ <h1 className='dictCOBUILD-Title'>{result.title}</h1>
+ {result.prons &&
+ <ul className='dictCOBUILD-Pron'>
+ {result.prons.map(p => (
+ <li key={p.phsym} className='dictCOBUILD-PronItem'>
+ {p.phsym}
+ <Speaker src={p.audio} />
+ </li>
+ ))}
+ </ul>
+ }
+ <div className='dictCOBUILD-Rate'>
+ {result.star as number >= 0 &&
+ <StarRates rate={result.star} />
+ }
+ {result.level &&
+ <span className='dictCOBUILD-Level'>{result.level}</span>
+ }
+ </div>
+ {result.defs &&
+ <ol className='dictCOBUILD-Defs'>
+ {result.defs.map((def, i) => (
+ <li className='dictCOBUILD-Def'
+ key={i}
+ dangerouslySetInnerHTML={{ __html: def }}
+ />
+ ))}
+ </ol>
+ }
+ </>
+ )
+}
+export default class DictCOBUILD extends React.PureComponent<ViewPorps<COBUILDResult>> {
render () {
const { result } = this.props
switch (result.type) {
- case 'ciba': return this.renderCiba(result as COBUILDCibaResult)
- case 'collins': return this.renderCollins(result as COBUILDColResult)
+ case 'ciba': return DictCOBUILDCiba(result as COBUILDCibaResult)
+ case 'collins': return <DictCOBUILDColWithSpeaker {...this.props as ViewPorps<COBUILDColResult>} />
default: return ''
}
}
diff --git a/src/components/dictionaries/cobuild/_style.scss b/src/components/dictionaries/cobuild/_style.scss
index 174e4d5cf..6c528654e 100644
--- a/src/components/dictionaries/cobuild/_style.scss
+++ b/src/components/dictionaries/cobuild/_style.scss
@@ -2463,12 +2463,6 @@
display: inline-block;
}
- @media screen and (max-width:761px) {
- .navigation .tabsNavigation {
- overflow-x: auto;
- }
- }
-
.dc .frenquency-title {
float: right;
}
|
fix
|
add mp3 playing and fixing styles
|
af6e6dfb262b82101420f1f05150dcd81f7dac6b
|
2018-04-14 18:15:09
|
CRIMX
|
feat(scss): add scss globals
| false
|
diff --git a/src/_sass_global/_interfaces.scss b/src/_sass_global/_interfaces.scss
new file mode 100644
index 000000000..c40ccd3c8
--- /dev/null
+++ b/src/_sass_global/_interfaces.scss
@@ -0,0 +1,91 @@
+/*-----------------------------------------------*\
+ Tailored for exposed components
+\*-----------------------------------------------*/
+
+%reset-important {
+ background-attachment: scroll !important;
+ background-color: transparent !important;
+ background-image: none !important;
+ background-position: 0 0 !important;
+ background-repeat: repeat !important;
+ border-color: transparent !important;
+ border-radius: 0 !important;
+ border-style: none !important;
+ border-width: 0 !important;
+ bottom: auto !important;
+ clear: none !important;
+ clip: auto !important;
+ color: inherit !important;
+ counter-increment: none !important;
+ counter-reset: none !important;
+ cursor: auto !important;
+ direction: inherit !important;
+ display: inline !important;
+ float: none !important;
+ font-family: inherit !important;
+ font-size: inherit !important;
+ font-style: inherit !important;
+ font-variant: normal !important;
+ font-weight: inherit !important;
+ height: auto !important;
+ left: auto !important;
+ letter-spacing: normal !important;
+ line-height: inherit !important;
+ list-style-type: inherit !important;
+ list-style-position: outside !important;
+ list-style-image: none !important;
+ margin: 0 !important;
+ max-height: none !important;
+ max-width: none !important;
+ min-height: 0 !important;
+ min-width: 0 !important;
+ opacity: 1 !important;
+ outline: invert none medium !important;
+ overflow: visible !important;
+ padding: 0 !important;
+ position: static !important;
+ quotes: "" "" !important;
+ right: auto !important;
+ table-layout: auto !important;
+ text-align: inherit !important;
+ text-decoration: inherit !important;
+ text-indent: 0 !important;
+ text-transform: none !important;
+ top: auto !important;
+ unicode-bidi: normal !important;
+ vertical-align: baseline !important;
+ visibility: inherit !important;
+ white-space: normal !important;
+ width: auto !important;
+ word-spacing: normal !important;
+ z-index: auto !important;
+
+ /* CSS3 */
+ /* Including all prefixes according to http://caniuse.com/ */
+ /* CSS Animations don't cascade, so don't require resetting */
+ background-origin: padding-box !important;
+ background-clip: border-box !important;
+ background-size: auto !important;
+ border-image: none !important;
+ border-radius: 0 !important;
+ box-shadow: none !important;
+ box-sizing: content-box !important;
+ column-count: auto !important;
+ column-gap: normal !important;
+ column-rule: medium none black !important;
+ column-span: 1 !important;
+ column-width: auto !important;
+ font-feature-settings: normal !important;
+ overflow-x: visible !important;
+ overflow-y: visible !important;
+ hyphens: manual !important;
+ perspective: none !important;
+ perspective-origin: 50% 50% !important;
+ backface-visibility: visible !important;
+ text-shadow: none !important;
+ transition: all 0s ease 0s !important;
+ transform: none; // React (shockingly) doesn't support !important
+ transform-origin: 50% 50% !important;
+ transform-style: flat !important;
+ word-break: normal !important;
+}
diff --git a/src/_sass_global/_variables.scss b/src/_sass_global/_variables.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/_sass_global/_z-indices.scss b/src/_sass_global/_z-indices.scss
index 86e3aad02..aa3d6b2b2 100644
--- a/src/_sass_global/_z-indices.scss
+++ b/src/_sass_global/_z-indices.scss
@@ -1,13 +1,11 @@
-/*------------------------------------*\
- z-index
-\*------------------------------------*/
+// Max 2^31 − 1 = 2147483647
-$global-zindex-dropdown-backdrop: 99999999999999999999999999999999999999999999999991 !default;
-$global-zindex-navbar: 99999999999999999999999999999999999999999999999992 !default;
-$global-zindex-dropdown: 99999999999999999999999999999999999999999999999993 !default;
-$global-zindex-fixed: 99999999999999999999999999999999999999999999999994 !default;
-$global-zindex-sticky: 99999999999999999999999999999999999999999999999995 !default;
-$global-zindex-modal-backdrop: 99999999999999999999999999999999999999999999999996 !default;
-$global-zindex-modal: 99999999999999999999999999999999999999999999999997 !default;
-$global-zindex-popover: 99999999999999999999999999999999999999999999999998 !default;
-$global-zindex-tooltip: 99999999999999999999999999999999999999999999999999 !default;
+$global-zindex-dropdown-backdrop: 2147483639 !default;
+$global-zindex-navbar: 2147483640 !default;
+$global-zindex-dropdown: 2147483641 !default;
+$global-zindex-fixed: 2147483642 !default;
+$global-zindex-sticky: 2147483643 !default;
+$global-zindex-modal-backdrop: 2147483644 !default;
+$global-zindex-modal: 2147483645 !default;
+$global-zindex-popover: 2147483646 !default;
+$global-zindex-tooltip: 2147483647 !default;
|
feat
|
add scss globals
|
23290ddb28fa5dec15f773ff4495e1aaf260b1bd
|
2018-05-06 16:25:29
|
CRIMX
|
refactor(options): rename entry
| false
|
diff --git a/src/options/index.js b/src/options/index.ts
similarity index 100%
rename from src/options/index.js
rename to src/options/index.ts
|
refactor
|
rename entry
|
d4769dbb53589ea7d042cb582e9e51fd53b3e3c1
|
2019-09-07 23:53:42
|
crimx
|
perf(panel): transition opacity
| false
|
diff --git a/src/content/components/DictItem/DictItem.scss b/src/content/components/DictItem/DictItem.scss
index 76c89f7f9..29b05861a 100644
--- a/src/content/components/DictItem/DictItem.scss
+++ b/src/content/components/DictItem/DictItem.scss
@@ -77,7 +77,7 @@
&::after {
content: '';
position: absolute;
- top: 100%;
+ top: 0;
left: 0;
width: 100%;
height: 100%;
@@ -86,18 +86,14 @@
rgba(225, 225, 225, 0.2) 60%,
rgba(225, 225, 225, 0.7) 100%
);
+ opacity: 0;
}
&:hover {
outline: none;
&::after {
- /**
- * use top instead of opacity to avoid GUP acceleration
- * which might casue iframe flickering in Chrome 66
- * @todo add back after Chrome 68
- */
- top: 0;
+ opacity: 1;
}
}
}
@@ -143,7 +139,8 @@
}
.dictItem-FoldMask::after {
- transition: top 400ms;
+ will-change: opacity;
+ transition: opacity 400ms;
}
.dictItem-BodyMesure {
|
perf
|
transition opacity
|
549983ac77d58de9471c8cf01a29ff95b4616e8f
|
2020-06-17 20:10:56
|
crimx
|
build: upgrade deps
| false
|
diff --git a/package.json b/package.json
index b6d666a99..f4a6c03a0 100644
--- a/package.json
+++ b/package.json
@@ -46,14 +46,14 @@
},
"dependencies": {
"@ant-design/icons": "^4.0.5",
- "@opentranslate/baidu": "^1.3.0",
- "@opentranslate/caiyun": "^1.3.0",
- "@opentranslate/google": "^1.3.0",
- "@opentranslate/languages": "^1.3.0",
- "@opentranslate/sogou": "^1.3.0",
- "@opentranslate/tencent": "^1.3.0",
- "@opentranslate/translator": "^1.3.0",
- "@opentranslate/youdao": "^1.3.0",
+ "@opentranslate/baidu": "^1.4.0",
+ "@opentranslate/caiyun": "^1.4.0",
+ "@opentranslate/google": "^1.4.0",
+ "@opentranslate/languages": "^1.4.0",
+ "@opentranslate/sogou": "^1.4.0",
+ "@opentranslate/tencent": "^1.4.0",
+ "@opentranslate/translator": "^1.4.0",
+ "@opentranslate/youdao": "^1.4.0",
"@types/classnames": "^2.2.10",
"@types/dompurify": "0.0.32",
"@types/firefox-webext-browser": "^67.0.2",
@@ -80,7 +80,7 @@
"md5": "^2.2.1",
"memoize-one": "^5.1.0",
"normalize-scss": "^7.0.1",
- "observable-hooks": "^2.1.2",
+ "observable-hooks": "^3.0.0",
"pako": "^1.0.10",
"qrcode.react": "^0.9.3",
"react": "^16.10.0",
diff --git a/yarn.lock b/yarn.lock
index f814f8107..2265323dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1722,74 +1722,74 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"
-"@opentranslate/baidu@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/baidu/-/baidu-1.3.0.tgz#52881861571d457bea9d6662d77bc66c1cf801df"
- integrity sha512-U8urf2Bi1KXqifpytjFXMz2T2TEZ+m+J0VtNEWImZJZOlGTz34bhoyotY7WdzwGSdMSHvb0ojR2m4ck16DrNkQ==
+"@opentranslate/baidu@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/baidu/-/baidu-1.4.0.tgz#25e262ca3c624776c5f22d5006c01754e2dd90d6"
+ integrity sha512-wTuNVdGRIzTLPTDJTFWKD0gtCGK36M0myVzTU50kF+2+nSfJqbvZjLAElGoCNOjp+EcEQG/0gCkchaSw2UVT0g==
dependencies:
- "@opentranslate/translator" "^1.3.0"
+ "@opentranslate/translator" "^1.4.0"
"@types/md5" "^2.1.33"
"@types/qs" "^6.5.3"
md5 "^2.2.1"
qs "^6.8.0"
-"@opentranslate/caiyun@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/caiyun/-/caiyun-1.3.0.tgz#15e8ae6e41dcd2592ebf8a3055f722cc02e29eaa"
- integrity sha512-9IxgODB7XsLU6O0wEqjfvmHcSDMBNnJDcTC48sE0hwA9CP2kNFdxAaVCmrUY0CuxhNu/dpgl1oAxnk2yCQqUoA==
+"@opentranslate/caiyun@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/caiyun/-/caiyun-1.4.0.tgz#803201e72b2db11d693fa267ef1556742b8571b4"
+ integrity sha512-JuhGCgLP4U/02noa4+9TmCxWBdox6ZomiKtzy4CyZgthbL64dX/qyh/Vzt/Rl/Y4ClsVCVgMUxjVqDvJiO7DEA==
dependencies:
- "@opentranslate/translator" "^1.3.0"
+ "@opentranslate/translator" "^1.4.0"
"@types/node" "^12.11.7"
"@types/qs" "^6.5.3"
qs "^6.8.0"
-"@opentranslate/google@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/google/-/google-1.3.0.tgz#d1ea6e6ea09145cf701b6838696bb6e09e8b4083"
- integrity sha512-Wb26sMqfu1LSX4N2RI/yZMHMNM3jkU7S0fFPCEQSWPO35+cxzrHw2/6LSfWLRrrR0Ww6VJepSZpF5uqaeonccw==
+"@opentranslate/google@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/google/-/google-1.4.0.tgz#64a67f06585bc87c08d54fdac3faa711c463e5b4"
+ integrity sha512-Y02wZF+oAdcpEG8X0rVJLZc9lm2rou/SXDMvRRdUITDpaMbFWkVDXRCnQYfw/OOADVu+zFzX5g4OS2eQW8w4aA==
dependencies:
- "@opentranslate/translator" "^1.3.0"
+ "@opentranslate/translator" "^1.4.0"
-"@opentranslate/languages@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/languages/-/languages-1.3.0.tgz#9f9afdf0dec1d6ebe10121a47b1efcc1b40a69c6"
- integrity sha512-NEDNiVPFxNxZpdpWK4wCT1woaF1As1bzqTt5W2KO3LAJRPQ59QhIUOiTOZcre+dS5+karIe6f8dtaMwAxSMmlQ==
+"@opentranslate/languages@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/languages/-/languages-1.4.0.tgz#24ff6383cf189b03b8d19daacbf0e7c1901e1619"
+ integrity sha512-m8PmwRG3/nTI4F9L03c7139VdnIRnTWGY28aA5wojXbilG2uBK0on7fB/fLwGr+B+2e6KgMEYIQ/3zin+pwPDQ==
-"@opentranslate/sogou@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/sogou/-/sogou-1.3.0.tgz#2291f9ebf2777dbef1b49bf52cba83aa49b908d2"
- integrity sha512-IUTfV0UWXZ3bAmmAb3nTYMYaU/PF9YiBsIGqJDv87iKI9039464+EA/0dodOY0vg5bCH9oFl/+w98HMdrwz4JA==
+"@opentranslate/sogou@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/sogou/-/sogou-1.4.0.tgz#169a998b1952a380c8f9b5fbf03495ef445aa393"
+ integrity sha512-/+/yELxwUE3e01HRCB/x1Lj9iC8zqCf/EJ7Ny5W5H+LH2VOk4jQ7JyoPcS9jQjfMHymGtMzCvSgGTG8cKjAddw==
dependencies:
- "@opentranslate/translator" "^1.3.0"
+ "@opentranslate/translator" "^1.4.0"
"@types/md5" "^2.1.33"
"@types/qs" "^6.5.3"
md5 "^2.2.1"
qs "^6.8.0"
-"@opentranslate/tencent@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/tencent/-/tencent-1.3.0.tgz#e3ab16850ae50d550c46e45419b2c1bea3d48a9c"
- integrity sha512-/riKm6+m5p2sqgm1FAz1eJACE+LkHY1pXKrhduYx5R6gQWNmECJyneng0ua3ViRxHUb33zTNlb3dDBqqW9/gfw==
+"@opentranslate/tencent@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/tencent/-/tencent-1.4.0.tgz#5ec25ffdc78adc937ac43b8ba73cf170dade1e58"
+ integrity sha512-KaJrPnS5OwlKIfBQW+r1gWNN8CYlRK9/th0ipcFLCCKwH1aFzkAd0zUDBOEnLODlv1X4TFIA/zaavGnWO+QH+Q==
dependencies:
- "@opentranslate/translator" "^1.3.0"
+ "@opentranslate/translator" "^1.4.0"
"@types/crypto-js" "^3.1.43"
crypto-js "^3.1.9-1"
-"@opentranslate/translator@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/translator/-/translator-1.3.0.tgz#803c3929fc8fdec0b013f6841e784016c5bb3d33"
- integrity sha512-ykA01Jkoh9IAjC8kHPkAn9ROfG+NkUYh7jSJd7JEy6JTSv/DIuQksDUNPkof3QzEwPB1I76XIx+xGs7nhkXysA==
+"@opentranslate/translator@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/translator/-/translator-1.4.0.tgz#b60153d993c1d1e46772cca2473a5a61b1d6d932"
+ integrity sha512-1rPpTsiobXNh1JsPlwQpSgd8hIz83ZEpRWbhsqCTAZ++EiTiZESCFMVamIf/sNvdd98zFwtOUHHY/QdCfMXzOQ==
dependencies:
- "@opentranslate/languages" "^1.3.0"
+ "@opentranslate/languages" "^1.4.0"
axios "^0.19.0"
franc-min "^4.1.0"
-"@opentranslate/youdao@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@opentranslate/youdao/-/youdao-1.3.0.tgz#5958b4cec019743860e9c00dacece48e7c080300"
- integrity sha512-X6cEvn010G5z/ZABHUl3O/ftFr7HBhUmC8rU7C+HDRws9rVJqQnPk3hXxhj5Ez1SBNDBQAy8EfUqm/GtN1vlLQ==
+"@opentranslate/youdao@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@opentranslate/youdao/-/youdao-1.4.0.tgz#6988b5106a46974dbedecf17f21815d58803c099"
+ integrity sha512-SS5WZZVG4hSjEq4rp3M8pGcA0cBQa5yxJQRGtu+Zfdf2eVPE6iTcjqmgrKvoLH08jrGf6PmaJ74X7/feFkgStw==
dependencies:
- "@opentranslate/translator" "^1.3.0"
+ "@opentranslate/translator" "^1.4.0"
js-sha256 "^0.9.0"
"@reach/router@^1.2.1":
@@ -10704,10 +10704,10 @@ object.values@^1.1.0, object.values@^1.1.1:
function-bind "^1.1.1"
has "^1.0.3"
-observable-hooks@^2.1.2:
- version "2.3.4"
- resolved "https://registry.yarnpkg.com/observable-hooks/-/observable-hooks-2.3.4.tgz#48eb43ed52d0fe513a8dcb610c234a332a1e0540"
- integrity sha512-3RzdzuzH869aU+6v4QMgWh8w9SM9l3iqNfLLo8g86Whu8hkkqQqt6wcqbjd7uwQ5nvyn1fxS9rn+Kt3PrBmQvg==
+observable-hooks@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/observable-hooks/-/observable-hooks-3.0.0.tgz#bfe3c9ad268dad4701b7bc48173512f3276d77ac"
+ integrity sha512-NmVWLZNyh6TK3oilHIEKvLOO2Hcub/XmT3F4qIuf6MCBGjsZs1gLdr985vp3EwCH6nTQSJ/+bCj/y+Gl/B/gwQ==
obuf@^1.0.0, obuf@^1.1.2:
version "1.1.2"
|
build
|
upgrade deps
|
9cef801756c9862873cb819b7224b1a930217ecc
|
2018-05-19 17:18:06
|
CRIMX
|
refactor(manifest): add more web accessible resources
| false
|
diff --git a/src/manifest/common.manifest.json b/src/manifest/common.manifest.json
index be5a176f2..c36fca6ac 100644
--- a/src/manifest/common.manifest.json
+++ b/src/manifest/common.manifest.json
@@ -53,6 +53,15 @@
"wordeditor.html",
"wordeditor.js",
"wordeditor.css",
+ "options.html",
+ "options.js",
+ "options.css",
+ "notebook.html",
+ "notebook.js",
+ "notebook.css",
+ "history.html",
+ "history.js",
+ "history.css",
"static/*"
],
|
refactor
|
add more web accessible resources
|
96fbdd7183687fc1c5d5682b8319f7ffdbce7760
|
2018-09-01 09:07:40
|
CRIMX
|
refactor(options): auto focus and select
| false
|
diff --git a/src/options/OptConfigProfile.vue b/src/options/OptConfigProfile.vue
index ed5915609..01b6b3b3c 100644
--- a/src/options/OptConfigProfile.vue
+++ b/src/options/OptConfigProfile.vue
@@ -79,7 +79,7 @@
<h4 class="modal-title">{{ $t('opt:config_profile_add') }}</h4>
</div>
<div class="modal-body">
- <input type="text" class="form-control" v-model="newProfileName">
+ <input v-focus v-select type="text" class="form-control" v-model="newProfileName">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" @click="isShowAdd = false">{{ $t('cancel') }}</button>
diff --git a/src/options/index.ts b/src/options/index.ts
index 9bfaf8d18..dc47072db 100644
--- a/src/options/index.ts
+++ b/src/options/index.ts
@@ -26,6 +26,8 @@ if (process.env.NODE_ENV !== 'development') {
Vue.use(VueStash)
Vue.use(VueI18Next)
+Vue.directive('focus', { inserted: el => el.focus() })
+Vue.directive('select', { inserted: (el: any) => el.select() })
Vue.config.productionTip = false
// Vue.use(VueI18Next) before loading
|
refactor
|
auto focus and select
|
76f17cbe3fc7e6041ab6bc6f94a0db38f9b4da17
|
2018-05-04 10:14:52
|
CRIMX
|
fix(content): fix firefox svg animation
| false
|
diff --git a/src/content/components/DictItem/_style.scss b/src/content/components/DictItem/_style.scss
index bf8047260..a9d90162a 100644
--- a/src/content/components/DictItem/_style.scss
+++ b/src/content/components/DictItem/_style.scss
@@ -76,6 +76,8 @@
border: none;
margin: 0 0 0 auto;
padding: 0;
+ cursor: pointer;
+ user-select: none;
&:hover {
outline: none;
@@ -88,8 +90,6 @@
height: 18px;
padding: 3px;
transition: transform 400ms;
- cursor: pointer;
- user-select: none;
&.isActive {
transform: rotate(-90deg);
@@ -153,4 +153,3 @@
90% { transform: translateX( 80px); opacity: 1; }
100% { transform: translateX(110px); opacity: 0; }
}
-
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index 63bd3b66b..d084ea074 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -8,10 +8,6 @@ import PortalFrame from '@/components/PortalFrame'
import MenuBar, { MenuBarDispatchers } from '../MenuBar'
import DictItem, { DictItemDispatchers } from '../DictItem'
-if (process.env.NODE_ENV === 'development') {
- require('@/panel')
-}
-
export type DictPanelDispatchers = DictItemDispatchers & MenuBarDispatchers & {
searchText: (arg?: { id?: DictID, info?: SelectionInfo | string }) => any
}
@@ -31,9 +27,7 @@ export default class DictPanel extends React.Component<DictPanelProps> {
frameHead = '<meta name="viewport" content="width=device-width, initial-scale=1">\n' + (
process.env.NODE_ENV === 'production'
? `<link type="text/css" rel="stylesheet" href="${browser.runtime.getURL('panel.css')}" />`
- : Array.from(document.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]'))
- .map(link => link.outerHTML)
- .join('\n')
+ : Array.from(document.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]'))[0].outerHTML
)
render () {
diff --git a/src/content/components/MenuBar/_style.scss b/src/content/components/MenuBar/_style.scss
index 964169049..4c47b0415 100644
--- a/src/content/components/MenuBar/_style.scss
+++ b/src/content/components/MenuBar/_style.scss
@@ -41,6 +41,13 @@
padding: 4px;
}
+.panel-MenuBar_Btn-close {
+ @extend .panel-MenuBar_Btn;
+ &:hover > svg {
+ animation: panel-MenuBar_Spin 400ms linear infinite;
+ }
+}
+
.panel-MenuBar_DragArea {
flex: 1.5;
align-self: stretch;
@@ -95,14 +102,6 @@
}
}
-.panel-MenuBar_Icon-close {
- @extend .panel-MenuBar_Icon;
-
- &:hover {
- animation: panel-MenuBar_Spin 400ms linear infinite;
- }
-}
-
@keyframes panel-MenuBar_Spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index 14e48f32b..127e4b09c 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -279,9 +279,9 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
</svg>
</button>
- <button className='panel-MenuBar_Btn' onClick={this.handleIconCloseClick}>
+ <button className='panel-MenuBar_Btn-close' onClick={this.handleIconCloseClick}>
<svg
- className='panel-MenuBar_Icon-close'
+ className='panel-MenuBar_Icon'
width='30' height='30' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 31.112 31.112'
>
<title>{t('tipClosePanel')}</title>
|
fix
|
fix firefox svg animation
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.