fix: set target _blank for links

sibiraj-s · Dec 10, 2020 · 400c636 · 400c636
1 parent e9d6909
commit 400c636
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -119,5 +119,5 @@ See [CONTRIBUTING.md](./.github/CONTRIBUTING.md) to get started.
 [npm]: https://www.npmjs.com/
 [yarn]: https://yarnpkg.com/lang/en/
 [github]: https://sibiraj-s.github.io/
-[documentation]: https://sibiraj.dev/ngx-editor/ 
+[documentation]: https://sibiraj.dev/ngx-editor/
 [wiki]: https://github.com/sibiraj-s/ngx-editor/wiki/ngxEditor
diff --git a/demo/src/app/doc.ts b/demo/src/app/doc.ts
@@ -112,8 +112,8 @@ export default {
               type: 'link',
               attrs: {
                 href: 'https://codemirror.net',
-                title: 'CodeMirror',
-                default: '_blank'
+                title: 'https://codemirror.net',
+                target: '_blank'
               }
             }
           ],
@@ -131,7 +131,7 @@ export default {
               attrs: {
                 href: 'https://en.wikipedia.org',
                 title: '',
-                default: '_blank'
+                target: '_blank'
               }
             }
           ],

diff --git a/src/lib/components/bubble/bubble.component.html b/src/lib/components/bubble/bubble.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="activeLinkItem">
-  <a [href]="activeLinkItem.attrs.href" [target]="(activeLinkItem.attrs.target)" [title]="activeLinkItem.attrs.href">
+  <a [href]="activeLinkItem.attrs.href" target="_blank" [title]="activeLinkItem.attrs.href">
     {{activeLinkItem.attrs.href}}
   </a>
   <div class="commands">

diff --git a/src/lib/modules/menu/link/link.component.ts b/src/lib/modules/menu/link/link.component.ts
@@ -126,7 +126,7 @@ export class LinkComponent implements OnDestroy {
     const { selection } = state;
 
     const attrs = {
-      title: text,
+      title: href,
       href,
       target: openInNewTab ? '_blank' : '_self'
     };

diff --git a/src/lib/schema/marks.ts b/src/lib/schema/marks.ts
@@ -9,7 +9,7 @@ const link: MarkSpec = {
   attrs: {
     href: {},
     title: { default: null },
-    default: { default: '_blank' }
+    target: { default: '_blank' }
   },
   inclusive: false,
   parseDOM: [
@@ -18,13 +18,14 @@ const link: MarkSpec = {
       getAttrs(dom: HTMLElement): GetAttrsSpec {
         return {
           href: dom.getAttribute('href'),
-          title: dom.getAttribute('title')
+          title: dom.getAttribute('title'),
+          target: dom.getAttribute('target'),
         };
       }
     }],
   toDOM(node): DOMOutputSpec {
-    const { href, title } = node.attrs;
-    return ['a', { href, title }, 0];
+    const { href, title, target } = node.attrs;
+    return ['a', { href, title, target }, 0];
   }
 };