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

Merge pull request #2030 from NativeScript/raikov/pseudoselectors-angular

Browse Source 
Fixed pseudoselectors to work with Angular
This commit is contained in:
tzraikov
2016-04-26 15:06:38 +03:00
parent 2e705febfa 75a8f85923
commit 7b842a677f
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ui/button/button.ios.ts
View File

@ -7,6 +7,7 @@ import utils = require("utils/utils");
import enums = require("ui/enums"); import enums = require("ui/enums");
import dependencyObservable = require("ui/core/dependency-observable"); import dependencyObservable = require("ui/core/dependency-observable");
import styleScope = require("../styling/style-scope"); import styleScope = require("../styling/style-scope");
import {Property} from "ui/core/dependency-observable";
class TapHandlerImpl extends NSObject { class TapHandlerImpl extends NSObject {
private _owner: WeakRef<Button>; private _owner: WeakRef<Button>;
@ -50,13 +51,7 @@ export class Button extends common.Button {
public onLoaded() { public onLoaded() {
super.onLoaded(); super.onLoaded();
if (this.parent !== null && this.page !== null) { this._updateHandler();
let rootPage = this.page;
let scope: styleScope.StyleScope = (<any>rootPage)._getStyleScope();
if (scope.getVisualStates(this) !== undefined) {
this._stateChangedHandler.start();
}
}
} }
public onUnloaded() { public onUnloaded() {
@ -64,6 +59,13 @@ export class Button extends common.Button {
this._stateChangedHandler.stop(); this._stateChangedHandler.stop();
} }
public _onPropertyChanged(property: Property, oldValue: any, newValue: any) {
super._onPropertyChanged(property, oldValue, newValue);
if (property.metadata.affectsStyle) {
this._updateHandler();
}
}
get ios(): UIButton { get ios(): UIButton {
return this._ios; return this._ios;
} }
@ -81,10 +83,23 @@ export class Button extends common.Button {
// the UIControlStateNormal value. If the value for UIControlStateNormal is not set, // the UIControlStateNormal value. If the value for UIControlStateNormal is not set,
// then the property defaults to a system value. Therefore, at a minimum, you should // then the property defaults to a system value. Therefore, at a minimum, you should
// set the value for the normal state. // set the value for the normal state.
var newText = value ? value._formattedText : null; let newText = value ? value._formattedText : null;
this.ios.setAttributedTitleForState(newText, UIControlState.UIControlStateNormal); this.ios.setAttributedTitleForState(newText, UIControlState.UIControlStateNormal);
this.style._updateTextDecoration(); this.style._updateTextDecoration();
} }
private _updateHandler() {
if (this.parent !== null && this.page !== null) {
let rootPage = this.page;
let scope: styleScope.StyleScope = (<any>rootPage)._getStyleScope();
if (scope.getVisualStates(this) !== undefined) {
this._stateChangedHandler.start();
}
else {
this._stateChangedHandler.stop();
}
}
}
} }
export class ButtonStyler implements style.Styler { export class ButtonStyler implements style.Styler {

3
ui/core/view-common.ts
View File

@ -894,8 +894,7 @@ export class View extends ProxyObject implements definition.View {
if (!rootPage || !rootPage.isLoaded) { if (!rootPage || !rootPage.isLoaded) {
return; return;
} }
var scope: styleScope.StyleScope = (<any>rootPage)._getStyleScope();
var scope: styleScope.StyleScope = (<any>rootPage)._getStyleScope()
scope.applySelectors(this); scope.applySelectors(this);
} }