Browse Source

Merge branch 'upgrade'

Daniel Zlotin 8 years ago
parent
commit
62847a7d57

+ 0
- 5
.npmignore View File

1
 example
1
 example
2
 old-example-redux
2
 old-example-redux
3
 
3
 
4
-test/
5
-res/generated/
6
-
7
-.npmignore
8
-
9
 #################
4
 #################
10
 # from .gitignore:
5
 # from .gitignore:
11
 ################
6
 ################

+ 2
- 2
example/package.json View File

8
     "android": "cd android && ./gradlew installDebug"
8
     "android": "cd android && ./gradlew installDebug"
9
   },
9
   },
10
   "dependencies": {
10
   "dependencies": {
11
-    "react-native": "0.31.0",
12
-    "react": "15.2.1",
11
+    "react-native": "0.37.0",
12
+    "react": "15.3.2",
13
     "react-native-navigation": "file:../"
13
     "react-native-navigation": "file:../"
14
   }
14
   }
15
 }
15
 }

+ 3
- 3
package.json View File

30
     "react": "*"
30
     "react": "*"
31
   },
31
   },
32
   "dependencies": {
32
   "dependencies": {
33
-    "lodash": "^4.13.0"
33
+    "lodash": "^4.16.0"
34
   },
34
   },
35
   "optionalDependencies": {
35
   "optionalDependencies": {
36
     "react-redux": "*"
36
     "react-redux": "*"
37
   },
37
   },
38
   "devDependencies": {
38
   "devDependencies": {
39
-    "react-native": "0.31.0",
40
-    "react": "15.2.1",
39
+    "react-native": "0.37.0",
40
+    "react": "15.3.2",
41
     "app-root-path": "^1.0.0",
41
     "app-root-path": "^1.0.0",
42
     "babel-cli": "^6.8.0",
42
     "babel-cli": "^6.8.0",
43
     "babel-core": "^6.8.0",
43
     "babel-core": "^6.8.0",

+ 2
- 2
src/deprecated/platformSpecificDeprecated.android.js View File

59
   let adapted = adaptNavigationStyleToScreenStyle(params);
59
   let adapted = adaptNavigationStyleToScreenStyle(params);
60
   adapted = adaptNavigationParams(adapted);
60
   adapted = adaptNavigationParams(adapted);
61
   adapted.overrideBackPress = params.overrideBackPress;
61
   adapted.overrideBackPress = params.overrideBackPress;
62
-  
62
+
63
   newPlatformSpecific.push(adapted);
63
   newPlatformSpecific.push(adapted);
64
 }
64
 }
65
 
65
 
351
 
351
 
352
 function addNavigatorButtons(screen, sideMenuParams) {
352
 function addNavigatorButtons(screen, sideMenuParams) {
353
   const Screen = Navigation.getRegisteredScreen(screen.screen);
353
   const Screen = Navigation.getRegisteredScreen(screen.screen);
354
-  Object.assign(screen, Screen.navigatorButtons);
354
+  screen.navigatorButtons = _.cloneDeep(Screen.navigatorButtons);
355
 
355
 
356
   // Get image uri from image id
356
   // Get image uri from image id
357
   const rightButtons = getRightButtons(screen);
357
   const rightButtons = getRightButtons(screen);

+ 3
- 3
src/deprecated/platformSpecificDeprecated.ios.js View File

185
   }
185
   }
186
 
186
 
187
   let navigatorEventID = screenInstanceID + '_events';
187
   let navigatorEventID = screenInstanceID + '_events';
188
-  let navigatorButtons = JSON.parse(JSON.stringify(screenClass.navigatorButtons));
188
+  let navigatorButtons = _.cloneDeep(screenClass.navigatorButtons);
189
   if (params.navigatorButtons) {
189
   if (params.navigatorButtons) {
190
-    navigatorButtons = JSON.parse(JSON.stringify(params.navigatorButtons));
190
+    navigatorButtons = _.cloneDeep(params.navigatorButtons);
191
   }
191
   }
192
   if (navigatorButtons.leftButtons) {
192
   if (navigatorButtons.leftButtons) {
193
     for (let i = 0; i < navigatorButtons.leftButtons.length; i++) {
193
     for (let i = 0; i < navigatorButtons.leftButtons.length; i++) {
230
 
230
 
231
   Controllers.NavigationControllerIOS(navigator.navigatorID).push({
231
   Controllers.NavigationControllerIOS(navigator.navigatorID).push({
232
     title: params.title,
232
     title: params.title,
233
-    subtitle:params.subtitle,
233
+    subtitle: params.subtitle,
234
     titleImage: params.titleImage,
234
     titleImage: params.titleImage,
235
     component: params.screen,
235
     component: params.screen,
236
     animated: params.animated,
236
     animated: params.animated,