##// END OF EJS Templates
Merge pull request #7747 from Carreau/fix-lang...
Min RK -
r20423:541ea682 merge
parent child Browse files
Show More
@@ -246,7 +246,7 b' define(['
246
246
247 var body = $("<form>").addClass("form-inline").append(
247 var body = $("<form>").addClass("form-inline").append(
248 $("<span>").text(
248 $("<span>").text(
249 "I couldn't find a kernel matching " + (data.selected.display_name || data.name) + "." +
249 "I couldn't find a kernel matching " + (data.selected.display_name || data.selected.name) + "." +
250 " Please select a kernel:"
250 " Please select a kernel:"
251 )
251 )
252 ).append(select);
252 ).append(select);
@@ -2209,13 +2209,23 b' define(function (require) {'
2209 } else if (this.nbformat_minor < nbmodel.nbformat_minor) {
2209 } else if (this.nbformat_minor < nbmodel.nbformat_minor) {
2210 this.nbformat_minor = nbmodel.nbformat_minor;
2210 this.nbformat_minor = nbmodel.nbformat_minor;
2211 }
2211 }
2212
2212
2213 if (this.session === null) {
2213 if (this.session === null) {
2214 var kernel_name = utils.get_url_param('kernel_name');
2214 var kernel_name = utils.get_url_param('kernel_name');
2215 if (kernel_name) {
2215 if (kernel_name) {
2216 this.kernel_selector.set_kernel(kernel_name);
2216 this.kernel_selector.set_kernel(kernel_name);
2217 } else if (this.metadata.kernelspec) {
2217 } else if (this.metadata.kernelspec) {
2218 this.kernel_selector.set_kernel(this.metadata.kernelspec);
2218 this.kernel_selector.set_kernel(this.metadata.kernelspec);
2219 } else if (this.metadata.language) {
2220 // compat with IJulia, IHaskell, and other early kernels
2221 // adopters that where setting a language metadata.
2222 this.kernel_selector.set_kernel({
2223 name: "(No name)",
2224 language: this.metadata.language
2225 });
2226 // this should be stored in kspec now, delete it.
2227 // remove once we do not support notebook v3 anymore.
2228 delete this.metadata.language;
2219 } else {
2229 } else {
2220 // setting kernel via set_kernel above triggers start_session,
2230 // setting kernel via set_kernel above triggers start_session,
2221 // otherwise start a new session with the server's default kernel
2231 // otherwise start a new session with the server's default kernel
General Comments 0
You need to be logged in to leave comments. Login now