##// END OF EJS Templates
Merge pull request #3294 from Carreau/jsfix...
Matthias Bussonnier -
r10616:98765425 merge
parent child Browse files
Show More
@@ -231,14 +231,16 b' var IPython = (function (IPython) {'
231 231 /**
232 232 * Execute given code into kernel, and pass result to callback.
233 233 *
234 * TODO: document input_request in callbacks
235 *
234 236 * @async
235 237 * @method execute
236 238 * @param {string} code
237 * @param callback {Object} With the following keys
238 * @param callback.'execute_reply' {function}
239 * @param callback.'output' {function}
240 * @param callback.'clear_output' {function}
241 * @param callback.'set_next_input' {function}
239 * @param [callbacks] {Object} With the optional following keys
240 * @param callbacks.'execute_reply' {function}
241 * @param callbacks.'output' {function}
242 * @param callbacks.'clear_output' {function}
243 * @param callbacks.'set_next_input' {function}
242 244 * @param {object} [options]
243 245 * @param [options.silent=false] {Boolean}
244 246 * @param [options.user_expressions=empty_dict] {Dict}
@@ -291,6 +293,7 b' var IPython = (function (IPython) {'
291 293 user_expressions : {},
292 294 allow_stdin : false
293 295 };
296 callbacks = callbacks || {};
294 297 if (callbacks.input_request !== undefined) {
295 298 content.allow_stdin = true;
296 299 }
General Comments 0
You need to be logged in to leave comments. Login now