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 
# Conflicts:
#	mithril.js
#	mithril.min.js
This commit is contained in:
Leo Horie 2016-11-13 22:45:28 -05:00
commit 4b061dacfe
5 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mithril.js
View file

@ -219,11 +219,10 @@ var _8 = function($window, Promise) {
return finalize(new Promise(function(resolve, reject) {
if (typeof args === "string") {
var url = args
if (typeof extra === "object") args = extra
else args = {}
if (typeof args.url === "undefined") args.url = url
args = extra || {}
if (args.url == null) args.url = url
}
if (typeof args.method === "undefined") args.method = "GET"
if (args.method == null) args.method = "GET"
args.method = args.method.toUpperCase()
var useBody = typeof args.useBody === "boolean" ? args.useBody : args.method !== "GET" && args.method !== "TRACE"
if (typeof args.serialize !== "function") args.serialize = typeof FormData !== "undefined" && args.data instanceof FormData ? function(value) {return value} : JSON.stringify
@ -540,7 +539,7 @@ var _14 = function($window) {
}
else {
removeNode(old, null)
insertNode(parent, createNode(vnode, hooks, undefined), nextSibling)
insertNode(parent, createNode(vnode, hooks, ns), nextSibling)
}
}
function updateText(old, vnode) {