Skip to content

fix(action bar): attach #comment nodes with _addView #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2017
Merged

fix(action bar): attach #comment nodes with _addView #729

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions nativescript-angular/directives/action-bar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { Page } from "ui/page";
import { View } from "ui/core/view";
import { registerElement, ViewClassMeta, NgView } from "../element-registry";

let actionBarMeta: ViewClassMeta = {
const actionBarMeta: ViewClassMeta = {
skipAddToDom: true,
insertChild: (parent: NgView, child: NgView, _atIndex: number) => {
insertChild: (parent: NgView, child: NgView, atIndex: number) => {
const bar = <ActionBar>(<any>parent);
const childView = <any>child;

Expand All @@ -17,13 +17,16 @@ let actionBarMeta: ViewClassMeta = {
} else if (child instanceof ActionItem) {
bar.actionItems.addItem(childView);
childView.parent = bar;
} else if (child.nodeName !== "#text" && child instanceof View) {
} else if (child.nodeName === "#comment") {
bar._addView(childView, atIndex);
} else if (child instanceof View) {
bar.titleView = childView;
}
},
removeChild: (parent: NgView, child: NgView) => {
const bar = <ActionBar>(<any>parent);
const childView = <any>child;

if (child instanceof NavigationButton) {
if (bar.navigationButton === childView) {
bar.navigationButton = null;
Expand Down