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

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

Browse source
This commit is contained in:
Leo Horie 2016-12-02 22:41:48 -05:00
commit 4e25e170e9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mithril.js
View file

@ -208,7 +208,7 @@ var _8 = function($window, Promise) {
var count = 0
function complete() {if (--count === 0 && typeof oncompletion === "function") oncompletion()}
return function finalize(promise0) {
var then0 = promise0.then, catcher = promise0.catch
var then0 = promise0.then
promise0.then = function() {
count++
var next = then0.apply(promise0, arguments)
@ -274,7 +274,7 @@ var _8 = function($window, Promise) {
if (useBody && (args.data != null)) xhr.send(args.data)
else xhr.send()
})
return args.background === true ? promise0 : finalize(promise0)
return args.background === true ? promise0 : finalize(promise0)
}
function jsonp(args, extra) {
var finalize = finalizer()
@ -1067,7 +1067,7 @@ var coreRouter = function($window) {
for (var i = 0; i < keys.length; i++) {
params[keys[i].replace(/:|\./g, "")] = decodeURIComponent(values[i])
}
resolve(routes[route0], params, path, route0, !!isRouteChange)
resolve(routes[route0], params, path, route0, Boolean(isRouteChange))
})
return
}