|
@@ -228,15 +228,16 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
|
228
|
228
|
}
|
229
|
229
|
});
|
230
|
230
|
}
|
231
|
|
- if (params.leftButton) {
|
232
|
|
- if (params.leftButton.icon) {
|
233
|
|
- const icon = resolveAssetSource(params.leftButton.icon);
|
|
231
|
+ const leftButton = getLeftButton(params);
|
|
232
|
+ if (leftButton) {
|
|
233
|
+ if (leftButton.icon) {
|
|
234
|
+ const icon = resolveAssetSource(leftButton.icon);
|
234
|
235
|
if (icon) {
|
235
|
|
- params.leftButton.icon = icon.uri;
|
|
236
|
+ leftButton.icon = icon.uri;
|
236
|
237
|
}
|
237
|
238
|
}
|
238
|
239
|
}
|
239
|
|
- newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, params.leftButton);
|
|
240
|
+ newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, leftButton);
|
240
|
241
|
}
|
241
|
242
|
|
242
|
243
|
function navigatorSetTabBadge(navigator, params) {
|
|
@@ -375,6 +376,25 @@ function addTitleBarBackButtonIfNeeded(screen) {
|
375
|
376
|
}
|
376
|
377
|
|
377
|
378
|
function getLeftButton(screen) {
|
|
379
|
+ const leftButton = getLeftButtonDeprecated(screen);
|
|
380
|
+ if (leftButton) {
|
|
381
|
+ console.warn('leftButton is deprecated. Instead, please use leftButtons like on iOS.');
|
|
382
|
+ return leftButton;
|
|
383
|
+ }
|
|
384
|
+
|
|
385
|
+ if (screen.navigatorButtons && screen.navigatorButtons.leftButtons) {
|
|
386
|
+ return screen.navigatorButtons.leftButtons[0];
|
|
387
|
+ }
|
|
388
|
+
|
|
389
|
+
|
|
390
|
+ if (screen.leftButtons) {
|
|
391
|
+ return screen.leftButtons[0];
|
|
392
|
+ }
|
|
393
|
+
|
|
394
|
+ return null;
|
|
395
|
+}
|
|
396
|
+
|
|
397
|
+function getLeftButtonDeprecated(screen) {
|
378
|
398
|
if (screen.navigatorButtons && screen.navigatorButtons.leftButton) {
|
379
|
399
|
return screen.navigatorButtons.leftButton;
|
380
|
400
|
}
|