From 7bd9f4da47c0676f02012ec4e98eb1978dff782e Mon Sep 17 00:00:00 2001
From: Sebastian <mail2stehle@gmail.com>
Date: Fri, 24 Feb 2017 23:38:59 +0100
Subject: [PATCH] Bugfixes

---
 .../angular/json-editor.component.ts          | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/Squidex/app/framework/angular/json-editor.component.ts b/src/Squidex/app/framework/angular/json-editor.component.ts
index 4796987b8..564b457e0 100644
--- a/src/Squidex/app/framework/angular/json-editor.component.ts
+++ b/src/Squidex/app/framework/angular/json-editor.component.ts
@@ -7,6 +7,7 @@
 
 import { AfterViewInit, Component, forwardRef, ElementRef, ViewChild } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
+import { Subject } from 'rxjs';
 
 import { ResourceLoaderService } from './../services/resource-loader.service';
 
@@ -28,6 +29,7 @@ export const SQX_JSON_EDITOR_CONTROL_VALUE_ACCESSOR: any = {
 export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit {
     private changeCallback: (value: any) => void = NOOP;
     private touchedCallback: () => void = NOOP;
+    private valueChanged = new Subject();
     private aceEditor: any;
     private value: any;
     private isDisabled = false;
@@ -65,6 +67,22 @@ export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit
     }
 
     public ngAfterViewInit() {
+        this.valueChanged.debounceTime(1000).subscribe(() => {
+            const isValid = this.aceEditor.getSession().getAnnotations().length === 0;
+
+            if (!isValid) {
+                this.changeCallback(null);
+            } else {
+                try {
+                    const value = JSON.parse(this.aceEditor.getValue());
+
+                    this.changeCallback(value);
+                } catch (e) {
+                    this.changeCallback(null);
+                }
+            }
+        });
+
         this.resourceLoader.loadScript('https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ace.js').then(() => {
             this.aceEditor = ace.edit(this.editor.nativeElement);
 
@@ -75,22 +93,12 @@ export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit
             this.setValue(this.value);
 
             this.aceEditor.on('blur', () => {
-                const isValid = this.aceEditor.getSession().getAnnotations().length === 0;
-
-                if (!isValid) {
-                    this.changeCallback(null);
-                } else {
-                    try {
-                        const value = JSON.parse(this.aceEditor.getValue());
-
-                        this.changeCallback(value);
-                    } catch (e) {
-                        this.changeCallback(null);
-                    }
-                }
-
                 this.touchedCallback();
             });
+
+            this.aceEditor.on('change', () => {
+                this.valueChanged.next();
+            });
         });
     }