From 4ec20d55da049cd5461fccffdff6c72a02825a09 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 14 Nov 2014 20:45:02 -0800 Subject: [PATCH] fix loading of language name from kernel_info language is langinfo.name, not langinfo.language fixes highlighting for IJulia kernels --- IPython/html/static/notebook/js/notebook.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js index b2f56b7f2..ae0b93489 100644 --- a/IPython/html/static/notebook/js/notebook.js +++ b/IPython/html/static/notebook/js/notebook.js @@ -240,11 +240,12 @@ define([ this.events.on('kernel_ready.Kernel', function(event, data) { var kinfo = data.kernel.info_reply; var langinfo = kinfo.language_info || {}; - if (!langinfo.name) langinfo.name = kinfo.language; - + if (!langinfo.name) { + langinfo.name = kinfo.language; + } that.metadata.language_info = langinfo; // Mode 'null' should be plain, unhighlighted text. - var cm_mode = langinfo.codemirror_mode || langinfo.language || 'null'; + var cm_mode = langinfo.codemirror_mode || langinfo.name || 'null'; that.set_codemirror_mode(cm_mode); }); @@ -1828,7 +1829,7 @@ define([ if (this.metadata.language_info !== undefined) { var langinfo = this.metadata.language_info; // Mode 'null' should be plain, unhighlighted text. - var cm_mode = langinfo.codemirror_mode || langinfo.language || 'null'; + var cm_mode = langinfo.codemirror_mode || langinfo.name || 'null'; this.set_codemirror_mode(cm_mode); }