vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #599 from mindeavor/propify-catch

Browse source 
Add `catch` to promise-like objects
This commit is contained in:
Leo Horie 2015-05-04 11:21:14 -04:00
commit 93105745d8
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mithril.js
View file

@ -859,6 +859,7 @@ var m = (function app(window, undefined) {
prop.then = function(resolve, reject) { prop.then = function(resolve, reject) {
return propify(promise.then(resolve, reject), initialValue) return propify(promise.then(resolve, reject), initialValue)
}; };
prop.catch = prop.then.bind(null, null)
return prop return prop
} }
//Promiz.mithril.js | Zolmeister | MIT //Promiz.mithril.js | Zolmeister | MIT

27
tests/mithril-tests.js
View file

@ -3872,6 +3872,12 @@ function testMithril(mock) {
mock.XMLHttpRequest.$instances.pop().onreadystatechange() mock.XMLHttpRequest.$instances.pop().onreadystatechange()
return prop().message === "error occurred" && error().message === "error occurred" return prop().message === "error occurred" && error().message === "error occurred"
}) })
test(function() {
var error = m.prop("no error")
var prop = m.request({method: "GET", url: "test", deserialize: function() {throw new Error("error occurred")}}).catch(error)
mock.XMLHttpRequest.$instances.pop().onreadystatechange()
return prop().message === "error occurred" && error().message === "error occurred"
})
test(function() { test(function() {
var error = m.prop("no error"), exception var error = m.prop("no error"), exception
var prop = m.request({method: "GET", url: "test", deserialize: function() {throw new TypeError("error occurred")}}).then(null, error) var prop = m.request({method: "GET", url: "test", deserialize: function() {throw new TypeError("error occurred")}}).then(null, error)
@ -4052,6 +4058,13 @@ function testMithril(mock) {
deferred.reject("test") deferred.reject("test")
return value === "test" return value === "test"
}) })
test(function() {
var value
var deferred = m.deferred()
deferred.promise.catch(function(data) {value = data})
deferred.reject("test")
return value === "test"
})
test(function() { test(function() {
var value var value
var deferred = m.deferred() var deferred = m.deferred()
@ -4059,6 +4072,13 @@ function testMithril(mock) {
deferred.reject("test") deferred.reject("test")
return value === "foo" return value === "foo"
}) })
test(function() {
var value
var deferred = m.deferred()
deferred.promise.catch(function(data) {return "foo"}).then(function(data) {value = data})
deferred.reject("test")
return value === "foo"
})
test(function() { test(function() {
var value1, value2 var value1, value2
var deferred = m.deferred() var deferred = m.deferred()
@ -4224,6 +4244,13 @@ function testMithril(mock) {
deferred1.resolve("test") deferred1.resolve("test")
return value[0] === "test" && value[1] === "foo" return value[0] === "test" && value[1] === "foo"
}) })
test(function() {
var value
var deferred = m.deferred()
m.sync([deferred.promise]).catch(function(data) {value = data})
deferred.reject("fail")
return value[0] === "fail"
})
test(function() { test(function() {
var value = 1 var value = 1
m.sync([]).then(function() {value = 2}) m.sync([]).then(function() {value = 2})