fix #6

doxiaodong · Sep 25, 2017 · a7bfe2b · a7bfe2b
1 parent 4fa8810
commit a7bfe2b
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 78 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>ng2-simplemde</title></head><body><simplemde-app></simplemde-app><script type="text/javascript" src="./lib.e02ecc357b24d743d402.js"></script><script type="text/javascript" src="./main.e02ecc357b24d743d402.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>ng2-simplemde</title></head><body><simplemde-app></simplemde-app><script type="text/javascript" src="./lib.c301294b17eb2be23a58.js"></script><script type="text/javascript" src="./main.c301294b17eb2be23a58.js"></script></body></html>
diff --git a/docs/lib.e02ecc357b24d743d402.js → docs/lib.c301294b17eb2be23a58.js b/docs/lib.e02ecc357b24d743d402.js → docs/lib.c301294b17eb2be23a58.js
diff --git a/docs/lib.e02ecc357b24d743d402.js.map → docs/lib.c301294b17eb2be23a58.js.map b/docs/lib.e02ecc357b24d743d402.js.map → docs/lib.c301294b17eb2be23a58.js.map
diff --git a/docs/main.e02ecc357b24d743d402.js → docs/main.c301294b17eb2be23a58.js b/docs/main.e02ecc357b24d743d402.js → docs/main.c301294b17eb2be23a58.js
diff --git a/docs/main.c301294b17eb2be23a58.js.map b/docs/main.c301294b17eb2be23a58.js.map
diff --git a/docs/main.e02ecc357b24d743d402.js.map b/docs/main.e02ecc357b24d743d402.js.map
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "type": "git",
     "url": "https://github.com/doxiaodong/ng2-simplemde"
   },
-  "version": "1.3.0",
+  "version": "1.3.1",
   "license": "MIT",
   "main": "bundles/ng2-simplemde.umd.min.js",
   "module": "lib/index.js",

diff --git a/server/app/app.component.ts b/server/app/app.component.ts
@@ -3,15 +3,33 @@ import {
   OnInit,
   ViewEncapsulation
 } from '@angular/core'
+import {
+  FormGroup,
+  Validators,
+  FormBuilder
+} from '@angular/forms'
 
 @Component({
   selector: 'simplemde-app',
   encapsulation: ViewEncapsulation.None,
   template: require('./app.html')
 })
 export class AppComponent implements OnInit {
+  form: FormGroup
 
   value = '11111'
 
+  constructor(
+    fb: FormBuilder
+  ) {
+
+    this.form = fb.group({
+      key: [
+        '',
+        Validators.required
+      ]
+    })
+  }
+
   ngOnInit() { }
 }
diff --git a/server/app/app.html b/server/app/app.html
@@ -1,3 +1,6 @@
 value: {{ value }}
 <simplemde [(ngModel)]="value"></simplemde>
 <simplemde [(ngModel)]="value" [options]="{ placeholder: '111' }"></simplemde>
+<form [formGroup]="form">
+  <simplemde formControlName="key" [(ngModel)]="value"></simplemde>
+</form>
diff --git a/server/share/share.module.ts b/server/share/share.module.ts
@@ -3,14 +3,22 @@ import {
   ModuleWithProviders
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
+import {
+  FormsModule,
+  ReactiveFormsModule
+} from '@angular/forms'
 import { SimplemdeModule } from '../../src'
 
 @NgModule({
   imports: [
+    FormsModule,
+    ReactiveFormsModule,
     CommonModule,
     SimplemdeModule
   ],
   exports: [
+    FormsModule,
+    ReactiveFormsModule,
     CommonModule,
     SimplemdeModule
   ]

diff --git a/src/component.ts b/src/component.ts
@@ -39,13 +39,17 @@ export class Simplemde extends NgModelBase implements AfterViewInit, OnDestroy {
   @Input() options: SimpleMDE.Options = {}
 
   private simplemde: SimpleMDE
+  private tmpValue = null
 
   writeValue(v: any) {
     if (v !== this._innerValue) {
       this._innerValue = v
-      if (this.value != null) {
+      if (this.simplemde && this.value != null) {
         this.simplemde.value(this.value)
       }
+      if (!this.simplemde) {
+        this.tmpValue = this.value
+      }
     }
   }
 
@@ -59,6 +63,11 @@ export class Simplemde extends NgModelBase implements AfterViewInit, OnDestroy {
 
     this.simplemde = new SimpleMDE(config)
 
+    if (this.tmpValue) {
+      this.simplemde.value(this.tmpValue)
+      this.tmpValue = null
+    }
+
     this.simplemde.codemirror.on('change', () => {
       this.value = this.simplemde.value()
     })
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>ng2-simplemde</title></head><body><simplemde-app></simplemde-app><script type="text/javascript" src="./lib.e02ecc357b24d743d402.js"></script><script type="text/javascript" src="./main.e02ecc357b24d743d402.js"></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>ng2-simplemde</title></head><body><simplemde-app></simplemde-app><script type="text/javascript" src="./lib.c301294b17eb2be23a58.js"></script><script type="text/javascript" src="./main.c301294b17eb2be23a58.js"></script></body></html>