Merge pull request NativeScript#750 from NativeScript/nnikolov/ActionBarItemNumberIssue

Nedyalko Nikolov · Nedyalko Nikolov · commit e84e5fbaaedf · 2015-09-17T11:00:42.000+03:00
Fix for NativeScript#747 issue.
diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
@@ -79,6 +79,7 @@
     <TypeScriptCompile Include="apps\action-bar-demo\pages\data-binding.ts">
       <DependentUpon>data-binding.xml</DependentUpon>
     </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\tests\ui\action-bar\ActionBar_NumberAsText.ts" />
     <TypeScriptCompile Include="apps\tests\xml-declaration\custom-code-file.ts" />
     <TypeScriptCompile Include="apps\transforms\app.ts" />
     <TypeScriptCompile Include="apps\transforms\main-page.ts" />
@@ -111,6 +112,7 @@
     <Content Include="apps\action-bar-demo\pages\center-view-segmented.xml" />
     <Content Include="apps\action-bar-demo\pages\center-view.xml" />
     <Content Include="apps\action-bar-demo\pages\data-binding.xml" />
+    <Content Include="apps\tests\ui\action-bar\ActionBar_NumberAsText.xml" />
     <Content Include="apps\tests\xml-declaration\custom-css-file.css" />
     <Content Include="apps\transforms\main-page.xml">
       <SubType>Designer</SubType>
diff --git a/apps/tests/ui/action-bar/ActionBar_NumberAsText.ts b/apps/tests/ui/action-bar/ActionBar_NumberAsText.ts
@@ -0,0 +1,5 @@
+﻿import frame = require("ui/frame");
+
+export function buttonTap(args) {
+    frame.topmost().goBack();
+}
diff --git a/apps/tests/ui/action-bar/ActionBar_NumberAsText.xml b/apps/tests/ui/action-bar/ActionBar_NumberAsText.xml
@@ -0,0 +1,12 @@
+﻿<Page>
+    <Page.actionBar>
+        <ActionBar title="Service Asset Maintenance">
+            <ActionBar.actionItems>
+                <ActionItem text="1" ios.position="right"/>
+            </ActionBar.actionItems>
+        </ActionBar>
+    </Page.actionBar>
+    <StackLayout>
+        <Button text="Click me" />
+    </StackLayout>
+</Page>
diff --git a/apps/tests/ui/action-bar/action-bar-tests-common.ts b/apps/tests/ui/action-bar/action-bar-tests-common.ts
@@ -4,6 +4,7 @@ import helper = require("../helper");
 import builder = require("ui/builder");
 import button = require("ui/button");
 import PageModule = require("ui/page");
+import fs = require("file-system");
 
 // <snippet module="ui/action-bar" title="ActionBar">
 // # ActionBar
@@ -203,3 +204,24 @@ export function test_Setting_ActionItems_doesnt_thrown() {
         helper.goBack();
     }
 }
+
+export function test_Setting_ActionItemsWithNumberAsText_doesnt_thrown() {
+
+    var gotException = false;
+
+    var moduleName = __dirname.substr(fs.knownFolders.currentApp().path.length);
+
+    try {
+        helper.navigateToModule(moduleName + "/ActionBar_NumberAsText");
+    }
+    catch (e) {
+        gotException = true;
+    }
+
+    try {
+        TKUnit.assert(!gotException, "Expected: false, Actual: " + gotException);
+    }
+    finally {
+        helper.goBack();
+    }
+}
diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts
@@ -197,7 +197,7 @@ export class ActionBar extends common.ActionBar {
         menu.clear();
         for (var i = 0; i < items.length; i++) {
             var item = items[i];
-            var menuItem = menu.add(android.view.Menu.NONE, i + ACTION_ITEM_ID_OFFSET, android.view.Menu.NONE, item.text);
+            var menuItem = menu.add(android.view.Menu.NONE, i + ACTION_ITEM_ID_OFFSET, android.view.Menu.NONE, item.text + "");
             if (item.icon) {
                 var drawableOrId = getDrawableOrResourceId(item.icon, this._appResources);
                 if (drawableOrId) {
diff --git a/ui/action-bar/action-bar.ios.ts b/ui/action-bar/action-bar.ios.ts
@@ -52,7 +52,7 @@ export class ActionBar extends common.ActionBar {
         if (previousController) {
             if (this.navigationButton) {
                 var tapHandler = TapBarItemHandlerImpl.new().initWithOwner(this.navigationButton);
-                var barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(this.navigationButton.text, UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");
+                var barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(this.navigationButton.text + "", UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");
                 previousController.navigationItem.backBarButtonItem = barButtonItem;
             }
             else {
@@ -124,7 +124,7 @@ export class ActionBar extends common.ActionBar {
             }
         }
         else {
-            barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(item.text, UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");
+            barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(item.text + "", UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");
         }
 
         return barButtonItem;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export class ActionBar extends common.ActionBar {`
`52`	`52`	`if (previousController) {`
`53`	`53`	`if (this.navigationButton) {`
`54`	`54`	`var tapHandler = TapBarItemHandlerImpl.new().initWithOwner(this.navigationButton);`
`55`		`- var barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(this.navigationButton.text, UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");`
	`55`	`+ var barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(this.navigationButton.text + "", UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");`
`56`	`56`	`previousController.navigationItem.backBarButtonItem = barButtonItem;`
`57`	`57`	`}`
`58`	`58`	`else {`
`@@ -124,7 +124,7 @@ export class ActionBar extends common.ActionBar {`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`else {`
`127`		`- barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(item.text, UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");`
	`127`	`+ barButtonItem = UIBarButtonItem.alloc().initWithTitleStyleTargetAction(item.text + "", UIBarButtonItemStyle.UIBarButtonItemStylePlain, tapHandler, "tap");`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`return barButtonItem;`