javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 20:11:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed HtmlView

Browse Source
This commit is contained in:
Rossen Hristov
2016-12-22 17:08:43 +02:00
parent 9d712cfaf6
commit a0a202113e
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tns-core-modules/ui/html-view/html-view-common.ts
View File

@ -1 +1,12 @@
 import { HtmlView as HtmlViewDefinition } from "ui/html-view";
import { View, Property } from "ui/core/view";
export * from "ui/core/view";
export class HtmlViewBase extends View implements HtmlViewDefinition {
public html: string;
}
// TODO: Can we use Label.ios optimization for affectsLayout???
export const htmlProperty = new Property<HtmlViewBase, string>({ name: "html", defaultValue: "", affectsLayout: true });
htmlProperty.register(HtmlViewBase);

17
tns-core-modules/ui/html-view/html-view.android.ts
View File

@ -1,17 +1,16 @@
import { HtmlView as HtmlViewDefinition } from "ui/html-view"; import {
import { View, Property } from "ui/core/view"; HtmlViewBase, htmlProperty
} from "./html-view-common";
export * from "ui/core/view"; export * from "./html-view-common";
export class HtmlView extends View implements HtmlViewDefinition { export class HtmlView extends HtmlViewBase {
private _android: android.widget.TextView; private _android: android.widget.TextView;
get android(): android.widget.TextView { get android(): android.widget.TextView {
return this._android; return this._android;
} }
public html: string;
public _createUI() { public _createUI() {
this._android = new android.widget.TextView(this._context); this._android = new android.widget.TextView(this._context);
// This makes the html <a href...> work // This makes the html <a href...> work
@ -33,8 +32,4 @@ export class HtmlView extends View implements HtmlViewDefinition {
this._android.setAutoLinkMask(mask); this._android.setAutoLinkMask(mask);
this._android.setText(<any>android.text.Html.fromHtml(value)); this._android.setText(<any>android.text.Html.fromHtml(value));
} }
} }
// TODO: Can we use Label.ios optimization for affectsLayout???
export const htmlProperty = new Property<HtmlView, string>({ name: "html", defaultValue: "", affectsLayout: true });
htmlProperty.register(HtmlView);

14
tns-core-modules/ui/html-view/html-view.ios.ts
View File

@ -1,12 +1,10 @@
import { HtmlView as HtmlViewDefinition } from "ui/html-view"; import {
import { View, layout, Property } from "ui/core/view"; HtmlViewBase, View, layout, htmlProperty
} from "./html-view-common";
export * from "ui/core/view"; export * from "./html-view-common";
// TODO: Can we use Label.ios optimization for affectsLayout??? export class HtmlView extends HtmlViewBase {
export const htmlProperty = new Property<HtmlView, string>({ name: "html", defaultValue: "", affectsLayout: true });
export class HtmlView extends View implements HtmlViewDefinition {
private _ios: UITextView; private _ios: UITextView;
constructor() { constructor() {
@ -20,8 +18,6 @@ export class HtmlView extends View implements HtmlViewDefinition {
this._ios.dataDetectorTypes = UIDataDetectorTypes.All; this._ios.dataDetectorTypes = UIDataDetectorTypes.All;
} }
public html: string;
get ios(): UITextView { get ios(): UITextView {
return this._ios; return this._ios;
} }