Commit 5d54ae6
Tsvetan Raikov
Fixed a crash in action bar on iOS 9.3
1 parent 6a45376 commit 5d54ae6
1 file changed
Lines changed: 11 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -112,31 +112,23 @@ export class ActionBar extends common.ActionBar { | |||
| 112 | 112 | } | |
| 113 | 113 | ||
| 114 | 114 | private populateMenuItems(navigationItem: UINavigationItem) { | |
| 115 | - var items = this.actionItems.getVisibleItems(); | ||
| 116 | - var leftBarItems = []; | ||
| 117 | - var rightBarItems = []; | ||
| 118 | - | ||
| 119 | - for (var i = 0; i < items.length; i++) { | ||
| 120 | - var barButtonItem = this.createBarButtonItem(items[i]); | ||
| 115 | + let items = this.actionItems.getVisibleItems(); | ||
| 116 | + let leftBarItems = []; | ||
| 117 | + let rightBarItems = []; | ||
| 118 | + for (let i = 0; i < items.length; i++) { | ||
| 119 | + let barButtonItem = this.createBarButtonItem(items[i]); | ||
| 121 | 120 | if (items[i].ios.position === enums.IOSActionItemPosition.left) { | |
| 122 | 121 | leftBarItems.push(barButtonItem); | |
| 123 | 122 | } | |
| 124 | 123 | else { | |
| 125 | - rightBarItems.push(barButtonItem); | ||
| 124 | + rightBarItems.splice(0, 0, barButtonItem); | ||
| 126 | 125 | } | |
| 127 | 126 | } | |
| 128 | - | ||
| 129 | - var leftArray: NSMutableArray = leftBarItems.length > 0 ? NSMutableArray.new() : null; | ||
| 130 | - leftBarItems.forEach((barItem, i, a) => leftArray.addObject(barItem)); | ||
| 131 | - | ||
| 132 | - // Right items should be added in reverse because they are added from right to left | ||
| 133 | - var rightArray: NSMutableArray = rightBarItems.length > 0 ? NSMutableArray.new() : null; | ||
| 134 | - rightBarItems.reverse(); | ||
| 135 | - rightBarItems.forEach((barItem, i, a) => rightArray.addObject(barItem)); | ||
| 136 | - | ||
| 137 | - navigationItem.leftItemsSupplementBackButton = true; | ||
| 138 | - navigationItem.setLeftBarButtonItemsAnimated(leftArray, true); | ||
| 139 | - navigationItem.setRightBarButtonItemsAnimated(rightArray, true); | ||
| 127 | + navigationItem.setLeftBarButtonItemsAnimated(<any>leftBarItems, false); | ||
| 128 | + navigationItem.setRightBarButtonItemsAnimated(<any>rightBarItems, false); | ||
| 129 | + if (leftBarItems.length > 0) { | ||
| 130 | + navigationItem.leftItemsSupplementBackButton = true; | ||
| 131 | + } | ||
| 140 | 132 | } | |
| 141 | 133 | ||
| 142 | 134 | private createBarButtonItem(item: dts.ActionItem): UIBarButtonItem { | |
0 commit comments