fix(ui): display article text when no HTML content

ncarlier · May 14, 2019 · 1fb5b3d · 1fb5b3d
1 parent 56018fe
commit 1fb5b3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ui/src/articles/components/ArticleContent.tsx b/ui/src/articles/components/ArticleContent.tsx
@@ -26,7 +26,7 @@ export default ({ article }: Props) => {
       let doc = ifrm.contentWindow ? ifrm.contentWindow.document : ifrm.contentDocument
       if (doc) {
         doc.open()
-        doc.write(article.html)
+        doc.write(article.html || article.text)
         doc.head.appendChild(cssLink)
         doc.head.appendChild(script)
         // Keyboard events have to propagate outside the iframe

diff --git a/ui/src/articles/queries.ts b/ui/src/articles/queries.ts
@@ -24,6 +24,7 @@ export const GetArticle = gql`
     article(id: $id) {
       id
       title
+      text
       html
       url
       status

diff --git a/ui/src/hooks/useKeyboard.ts b/ui/src/hooks/useKeyboard.ts
@@ -6,13 +6,13 @@ export type KeyHandler = (e: ExtendedKeyboardEvent, combo: string) => void
 export default (key: string | string[], handler: KeyHandler, enable = true) => {
   useEffect(() => {
     if (enable) {
-      console.log('bind', key)
+      // console.log('bind', key)
       mousetrap.unbind(key)
       setTimeout(() => {
         mousetrap.bind(key, handler)
       }, 200)
       return () => {
-        console.log('unbind', key)
+        // console.log('unbind', key)
         mousetrap.unbind(key)
       }
     }