From c432382745dc1c5f1130a60cef64239a324f6bba Mon Sep 17 00:00:00 2001 From: Nuwan Goonasekera Date: Sat, 20 Oct 2018 18:24:33 +0530 Subject: [PATCH] Use alternative markdown component till issue is resolved: https://github.com/dimpu/ngx-md/issues/159 --- angular.json | 3 ++- package.json | 2 +- src/app/app.module.ts | 4 ++-- src/app/catalog/plugins/docker/docker.component.html | 4 ++-- src/app/catalog/plugins/plugins.module.ts | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/angular.json b/angular.json index 5d0fe9f..364de68 100644 --- a/angular.json +++ b/angular.json @@ -28,7 +28,8 @@ "scripts": [ "node_modules/moment/min/moment.min.js", "node_modules/bootstrap-material-design/dist/js/material.min.js", - "node_modules/bootstrap-material-design/dist/js/ripples.min.js" + "node_modules/bootstrap-material-design/dist/js/ripples.min.js", + "node_modules/marked/lib/marked.js" ] }, "configurations": { diff --git a/package.json b/package.json index 085bd91..f3e4bdb 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "core-js": "^2.5.4", "moment": "^2.19.3", "ngx-clipboard": "^11.1.9", - "ngx-md": "^6.0.9", + "ngx-markdown": "^6.3.0", "ngx-order-pipe": "^2.0.1", "rxjs": "^6.3.3", "rxjs-tslint": "^0.1.5", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7095e37..48fafee 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { ReactiveFormsModule } from '@angular/forms'; import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'; -import { NgxMdModule } from 'ngx-md'; +import { MarkdownModule } from 'ngx-markdown'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { LoginModule } from './login/login.module'; @@ -36,7 +36,7 @@ import { DockerConfigComponent } from './catalog/plugins/docker/docker.component }), AppRoutingModule, LoginModule, - NgxMdModule.forRoot(), + MarkdownModule.forRoot(), BrowserAnimationsModule, MyAppliancesModule, PluginsModule diff --git a/src/app/catalog/plugins/docker/docker.component.html b/src/app/catalog/plugins/docker/docker.component.html index ca376d0..0e49001 100644 --- a/src/app/catalog/plugins/docker/docker.component.html +++ b/src/app/catalog/plugins/docker/docker.component.html @@ -33,9 +33,9 @@

Configure: {{ selectedRepoDetail.name }}


- + {{ selectedRepoDetail.full_description }} - +
diff --git a/src/app/catalog/plugins/plugins.module.ts b/src/app/catalog/plugins/plugins.module.ts
index 4c18fc2..766c07c 100644
--- a/src/app/catalog/plugins/plugins.module.ts
+++ b/src/app/catalog/plugins/plugins.module.ts
@@ -18,7 +18,7 @@ import { CloudMan2ConfigComponent } from './cloudman2/cloudman2.component';
 import { GVLConfigComponent } from './gvl/gvl.component';
 import { DockerConfigComponent } from './docker/docker.component';
 import { DockerFileEditorComponent } from './docker/components/docker-file-editor.component';
-import { NgxMdModule } from 'ngx-md';
+import { MarkdownModule } from 'ngx-markdown';
 
 @NgModule({
     imports: [
@@ -34,7 +34,7 @@ import { NgxMdModule } from 'ngx-md';
         MatCheckboxModule,
         MatTooltipModule,
         LayoutModule,
-        NgxMdModule
+        MarkdownModule
     ],
     declarations: [UbuntuConfigComponent, CloudManConfigComponent, CloudMan2ConfigComponent,
                    GVLConfigComponent, DockerConfigComponent, DockerFileEditorComponent],