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

fix handling of errors in promises

Browse source
This commit is contained in:
Leo Horie 2014-03-21 23:20:47 -04:00
parent 45b13165f6
commit 77d5484169
6 changed files with 48 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
archive/v0.1.1/mithril-tests.js
View file

@ -307,14 +307,20 @@ new function(window) {
var next = m.deferred() var next = m.deferred()
if (!success) success = identity if (!success) success = identity
if (!error) error = identity if (!error) error = identity
resolvers.push(function(value) { function push(list, method, callback) {
var result = success(value) list.push(function(value) {
next.resolve(result !== undefined ? result : value) try {
}) var result = callback(value)
rejecters.push(function(value) { next[method](result !== undefined ? result : value)
var result = error(value) }
next.reject(result !== undefined ? result : value) catch (e) {
}) if (e instanceof Error && e.constructor !== Error) throw e
else next.reject(e)
}
})
}
push(resolvers, "resolve", success)
push(rejecters, "reject", error)
return next.promise return next.promise
} }
return object return object
@ -719,7 +725,7 @@ function testMithril(mock) {
test(function() { test(function() {
var value var value
var deferred = m.deferred() var deferred = m.deferred()
deferred.promise.then(function(value) {return "foo"}).then(function(data) {value = data}) deferred.promise.then(function(data) {return "foo"}).then(function(data) {value = data})
deferred.resolve("test") deferred.resolve("test")
return value === "foo" return value === "foo"
}) })
@ -733,10 +739,17 @@ function testMithril(mock) {
test(function() { test(function() {
var value var value
var deferred = m.deferred() var deferred = m.deferred()
deferred.promise.then(null, function(value) {return "foo"}).then(null, function(data) {value = data}) deferred.promise.then(null, function(data) {return "foo"}).then(null, function(data) {value = data})
deferred.reject("test") deferred.reject("test")
return value === "foo" return value === "foo"
}) })
test(function() {
var value1, value2
var deferred = m.deferred()
deferred.promise.then(function(data) {throw new Error}).then(function(data) {value1 = 1}, function(data) {value2 = data})
deferred.resolve("test")
return value1 === undefined && value2 instanceof Error
})
//m.sync //m.sync
test(function() { test(function() {

2
archive/v0.1.1/mithril.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
archive/v0.1.1/mithril.min.map
View file

File diff suppressed because one or more lines are too long

BIN
archive/v0.1.1/mithril.min.zip
View file

Binary file not shown.

22
mithril.js
View file

@ -307,14 +307,20 @@ new function(window) {
var next = m.deferred() var next = m.deferred()
if (!success) success = identity if (!success) success = identity
if (!error) error = identity if (!error) error = identity
resolvers.push(function(value) { function push(list, method, callback) {
var result = success(value) list.push(function(value) {
next.resolve(result !== undefined ? result : value) try {
}) var result = callback(value)
rejecters.push(function(value) { next[method](result !== undefined ? result : value)
var result = error(value) }
next.reject(result !== undefined ? result : value) catch (e) {
}) if (e instanceof Error && e.constructor !== Error) throw e
else next.reject(e)
}
})
}
push(resolvers, "resolve", success)
push(rejecters, "reject", error)
return next.promise return next.promise
} }
return object return object

11
tests/mithril-tests.js
View file

@ -214,7 +214,7 @@ function testMithril(mock) {
test(function() { test(function() {
var value var value
var deferred = m.deferred() var deferred = m.deferred()
deferred.promise.then(function(value) {return "foo"}).then(function(data) {value = data}) deferred.promise.then(function(data) {return "foo"}).then(function(data) {value = data})
deferred.resolve("test") deferred.resolve("test")
return value === "foo" return value === "foo"
}) })
@ -228,10 +228,17 @@ function testMithril(mock) {
test(function() { test(function() {
var value var value
var deferred = m.deferred() var deferred = m.deferred()
deferred.promise.then(null, function(value) {return "foo"}).then(null, function(data) {value = data}) deferred.promise.then(null, function(data) {return "foo"}).then(null, function(data) {value = data})
deferred.reject("test") deferred.reject("test")
return value === "foo" return value === "foo"
}) })
test(function() {
var value1, value2
var deferred = m.deferred()
deferred.promise.then(function(data) {throw new Error}).then(function(data) {value1 = 1}, function(data) {value2 = data})
deferred.resolve("test")
return value1 === undefined && value2 instanceof Error
})
//m.sync //m.sync
test(function() { test(function() {