Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request created for 1.0 vs. 1.1 diffs. #85

Closed
wants to merge 68 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
65e0487
Work around jekyll rendering bug. See #56.
briancavalier Dec 7, 2012
46f7399
Minor updates to promise states wording
domenic Jan 27, 2013
b6ba05a
Fix #74. Clarify that all handlers must execute
briancavalier Feb 12, 2013
223b599
Specify the `this` value must not be special. Closes #58.
domenic Feb 9, 2013
a75cbbb
Terminology clarification on "thenable" and "exception."
domenic Feb 9, 2013
768bee5
Add a conformant implementations list.
domenic Feb 9, 2013
90833e9
Move "must not change" definition into relevant section.
domenic Feb 16, 2013
9b8722c
Use relative links, now that GitHub supports it.
domenic Feb 21, 2013
9697618
Use fenced code blocks, now that GitHub pages support them.
domenic Feb 21, 2013
0e23223
`undefined` is code, mark it as such.
domenic Feb 21, 2013
7fdf92a
Added Naive Promesse
val1984 Mar 5, 2013
0ef0acd
Add promise-as3 and P implementations.
domenic Mar 7, 2013
853f08f
Add the "Thenable Assimilation Procedure". Closes #75.
domenic Feb 17, 2013
ad57184
Be less specific about calling `thenable.then`.
domenic Mar 11, 2013
49f5f2f
Add changelog for 1.0 to 1.1.
domenic Feb 21, 2013
0cb1cbc
Added node-fate to Promises/A+ implementations
shanewholloway Mar 11, 2013
78fb508
Updates based on review comments.
domenic Mar 15, 2013
2a55eb7
Add when 2.0.0 to implementations
briancavalier Mar 19, 2013
20fb88d
Merge pull request #90 from briancavalier/add-when-200
briancavalier Mar 20, 2013
f180200
Add Covenant to implementations.
domenic Mar 21, 2013
d08e9dd
Replace thenable assimilation with resolution.
domenic Mar 15, 2013
b468e50
Handle exceptions thrown by getting `x.then`.
domenic Mar 15, 2013
be4524d
Spell the resolution procedure as `[[Resolve]]`.
domenic Apr 4, 2013
40168f9
Fix typo.
domenic Apr 4, 2013
0cfdf50
Add Pinky to implementations list.
domenic Apr 4, 2013
ca07ea2
added ondras/promise
ondras Apr 11, 2013
983582e
Add ff to implementations list.
domenic Apr 12, 2013
df73815
Adding D.js to implementations list.
malko Apr 14, 2013
65eb7d4
Update Covenant's description.
domenic Apr 20, 2013
1e3b123
Consistently use "reason" rather than "rejection reason". See #80
briancavalier Apr 23, 2013
ac41301
Similarly, use "value" instead of "fulfillment value". thanks @domenic
briancavalier Apr 23, 2013
ae48d4a
Add Shvua to list of implementations.
arieh Apr 22, 2013
ee27726
Handle thenables that fulfill with themselves.
domenic Apr 20, 2013
def6e2d
Allow vicious cycle detection.
domenic Apr 20, 2013
6c24cf2
Mandate `[[Resolve]](p, p)` to throw a `TypeError`.
domenic Apr 26, 2013
4972d6b
Add more implementations!
domenic May 16, 2013
dac2212
Encourage usage of the "promises-aplus" keyword.
domenic May 16, 2013
38ccd40
Add link to FidPromise implementation.
fidian May 16, 2013
417c016
Add Core to list of Promises/A+ implementations
fastner May 16, 2013
9f1d439
Adds nbd.js as a conforming implementation
Aintaer May 26, 2013
e14e654
Add YUI to the list of implementations
juandopazo May 31, 2013
653b7ea
Add Pacta to implementations.
mudge Jun 1, 2013
36d9110
Add @domenic as co-editor
briancavalier Jun 2, 2013
dcfee2f
Merge pull request #123 from briancavalier/add-domenic-as-coeditor
briancavalier Jun 3, 2013
d28d15a
Update YUI link as per @juandopazo's request.
domenic Jun 7, 2013
10d9184
Rewrite the introduction. Closes #106, closes #95.
domenic May 26, 2013
c6786b6
Update differences document for recent changes and clarity.
domenic May 27, 2013
8194fe9
Changelog should reference newer [[Resolve]].
domenic May 27, 2013
556f02a
Add @ForbesLindesay and @erights as contributors.
domenic May 27, 2013
60feafc
Update cujoJS spelling
briancavalier Jun 7, 2013
7567f36
Merge pull request #117 from promises-aplus/new-intro
briancavalier Jun 9, 2013
46791de
Remove self-fulfilling thenable special case.
domenic Jun 8, 2013
7cbacbe
Clarify infinite vs. circular thenable chains.
domenic Jun 8, 2013
1d44146
Update links to use promisesaplus.com.
domenic Jun 8, 2013
97e3162
Create a section for other-language implementations.
domenic Jun 8, 2013
ce2cfa7
Create a section for implementations inside frameworks.
domenic Jun 11, 2013
b56f76c
Merge pull request #126 from promises-aplus/implementations-in-other-…
briancavalier Jun 20, 2013
9ba58eb
Constrain onFulfilled and onRejected to not be called too early.
briancavalier Jun 18, 2013
1721033
Add potch/promise.js implementation.
potch Jul 10, 2013
71a86ae
Add tagline to spec.
briancavalier Jul 9, 2013
e5c029f
Fix missing space.
domenic Aug 3, 2013
1a4cb7d
Update and improve changelog.
domenic Aug 3, 2013
15410d4
Fix list item spacing for Promise States section.
domenic Aug 3, 2013
f35ef37
Enforce a clean stack for `onFulfilled` and `onRejected`.
domenic Aug 14, 2013
ffe71f6
Add SHXPromise to implementations
MSNexploder Aug 26, 2013
cb472c7
Merge pull request #142 from MSNexploder/patch-1
briancavalier Aug 29, 2013
c1f3082
add bluebird to implementations
petkaantonov Sep 27, 2013
e5fbe41
Fix #146: note references should be 3.x, not 4.x.
domenic Sep 29, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor updates to promise states wording
domenic committed Jan 27, 2013
commit 46f7399fe2a33bc6f8a96e57f12da73686003e38
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -23,19 +23,19 @@ A promise represents a value that may not be available yet. The primary method f

A promise must be in one of three states: pending, fulfilled, or rejected.

1. When in pending, a promise:
1. When pending, a promise:

1. may transition to either the fulfilled or rejected state.

1. When in fulfilled, a promise:
1. When fulfilled, a promise:

1. must not transition to any other state.
1. must have a value, which must not change.
1. must have a fulfillment value, which must not change.

1. When in rejected, a promise:
1. When rejected, a promise:

1. must not transition to any other state.
1. must have a reason, which must not change.
1. must have a rejection reason, which must not change.

### The `then` Method