Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: d-i-t-a/R2D2BC
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.1.0-beta.3
Choose a base ref
...
head repository: d-i-t-a/R2D2BC
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref

Commits on Aug 10, 2022

  1. Copy the full SHA
    636d2c6 View commit details
  2. updated dependencies

    aferditamuriqi committed Aug 10, 2022
    Copy the full SHA
    771212e View commit details
  3. Merge pull request #378 from d-i-t-a/bugfix/optional-configuration-pr…

    …operties
    
    fixed optional configuration properties
    aferditamuriqi authored Aug 10, 2022
    Copy the full SHA
    7a153b7 View commit details
  4. version bump

    aferditamuriqi committed Aug 10, 2022
    Copy the full SHA
    7e7bd2b View commit details
  5. Copy the full SHA
    8fff138 View commit details
  6. Merge pull request #379 from d-i-t-a/bugfix/replace-node-sass

    replaced node-sass with sass
    aferditamuriqi authored Aug 10, 2022
    Copy the full SHA
    4341e21 View commit details
  7. Copy the full SHA
    5b79c7a View commit details
  8. version bump

    aferditamuriqi committed Aug 10, 2022
    Copy the full SHA
    6bee3e5 View commit details
  9. Copy the full SHA
    c07d321 View commit details
  10. Merge pull request #380 from d-i-t-a/bugfix/remove-unused-config

    removed uplink as it isn't used since v1
    aferditamuriqi authored Aug 10, 2022
    Copy the full SHA
    d34368b View commit details

Commits on Aug 11, 2022

  1. Copy the full SHA
    e0afca9 View commit details
  2. version bump

    aferditamuriqi committed Aug 11, 2022
    Copy the full SHA
    faa4e91 View commit details
  3. Merge pull request #381 from d-i-t-a/bugfix/optimized-console-logger

    optimized console logger
    aferditamuriqi authored Aug 11, 2022
    Copy the full SHA
    ea78fb3 View commit details
  4. Copy the full SHA
    9fdd8df View commit details
  5. Copy the full SHA
    45ba7b8 View commit details
  6. version bump

    aferditamuriqi committed Aug 11, 2022
    Copy the full SHA
    3539de4 View commit details
  7. Merge pull request #382 from d-i-t-a/bugfix/cisl-readaloud-6

    CISL read-aloud fixes
    aferditamuriqi authored Aug 11, 2022
    Copy the full SHA
    4a7d9ed View commit details

Commits on Aug 20, 2022

  1. fixes request config

    aferditamuriqi committed Aug 20, 2022
    Copy the full SHA
    fc91044 View commit details

Commits on Aug 23, 2022

  1. Copy the full SHA
    fef3210 View commit details
  2. version bump

    aferditamuriqi committed Aug 23, 2022
    Copy the full SHA
    0ace03f View commit details
  3. Copy the full SHA
    eaa891f View commit details

Commits on Sep 11, 2022

  1. Fixes safari read along (mobile safari selection issues, and mobile /…

    … desktop safari speech highlight issues)
    aferditamuriqi committed Sep 11, 2022
    Copy the full SHA
    c742ce6 View commit details
  2. Copy the full SHA
    f8f3bb7 View commit details
  3. Copy the full SHA
    6efbe25 View commit details
  4. Copy the full SHA
    f1ae59f View commit details
  5. version bump

    aferditamuriqi committed Sep 11, 2022
    Copy the full SHA
    3889d7f View commit details
  6. Merge pull request #384 from d-i-t-a/bugfix/cisl-readaloud-7

    CISL read-aloud and mobile safari selection fixes
    aferditamuriqi authored Sep 11, 2022
    Copy the full SHA
    4cd4fa9 View commit details
  7. Copy the full SHA
    e6a085b View commit details
  8. Refactored annotation to accommodate comments side bar. As well as fi…

    …xed several issues found with annotation sync
    aferditamuriqi committed Sep 11, 2022
    Copy the full SHA
    6474766 View commit details
  9. version bump

    aferditamuriqi committed Sep 11, 2022
    Copy the full SHA
    a5fb253 View commit details
  10. Linter fixes

    aferditamuriqi committed Sep 11, 2022
    Copy the full SHA
    69045ff View commit details
  11. Merge pull request #385 from d-i-t-a/bugfix/allvit-fixes-1

    Allvit and Bibliotheca Annotation fixes
    aferditamuriqi authored Sep 11, 2022
    Copy the full SHA
    48474ee View commit details

Commits on Sep 20, 2022

  1. version bump

    aferditamuriqi committed Sep 20, 2022
    Copy the full SHA
    a8da6cd View commit details
  2. Copy the full SHA
    e165394 View commit details
  3. Merge pull request #386 from d-i-t-a/bugfix/media-overlay-pause

    media overlay pause - audio element could be undefined
    aferditamuriqi authored Sep 20, 2022
    Copy the full SHA
    9257391 View commit details

Commits on Sep 21, 2022

  1. version bump

    aferditamuriqi committed Sep 21, 2022
    Copy the full SHA
    38fb399 View commit details
  2. Copy the full SHA
    200cbcf View commit details
  3. Merge pull request #387 from d-i-t-a/bugfix/media-overlay-loop-issue

    media overlay loop issue
    aferditamuriqi authored Sep 21, 2022
    Copy the full SHA
    ec64e08 View commit details
  4. version bump

    aferditamuriqi committed Sep 21, 2022
    Copy the full SHA
    8a8814a View commit details
  5. Copy the full SHA
    dc2c3f6 View commit details

Commits on Sep 29, 2022

  1. Copy the full SHA
    d390135 View commit details
  2. version bump

    aferditamuriqi committed Sep 29, 2022
    Copy the full SHA
    36514bc View commit details
  3. Merge pull request #389 from d-i-t-a/bugfix/pagebreak-selectors-and-b…

    …ase-urls
    
    page break selectors and base urls
    aferditamuriqi authored Sep 29, 2022
    Copy the full SHA
    619a454 View commit details
  4. Copy the full SHA
    ec73f65 View commit details

Commits on Oct 9, 2022

  1. Initial PDF Navigator

    aferditamuriqi committed Oct 9, 2022
    Copy the full SHA
    8e772ac View commit details
  2. Copy the full SHA
    34f9604 View commit details

Commits on Nov 1, 2022

  1. Bump @xmldom/xmldom from 0.8.2 to 0.8.5

    Bumps [@xmldom/xmldom](https://github.com/xmldom/xmldom) from 0.8.2 to 0.8.5.
    - [Release notes](https://github.com/xmldom/xmldom/releases)
    - [Changelog](https://github.com/xmldom/xmldom/blob/master/CHANGELOG.md)
    - [Commits](xmldom/xmldom@0.8.2...0.8.5)
    
    ---
    updated-dependencies:
    - dependency-name: "@xmldom/xmldom"
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Nov 1, 2022
    Copy the full SHA
    85e5a65 View commit details

Commits on Nov 7, 2022

  1. Copy the full SHA
    279752b View commit details
  2. version bump

    aferditamuriqi committed Nov 7, 2022
    Copy the full SHA
    d4cbcdb View commit details
  3. Merge pull request #397 from d-i-t-a/bugfix/selection-events-on-document

    selection events on document
    aferditamuriqi authored Nov 7, 2022
    Copy the full SHA
    bdbeeff View commit details
Showing with 24,851 additions and 19,022 deletions.
  1. +12 −0 .github/dependabot.yml
  2. +1 −1 .github/workflows/nodejs.yml
  3. +4 −0 .gitignore
  4. +14 −10 build.ts
  5. +1 −1 examples/react/index.tsx
  6. +1 −0 examples/react/tsconfig.json
  7. +4 −0 examples/server.ts
  8. +2 −2 injectables/style/popup.css
  9. +6 −0 injectables/style/style.css
  10. +19,189 −15,890 package-lock.json
  11. +62 −53 package.json
  12. +2 −2 polyfills.js
  13. +3 −1 src/model/Link.ts
  14. +1 −5 src/model/Locator.ts
  15. +19 −16 src/model/Publication.ts
  16. +2 −0 src/model/user-settings/ReadiumCSS.ts
  17. +166 −94 src/model/user-settings/UserSettings.ts
  18. +342 −112 src/modules/AnnotationModule.ts
  19. +98 −113 src/modules/BookmarkModule.ts
  20. +230 −305 src/modules/TTS/TTSModule2.ts
  21. +34 −39 src/modules/TTS/TTSSettings.ts
  22. +76 −43 src/modules/citation/CitationModule.ts
  23. +253 −0 src/modules/consumption/ConsumptionModule.ts
  24. +1 −1 src/modules/highlight/HtmlElementSelector.ts
  25. +2 −4 src/modules/highlight/LayerSettings.ts
  26. +514 −372 src/modules/highlight/TextHighlighter.ts
  27. +1 −0 src/modules/highlight/common/highlight.ts
  28. +35 −65 src/modules/highlight/common/rect-utils.ts
  29. +4 −8 src/modules/highlight/common/selection.ts
  30. +58 −104 src/modules/highlight/renderer/iframe/selection.ts
  31. +53 −52 src/modules/history/HistoryModule.ts
  32. +41 −46 src/modules/linefocus/LineFocusModule.ts
  33. +127 −170 src/modules/mediaoverlays/MediaOverlayModule.ts
  34. +27 −30 src/modules/mediaoverlays/MediaOverlaySettings.ts
  35. +31 −29 src/modules/pagebreak/PageBreakModule.ts
  36. +12 −18 src/modules/positions/TimelineModule.ts
  37. +589 −131 src/modules/protection/ContentProtectionModule.ts
  38. +20 −19 src/modules/sampleread/SampleReadEventHandler.ts
  39. +25 −30 src/modules/search/DefinitionsModule.ts
  40. +67 −35 src/modules/search/Popup.ts
  41. +123 −63 src/modules/search/SearchModule.ts
  42. +10 −8 src/modules/search/searchWithDomSeek.ts
  43. +491 −374 src/navigator/IFrameNavigator.ts
  44. +74 −1 src/navigator/Navigator.ts
  45. +351 −0 src/navigator/PDFNavigator.ts
  46. +444 −258 src/reader.ts
  47. +6 −0 src/store/Annotator.ts
  48. +84 −7 src/store/LocalAnnotator.ts
  49. +12 −6 src/store/LocalStorageStore.ts
  50. +11 −0 src/styles/sass/reader.scss
  51. +5 −3 src/styles/sass/reader/_error.scss
  52. +1 −1 src/styles/sass/reader/_loading.scss
  53. +5 −3 src/styles/sass/reader/_toolbox.scss
  54. +15 −14 src/styles/sass/reader/_tts.scss
  55. +43 −27 src/utils/EventHandler.ts
  56. +181 −0 src/utils/GrabToPan.ts
  57. +0 −22 src/utils/HTMLTemplates.ts
  58. +68 −36 src/utils/KeyboardEventHandler.ts
  59. +4 −1 src/utils/index.ts
  60. +1 −1 src/views/BookView.ts
  61. +1 −1 src/views/FixedBookView.ts
  62. +19 −16 src/views/ReflowableBookView.ts
  63. +53 −17 viewer/index_api.html
  64. +537 −360 viewer/index_dita.html
  65. +139 −0 viewer/index_pdf.html
  66. +0 −2 viewer/index_sampleread.html
  67. +44 −0 viewer/pdf/manifest/sample.json
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
open-pull-requests-limit: 100
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ['10.x', '12.x', '14.x', '16.x']
node: ['14.x', '16.x', '18.x']

steps:
- uses: actions/checkout@v3
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -6,3 +6,7 @@ settings.json
yarn.lock
.parcel-cache
parcel-dist
examples/epubs_
examples/epubs__
examples/epubs___
examples/epubs____
24 changes: 14 additions & 10 deletions build.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import { build as esbuild, BuildOptions } from "esbuild";
import util from "util";
import * as util from "util";
import chalk from "chalk";
import { Options as SassOptions } from "node-sass";
import { promises as fs } from "fs";
import { watch } from "chokidar";
import { debounce } from "debounce";
const copy = util.promisify(require("copy"));
const rimraf = util.promisify(require("rimraf"));
const exec = util.promisify(require("child_process").exec);
const sass = util.promisify(require("node-sass").render);
import debounce from "debounce";
import copy0 from "copy";
import child_process0 from "child_process";
import sass0 from "sass";
import { rimraf } from "rimraf";

const copy = util.promisify(copy0);
const exec = util.promisify(child_process0.exec);
const sass = util.promisify(sass0.render);

const isWatchEnabled = process.argv[2] === "-w";
// for now we bundle for production whenever we aren't in watch mode
// for now, we bundle for production whenever we aren't in watch mode
const isProduction = !isWatchEnabled;

/**
@@ -65,17 +68,18 @@ async function buildTs(
* Compiles SASS to CSS and writes it to the filesystem
*/
async function compileCss(input: string, filename: string) {
const options: SassOptions = {
const options = {
file: input,
sourceMap: true,
outFile: `dist/${filename}.css`,
bundle: false,
outputStyle: "compressed",
};
try {
const result = await sass(options);
const fullPath = `dist/${filename}`;
const p1 = fs.writeFile(`${fullPath}.css`, result.css);
const p2 = fs.writeFile(`${fullPath}.map.css`, result.map);
const p2 = fs.writeFile(`${fullPath}.css.map`, result.map);
await Promise.all([p1, p2]);
logBundled("Compiled SASS", `${fullPath}.css`);
} catch (e) {
2 changes: 1 addition & 1 deletion examples/react/index.tsx
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ const App = () => {
const url = new URL("https://alice.dita.digital/manifest.json");
D2Reader.load({
url,
injectables: injectables as any,
injectables: injectables,
injectablesFixed: [],
}).then(setReader);
}, []);
1 change: 1 addition & 0 deletions examples/react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@
"declaration": true,
"preserveConstEnums": true,
"strictNullChecks": true,
"strict": true,
"target": "es6",
"skipLibCheck": true,
"jsx": "react",
4 changes: 4 additions & 0 deletions examples/server.ts
Original file line number Diff line number Diff line change
@@ -33,6 +33,10 @@ async function start() {
title: "API Example",
getUrl: (url) => `/viewer/index_api.html?url=${url}`,
},
{
title: "Static Placeholder PDF Example",
getUrl: (url) => `/viewer/index_pdf.html?url=${url}`,
},
],
});

4 changes: 2 additions & 2 deletions injectables/style/popup.css
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@
margin: 0;
background-color: #fafafa;
border-radius: 0.5em;
line-height: 0;
/*line-height: 1;*/
max-width: 353px;
}
.d2-popup-content {
@@ -117,5 +117,5 @@
background: #fafafa;
border-radius: 0.5em;
-webkit-font-smoothing: subpixel-antialiased;
line-height: normal;
line-height: normal !important;
}
6 changes: 6 additions & 0 deletions injectables/style/style.css
Original file line number Diff line number Diff line change
@@ -253,3 +253,9 @@
img {
max-height: var(--USER__maxMediaHeight) !important;
}

#R2_ID_GUTTER_RIGHT_CONTAINER {
position: absolute;
top: 0;
right: -20px;
}
Loading