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

alpha1

Browse Source
This commit is contained in:
Hristo Hristov
2016-11-25 14:51:36 +02:00
parent bb2c7aa60a
commit 645f428f59
62 changed files with 2556 additions and 2875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/button/button-common.ts
View File

@@ -1,21 +1,13 @@
import { Button as ButtonDefinition } from "ui/button";
import { TextBase } from "ui/text-base";
import { WhiteSpace } from "ui/enums";
export abstract class ButtonBase extends TextBase implements ButtonDefinition {
public static tapEvent = "tap";
get textWrap(): boolean {
return this.style.whiteSpace === WhiteSpace.normal;
return this.style.whiteSpace === "normal";
}
set textWrap(value: boolean) {
this.style.whiteSpace = value ? WhiteSpace.normal : WhiteSpace.nowrap;
}
get whiteSpace(): string {
return this.style.whiteSpace;
}
set whiteSpace(value: string) {
this.style.whiteSpace = value;
this.style.whiteSpace = value ? "normal" : "nowrap";
}
}

8
tns-core-modules/ui/button/button.android.ts
View File

@@ -6,7 +6,9 @@ export * from "./button-common";
@Interfaces([android.view.View.OnClickListener])
class ClickListener implements android.view.View.OnClickListener {
constructor(public owner: WeakRef<Button>) { }
constructor(public owner: WeakRef<Button>) {
return global.__native(this);
}
public onClick(v: android.view.View): void {
let btn = this.owner.get();
@@ -18,7 +20,9 @@ class ClickListener implements android.view.View.OnClickListener {
@Interfaces([android.view.View.OnTouchListener])
class TouchListener implements android.view.View.OnTouchListener {
constructor(public owner: WeakRef<Button>) { }
constructor(public owner: WeakRef<Button>) {
return global.__native(this);
}
public onTouch(v: android.view.View, event: android.view.MotionEvent): boolean {
let btn = this.owner.get();

6
tns-core-modules/ui/button/button.d.ts vendored
View File

@@ -31,12 +31,6 @@ declare module "ui/button" {
*/
textWrap: boolean;
/**
* Gets or sets text whiteSpace.
* "normal" or "nowrap"
*/
whiteSpace: string;
/**
* A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
* @param eventNames - String corresponding to events (e.g. "propertyChange"). Optionally could be used more events separated by `,` (e.g. "propertyChange", "change").

47
tns-core-modules/ui/button/button.ios.ts
View File

@@ -1,17 +1,16 @@
import { ControlStateChangeListener } from "ui/core/control-state-change";
import { whiteSpaceProperty, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingProperty } from "ui/styling/style";
import { View, PseudoClassHandler, borderTopWidthProperty, borderRightWidthProperty, borderBottomWidthProperty, borderLeftWidthProperty, paddingProperty } from "ui/core/view";
import { View, PseudoClassHandler } from "ui/core/view";
import types = require("utils/types");
import { ButtonBase } from "./button-common";
import { textProperty, formattedTextProperty } from "../text-base/text-base-common";
import { WhiteSpace } from "ui/enums";
import { textProperty, formattedTextProperty, whiteSpaceProperty } from "../text-base/text-base-common";
export * from "./button-common";
export class Button extends ButtonBase {
public nativeView: UIButton;
private _tapHandler: NSObject;
private _stateChangedHandler: ControlStateChangeListener;
@@ -44,12 +43,12 @@ export class Button extends ButtonBase {
}
}
get [whiteSpaceProperty.native](): string {
return WhiteSpace.normal;
get [whiteSpaceProperty.native](): "normal" | "nowrap" {
return "normal";
}
set [whiteSpaceProperty.native](value: string) {
set [whiteSpaceProperty.native](value: "normal" | "nowrap") {
let nativeView = this.nativeView.titleLabel;
if (value === WhiteSpace.normal) {
if (value === "normal") {
nativeView.lineBreakMode = NSLineBreakMode.ByWordWrapping;
nativeView.numberOfLines = 0;
}
@@ -65,7 +64,7 @@ export class Button extends ButtonBase {
set [borderTopWidthProperty.native](value: number) {
let nativeView = this.nativeView;
let insets = nativeView.contentEdgeInsets;
insets.top = this.style.paddingTop + value;
insets.top = this.style.effectivePaddingTop + value;
nativeView.contentEdgeInsets = insets;
}
@@ -75,7 +74,7 @@ export class Button extends ButtonBase {
set [borderRightWidthProperty.native](value: number) {
let nativeView = this.nativeView;
let insets = nativeView.contentEdgeInsets;
insets.right = this.style.paddingRight + value;
insets.right = this.style.effectivePaddingRight + value;
nativeView.contentEdgeInsets = insets;
}
@@ -85,7 +84,7 @@ export class Button extends ButtonBase {
set [borderBottomWidthProperty.native](value: number) {
let nativeView = this.nativeView;
let insets = nativeView.contentEdgeInsets;
insets.bottom = this.style.paddingBottom + value;
insets.bottom = this.style.effectivePaddingBottom + value;
nativeView.contentEdgeInsets = insets;
}
@@ -95,22 +94,22 @@ export class Button extends ButtonBase {
set [borderLeftWidthProperty.native](value: number) {
let nativeView = this.nativeView;
let insets = nativeView.contentEdgeInsets;
insets.left = this.style.paddingLeft + value;
insets.left = this.style.effectivePaddingLeft + value;
nativeView.contentEdgeInsets = insets;
}
get [paddingProperty.native](): UIEdgeInsets {
return this.nativeView.contentEdgeInsets;
}
set [paddingProperty.native](value: UIEdgeInsets) {
let nativeView = this.nativeView;
let style = this.style;
var top = value.top + style.borderTopWidth;
var left = value.left + style.borderLeftWidth;
var bottom = value.bottom + style.borderBottomWidth;
var right = value.right + style.borderRightWidth;
this.nativeView.contentEdgeInsets = { left, top, right, bottom };
}
// get [paddingProperty.native](): UIEdgeInsets {
// return this.nativeView.contentEdgeInsets;
// }
// set [paddingProperty.native](value: UIEdgeInsets) {
// const nativeView = this.nativeView;
// const style = this.style;
// const top = value.top + style.effectiveBorderTopWidth;
// const left = value.left + style.effectiveBorderLeftWidth;
// const bottom = value.bottom + style.effectiveBorderBottomWidth;
// const right = value.right + style.effectiveBorderRightWidth;
// this.nativeView.contentEdgeInsets = { left, top, right, bottom };
// }
}
class TapHandlerImpl extends NSObject {