Show More
@@ -169,7 +169,8 define([ | |||
|
169 | 169 | var that = this; |
|
170 | 170 | if (typeof selected === 'string') { |
|
171 | 171 | selected = { |
|
172 | name: selected | |
|
172 | name: selected, | |
|
173 | language: selected | |
|
173 | 174 | }; |
|
174 | 175 | } |
|
175 | 176 | if (this._loaded) { |
@@ -246,7 +247,7 define([ | |||
|
246 | 247 | |
|
247 | 248 | var body = $("<form>").addClass("form-inline").append( |
|
248 | 249 | $("<span>").text( |
|
249 | "I couldn't find a kernel matching " + (data.selected.display_name || data.name) + "." + | |
|
250 | "I couldn't find a kernel matching " + (data.selected.display_name || data.selected.name) + "." + | |
|
250 | 251 | " Please select a kernel:" |
|
251 | 252 | ) |
|
252 | 253 | ).append(select); |
@@ -2209,13 +2209,20 define(function (require) { | |||
|
2209 | 2209 | } else if (this.nbformat_minor < nbmodel.nbformat_minor) { |
|
2210 | 2210 | this.nbformat_minor = nbmodel.nbformat_minor; |
|
2211 | 2211 | } |
|
2212 | ||
|
2212 | ||
|
2213 | 2213 | if (this.session === null) { |
|
2214 | 2214 | var kernel_name = utils.get_url_param('kernel_name'); |
|
2215 | 2215 | if (kernel_name) { |
|
2216 | 2216 | this.kernel_selector.set_kernel(kernel_name); |
|
2217 | 2217 | } else if (this.metadata.kernelspec) { |
|
2218 | 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 seting a language metadata. | |
|
2222 | this.kernel_selector.set_kernel(this.metadata.language); | |
|
2223 | // this shoudl be stored in kspec now, delete it. | |
|
2224 | // remove once we do not support notebook v3 anymore. | |
|
2225 | del this.metadata.language; | |
|
2219 | 2226 | } else { |
|
2220 | 2227 | // setting kernel via set_kernel above triggers start_session, |
|
2221 | 2228 | // 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