浏览代码

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 年前
父节点
当前提交
35e5b86b25
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4
    1
      src/deprecated/platformSpecificDeprecated.android.js

+ 4
- 1
src/deprecated/platformSpecificDeprecated.android.js 查看文件

349
   addTitleBarBackButtonIfNeeded(params);
349
   addTitleBarBackButtonIfNeeded(params);
350
   addNavigationStyleParams(params);
350
   addNavigationStyleParams(params);
351
 
351
 
352
+
352
   /*
353
   /*
353
    * adapt to new API
354
    * adapt to new API
354
    */
355
    */
383
 
384
 
384
 function addNavigatorButtons(screen, sideMenuParams) {
385
 function addNavigatorButtons(screen, sideMenuParams) {
385
   const Screen = Navigation.getRegisteredScreen(screen.screen);
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
   // Get image uri from image id
391
   // Get image uri from image id
389
   const rightButtons = getRightButtons(screen);
392
   const rightButtons = getRightButtons(screen);