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

fix abort so that it works without custom extract option

Browse source
This commit is contained in:
Leo Horie 2014-04-29 22:20:19 -04:00
parent 38dba03f6d
commit f4a248f0a5
6 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
archive/v0.1.11/mithril-tests.js
View file

@ -399,7 +399,9 @@ Mithril = m = new function app(window) {
xhr.onload = typeof options.onload == "function" ? options.onload : function() {} xhr.onload = typeof options.onload == "function" ? options.onload : function() {}
xhr.onerror = typeof options.onerror == "function" ? options.onerror : function() {} xhr.onerror = typeof options.onerror == "function" ? options.onerror : function() {}
xhr.onreadystatechange = function() { xhr.onreadystatechange = function() {
if (xhr.readyState === 4 && xhr.status === 0) xhr.onerror({type: "error", target: xhr}) if (xhr.readyState === 4 && xhr.status === 0) {
xhr.onerror({type: "error", target: xhr})
}
} }
if (typeof options.config == "function") options.config(xhr, options) if (typeof options.config == "function") options.config(xhr, options)
xhr.send(options.data) xhr.send(options.data)
@ -439,7 +441,9 @@ Mithril = m = new function app(window) {
var deferred = m.deferred() var deferred = m.deferred()
var serialize = xhrOptions.serialize || JSON.stringify var serialize = xhrOptions.serialize || JSON.stringify
var deserialize = xhrOptions.deserialize || JSON.parse var deserialize = xhrOptions.deserialize || JSON.parse
var extract = xhrOptions.extract || function(xhr, xhrOptions) {return xhr.responseText} var extract = xhrOptions.extract || function(xhr, xhrOptions) {
return xhr.responseText.length === 0 && deserialize === JSON.parse ? null : xhr.responseText
}
xhrOptions.url = parameterizeUrl(xhrOptions.url, xhrOptions.data) xhrOptions.url = parameterizeUrl(xhrOptions.url, xhrOptions.data)
xhrOptions = bindData(xhrOptions, xhrOptions.data, serialize) xhrOptions = bindData(xhrOptions, xhrOptions.data, serialize)
xhrOptions.onload = xhrOptions.onerror = function(e) { xhrOptions.onload = xhrOptions.onerror = function(e) {

8
archive/v0.1.11/mithril.js
View file

@ -399,7 +399,9 @@ Mithril = m = new function app(window) {
xhr.onload = typeof options.onload == "function" ? options.onload : function() {} xhr.onload = typeof options.onload == "function" ? options.onload : function() {}
xhr.onerror = typeof options.onerror == "function" ? options.onerror : function() {} xhr.onerror = typeof options.onerror == "function" ? options.onerror : function() {}
xhr.onreadystatechange = function() { xhr.onreadystatechange = function() {
if (xhr.readyState === 4 && xhr.status === 0) xhr.onerror({type: "error", target: xhr}) if (xhr.readyState === 4 && xhr.status === 0) {
xhr.onerror({type: "error", target: xhr})
}
} }
if (typeof options.config == "function") options.config(xhr, options) if (typeof options.config == "function") options.config(xhr, options)
xhr.send(options.data) xhr.send(options.data)
@ -439,7 +441,9 @@ Mithril = m = new function app(window) {
var deferred = m.deferred() var deferred = m.deferred()
var serialize = xhrOptions.serialize || JSON.stringify var serialize = xhrOptions.serialize || JSON.stringify
var deserialize = xhrOptions.deserialize || JSON.parse var deserialize = xhrOptions.deserialize || JSON.parse
var extract = xhrOptions.extract || function(xhr, xhrOptions) {return xhr.responseText} var extract = xhrOptions.extract || function(xhr, xhrOptions) {
return xhr.responseText.length === 0 && deserialize === JSON.parse ? null : xhr.responseText
}
xhrOptions.url = parameterizeUrl(xhrOptions.url, xhrOptions.data) xhrOptions.url = parameterizeUrl(xhrOptions.url, xhrOptions.data)
xhrOptions = bindData(xhrOptions, xhrOptions.data, serialize) xhrOptions = bindData(xhrOptions, xhrOptions.data, serialize)
xhrOptions.onload = xhrOptions.onerror = function(e) { xhrOptions.onload = xhrOptions.onerror = function(e) {

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

Binary file not shown.

8
mithril.js
View file

@ -399,7 +399,9 @@ Mithril = m = new function app(window) {
xhr.onload = typeof options.onload == "function" ? options.onload : function() {} xhr.onload = typeof options.onload == "function" ? options.onload : function() {}
xhr.onerror = typeof options.onerror == "function" ? options.onerror : function() {} xhr.onerror = typeof options.onerror == "function" ? options.onerror : function() {}
xhr.onreadystatechange = function() { xhr.onreadystatechange = function() {
if (xhr.readyState === 4 && xhr.status === 0) xhr.onerror({type: "error", target: xhr}) if (xhr.readyState === 4 && xhr.status === 0) {
xhr.onerror({type: "error", target: xhr})
}
} }
if (typeof options.config == "function") options.config(xhr, options) if (typeof options.config == "function") options.config(xhr, options)
xhr.send(options.data) xhr.send(options.data)
@ -439,7 +441,9 @@ Mithril = m = new function app(window) {
var deferred = m.deferred() var deferred = m.deferred()
var serialize = xhrOptions.serialize || JSON.stringify var serialize = xhrOptions.serialize || JSON.stringify
var deserialize = xhrOptions.deserialize || JSON.parse var deserialize = xhrOptions.deserialize || JSON.parse
var extract = xhrOptions.extract || function(xhr, xhrOptions) {return xhr.responseText} var extract = xhrOptions.extract || function(xhr, xhrOptions) {
return xhr.responseText.length === 0 && deserialize === JSON.parse ? null : xhr.responseText
}
xhrOptions.url = parameterizeUrl(xhrOptions.url, xhrOptions.data) xhrOptions.url = parameterizeUrl(xhrOptions.url, xhrOptions.data)
xhrOptions = bindData(xhrOptions, xhrOptions.data, serialize) xhrOptions = bindData(xhrOptions, xhrOptions.data, serialize)
xhrOptions.onload = xhrOptions.onerror = function(e) { xhrOptions.onload = xhrOptions.onerror = function(e) {