Merge pull request #611 from vjeux/update2

vjeux · vjeux · commit 0bfcc9a6c266 · 2015-04-01T18:43:43.000-07:00
Updates from Wed 1 Apr
diff --git a/Examples/2048/2048.xcodeproj/project.pbxproj b/Examples/2048/2048.xcodeproj/project.pbxproj
@@ -121,7 +121,9 @@
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Examples/Movies/Movies.xcodeproj/project.pbxproj b/Examples/Movies/Movies.xcodeproj/project.pbxproj
@@ -159,7 +159,9 @@
 				58C571FC1AA6124500CDF9C8 /* Libraries */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj b/Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj
@@ -242,7 +242,9 @@
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Examples/SampleApp/index.ios.js b/Examples/SampleApp/index.ios.js
@@ -24,7 +24,7 @@ var SampleApp = React.createClass({
         </Text>
         <Text style={styles.instructions}>
           Press Cmd+R to reload,{'\n'}
-          Cmd+Shift+Z for dev menu
+          Cmd+Control+Z for dev menu
         </Text>
       </View>
     );
diff --git a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj b/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj
@@ -121,7 +121,9 @@
 				58C572071AA6126D00CDF9C8 /* Libraries */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js b/Examples/UIExplorer/Navigator/BreadcrumbNavSample.js
@@ -115,7 +115,7 @@ var BreadcrumbNavSample = React.createClass({
         renderScene={this._renderScene}
         navigationBar={
           <Navigator.BreadcrumbNavigationBar
-            navigationBarRouteMapper={this._navBarRouteMapper}
+            routeMapper={this._navBarRouteMapper}
           />
         }
       />
diff --git a/Examples/UIExplorer/Navigator/NavigationBarSample.js b/Examples/UIExplorer/Navigator/NavigationBarSample.js
@@ -121,8 +121,8 @@ var NavigationBarSample = React.createClass({
         )}
         navigationBar={
           <Navigator.NavigationBar
-            navigationBarRouteMapper={NavigationBarRouteMapper}
-            navigationBarStyles={styles.navBar}
+            routeMapper={NavigationBarRouteMapper}
+            style={styles.navBar}
           />
         }
       />
diff --git a/Examples/UIExplorer/PushNotificationIOSExample.js b/Examples/UIExplorer/PushNotificationIOSExample.js
@@ -74,7 +74,7 @@ class NotificationExample extends React.Component {
   _onNotification(notification) {
     AlertIOS.alert(
       'Notification Received',
-      `Alert message: ${notification.getMessage()}`,
+      'Alert message: ' + notification.getMessage(),
       [{
         text: 'Dismiss',
         onPress: null,
diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj
@@ -305,7 +305,9 @@
 				004D289F1AAF61C70097A701 /* UIExplorerTests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj.rej
@@ -0,0 +1,72 @@
+diff a/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Libraries/FBReactKit/js/react-native-github/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj	(rejected hunks)
+@@ -19,6 +19,7 @@
+ 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
+ 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+ 		147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
++		D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
+ /* End PBXBuildFile section */
+ 
+ /* Begin PBXContainerItemProxy section */
+@@ -78,6 +79,13 @@
+ 			remoteGlobalIDString = 134814201AA4EA6300B7C361;
+ 			remoteInfo = RCTActionSheet;
+ 		};
++		D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */ = {
++			isa = PBXContainerItemProxy;
++			containerPortal = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
++			proxyType = 2;
++			remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
++			remoteInfo = RCTVibration;
++		};
+ /* End PBXContainerItemProxy section */
+ 
+ /* Begin PBXFileReference section */
+@@ -98,6 +106,7 @@
+ 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+ 		14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
++		D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
+ /* End PBXFileReference section */
+ 
+ /* Begin PBXFrameworksBuildPhase section */
+@@ -112,6 +121,7 @@
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
++				D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
+ 				147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
+ 				134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
+ 				134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
+@@ -145,6 +155,7 @@
+ 		1316A21D1AA397F400C0188E /* Libraries */ = {
+ 			isa = PBXGroup;
+ 			children = (
++				D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
+ 				14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */,
+ 				13417FFA1AA91531003F314A /* ReactKit.xcodeproj */,
+ 				134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
+@@ -334,6 +353,10 @@
+ 					ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */;
+ 				},
+ 				{
++					ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
++					ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
++				},
++				{
+ 					ProductGroup = 13417FFB1AA91531003F314A /* Products */;
+ 					ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */;
+ 				},
+@@ -396,6 +419,13 @@
+ 			remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */;
+ 			sourceTree = BUILT_PRODUCTS_DIR;
+ 		};
++		D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */ = {
++			isa = PBXReferenceProxy;
++			fileType = archive.ar;
++			path = libRCTVibration.a;
++			remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
++			sourceTree = BUILT_PRODUCTS_DIR;
++		};
+ /* End PBXReferenceProxy section */
+ 
+ /* Begin PBXResourcesBuildPhase section */
diff --git a/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj b/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj
@@ -233,7 +233,9 @@
 				004D289F1AAF61C70097A701 /* IntegrationTestsTests */,
 				83CBBA001A601CBA00E9B192 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj
@@ -54,7 +54,9 @@
 				14C644C21AB0DFC900DE3C65 /* RCTActionSheetManager.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 /* End PBXGroup section */
 
diff --git a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj
@@ -46,7 +46,9 @@
 				832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */,
 				832C81811AAF6DEF007FA2F7 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		832C81811AAF6DEF007FA2F7 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Libraries/CustomComponents/Navigator/Navigator.js b/Libraries/CustomComponents/Navigator/Navigator.js
@@ -462,7 +462,7 @@ var Navigator = React.createClass({
       this._emitDidFocus(presentedIndex);
       this._removePoppedRoutes();
       if (AnimationsDebugModule) {
-        AnimationsDebugModule.stopRecordingFps();
+        AnimationsDebugModule.stopRecordingFps(Date.now());
       }
       this._hideOtherScenes(presentedIndex);
     }
diff --git a/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorBreadcrumbNavigationBar.js
@@ -77,7 +77,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
       popToRoute: PropTypes.func,
       popToTop: PropTypes.func,
     }),
-    navigationBarRouteMapper: PropTypes.shape({
+    routeMapper: PropTypes.shape({
       rightContentForRoute: PropTypes.func,
       titleContentForRoute: PropTypes.func,
       iconForRoute: PropTypes.func,
@@ -87,7 +87,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
       idStack: React.PropTypes.arrayOf(React.PropTypes.number),
       presentedIndex: React.PropTypes.number,
     }),
-    navigationBarStyles: View.propTypes.style,
+    style: View.propTypes.style,
   },
 
   statics: {
@@ -144,7 +144,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
     var titles = navState.routeStack.map(this._renderOrReturnTitle);
     var buttons = navState.routeStack.map(this._renderOrReturnRightButton);
     return (
-      <View style={[styles.breadCrumbContainer, this.props.navigationBarStyles]}>
+      <View style={[styles.breadCrumbContainer, this.props.style]}>
         {titles}
         {icons}
         {buttons}
@@ -154,7 +154,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
 
   _renderOrReturnBreadcrumb: function(route, index) {
     var uid = this.props.navState.idStack[index];
-    var navBarRouteMapper = this.props.navigationBarRouteMapper;
+    var navBarRouteMapper = this.props.routeMapper;
     var navOps = this.props.navigator;
     var alreadyRendered = this.refs['crumbContainer' + uid];
     if (alreadyRendered) {
@@ -199,7 +199,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
         />
       );
     }
-    var navBarRouteMapper = this.props.navigationBarRouteMapper;
+    var navBarRouteMapper = this.props.routeMapper;
     var titleContent = navBarRouteMapper.titleContentForRoute(
       navState.routeStack[index],
       this.props.navigator
@@ -219,7 +219,7 @@ var NavigatorBreadcrumbNavigationBar = React.createClass({
 
   _renderOrReturnRightButton: function(route, index) {
     var navState = this.props.navState;
-    var navBarRouteMapper = this.props.navigationBarRouteMapper;
+    var navBarRouteMapper = this.props.routeMapper;
     var uid = navState.idStack[index];
     var alreadyRendered = this.refs['rightContainer' + uid];
     if (alreadyRendered) {
diff --git a/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js b/Libraries/CustomComponents/Navigator/NavigatorNavigationBar.js
@@ -46,7 +46,7 @@ var NavigatorNavigationBar = React.createClass({
 
   propTypes: {
     navigator: React.PropTypes.object,
-    navigationBarRouteMapper: React.PropTypes.shape({
+    routeMapper: React.PropTypes.shape({
       Title: React.PropTypes.func.isRequired,
       LeftButton: React.PropTypes.func.isRequired,
       RightButton: React.PropTypes.func.isRequired,
@@ -56,7 +56,7 @@ var NavigatorNavigationBar = React.createClass({
       idStack: React.PropTypes.arrayOf(React.PropTypes.number),
       presentedIndex: React.PropTypes.number,
     }),
-    navigationBarStyles: View.propTypes.style,
+    style: View.propTypes.style,
   },
 
   statics: {
@@ -133,7 +133,7 @@ var NavigatorNavigationBar = React.createClass({
     }, this);
 
     return (
-      <View style={[styles.navBarContainer, this.props.navigationBarStyles]}>
+      <View style={[styles.navBarContainer, this.props.style]}>
         {components}
       </View>
     );
@@ -145,7 +145,6 @@ var NavigatorNavigationBar = React.createClass({
     /*number*/index
   ) /*object*/ {
     var navState = this.props.navState;
-    var navBarRouteMapper = this.props.navigationBarRouteMapper;
     var uid = navState.idStack[index];
     var containerRef = componentName + 'Container' + uid;
     var alreadyRendered = this.refs[containerRef];
@@ -160,7 +159,7 @@ var NavigatorNavigationBar = React.createClass({
       );
     }
 
-    var content = navBarRouteMapper[componentName](
+    var content = this.props.routeMapper[componentName](
       navState.routeStack[index],
       this.props.navigator,
       index,
diff --git a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj
@@ -54,7 +54,9 @@
 				134814051AA4E45400B7C361 /* RCTLocationObserver.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 /* End PBXGroup section */
 
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
@@ -56,35 +56,33 @@ var warning = require('warning');
 
 var Image = React.createClass({
   propTypes: {
+    /**
+     * `uri` is a string representing the resource identifier for the image, which
+     * could be an http address, a local file path, or the name of a static image
+     * resource (which should be wrapped in the `required('image!name')` function).
+     */
     source: PropTypes.shape({
-      /**
-       * A string representing the resource identifier for the image, which
-       * could be an http address, a local file path, or the name of a static image
-       * resource (which should be wrapped in the `ix` function).
-       */
       uri: PropTypes.string,
     }),
     /**
-     * accessible - Whether this element should be revealed as an accessible
-     * element.
+     * Whether this element should be revealed as an accessible element.
      */
     accessible: PropTypes.bool,
     /**
-     * accessibilityLabel - Custom string to display for accessibility.
+     * Custom string to display for accessibility.
      */
     accessibilityLabel: PropTypes.string,
     /**
-     * capInsets - When the image is resized, the corners of the size specified
+     * When the image is resized, the corners of the size specified
      * by capInsets will stay a fixed size, but the center content and borders
      * of the image will be stretched.  This is useful for creating resizable
-     * rounded buttons, shadows, and other resizable assets.  More info:
-     *
-     *   https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/index.html#//apple_ref/occ/instm/UIImage/resizableImageWithCapInsets:
+     * rounded buttons, shadows, and other resizable assets.  More info on
+     * [Apple documentation](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/index.html#//apple_ref/occ/instm/UIImage/resizableImageWithCapInsets)
      */
     capInsets: EdgeInsetsPropType,
     style: StyleSheetPropType(ImageStylePropTypes),
     /**
-     * testID - A unique identifier for this element to be used in UI Automation
+     * A unique identifier for this element to be used in UI Automation
      * testing scripts.
      */
     testID: PropTypes.string,
diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj
@@ -81,7 +81,9 @@
 				1304D5AA1AA8C4A30002E2BE /* RCTStaticImageManager.m */,
 				58B5115E1A9E6B3D00147676 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		58B5115E1A9E6B3D00147676 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj
@@ -51,7 +51,9 @@
 				1372B7361AB03E7B00659ED6 /* RCTReachability.m */,
 				58B511DC1A9E6C8500147676 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		58B511DC1A9E6C8500147676 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj
@@ -54,7 +54,9 @@
 				148699CE1ABD045300480536 /* RCTPushNotificationManager.m */,
 				134814211AA4EA7D00B7C361 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 /* End PBXGroup section */
 
diff --git a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj
@@ -65,7 +65,9 @@
 				58E64FE31AB964CD007446E2 /* FBSnapshotTestCase */,
 				580C37701AB104AF0015E709 /* Products */,
 			);
+			indentWidth = 2;
 			sourceTree = "<group>";
+			tabWidth = 2;
 		};
 		580C37701AB104AF0015E709 /* Products */ = {
 			isa = PBXGroup;
diff --git a/Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj/project.pbxproj b/Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj/project.pbxproj
diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj
diff --git a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ var BreadcrumbNavSample = React.createClass({`
`115`	`115`	`renderScene={this._renderScene}`
`116`	`116`	`navigationBar={`
`117`	`117`	`<Navigator.BreadcrumbNavigationBar`
`118`		`- navigationBarRouteMapper={this._navBarRouteMapper}`
	`118`	`+ routeMapper={this._navBarRouteMapper}`
`119`	`119`	`/>`
`120`	`120`	`}`
`121`	`121`	`/>`