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.

Sign up for GitHub

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

Jump to bottom

Fixed several typos in promise.js #3172

Merged
merged 6 commits into from
Dec 3, 2016
Merged

Fixed several typos in promise.js #3172

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb72426
Fixed several typos in promise.js
Marketionist Nov 27, 2016
70f3783
Another minor typo fix
Marketionist Nov 27, 2016
9732853
Minor styling fix
Marketionist Nov 27, 2016
917bb8d
Typo fix
Marketionist Nov 27, 2016
43dc339
Order scheduled fix
Marketionist Nov 28, 2016
2b30ad2
Another minor indentation fix
Marketionist Nov 28, 2016
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
8 changes: 4 additions & 4 deletions javascript/node/selenium-webdriver/lib/promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
*
* When a subtask is discarded due to an unreported rejection in its parent
* frame, the existing callbacks on that task will never settle and the
* callbacks will not be invoked. If a new callback is attached ot the subtask
* callbacks will not be invoked. If a new callback is attached to the subtask
* _after_ it has been discarded, it is handled the same as adding a callback
* to a cancelled promise: the error-callback path is invoked. This behavior is
* intended to handle cases where the user saves a reference to a task promise,
Expand Down Expand Up @@ -595,7 +595,7 @@
* > must execute in the order of their originating calls to `then`.
* >
*
* Specifically, the conformance tests contains the following scenario (for
* Specifically, the conformance tests contain the following scenario (for
* brevity, only the fulfillment version is shown):
*
* var p1 = Promise.resolve();
Expand All @@ -609,7 +609,7 @@
* // B
*
* Since the [ControlFlow](#scheduling_callbacks) executes promise callbacks as
* tasks, with this module, the result would be
* tasks, with this module, the result would be:
*
* var p2 = promise.fulfilled();
* p2.then(function() {
Expand Down Expand Up @@ -2165,7 +2165,7 @@ const SIMPLE_SCHEDULER = new SimpleScheduler;
/**
* Handles the execution of scheduled tasks, each of which may be an
* asynchronous operation. The control flow will ensure tasks are executed in
* the ordered scheduled, starting each task only once those before it have
* the ordered schedule, starting each task only once those before it have
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the order scheduled

* completed.
*
* Each task scheduled within this flow may return a {@link ManagedPromise} to
Expand Down