Merge pull request NativeScript#193 from NativeScript/action-bar-crash

vakrilov · vakrilov · commit 8c40ec632c8d · 2016-04-22T17:49:43.000+03:00
Fix crashing ActionBar in IOS
diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
@@ -41,6 +41,7 @@ nativeScriptBootstrap(RendererTest).then((compRef) => {
 //nativeScriptBootstrap(ImageTest);
 //nativeScriptBootstrap(NavigationTest, [NS_ROUTER_PROVIDERS]);
 // nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS], { startPageActionBarHidden: false });
+// nativeScriptBootstrap(ActionBarTest, [NS_ROUTER_PROVIDERS]);
 // nativeScriptBootstrap(ModalTest);
 // nativeScriptBootstrap(PlatfromDirectivesTest);
 // nativeScriptBootstrap(RouterOutletTest, [NS_ROUTER_PROVIDERS]);
diff --git a/ng-sample/app/examples/action-bar/action-bar-test.ts b/ng-sample/app/examples/action-bar/action-bar-test.ts
@@ -75,8 +75,6 @@ class SecondComponent {
     }
 }
 
-
-
 @Component({
     selector: 'action-bar-test',
     directives: [NS_ROUTER_DIRECTIVES],
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -26,7 +26,7 @@
 		"tns-core-modules": "^2.0.0-angular-4",
 		"nativescript-intl": "^0.0.2",
 		"angular2": "2.0.0-beta.14",
-        "es6-shim": "^0.35.0",
+		"es6-shim": "^0.35.0",
 		"parse5": "1.4.2",
 		"punycode": "1.3.2",
 		"querystring": "0.2.0",
@@ -49,6 +49,9 @@
 		"id": "org.nativescript.ngsample",
 		"tns-android": {
 			"version": "1.7.1"
+		},
+		"tns-ios": {
+			"version": "1.7.0"
 		}
 	}
 }
diff --git a/src/nativescript-angular/directives/action-bar.ts b/src/nativescript-angular/directives/action-bar.ts
@@ -50,9 +50,6 @@ registerElement("NavigationButton", () => require("ui/action-bar").NavigationBut
 })
 export class ActionBarComponent {
     constructor(public element: ElementRef, private page: Page) {
-    }
-
-    ngOnInit() {
         if (isBlank(this.page.actionBarHidden)) {
             this.page.actionBarHidden = false;
         }
@@ -94,13 +91,11 @@ export class ActionBarScope {
 })
 export class ActionItemDirective {
     constructor(public element: ElementRef, @Optional() private ownerScope: ActionBarScope) {
-    }
-
-    ngOnInit() {
         if (this.ownerScope) {
             this.ownerScope.onActionInit(this);
         }
     }
+    
     ngOnDestroy() {
         if (this.ownerScope) {
             this.ownerScope.onActionDestroy(this);
@@ -113,13 +108,11 @@ export class ActionItemDirective {
 })
 export class NavigationButtonDirective {
     constructor(public element: ElementRef, @Optional() private ownerScope: ActionBarScope) {
-    }
-
-    ngOnInit() {
         if (this.ownerScope) {
             this.ownerScope.onNavButtonInit(this);
         }
     }
+
     ngOnDestroy() {
         if (this.ownerScope) {
             this.ownerScope.onNavButtonDestroy(this);

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,6 @@ class SecondComponent {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-`
`79`		`-`
`80`	`78`	`@Component({`
`81`	`79`	`selector: 'action-bar-test',`
`82`	`80`	`directives: [NS_ROUTER_DIRECTIVES],`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"tns-core-modules": "^2.0.0-angular-4",`
`27`	`27`	`"nativescript-intl": "^0.0.2",`
`28`	`28`	`"angular2": "2.0.0-beta.14",`
`29`		`- "es6-shim": "^0.35.0",`
	`29`	`+ "es6-shim": "^0.35.0",`
`30`	`30`	`"parse5": "1.4.2",`
`31`	`31`	`"punycode": "1.3.2",`
`32`	`32`	`"querystring": "0.2.0",`
`@@ -49,6 +49,9 @@`
`49`	`49`	`"id": "org.nativescript.ngsample",`
`50`	`50`	`"tns-android": {`
`51`	`51`	`"version": "1.7.1"`
	`52`	`+ },`
	`53`	`+ "tns-ios": {`
	`54`	`+ "version": "1.7.0"`
`52`	`55`	`}`
`53`	`56`	`}`
`54`	`57`	`}`