Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
rsvp.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
rsvp.js
Commits
5ccaf0c5
Commit
5ccaf0c5
authored
Oct 04, 2013
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remote/cancellable' into cancellable
Conflicts: lib/rsvp/all.js test/tests/extension_test.js
parents
4118cd40
558ac4dd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
119 additions
and
4 deletions
+119
-4
lib/rsvp/all.js
lib/rsvp/all.js
+6
-1
lib/rsvp/promise.js
lib/rsvp/promise.js
+7
-0
lib/rsvp/queue.js
lib/rsvp/queue.js
+1
-1
test/tests/extension_test.js
test/tests/extension_test.js
+105
-2
No files found.
lib/rsvp/all.js
View file @
5ccaf0c5
...
...
@@ -55,11 +55,16 @@ function promiseAtLeast(expected_count, promises) {
};
}
function
cancelAll
(
rejectionValue
)
{
reject
(
rejectionValue
);
canceller
();
}
for
(
var
i
=
0
;
i
<
promises
.
length
;
i
++
)
{
promise
=
promises
[
i
];
if
(
promise
&&
typeof
promise
.
then
===
'
function
'
)
{
promise
.
then
(
resolver
(
i
),
reject
,
notifier
(
i
));
promise
.
then
(
resolver
(
i
),
cancelAll
,
notifier
(
i
));
}
else
{
resolveAll
(
i
,
promise
);
}
...
...
lib/rsvp/promise.js
View file @
5ccaf0c5
...
...
@@ -83,6 +83,9 @@ var invokeCallback = function(type, promise, callback, event) {
var
hasCallback
=
isFunction
(
callback
),
value
,
error
,
succeeded
,
failed
;
if
(
promise
.
isFulfilled
)
{
return
;
}
if
(
promise
.
isRejected
)
{
return
;
}
if
(
hasCallback
)
{
try
{
value
=
callback
(
event
.
detail
);
...
...
@@ -234,6 +237,8 @@ function handleThenable(promise, value) {
function
fulfill
(
promise
,
value
)
{
config
.
async
(
function
()
{
if
(
promise
.
isFulfilled
)
{
return
;
}
if
(
promise
.
isRejected
)
{
return
;
}
promise
.
trigger
(
'
promise:resolved
'
,
{
detail
:
value
});
promise
.
isFulfilled
=
true
;
promise
.
fulfillmentValue
=
value
;
...
...
@@ -242,6 +247,8 @@ function fulfill(promise, value) {
function
reject
(
promise
,
value
)
{
config
.
async
(
function
()
{
if
(
promise
.
isFulfilled
)
{
return
;
}
if
(
promise
.
isRejected
)
{
return
;
}
promise
.
trigger
(
'
promise:failed
'
,
{
detail
:
value
});
promise
.
isRejected
=
true
;
promise
.
rejectedReason
=
value
;
...
...
lib/rsvp/queue.js
View file @
5ccaf0c5
...
...
@@ -23,7 +23,7 @@ var Queue = function() {
}
function
canceller
()
{
for
(
var
i
=
0
;
i
<
promise_list
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
2
;
i
++
)
{
promise_list
[
i
].
cancel
();
}
}
...
...
test/tests/extension_test.js
View file @
5ccaf0c5
...
...
@@ -782,6 +782,36 @@ describe("RSVP extensions", function() {
},
20
);
});
specify
(
'
cancel the array of promise as soon as rejected
'
,
function
(
done
)
{
var
firstResolver
,
secondResolver
;
var
first
=
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
firstResolver
=
{
resolve
:
resolve
,
reject
:
reject
};
});
var
second
=
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
secondResolver
=
{
resolve
:
resolve
,
reject
:
reject
};
});
setTimeout
(
function
()
{
firstResolver
.
reject
(
"
Foo
"
);
},
0
);
setTimeout
(
function
()
{
secondResolver
.
resolve
(
true
);
},
5000
);
var
all_promise
=
RSVP
.
all
([
first
,
second
]);
setTimeout
(
function
()
{
assert
(
first
.
isRejected
);
assert
.
equal
(
first
.
rejectedReason
,
"
Foo
"
);
assert
(
second
.
isRejected
);
assert
(
second
.
rejectedReason
instanceof
RSVP
.
CancellationError
);
done
();
},
20
);
});
specify
(
'
cancel with non cancellable thenables
'
,
function
(
done
)
{
var
firstResolver
,
secondResolver
;
...
...
@@ -1026,6 +1056,36 @@ describe("RSVP extensions", function() {
},
20
);
});
specify
(
'
cancel the array of promise as soon as rejected
'
,
function
(
done
)
{
var
firstResolver
,
secondResolver
;
var
first
=
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
firstResolver
=
{
resolve
:
resolve
,
reject
:
reject
};
});
var
second
=
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
secondResolver
=
{
resolve
:
resolve
,
reject
:
reject
};
});
setTimeout
(
function
()
{
firstResolver
.
reject
(
"
Foo
"
);
},
0
);
setTimeout
(
function
()
{
secondResolver
.
resolve
(
true
);
},
5000
);
var
all_promise
=
RSVP
.
any
([
first
,
second
]);
setTimeout
(
function
()
{
assert
(
first
.
isRejected
);
assert
.
equal
(
first
.
rejectedReason
,
"
Foo
"
);
assert
(
second
.
isRejected
);
assert
(
second
.
rejectedReason
instanceof
RSVP
.
CancellationError
);
done
();
},
20
);
});
specify
(
'
cancel with non cancellable thenables
'
,
function
(
done
)
{
var
firstResolver
,
secondResolver
;
...
...
@@ -1691,6 +1751,50 @@ describe("`cancel` on promise created by then", function () {
assert
.
equal
(
typeof
promise
.
cancel
,
"
function
"
);
});
it
(
'
should stop parent fulFillment propagation
'
,
function
(
done
)
{
var
promise
=
new
RSVP
.
resolve
(
1
),
promise2
=
promise
.
then
();
promise2
.
cancel
(
"
Foo
"
);
setTimeout
(
function
()
{
assert
.
equal
(
promise2
.
isRejected
,
true
);
assert
.
equal
(
promise2
.
isFulfilled
,
undefined
);
assert
(
promise2
.
rejectedReason
instanceof
RSVP
.
CancellationError
);
done
();
},
20
);
});
it
(
'
should stop parent rejection propagation
'
,
function
(
done
)
{
var
reject_count
=
0
,
promise
=
new
RSVP
.
reject
(
1
),
promise2
=
promise
.
fail
(
function
()
{
reject_count
+=
1
;});
promise2
.
cancel
(
"
Foo
"
);
setTimeout
(
function
()
{
assert
.
equal
(
promise2
.
isRejected
,
true
);
assert
.
equal
(
promise2
.
isFulfilled
,
undefined
);
assert
(
promise2
.
rejectedReason
instanceof
RSVP
.
CancellationError
);
assert
.
equal
(
reject_count
,
1
);
done
();
},
20
);
});
it
(
'
should not be callable twice
'
,
function
(
done
)
{
var
reject_count
=
0
,
promise
=
new
RSVP
.
reject
(
1
),
promise2
=
promise
.
fail
(
function
()
{
reject_count
+=
1
;});
promise2
.
cancel
(
"
Foo
"
);
promise2
.
cancel
(
"
Bar
"
);
setTimeout
(
function
()
{
assert
.
equal
(
promise2
.
isRejected
,
true
);
assert
.
equal
(
promise2
.
isFulfilled
,
undefined
);
assert
(
promise2
.
rejectedReason
instanceof
RSVP
.
CancellationError
);
assert
.
equal
(
reject_count
,
1
);
done
();
},
20
);
});
it
(
'
should cancel the pending fulfilled promise
'
,
function
(
done
)
{
var
cancel_called
=
false
,
promise
=
new
RSVP
.
Promise
(
function
(
resolve
)
{
resolve
();}),
...
...
@@ -2088,13 +2192,12 @@ describe("`RSVP.Queue`", function () {
assert
(
promise
instanceof
RSVP
.
Promise
);
});
it
(
'
should work without `new`
'
,
function
(
done
)
{
it
(
'
should work without `new`
'
,
function
()
{
var
promise
=
RSVP
.
Queue
()
.
push
(
function
()
{
return
'
value
'
;
});
promise
.
then
(
function
(
value
)
{
assert
.
equal
(
value
,
'
value
'
);
done
();
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment