Skip to content

Update fri 29 may - #1446

Merged
tadeuzagallo merged 21 commits into
react:masterfrom
tadeuzagallo:Update_Fri_29_May
May 30, 2015
Merged

Update fri 29 may#1446
tadeuzagallo merged 21 commits into
react:masterfrom
tadeuzagallo:Update_Fri_29_May

Conversation

@tadeuzagallo

Copy link
Copy Markdown
Contributor

No description provided.

tadeuzagalloand others added 12 commits May 28, 2015 08:53
Summary:
@public
Allow to pass an optional completion block to the bridge JS calls.
The block will be called from the JS thread, after the javascript has finished
running and the returned calls have been processed/dispatched to the native modules.
Test Plan: Added `testCallbackIsCalledOnTheRightTime` to `RKBatchedBridgeTests`
…l:args:]"
Test plan: broke catalyst apps
Summary: This reverts commit 9fba6a360dc5f8bf.
fbobjc/Tools/revert
Reverter: jprado
@build-break
commit 9fba6a360dc5f8bf014f3d3c584c545b16da5100
Author: Tadeu Zagallo <tadeuzagallo@fb.com>
AuthorDate: Thu May 28 08:29:19 2015 -0700
Commit: Service User <svcscm@fb.com>
CommitDate: Thu May 28 09:53:53 2015 -0700
[ReactNative] Add completionBlock to -[RCTBridge enqueueJSCall:args:]
Summary:
@public
Allow to pass an optional completion block to the bridge JS calls.
The block will be called from the JS thread, after the javascript has finished
running and the returned calls have been processed/dispatched to the native modules.
Test Plan: Added `testCallbackIsCalledOnTheRightTime` to `RKBatchedBridgeTests`
Summary:
@public
This fixes an issue with the containerBackgroundColor property of `<Text>` nodes, where containerBackgroundColor was being overridden by the backgroundColor. I also fixed up the example so that it demonstrates the feature more clearly.
Test Plan:
* Check UIExplorer text example
* Run Catalyst snapshot tests and check MAdMan, Groups
Summary:
Add the license field on package.json
Closesreact#1409
Github Author: Leonardo YongUk Kim <dalinaum@gmail.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
@facebook-github-botfacebook-github-bot added GH Review: review-needed CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. labels May 29, 2015
@tadeuzagallo
tadeuzagalloforce-pushed the Update_Fri_29_May branch 2 times, most recently from db63644 to c6b7eb7CompareMay 29, 2015 22:10
@ccheever

Copy link
Copy Markdown
Contributor

EDIT: Striking comment because I put it on the wrong issue :/

I think this can be closed because a superset of commits was merged in#1432

@brentvatne - I don't have sufficient permissions to close but I know you're triaging today?

@tadeuzagallo

Copy link
Copy Markdown
ContributorAuthor

I merged #1432 with the commits up to yesterday, these commits are today's, they don't have any commit in common. Be careful before closing things.

@ccheever

Copy link
Copy Markdown
Contributor

@tadeuzagallo sorry my mistake -- i posted my comment to the wrong tab in my browser, and it should have gone to this page.
#1392

(Will note this on my earlier comment.)

@tadeuzagallo

Copy link
Copy Markdown
ContributorAuthor

Oh, I see. Closed it, Thanks!

@tadeuzagallo
tadeuzagalloforce-pushed the Update_Fri_29_May branch 3 times, most recently from 8e92a9e to d700e92CompareMay 30, 2015 01:02
tadeuzagallo added a commit that referenced this pull request May 30, 2015
@tadeuzagallo
tadeuzagallo merged commit c60c1c0 into react:masterMay 30, 2015
@tadeuzagallo
tadeuzagallo deleted the Update_Fri_29_May branch May 30, 2015 01:35
mganandraj pushed a commit to mganandraj/react-native that referenced this pull request Dec 6, 2022
AB#6558463 Remove temporary patch to emit warning instead of error
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA SignedThis label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@tadeuzagallo@ccheever@facebook-github-bot@nicklockwood@vjeux@dalinaum@frantic@kmagiera