Merge pull request NativeScript#1771 from NativeScript/formatted-text-fix

hamorphis · hamorphis · commit c3a7ed818fd4 · 2016-03-16T14:57:55.000+02:00
Prevent stack overflow when re-applying iOS formatted text
diff --git a/ui/text-base/text-base.ios.ts b/ui/text-base/text-base.ios.ts
@@ -17,11 +17,19 @@ export class TextBase extends common.TextBase {
         this.requestLayout();
     }
 
+    private _settingFormattedTextPropertyToNative = false;
     public _onStylePropertyChanged(property: dependencyObservable.Property): void {
+        if (this._settingFormattedTextPropertyToNative) {
+            // Guard against stack-overflow.
+            return;
+        }
+
         if (this.formattedText) {
             // Re-apply the formatted text to override style changes if needed.
             // https://github.com/NativeScript/NativeScript/issues/1078
+            this._settingFormattedTextPropertyToNative = true;
             this._setFormattedTextPropertyToNative(this.formattedText);
+            this._settingFormattedTextPropertyToNative = false;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,19 @@ export class TextBase extends common.TextBase {`
`17`	`17`	`this.requestLayout();`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ private _settingFormattedTextPropertyToNative = false;`
`20`	`21`	`public _onStylePropertyChanged(property: dependencyObservable.Property): void {`
	`22`	`+ if (this._settingFormattedTextPropertyToNative) {`
	`23`	`+ // Guard against stack-overflow.`
	`24`	`+ return;`
	`25`	`+ }`
	`26`	`+`
`21`	`27`	`if (this.formattedText) {`
`22`	`28`	`// Re-apply the formatted text to override style changes if needed.`
`23`	`29`	`// https://github.com/NativeScript/NativeScript/issues/1078`
	`30`	`+ this._settingFormattedTextPropertyToNative = true;`
`24`	`31`	`this._setFormattedTextPropertyToNative(this.formattedText);`
	`32`	`+ this._settingFormattedTextPropertyToNative = false;`
`25`	`33`	`}`
`26`	`34`	`}`
`27`	`35`	`}`