status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1327 from a2/Update_Mon_18_May 

Updates from Mon 18 May
This commit is contained in:
Alexsander Akers 2015-05-18 16:47:09 +01:00
parent 424d1318c8 7219fcefc6
commit f2ffaed4ca
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
React/Base/RCTBridge.m
View File

@ -1182,6 +1182,7 @@ RCT_INNER_BRIDGE_ONLY(_invokeAndProcessModule:(NSString *)module method:(NSStrin
}
void (^mainThreadInvalidate)(void) = ^{
RCTAssertMainThread();
[_mainDisplayLink invalidate];
_mainDisplayLink = nil;
@ -1221,7 +1222,7 @@ RCT_INNER_BRIDGE_ONLY(_invokeAndProcessModule:(NSString *)module method:(NSStrin
/**
* Main Thread deallocations
*/
mainThreadInvalidate();
dispatch_async(dispatch_get_main_queue(), mainThreadInvalidate);
}];
}

2
package.json
View File

@ -68,7 +68,7 @@
"yargs": "1.3.2"
},
"devDependencies": {
"jest-cli": "0.4.3",
"jest-cli": "0.4.5",
"eslint": "0.9.2"
}
}

2
packager/package.json
View File

@ -25,7 +25,7 @@
},
"dependencies": {},
"devDependencies": {
"jest-cli": "0.4.3",
"jest-cli": "0.4.5",
"eslint": "0.9.2"
}
}