Merge pull request #1327 from a2/Update_Mon_18_May

Updates from Mon 18 May
facebook · May 18, 2015 · f2ffaed · f2ffaed
2 parents 424d131 + 7219fce
commit f2ffaed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
@@ -1182,6 +1182,7 @@ - (void)invalidate
   }
 
   void (^mainThreadInvalidate)(void) = ^{
+    RCTAssertMainThread();
 
     [_mainDisplayLink invalidate];
     _mainDisplayLink = nil;
@@ -1221,7 +1222,7 @@ - (void)invalidate
     /**
      * Main Thread deallocations
      */
-    mainThreadInvalidate();
+    dispatch_async(dispatch_get_main_queue(), mainThreadInvalidate);
 
   }];
 }

diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "yargs": "1.3.2"
   },
   "devDependencies": {
-    "jest-cli": "0.4.3",
+    "jest-cli": "0.4.5",
     "eslint": "0.9.2"
   }
 }
diff --git a/packager/package.json b/packager/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "jest-cli": "0.4.3",
+    "jest-cli": "0.4.5",
     "eslint": "0.9.2"
   }
 }