diff --git a/src/jupyter_contrib_nbextensions/nbconvert_support/collapsible_headings.py b/src/jupyter_contrib_nbextensions/nbconvert_support/collapsible_headings.py index e9e688007..7e6bcf520 100644 --- a/src/jupyter_contrib_nbextensions/nbconvert_support/collapsible_headings.py +++ b/src/jupyter_contrib_nbextensions/nbconvert_support/collapsible_headings.py @@ -25,6 +25,11 @@ class ExporterCollapsibleHeadings(ExporterInliner): def __init__(self, *args, **kwargs): super(ExporterCollapsibleHeadings, self).__init__(*args, **kwargs) + self.inliner_resources['css'].append(""" +/* no local copies of fontawesome fonts in basic templates, so use cdn */ +@import url(https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css) +""") # noqa: E501 + ch_dir = os.path.join( os.path.dirname(contrib_init), 'nbextensions', 'collapsible_headings') @@ -32,20 +37,6 @@ def __init__(self, *args, **kwargs): with open(os.path.join(ch_dir, 'main.css'), 'r') as f: self.inliner_resources['css'].append(f.read()) - self.inliner_resources['css'].append(""" -/* no local copies of fontawesome fonts from basic templates, so get them from cdn */ -@font-face { - font-family: 'FontAwesome'; - src: url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/fonts/fontawesome-webfont.eot'); - src: url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), - url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/fonts/fontawesome-webfont.woff') format('woff'), - url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/fonts/fontawesome-webfont.ttf') format('truetype'), - url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg'); - font-weight: normal; - font-style: normal; -} -""") # noqa: E501 - with open(os.path.join(ch_dir, 'main.js'), 'r') as f: self.inliner_resources['js'].append(f.read()) @@ -53,16 +44,10 @@ def __init__(self, *args, **kwargs): collapsible_headings_options = cm.get('notebook').get( 'collapsible_headings', {}) self.inliner_resources['js'].append(""" -require([ - 'jquery', - 'nbextensions/collapsible_headings/main' -], function ( - $, - nbext -) { - nbext.set_collapsible_headings_options(%s); - $(document).ready(function () { - nbext.refresh_all_headings(); +$(document).ready(function () { + require(['nbextensions/collapsible_headings/main'], function (ch) { + ch.set_collapsible_headings_options(%s); + ch.refresh_all_headings(); }); }); """ % json.dumps(collapsible_headings_options))