diff --git a/.betterer.cache b/.betterer.cache index ed645b2..b12a8f1 100644 --- a/.betterer.cache +++ b/.betterer.cache @@ -9,14 +9,14 @@ "src/darkreader.d.ts": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25d750b5e282b9a06893cb9ba3d89fdb8c765cbbee", "src/declarations.ts": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2510017b35714fad5b8b4a2684339e3a8350235276", "src/defineEpubAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2556c657888ae03f4a8a25a43d4bb1efb826f73777", - "src/defineGenericAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb253207840425", + "src/defineGenericAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb258b2f617c74eb18aa197f754df0380fae2cf11ff4", "src/definePdfAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb250e290f0e8b7ab9688ef4aa79300fc1a989abd4ca", "src/defineVideoAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25680c2792184f1d1d3943841815a1f844a246788c", "src/defineWebAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb259691a72fc7f49ff13f8429789575f8e1d3022634", - "src/main.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb254230181218", - "src/resourcesFolder.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25906225781", + "src/main.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2575f09e1db6958352a4ddeddcc576339b91d1e247", + "src/resourcesFolder.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25e142cfef8714cb0bb5441dbd60be2dd3aef729d3", "src/settings.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb252ca4e189c2a182a56d3f91554e80b4ced8c72cf0", - "src/sourceViewObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb251715603083", + "src/sourceViewObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2510fd993fdd62437bf1fab269cdc9f6343d53fba2", "src/styleObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25be53fd67d873a7d62f2c22b85836bfea6b036bb4", "src/types.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25a95a387c4b9d82b0b816038492d0d51d0158c1cb", "src/utils.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25a7298b36e9d35340bb4196ff6e76933127171eea", @@ -33,14 +33,14 @@ "src/darkreader.d.ts": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25d750b5e282b9a06893cb9ba3d89fdb8c765cbbee", "src/declarations.ts": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2510017b35714fad5b8b4a2684339e3a8350235276", "src/defineEpubAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2556c657888ae03f4a8a25a43d4bb1efb826f73777", - "src/defineGenericAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb253207840425", + "src/defineGenericAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb258b2f617c74eb18aa197f754df0380fae2cf11ff4", "src/definePdfAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb250e290f0e8b7ab9688ef4aa79300fc1a989abd4ca", "src/defineVideoAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25680c2792184f1d1d3943841815a1f844a246788c", "src/defineWebAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb259691a72fc7f49ff13f8429789575f8e1d3022634", - "src/main.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb254230181218", - "src/resourcesFolder.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25906225781", + "src/main.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2575f09e1db6958352a4ddeddcc576339b91d1e247", + "src/resourcesFolder.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25e142cfef8714cb0bb5441dbd60be2dd3aef729d3", "src/settings.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb252ca4e189c2a182a56d3f91554e80b4ced8c72cf0", - "src/sourceViewObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb251715603083", + "src/sourceViewObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2510fd993fdd62437bf1fab269cdc9f6343d53fba2", "src/styleObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25be53fd67d873a7d62f2c22b85836bfea6b036bb4", "src/types.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25a95a387c4b9d82b0b816038492d0d51d0158c1cb", "src/utils.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25a7298b36e9d35340bb4196ff6e76933127171eea", @@ -57,14 +57,14 @@ "src/darkreader.d.ts": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25d750b5e282b9a06893cb9ba3d89fdb8c765cbbee", "src/declarations.ts": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2510017b35714fad5b8b4a2684339e3a8350235276", "src/defineEpubAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2556c657888ae03f4a8a25a43d4bb1efb826f73777", - "src/defineGenericAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb253207840425", + "src/defineGenericAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb258b2f617c74eb18aa197f754df0380fae2cf11ff4", "src/definePdfAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb250e290f0e8b7ab9688ef4aa79300fc1a989abd4ca", "src/defineVideoAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25680c2792184f1d1d3943841815a1f844a246788c", "src/defineWebAnnotation.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb259691a72fc7f49ff13f8429789575f8e1d3022634", - "src/main.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb254230181218", - "src/resourcesFolder.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25906225781", + "src/main.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2575f09e1db6958352a4ddeddcc576339b91d1e247", + "src/resourcesFolder.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25e142cfef8714cb0bb5441dbd60be2dd3aef729d3", "src/settings.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb252ca4e189c2a182a56d3f91554e80b4ced8c72cf0", - "src/sourceViewObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb251715603083", + "src/sourceViewObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb2510fd993fdd62437bf1fab269cdc9f6343d53fba2", "src/styleObserver.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25be53fd67d873a7d62f2c22b85836bfea6b036bb4", "src/types.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25a95a387c4b9d82b0b816038492d0d51d0158c1cb", "src/utils.tsx": "b00d3a9e3b90e83a3e56d41d0066c949f7cabb25a7298b36e9d35340bb4196ff6e76933127171eea", diff --git a/README.md b/README.md index b2b0253..ed57ae0 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,9 @@ Visit [CONTRIBUTING.md](./CONTRIBUTING.md) for information on building from sour ## Changelog +### 0.2.11 (2024-01-06) +* Fix issue with rendering annotator in Obsidian 1.5.3 and later (See issue #356) + ### 0.2.10 (2023-01-09) * Fix bug #284 Plugin didn't start on iOS diff --git a/manifest-beta.json b/manifest-beta.json index 088f759..e2a8548 100644 --- a/manifest-beta.json +++ b/manifest-beta.json @@ -1,7 +1,7 @@ { "id": "obsidian-annotator", "name": "Annotator", - "version": "0.2.8", + "version": "0.2.11", "minAppVersion": "1.0.3", "description": "This is a sample plugin for Obsidian. It allows you to open and annotate PDF and EPUB files.", "author": "Obsidian", diff --git a/manifest.json b/manifest.json index 64dd266..678b49b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "id": "obsidian-annotator", "name": "Annotator", - "version": "0.2.10", + "version": "0.2.11", "minAppVersion": "1.0.3", "description": "This is a sample plugin for Obsidian. It allows you to open and annotate PDF and EPUB files.", "author": "Obsidian", diff --git a/package.json b/package.json index ed8940e..5261b26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-annotator", - "version": "0.2.10", + "version": "0.2.11", "description": "This is a sample plugin for Obsidian (https://obsidian.md)", "main": "main.js", "scripts": { @@ -67,14 +67,14 @@ "cheerio": "^1.0.0-rc.10", "core-js": "^3.17.2", "epubjs": "^0.3.93", + "he": "^1.1.1", "jszip": "^3.7.1", + "lodash": "^4.17.4", "mime": "^3.0.0", "monkey-around": "^2.2.0", "react": "^17.0.2", "react-dom": "^17.0.2", "react-offline-iframe": "^0.5.0", - "striptags": "^3.2.0", - "he": "^1.1.1", - "lodash": "^4.17.4" + "striptags": "^3.2.0" } } diff --git a/submodules/hypothesis-client-annotator-fork b/submodules/hypothesis-client-annotator-fork index 398e186..6e9f06a 160000 --- a/submodules/hypothesis-client-annotator-fork +++ b/submodules/hypothesis-client-annotator-fork @@ -1 +1 @@ -Subproject commit 398e186de0758c8c5e4ad88b69a7bce5546641fc +Subproject commit 6e9f06ad6bd8b096a79614b16b0733e0491a2d30 diff --git a/versions.json b/versions.json index cb26181..ba7f582 100644 --- a/versions.json +++ b/versions.json @@ -24,5 +24,6 @@ "0.2.7": "1.0.3", "0.2.8": "1.0.3", "0.2.9": "1.0.3", - "0.2.10": "1.0.3" + "0.2.10": "1.0.3", + "0.2.11": "1.0.3" }