javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-26 03:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed all merge problems.

Browse Source
This commit is contained in:
Rossen Hristov
2015-08-06 14:56:52 +03:00
parent abc9faccfa
commit 59d6dbb224
9 changed files with 114 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ui/text-view/text-view.ios.ts
View File

@ -40,31 +40,6 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
}
}
//class UITextViewImpl extends UITextView {
// static new(): UITextViewImpl {
// return <UITextViewImpl>super.new();
// }
// private _owner: TextView;
// public initWithOwner(owner: TextView): UITextViewImpl {
// this._owner = owner;
// return this;
// }
// public textRectForBoundsLimitedToNumberOfLines(bounds: CGRect, numberOfLines: number): CGRect {
// var rect = super.textRectForBoundsLimitedToNumberOfLines(bounds, numberOfLines);
// var textRect = CGRectMake(
// this._owner.borderWidth + this._owner.paddingLeft,
// this._owner.borderWidth + this._owner.paddingTop,
// rect.size.width - (this._owner.borderWidth + this._owner.paddingLeft + this._owner.paddingRight + this._owner.borderWidth),
// rect.size.height - (this._owner.borderWidth + this._owner.paddingTop + this._owner.paddingBottom + this._owner.borderWidth)
// );
// console.log("UITextViewImpl.textRectForBoundsLimitedToNumberOfLines(" + NSStringFromCGRect(bounds) + "): " + NSStringFromCGRect(textRect));
// return textRect;
// }
//}
export class TextView extends common.TextView {
private _ios: UITextView;
private _delegate: UITextViewDelegateImpl;
@ -73,7 +48,6 @@ export class TextView extends common.TextView {
super();
this._ios = new UITextView();
//this._ios = UITextViewImpl.new().initWithOwner(this);
if (!this._ios.font) {
this._ios.font = UIFont.systemFontOfSize(12);
}