Browse Source

Android: If the user has specified navigatorButtons on the showModal params use those instead of the default navigatorButtons of the registered screen. (#675)

Ioannis Kokkinidis 8 years ago
parent
commit
35e5b86b25
1 changed files with 4 additions and 1 deletions
  1. 4
    1
      src/deprecated/platformSpecificDeprecated.android.js

+ 4
- 1
src/deprecated/platformSpecificDeprecated.android.js View File

@@ -349,6 +349,7 @@ function showModal(params) {
349 349
   addTitleBarBackButtonIfNeeded(params);
350 350
   addNavigationStyleParams(params);
351 351
 
352
+
352 353
   /*
353 354
    * adapt to new API
354 355
    */
@@ -383,7 +384,9 @@ function addNavigatorParams(screen, navigator = null, idx = '') {
383 384
 
384 385
 function addNavigatorButtons(screen, sideMenuParams) {
385 386
   const Screen = Navigation.getRegisteredScreen(screen.screen);
386
-  screen.navigatorButtons = _.cloneDeep(Screen.navigatorButtons);
387
+  if (screen.navigatorButtons == null) {
388
+    screen.navigatorButtons = _.cloneDeep(Screen.navigatorButtons);
389
+  }
387 390
 
388 391
   // Get image uri from image id
389 392
   const rightButtons = getRightButtons(screen);