From a1ed78ddadc509cfc0330a7ae9c644351b1b8b8f Mon Sep 17 00:00:00 2001 From: bzinberg Date: Thu, 30 Jan 2020 16:09:58 -0500 Subject: [PATCH 1/3] Update CodeMirror dependency Per https://github.com/codemirror/CodeMirror/issues/6128#issuecomment-580438029, hoping to pick up a fix to https://github.com/codemirror/CodeMirror/issues/6064 that got merged in recently. --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 52138a7f3..58e237b26 100644 --- a/bower.json +++ b/bower.json @@ -5,7 +5,7 @@ "backbone": "components/backbone#~1.2", "bootstrap": "bootstrap#~3.4", "bootstrap-tour": "0.9.0", - "codemirror": "components/codemirror#~5.48.4", + "codemirror": "components/codemirror#~5.51.0", "create-react-class": "https://cdn.jsdelivr.net/npm/create-react-class@15.6.3/create-react-class.min.js", "es6-promise": "~1.0", "font-awesome": "components/font-awesome#~4.7.0", From cb385481f66942f7f24b88bccee42fd58e118221 Mon Sep 17 00:00:00 2001 From: Ben Zinberg Date: Thu, 30 Jan 2020 19:58:45 -0500 Subject: [PATCH 3/3] Fix place where we were passing an `Array[string]` to `CodeMirror.findModeByExtension` instead of passing a string. (I guess older versions of CodeMirror allowed this?) --- notebook/static/base/js/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/static/base/js/utils.js b/notebook/static/base/js/utils.js index 54a2bd0d4..1d8a9d010 100644 --- a/notebook/static/base/js/utils.js +++ b/notebook/static/base/js/utils.js @@ -754,7 +754,7 @@ define([ // .mime var info = (mode && mode.mode && mode.mime && mode) || CodeMirror.findModeByName(modename) || - CodeMirror.findModeByExtension(modename.split(".").slice(-1)) || + CodeMirror.findModeByExtension(modename.split(".").slice(-1)[0]) || CodeMirror.findModeByMIME(modename) || {mode: modename, mime: modename};