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

Merge branch 'next' into components

Browse source
This commit is contained in:
Leo Horie 2015-03-27 11:58:59 -04:00
commit 8b1a58bc51
69 changed files with 13028 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mithril.js
View file

@ -838,12 +838,11 @@ var m = (function app(window, undefined) {
deferred.promise = propify(deferred.promise);
return deferred
};
function propify(promise) {
var prop = m.prop();
function propify(promise, initialValue) {
var prop = m.prop(initialValue);
promise.then(prop);
prop.then = function(resolve, reject) {
promise = promise.then(resolve, reject).then(prop);
return prop;
return propify(promise.then(resolve, reject), initialValue)
};
return prop
}
@ -1096,7 +1095,7 @@ var m = (function app(window, undefined) {
m.request = function(xhrOptions) {
if (xhrOptions.background !== true) m.startComputation();
var deferred = m.deferred();
var deferred = new Deferred();
var isJSONP = xhrOptions.dataType && xhrOptions.dataType.toLowerCase() === "jsonp";
var serialize = xhrOptions.serialize = isJSONP ? identity : xhrOptions.serialize || JSON.stringify;
var deserialize = xhrOptions.deserialize = isJSONP ? identity : xhrOptions.deserialize || JSON.parse;
@ -1125,7 +1124,7 @@ var m = (function app(window, undefined) {
if (xhrOptions.background !== true) m.endComputation()
};
ajax(xhrOptions);
deferred.promise(xhrOptions.initialValue);
deferred.promise = propify(deferred.promise, xhrOptions.initialValue);
return deferred.promise
};