Switch to deffered objects interface.

This commit is contained in:
Lars Jung 2014-06-21 15:28:04 +02:00
parent 71d2ff10dc
commit 5fab8e1465
4 changed files with 26 additions and 25 deletions

View file

@ -37,10 +37,12 @@ modulejs.define('core/resource', ['_', '$', 'config', 'core/settings'], function
loadScript = function (filename, callback) {
$.ajax({
url: scriptsHref + filename,
dataType: 'script',
complete: function () { callback(); }
});
url: scriptsHref + filename,
dataType: 'script'
}).done(function () {
callback();
});
},
loadScriptGlob = function (filename, globalId, callback) {

View file

@ -12,19 +12,19 @@ modulejs.define('core/server', ['$', '_', 'config', 'core/location'], function (
if (server.api) {
$.ajax({
url: location.getAbsHref(),
data: data,
type: 'POST',
dataType: 'json',
success: function (json) {
url: location.getAbsHref(),
data: data,
type: 'POST',
dataType: 'json'
})
.done(function (json) {
callback(json);
},
error: function () {
})
.fail(function () {
callback();
}
});
});
} else {
callback();
}

View file

@ -49,18 +49,18 @@ modulejs.define('ext/preview-txt', ['_', '$', 'markdown', 'core/settings', 'core
preloadText = function (absHref, callback) {
$.ajax({
url: absHref,
dataType: 'text',
success: function (content) {
url: absHref,
dataType: 'text'
})
.done(function (content) {
callback(content);
// setTimeout(function () { callback(content); }, 1000); // for testing
},
error: function (jqXHR, textStatus, errorThrown) {
})
.fail(function (jqXHR, textStatus, errorThrown) {
callback('[ajax error] ' + textStatus);
}
});
});
},
onEnter = function (items, idx) {

View file

@ -51,12 +51,11 @@ if (window.attachEvent && !window.addEventListener) { throw 'no-browser'; }
url: url,
data: {action: 'get', setup: true, options: true, types: true, theme: true, langs: true},
type: 'POST',
dataType: 'json',
success: function (config) {
dataType: 'json'
}).done(function (config) {
modulejs.define('config', config);
$(function () { modulejs.require(module); });
}
modulejs.define('config', config);
$(function () { modulejs.require(module); });
});
}());