mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2024-09-20 12:48:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to deffered objects interface.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/_h5ai/client/js/inc/core/resource.js
View file

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

18
src/_h5ai/client/js/inc/core/server.js
View file

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

14
src/_h5ai/client/js/inc/ext/preview-txt.js
View file

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

9
src/_h5ai/client/js/scripts.js
View file

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