Added underline annotation support

zotero · Aug 28, 2024 · 361c70a · 361c70a
1 parent a089dba
commit 361c70a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Zotero/Models/FieldKeys.swift b/Zotero/Models/FieldKeys.swift
@@ -153,7 +153,7 @@ struct FieldKeys {
 
             static func allHtmlEpubFields(for type: AnnotationType) -> [KeyBaseKeyPair] {
                 switch type {
-                case .highlight:
+                case .highlight, .underline:
                     return [KeyBaseKeyPair(key: Annotation.type, baseKey: nil),
                             KeyBaseKeyPair(key: Annotation.comment, baseKey: nil),
                             KeyBaseKeyPair(key: Annotation.color, baseKey: nil),
@@ -172,7 +172,7 @@ struct FieldKeys {
                             KeyBaseKeyPair(key: Annotation.Position.htmlEpubType, baseKey: Annotation.position),
                             KeyBaseKeyPair(key: Annotation.Position.htmlEpubValue, baseKey: Annotation.position)]
 
-                case .ink, .image, .underline, .freeText:
+                case .ink, .image, .freeText:
                     return []
                 }
             }

diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift
@@ -134,7 +134,10 @@ class HtmlEpubDocumentViewController: UIViewController {
             case .note:
                 toolName = "note"
 
-            case .eraser, .image, .ink, .underline, .freeText:
+            case .underline:
+                toolName = "underline"
+
+            case .eraser, .image, .ink, .freeText:
                 return
             }
             webViewHandler.call(javascript: "setTool({ type: '\(toolName)', color: '\(color.hexString)' });").subscribe().disposed(by: disposeBag)