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

HtmlView UI component added + test

Browse Source
This commit is contained in:
Vladimir Enchev
2015-07-15 11:59:00 +03:00
parent 57312ef1f3
commit 835ab8c142
8 changed files with 73 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ui/html-view/html-view.ios.ts
View File

@ -8,16 +8,16 @@ import viewModule = require("ui/core/view");
function onHtmlPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var view = <HtmlView>data.object;
if (!view.android) {
if (!view.ios) {
return;
}
if (types.isString(data.newValue)) {
var htmlString = NSString.stringWithString(data.newValue);
var nsData = htmlString.dataUsingEncoding(NSUnicodeStringEncoding);
var options = NSDictionary.new();
options.setValueForKey(NSDocumentTypeDocumentAttribute, NSHTMLTextDocumentType);
view.ios.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, options, null);
view.ios.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, <any>{ [NSDocumentTypeDocumentAttribute]: NSHTMLTextDocumentType }, null);
} else {
view.ios.attributedText = NSAttributedString.new();
}
}
@ -66,9 +66,8 @@ export class HtmlView extends common.HtmlView {
var nativeSize = nativeView.sizeThatFits(CGSizeMake(width, height));
var labelWidth = nativeSize.width;
//if (!this.textWrap) {
labelWidth = Math.min(labelWidth, width);
//}
labelWidth = Math.min(labelWidth, width);
var measureWidth = Math.max(labelWidth, this.minWidth);
var measureHeight = Math.max(nativeSize.height, this.minHeight);