mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Infrastructure for AJAX requests returning ES6 promises

Browse Source
This commit is contained in:
Thomas Kluyver 2014-11-13 11:42:37 -08:00
parent 0a22217f7e
commit 9b2dac3fc1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IPython/html/static/base/js/utils.js
View File

@ -5,6 +5,7 @@ define([
'base/js/namespace',
'jquery',
'codemirror/lib/codemirror',
'es6promise',
], function(IPython, $, CodeMirror){
"use strict";
@ -591,6 +592,21 @@ define([
return wrapped_error;
};
var promising_ajax = function(url, settings) {
// Like $.ajax, but returning an ES6 promise. success and error settings
// will be ignored.
return new Promise(function(resolve, reject) {
settings.success = function(data, status, jqXHR) {
resolve(data);
}
settings.error = function(jqXHR, status, error) {
log_ajax_error(jqXHR, status, error);
reject(wrap_ajax_error(jqXHR, status, error));
}
$.ajax(url, settings);
});
};
var utils = {
regex_split : regex_split,
uuid : uuid,
@ -618,7 +634,8 @@ define([
log_ajax_error : log_ajax_error,
requireCodeMirrorMode : requireCodeMirrorMode,
XHR_ERROR : XHR_ERROR,
wrap_ajax_error : wrap_ajax_error
wrap_ajax_error : wrap_ajax_error,
promising_ajax : promising_ajax,
};
// Backwards compatability.

1
IPython/html/templates/page.html
View File

@ -30,6 +30,7 @@
moment: "components/moment/moment",
codemirror: 'components/codemirror',
termjs: "components/term.js/src/term",
es6promise: 'components/es6-promise/promise.min',
contents: '{{ contents_js_source }}',
},
shim: {