From 5e6d50ac01786128e48a109ca6e84b6f72debb32 Mon Sep 17 00:00:00 2001 From: Jean-Francois Cere Date: Sun, 19 Nov 2017 21:19:59 -0500 Subject: [PATCH] Update ngx-markdown@1.4.0 (#236) --- demo-app/package.json | 2 +- demo-app/src/app/app.module.ts | 4 +-- demo-app/src/app/home/home.component.html | 6 ++-- demo-app/src/app/home/home.module.ts | 4 +-- .../validation-binding.component.html | 6 ++-- .../validation-form-state.component.html | 6 ++-- .../validation-ngmodel.component.html | 6 ++-- .../validation-playground.component.html | 8 ++--- .../app/validation/validation.component.html | 2 +- .../src/app/validation/validation.module.ts | 4 +-- demo-app/src/styles.scss | 4 +-- demo-app/yarn.lock | 34 +++++++++---------- 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/demo-app/package.json b/demo-app/package.json index 43a96180..dd4c6bbe 100644 --- a/demo-app/package.json +++ b/demo-app/package.json @@ -30,9 +30,9 @@ "core-js": "^2.4.1", "highlightjs": "^9.10.0", "mdi": "^1.8.36", - "ng2-markdown-to-html": "^1.3.1", "ng2-materialize": "file:../", "ngx-malihu-scrollbar": "^1.2.1", + "ngx-markdown": "^1.4.0", "rxjs": "^5.1.0", "ts-helpers": "^1.1.1", "web-animations-js": "^2.2.5", diff --git a/demo-app/src/app/app.module.ts b/demo-app/src/app/app.module.ts index 6a256dd6..a310cafd 100644 --- a/demo-app/src/app/app.module.ts +++ b/demo-app/src/app/app.module.ts @@ -4,9 +4,9 @@ import { HttpModule } from '@angular/http'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule } from '@angular/router'; -import { MarkdownToHtmlModule } from 'ng2-markdown-to-html'; import { MaterializeModule } from 'ng2-materialize'; import { MalihuScrollbarModule } from 'ngx-malihu-scrollbar'; +import { MarkdownModule } from 'ngx-markdown'; import { ROUTES } from './app.routing'; @@ -48,7 +48,7 @@ import { ValidationModule } from './validation/validation.module'; FormsModule, HttpModule, MalihuScrollbarModule.forRoot(), - MarkdownToHtmlModule.forRoot(), + MarkdownModule.forRoot(), MaterializeModule.forRoot(), ReactiveFormsModule, RouterModule.forRoot(ROUTES), diff --git a/demo-app/src/app/home/home.component.html b/demo-app/src/app/home/home.component.html index ae5cf60c..339b251a 100644 --- a/demo-app/src/app/home/home.component.html +++ b/demo-app/src/app/home/home.component.html @@ -14,8 +14,8 @@ - + # ng2-materialize [![CircleCI status](https://circleci.com/gh/sherweb/ng2-materialize.svg?style=shield&circle-token=4f457a3c93c34ad9cdf21cbe53605dad94f21955)](https://circleci.com/gh/sherweb/ng2-materialize) [![AppVeyor status](https://ci.appveyor.com/api/projects/status/github/sherweb/ng2-materialize?branch=master&svg=true)](https://ci.appveyor.com/project/sherweb/ng2-materialize) [![NPM Version](https://img.shields.io/npm/v/ng2-materialize.svg?style=flat)](https://www.npmjs.com/package/ng2-materialize) [![License](https://img.shields.io/npm/l/ng2-materialize.svg)](https://opensource.org/licenses/Apache-2.0) - + - \ No newline at end of file + \ No newline at end of file diff --git a/demo-app/src/app/home/home.module.ts b/demo-app/src/app/home/home.module.ts index bebd8d26..37f740ae 100644 --- a/demo-app/src/app/home/home.module.ts +++ b/demo-app/src/app/home/home.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MarkdownToHtmlModule } from 'ng2-markdown-to-html'; import { MaterializeModule } from 'ng2-materialize'; +import { MarkdownModule } from 'ngx-markdown'; import { CodeSnippetModule } from '../shared/code-snippet/code-snippet.module'; import { HomeComponent } from './home.component'; @@ -12,7 +12,7 @@ import { HomeComponent } from './home.component'; BrowserAnimationsModule, CodeSnippetModule, CommonModule, - MarkdownToHtmlModule.forRoot(), + MarkdownModule.forRoot(), MaterializeModule, ], declarations: [ HomeComponent ], diff --git a/demo-app/src/app/validation/validation-binding/validation-binding.component.html b/demo-app/src/app/validation/validation-binding/validation-binding.component.html index 519ac483..04888b55 100644 --- a/demo-app/src/app/validation/validation-binding/validation-binding.component.html +++ b/demo-app/src/app/validation/validation-binding/validation-binding.component.html @@ -70,10 +70,10 @@
Submitted form
- +
-
-
+
+
\ No newline at end of file diff --git a/demo-app/src/app/validation/validation-form-state/validation-form-state.component.html b/demo-app/src/app/validation/validation-form-state/validation-form-state.component.html index 6b04ff94..91055630 100644 --- a/demo-app/src/app/validation/validation-form-state/validation-form-state.component.html +++ b/demo-app/src/app/validation/validation-form-state/validation-form-state.component.html @@ -66,10 +66,10 @@
Submitted form
- +
-
-
+
+
\ No newline at end of file diff --git a/demo-app/src/app/validation/validation-ngmodel/validation-ngmodel.component.html b/demo-app/src/app/validation/validation-ngmodel/validation-ngmodel.component.html index 9899a12c..0994bd83 100644 --- a/demo-app/src/app/validation/validation-ngmodel/validation-ngmodel.component.html +++ b/demo-app/src/app/validation/validation-ngmodel/validation-ngmodel.component.html @@ -75,10 +75,10 @@
Submitted form
- +
-
-
+
+
\ No newline at end of file diff --git a/demo-app/src/app/validation/validation-playground/validation-playground.component.html b/demo-app/src/app/validation/validation-playground/validation-playground.component.html index d0bace8b..6fa72667 100644 --- a/demo-app/src/app/validation/validation-playground/validation-playground.component.html +++ b/demo-app/src/app/validation/validation-playground/validation-playground.component.html @@ -272,11 +272,11 @@
Additionnal information
Submitted user
- - + +
-
-
+
+
\ No newline at end of file diff --git a/demo-app/src/app/validation/validation.component.html b/demo-app/src/app/validation/validation.component.html index 49a38a1d..a0f11167 100644 --- a/demo-app/src/app/validation/validation.component.html +++ b/demo-app/src/app/validation/validation.component.html @@ -13,7 +13,7 @@
Configuration

ReactiveFormModule should be added in component module or application module.

- +
diff --git a/demo-app/src/app/validation/validation.module.ts b/demo-app/src/app/validation/validation.module.ts index b8dec015..3dc37423 100644 --- a/demo-app/src/app/validation/validation.module.ts +++ b/demo-app/src/app/validation/validation.module.ts @@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MarkdownToHtmlModule } from 'ng2-markdown-to-html'; import { MaterializeModule } from 'ng2-materialize'; +import { MarkdownModule } from 'ngx-markdown'; import { CodeSnippetModule } from '../shared/code-snippet/code-snippet.module'; import { PropertiesTableModule } from '../shared/properties-table/properties-table.module'; @@ -19,7 +19,7 @@ import { ValidationComponent } from './validation.component'; CodeSnippetModule, CommonModule, FormsModule, - MarkdownToHtmlModule.forChild(), + MarkdownModule.forChild(), MaterializeModule, PropertiesTableModule, ReactiveFormsModule, diff --git a/demo-app/src/styles.scss b/demo-app/src/styles.scss index a4682641..4e714ad2 100644 --- a/demo-app/src/styles.scss +++ b/demo-app/src/styles.scss @@ -67,9 +67,9 @@ code[class*="language-"] { margin: 0 0.05em !important; } -/* n2-markdown-to-html override */ +/* ngx-markdown override */ -markdown-to-html { +markdown { h1 { font-size: 2.92rem; } h2 { font-size: 2.28rem; } h3 { font-size: 1.64rem; } diff --git a/demo-app/yarn.lock b/demo-app/yarn.lock index 9ad0c918..6ed70dde 100644 --- a/demo-app/yarn.lock +++ b/demo-app/yarn.lock @@ -172,8 +172,8 @@ resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.3.0.tgz#583c223dd33385a1dda01aaf77b0cd0411c4b524" "@types/materialize-css@^0.100.0": - version "0.100.0" - resolved "https://registry.yarnpkg.com/@types/materialize-css/-/materialize-css-0.100.0.tgz#2b311b2ca273d6fd689609ab8e8d932966f8f45c" + version "0.100.1" + resolved "https://registry.yarnpkg.com/@types/materialize-css/-/materialize-css-0.100.1.tgz#9ab5b1faba5ba28b6c39ab94c31f77f5fd2f7b68" dependencies: "@types/jquery" "*" "@types/pickadate" "*" @@ -195,8 +195,8 @@ "@types/jquery" "*" "@types/prismjs@^1.6.0": - version "1.6.2" - resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.6.2.tgz#0d49b1c8a78a4d129cfd55360b06172a64139de0" + version "1.6.5" + resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.6.5.tgz#e222615538ea2df248c72512e1faf346af2640d6" "@types/q@^0.0.32": version "0.0.32" @@ -3682,15 +3682,6 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -ng2-markdown-to-html@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/ng2-markdown-to-html/-/ng2-markdown-to-html-1.3.1.tgz#d60791dea1a1ab273f1fe76f2346e56dabd17afe" - dependencies: - "@types/marked" "0.3.0" - "@types/prismjs" "^1.6.0" - marked "^0.3.6" - prismjs "^1.6.0" - "ng2-materialize@file:..": version "1.6.0" dependencies: @@ -3706,6 +3697,15 @@ ngx-malihu-scrollbar@^1.2.1: jquery "^3.0.0" malihu-custom-scrollbar-plugin "^3.1.5" +ngx-markdown@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ngx-markdown/-/ngx-markdown-1.4.0.tgz#1ac11602a52abb7998685376949cfd7065b3de82" + dependencies: + "@types/marked" "0.3.0" + "@types/prismjs" "^1.6.0" + marked "^0.3.6" + prismjs "^1.6.0" + no-case@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081" @@ -4495,8 +4495,8 @@ pretty-error@^2.0.2: utila "~0.4" prismjs@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365" + version "1.8.3" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.8.3.tgz#4a3d140be5f2614a8987ca2330733a40d8ad207b" optionalDependencies: clipboard "^1.5.5" @@ -5568,8 +5568,8 @@ timers-browserify@^2.0.2: setimmediate "^1.0.4" tiny-emitter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.0.tgz#bad327adb1804b42a231afa741532bd884cd09ad" + version "2.0.2" + resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c" tmp@0.0.24: version "0.0.24"