Edited by Code-review facebook#997

bimawa · Apr 24, 2015 · de1d849 · de1d849
1 parent 7365704
commit de1d849
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 95 deletions.
diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer.xcscheme
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
    version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+   <BuildAction>
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForRunning = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
@@ -20,60 +13,12 @@
                ReferencedContainer = "container:UIExplorer.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "004D289D1AAF61C70097A701"
-               BuildableName = "UIExplorerTests.xctest"
-               BlueprintName = "UIExplorerTests"
-               ReferencedContainer = "container:UIExplorer.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "004D289D1AAF61C70097A701"
-               BuildableName = "UIExplorerTests.xctest"
-               BlueprintName = "UIExplorerTests"
-               ReferencedContainer = "container:UIExplorer.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "UIExplorer.app"
-            BlueprintName = "UIExplorer"
-            ReferencedContainer = "container:UIExplorer.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      buildConfiguration = "Debug">
+      <BuildableProductRunnable>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
@@ -82,31 +27,5 @@
             ReferencedContainer = "container:UIExplorer.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "UIExplorer.app"
-            BlueprintName = "UIExplorer"
-            ReferencedContainer = "container:UIExplorer.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
 </Scheme>
diff --git a/React/Views/RCTTextField.m b/React/Views/RCTTextField.m
@@ -43,16 +43,12 @@ - (void)setText:(NSString *)text
 }
 
 - (void)_setupPlaceholder {
-    NSAttributedString *placeholderAttributedString = nil;
-    if (self.placeholder && self.placeholder.length > 0) {
-        if (self.placeholderTextColor) {
-            placeholderAttributedString = [[NSAttributedString alloc] initWithString:self.placeholder attributes:@{NSForegroundColorAttributeName : self.placeholderTextColor}];
-        }
+    if (self.placeholder.length > 0 && self.placeholderTextColor) {
+        self.attributedPlaceholder = [[NSAttributedString alloc] initWithString:self.placeholder
+                                                                     attributes:@{
+                                                                             NSForegroundColorAttributeName: self.placeholderTextColor
+                                                                     }];
     }
-
-    if (placeholderAttributedString)
-        self.attributedPlaceholder = placeholderAttributedString;
-
 }
 
 - (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor {
@@ -61,7 +57,7 @@ - (void)setPlaceholderTextColor:(UIColor *)placeholderTextColor {
 }
 
 - (void)setPlaceholder:(NSString *)placeholder {
-    [super setPlaceholder:[placeholder mutableCopy]];
+    super.placeholder = placeholder;
     [self _setupPlaceholder];
 }