Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Leo Horie 2014-10-12 21:48:54 -04:00
commit b75afdc893

View file

@ -644,7 +644,7 @@ Mithril = m = new function app(window, undefined) {
return deferred
}
function propify(promise) {
prop = m.prop()
var prop = m.prop()
promise.then(prop)
prop.then = function(resolve, reject) {
return propify(promise.then(resolve, reject))