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

fix snapshot (#2544)

Browse Source
This commit is contained in:
Hristo Hristov
2016-08-02 17:12:35 +03:00
committed by GitHub
parent 5b553daaad
commit 441a8087f9
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
import style = require("ui/styling/style");
import { TextBaseStyler as TBS } from "ui/text-base/text-base-styler";
import {device} from "platform";
let styleHandlersInitialized: boolean;
global.moduleMerge(common, exports);
@ -15,6 +16,10 @@ export class Button extends common.Button {
super();
this._isPressed = false;
if(!styleHandlersInitialized) {
styleHandlersInitialized = true;
ButtonStyler.registerHandlers();
}
}
get android(): android.widget.Button {
@ -128,6 +133,4 @@ export class ButtonStyler implements style.Styler {
TextBaseStyler.getLetterSpacingProperty), "Button");
}
}
}
ButtonStyler.registerHandlers();
}

13
tns-core-modules/ui/text-base/text-base-common.ts
View File

@ -45,10 +45,19 @@ function onFormattedTextPropertyChanged(data: dependencyObservable.PropertyChang
(<proxy.PropertyMetadata>formattedTextProperty.metadata).onSetNativeValue = onFormattedTextPropertyChanged;
let styleHandlersInitialized: boolean;
export class TextBase extends view.View implements definition.TextBase, formattedString.FormattedStringView {
public static textProperty = textProperty;
public static formattedTextProperty = formattedTextProperty;
constructor() {
super();
if (!styleHandlersInitialized) {
styleHandlersInitialized = true;
tbs.TextBaseStyler.registerHandlers();
}
}
public _onBindingContextChanged(oldValue: any, newValue: any) {
super._onBindingContextChanged(oldValue, newValue);
if (this.formattedText) {
@ -134,6 +143,4 @@ export class TextBase extends view.View implements definition.TextBase, formatte
_requestLayoutOnTextChanged(): void {
this.requestLayout();
}
}
tbs.TextBaseStyler.registerHandlers();
}