javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

imports improved

Browse Source
This commit is contained in:
Vladimir Enchev
2015-12-14 17:08:24 +02:00
parent cbf69e60e8
commit 074ac89871
90 changed files with 529 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,8 @@
import definition = require("ui/html-view");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import utils = require("utils/utils");
import types = require("utils/types");
import viewModule = require("ui/core/view");
import * as utilsModule from "utils/utils";
import * as viewModule from "ui/core/view";
function onHtmlPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var view = <HtmlView>data.object;
@ -12,6 +11,8 @@ function onHtmlPropertyChanged(data: dependencyObservable.PropertyChangeData) {
return;
}
var types = require("utils/types");
if (types.isString(data.newValue)) {
var htmlString = NSString.stringWithString(data.newValue);
var nsData = htmlString.dataUsingEncoding(NSUnicodeStringEncoding);
@ -36,7 +37,7 @@ export class HtmlView extends common.HtmlView {
this._ios.scrollEnabled = false;
this._ios.editable = false;
this._ios.selectable = true;
this._ios.userInteractionEnabled = true;
this._ios.userInteractionEnabled = true;
this._ios.dataDetectorTypes = UIDataDetectorTypes.UIDataDetectorTypeAll;
}
@ -52,6 +53,8 @@ export class HtmlView extends common.HtmlView {
var nativeView = this._nativeView;
if (nativeView) {
var utils: typeof utilsModule = require("utils/utils");
var width = utils.layout.getMeasureSpecSize(widthMeasureSpec);
var widthMode = utils.layout.getMeasureSpecMode(widthMeasureSpec);
@ -74,8 +77,10 @@ export class HtmlView extends common.HtmlView {
var measureWidth = Math.max(labelWidth, this.minWidth);
var measureHeight = Math.max(nativeSize.height, this.minHeight);
var widthAndState = viewModule.View.resolveSizeAndState(measureWidth, width, widthMode, 0);
var heightAndState = viewModule.View.resolveSizeAndState(measureHeight, height, heightMode, 0);
var view: typeof viewModule = require("ui/core/view");
var widthAndState = view.View.resolveSizeAndState(measureWidth, width, widthMode, 0);
var heightAndState = view.View.resolveSizeAndState(measureHeight, height, heightMode, 0);
this.setMeasuredDimension(widthAndState, heightAndState);
}