Skip to content

Commit 4571423

Browse files
committed
Merge branch 'issue_52' of https://github.com/pobocks/api.jquery.com into pobocks-issue_52
* 'issue_52' of https://github.com/pobocks/api.jquery.com: fixes #52 - language taken from http://dev.api.jquery.com/deferred.reject/
2 parents 6f791c9 + 024ff87 commit 4571423

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

entries/deferred.progress.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</signature>
1212
<desc> Add handlers to be called when the Deferred object generates progress notifications.</desc>
1313
<longdesc>
14-
<p>The argument can be either a single function or an array of functions. When the Deferred generates progress notifications by calling <code>notify</code> or <code>notifyWith</code>, the <code>progressCallbacks</code> are called. Since <code>deferred.progress()</code> returns the Deferred object, other methods of the Deferred object can be chained to this one. When the Deferred is resolved or rejected, progress callbacks will no longer be called. For more information, see the documentation for <a href="/category/deferred-object/">Deferred object</a>.</p>
14+
<p>The argument can be either a single function or an array of functions. When the Deferred generates progress notifications by calling <code>notify</code> or <code>notifyWith</code>, the <code>progressCallbacks</code> are called. Since <code>deferred.progress()</code> returns the Deferred object, other methods of the Deferred object can be chained to this one. When the Deferred is resolved or rejected, progress callbacks will no longer be called, with the exception that any progressCallbacks added after the Deferred enters the resolved or rejected state are executed immediately when they are added, using the arguments that were passed to the <code>.notify()</code> or <code>notifyWith()</code> call. For more information, see the documentation for <a href="/category/deferred-object/">Deferred object</a>.</p>
1515
</longdesc>
1616
<category slug="deferred-object"/>
1717
<category slug="version/1.7"/>

0 commit comments

Comments
 (0)