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 #1198 from NativeScript/feature/action-bar

Browse Source 
Feature/action bar
This commit is contained in:
Alexander Vakrilov
2015-12-03 15:28:14 +02:00
parent c07751a419 68906152b9
commit fd59932487
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/tests/ui/action-bar/action-bar-tests-common.ts
View File

@ -19,12 +19,12 @@ import actionBarModule = require("ui/action-bar");
//```XML //```XML
// <Page> // <Page>
// <Page.actionBar> // <Page.actionBar>
// {%raw%}<ActionBar title="{{ title }}" android.icon="res://ic_test"/>{%endraw%} // {%raw%}<ActionBar title="{{ title }}" android.icon="res://is_custom_home_icon"/>{%endraw%}
// </Page.actionBar> // </Page.actionBar>
// ... // ...
// </Page> // </Page>
//``` //```
//The icon can only be set in Android platform. Following the design guides it is automatically hidden in Lollipop versions (API level >= 20). You explicitly control its visibility with the `android.iconVisibility' property. //The icon can only be set in Android platform. It is hidden by default, but you explicitly control its visibility with the `android.iconVisibility' property.
// //
// //
// ## Setting Custom Title View // ## Setting Custom Title View
@ -205,7 +205,7 @@ export function test_titleView_inherit_bindingContext_inXML() {
p.bindingContext = { myProp: "success" }; p.bindingContext = { myProp: "success" };
var centerBtn = <button.Button>p.actionBar.titleView; var centerBtn = <button.Button>p.actionBar.titleView;
TKUnit.assert(centerBtn instanceof button.Button, "cneterView not loaded correctly"); TKUnit.assert(centerBtn instanceof button.Button, "titleView not loaded correctly");
TKUnit.assertEqual(centerBtn.text, "success", "actionItem.text"); TKUnit.assertEqual(centerBtn.text, "success", "actionItem.text");
}; };
@ -216,7 +216,7 @@ export function test_titleView_inXML() {
"</ActionBar.titleView> </ActionBar> </Page.actionBar> </Page>"); "</ActionBar.titleView> </ActionBar> </Page.actionBar> </Page>");
var centerBtn = <button.Button>p.actionBar.titleView; var centerBtn = <button.Button>p.actionBar.titleView;
TKUnit.assert(centerBtn instanceof button.Button, "cneterView not loaded correctly"); TKUnit.assert(centerBtn instanceof button.Button, "titleView not loaded correctly");
}; };
export function test_titleView_inXML_short_definition() { export function test_titleView_inXML_short_definition() {
@ -226,7 +226,16 @@ export function test_titleView_inXML_short_definition() {
"</ActionBar> </Page.actionBar> </Page>"); "</ActionBar> </Page.actionBar> </Page>");
var centerBtn = <button.Button>p.actionBar.titleView; var centerBtn = <button.Button>p.actionBar.titleView;
TKUnit.assert(centerBtn instanceof button.Button, "cneterView not loaded correctly"); TKUnit.assert(centerBtn instanceof button.Button, "titleView not loaded correctly");
};
export function test_ActionBar_is_not_empty_when_titleView_is_set() {
var p = <PageModule.Page>builder.parse(
"<Page> <Page.actionBar> <ActionBar> <ActionBar.titleView>" +
"<Button text=\"test\" />" +
"</ActionBar.titleView> </ActionBar> </Page.actionBar> </Page>");
TKUnit.assertFalse(p.actionBar._isEmpty(), "titleView is set but ActionBar reports empty");
}; };
export function test_ActionBarItemBindingToEvent() { export function test_ActionBarItemBindingToEvent() {

1
ui/action-bar/action-bar-common.ts
View File

@ -152,6 +152,7 @@ export class ActionBar extends view.View implements dts.ActionBar {
public _isEmpty(): boolean { public _isEmpty(): boolean {
if (this.title || if (this.title ||
this.titleView ||
(this.android && this.android.icon) || (this.android && this.android.icon) ||
this.navigationButton || this.navigationButton ||
this.actionItems.getItems().length > 0) { this.actionItems.getItems().length > 0) {