EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2949 compile: Do not update data before compiling template 

This prevents errors when the templata and data are changed and they
have different properties than the old template and data.
main
Albert Gasset 2019-04-10 13:01:56 +02:00
parent 13a9dab037
commit 19143109c3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/compile/components/compile-html/compile-html.ts
View File

@ -58,6 +58,7 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
protected componentRef: ComponentRef<any>; protected componentRef: ComponentRef<any>;
protected element; protected element;
protected differ: any; // To detect changes in the jsData input. protected differ: any; // To detect changes in the jsData input.
protected creatingComponent = false;
constructor(protected compileProvider: CoreCompileProvider, protected cdr: ChangeDetectorRef, element: ElementRef, constructor(protected compileProvider: CoreCompileProvider, protected cdr: ChangeDetectorRef, element: ElementRef,
@Optional() protected navCtrl: NavController, differs: KeyValueDiffers, protected domUtils: CoreDomUtilsProvider, @Optional() protected navCtrl: NavController, differs: KeyValueDiffers, protected domUtils: CoreDomUtilsProvider,
@ -70,7 +71,7 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
* Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays). * Detect and act upon changes that Angular can’t or won’t detect on its own (objects and arrays).
*/ */
ngDoCheck(): void { ngDoCheck(): void {
if (this.componentInstance) { if (this.componentInstance && !this.creatingComponent) {
// Check if there's any change in the jsData object. // Check if there's any change in the jsData object.
const changes = this.differ.diff(this.jsData); const changes = this.differ.diff(this.jsData);
if (changes) { if (changes) {
@ -91,6 +92,7 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
this.text) { this.text) {
// Create a new component and a new module. // Create a new component and a new module.
this.creatingComponent = true;
this.compileProvider.createAndCompileComponent(this.text, this.getComponentClass(), this.extraImports) this.compileProvider.createAndCompileComponent(this.text, this.getComponentClass(), this.extraImports)
.then((factory) => { .then((factory) => {
// Destroy previous components. // Destroy previous components.
@ -107,6 +109,8 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
this.domUtils.showErrorModal(error); this.domUtils.showErrorModal(error);
this.loaded = true; this.loaded = true;
}).finally(() => {
this.creatingComponent = false;
}); });
} }
} }