Merge pull request #1617 from stanwest/collapsible_headings_jupyter_version

juhasch · web-flow · commit 218a91f91d8d · 2022-12-10T21:18:29.000+01:00
In Collapsible Headings, get notebook version from sys_info if possible
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,9 @@ readthedocs stuff gets all the shiny link goodness. Thanks!
 
 Unreleased (aka. GitHub master)
 -------------------------------
+
+- In *Collapsible Headings*, get the notebook version from `sys_info` if possible, resolving an incompatibility with *notebook* versions 6.5.x [#1617](https://github.com/ipython-contrib/jupyter_contrib_nbextensions/pull/1617).
+
 0.7.0
 -----
 
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js b/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js
@@ -595,7 +595,7 @@
 	 *  @return {Promise}
 	 */
 	function patch_Tooltip () {
-		if (Number(Jupyter.version[0]) >= 5) {
+		if (Number(((sys_info) ? sys_info.notebook_version : Jupyter.version).split(".")[0]) >= 5) {
 			return Promise.resolve();
 		}
 		return new Promise(function (resolve, reject) {

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@`
`595`	`595`	`* @return {Promise}`
`596`	`596`	`*/`
`597`	`597`	`function patch_Tooltip () {`
`598`		`- if (Number(Jupyter.version[0]) >= 5) {`
	`598`	`+ if (Number(((sys_info) ? sys_info.notebook_version : Jupyter.version).split(".")[0]) >= 5) {`
`599`	`599`	`return Promise.resolve();`
`600`	`600`	`}`
`601`	`601`	`return new Promise(function (resolve, reject) {`