[Toc2] Scrolling: update a mark in TOC to currently displayed section

src/jupyter_contrib_nbextensions/nbconvert_support/collapsible_headings.py

@@ -21,9 +21,6 @@ class ExporterCollapsibleHeadings(ExporterInliner):
         jupyter nbconvert --to html_ch FILE.ipynb
     """
 
-    def _template_file_default(self):
-        return 'collapsible_headings'
-
     def __init__(self, *args, **kwargs):
         super(ExporterCollapsibleHeadings, self).__init__(*args, **kwargs)
 

src/jupyter_contrib_nbextensions/nbconvert_support/pre_codefolding.py

@@ -5,28 +5,33 @@
 """
 
 from nbconvert.preprocessors import Preprocessor
+from traitlets import Bool, Unicode
 
 
 class CodeFoldingPreprocessor(Preprocessor):
     """
     :mod:`nbconvert` Preprocessor for the code_folding nbextension.
 
-    Folds codecells as displayed in the notebook.
+    Folds codecells as displayed in the notebook. The hidden code below the fold gets removed.
 
     The preprocessor is installed by default. To enable codefolding with
     NbConvert, you need to set the configuration parameter
-    `NbConvertApp.codefolding=True`.
+    `CodeFoldingPreprocessor.remove_folded_code=True`.
     This can be done either in the `jupyter_nbconvert_config.py` file::
 
-        c.NbConvertApp.codefolding = True
+        c.CodeFoldingPreprocessor.remove_folded_code=True = True
 
     or using a command line parameter when calling NbConvert::
 
-        $ jupyter nbconvert --to html --NbConvertApp.codefolding=True mynotebook.ipynb
+        $ jupyter nbconvert --to html --CodeFoldingPreprocessor.remove_folded_code=True mynotebook.ipynb
+
+    The folding mark can be configured using
+            c.CodeFoldingPreprocessor.fold_mark = '<->'
 
     """  # noqa: E501
 
-    fold_mark = u'↔'
+    remove_folded_code = Bool(False, help="Remove code that was folded").tag(config=True)
+    fold_mark = Unicode(u'↔', help="Symbol for folded code").tag(config=True)
 
     def fold_cell(self, cell, folded):
         """
@@ -54,10 +59,16 @@ def fold_cell(self, cell, folded):
                 fcell += l
         return fcell
 
+    def preprocess(self, nb, resources):
+        """Skip preprocessor if not enabled"""
+        if self.remove_folded_code:
+            return super(CodeFoldingPreprocessor, self).preprocess(nb, resources)
+        else:
+            return nb, resources
+
     def preprocess_cell(self, cell, resources, index):
         """
         Read cell metadata and remove lines marked as `folded`.
-        Requires configuration parameter 'NbConvertApp.codefolding = True'
 
         Parameters
         ----------
@@ -69,10 +80,10 @@ def preprocess_cell(self, cell, resources, index):
         index : int
             Index of the cell being processed (see base.py)
         """
-        dofolding = self.config.NbConvertApp.get('codefolding', False) is True
-        if hasattr(cell, 'source') and cell.cell_type == 'code' and dofolding:
+        if hasattr(cell, 'source') and cell.cell_type == 'code':
             if hasattr(cell['metadata'], 'code_folding'):
                 folded = cell['metadata']['code_folding']
                 if len(folded) > 0:
+                    self.log.debug('Removing folded code in cell')
                     cell.source = self.fold_cell(cell.source, folded)
         return cell, resources

src/jupyter_contrib_nbextensions/nbextensions/autosavetime/autosavetime.yaml

@@ -1,5 +1,5 @@
 Type: IPython Notebook Extension
-Compatibility: 3.x, 4.x
+Compatibility: 3.x, 4.x, 5.x
 Name: AutoSaveTime
 Main: main.js
 Icon: icon.png

src/jupyter_contrib_nbextensions/nbextensions/autosavetime/main.js

@@ -1,22 +1,14 @@
 define([
     'jquery',
     'base/js/namespace',
-    'base/js/events',
-    'base/js/utils',
-    'services/config'
+    'base/js/events'
 ], function(
     $,
     IPython,
-    events,
-    utils,
-    configmod
+    events
 ) {
     "use strict";
 
-    // create config object to load parameters
-    var base_url = utils.get_body_data("baseUrl");
-    var config = new configmod.ConfigSection('notebook', {base_url: base_url});
-
     // define default values for config parameters
     var params = {
         autosavetime_set_starting_interval : false,
@@ -26,13 +18,14 @@ define([
 
     // update params with any specified in the server's config file
     var update_params = function() {
+        var config = IPython.notebook.config;
         for (var key in params) {
             if (config.data.hasOwnProperty(key))
                 params[key] = config.data[key];
         }
     };
 
-    config.loaded.then( function() {
+    var initialize = function () {
         update_params();
 
         var si = params.autosavetime_starting_interval;
@@ -76,10 +69,10 @@ define([
                 }
             }
         });
-    });
+    };
 
     var load_ipython_extension = function() {
-        config.load();
+        return IPython.notebook.config.loaded.then(initialize);
     };
 
     return {

src/jupyter_contrib_nbextensions/nbextensions/autoscroll/main.js

@@ -1,16 +1,15 @@
 define([
     'jquery',
     'base/js/namespace',
-    'base/js/utils',
-    'services/config',
+    'base/js/events',
     'notebook/js/outputarea',
     'notebook/js/codecell'
 ], function (
     $,
     IPython,
-    utils,
-    configmod,
-    oa, codecell
+    events,
+    oa,
+    codecell
 ) {
     "use strict";
 
@@ -25,12 +24,9 @@ define([
         autoscroll_show_button : false
     };
 
-    // create config object to load parameters
-    var base_url = utils.get_body_data("baseUrl");
-    var config = new configmod.ConfigSection('notebook', {base_url: base_url});
-
     // update params with any specified in the server's config file
     var update_params = function() {
+        var config = IPython.notebook.config;
         for (var key in params) {
             if (config.data.hasOwnProperty(key))
                 params[key] = config.data[key];
@@ -69,7 +65,7 @@ define([
         initAutoScroll();
     };
 
-    config.loaded.then( function() {
+    var initialize = function() {
         update_params();
 
         var thresholds = [-1, 1, 10, 20, 50, 100, 200, 500, 1000];
@@ -107,7 +103,7 @@ define([
             IPython.toolbar.add_buttons_group([action_full_name]);
         }
         initAutoScroll();
-    });
+    };
 
     var load_ipython_extension = function () {
         var prefix = 'auto';
@@ -121,8 +117,8 @@ define([
 
         action_full_name = IPython.keyboard_manager.actions.register(action, action_name, prefix);
 
-        config.load();
-        $([IPython.events]).on("notebook_loaded.Notebook", function(){
+        IPython.notebook.config.loaded.then(initialize);
+        events.on("notebook_loaded.Notebook", function(){
             initAutoScroll();
         });
 

src/jupyter_contrib_nbextensions/nbextensions/chrome-clipboard/main.js

@@ -2,22 +2,21 @@
 // works with images and notebook cells (MIME-type 'notebook-cell/json')
 
 define([
-    'base/js/namespace',
     'jquery',
-	'base/js/utils',
-    'services/config',
+    'base/js/namespace',
     'base/js/events'
-], function(IPython, $, utils, configmod, events) {
+], function(
+    $,
+    IPython,
+    events
+) {
     "use strict";
     if (window.chrome === undefined) return;
 
     	var params = {
 		subdirectory : '',
 	};
 
-    var base_url = utils.get_body_data("baseUrl");
-    var config = new configmod.ConfigSection('notebook', {base_url: base_url});
-
     /* http://stackoverflow.com/questions/3231459/create-unique-id-with-javascript */
     function uniqueid(){
         // always start with a letter (for DOM friendlyness)
@@ -58,7 +57,7 @@ define([
             name = uniqueid() + '.' + msg.match(/data:image\/(\S+);/)[1];
             }
         create_dir(path);
-        var url = '//' + location.host + utils.url_path_join(base_url, 'api/contents', path, name);
+        var url = '//' + location.host + utils.url_path_join(IPython.notebook.base_url, 'api/contents', path, name);
 
         var img = msg.replace(/(^\S+,)/, ''); // strip header
         //console.log("send_to_server:", url, img);
@@ -90,10 +89,9 @@ define([
      */
     var load_ipython_extension = function() {
 
-		config.load();
-		config.loaded
+		IPython.notebook.config.loaded
 			.then(function () {
-				$.extend(true, params, config.data.dragdrop); // update params
+				$.extend(true, params, IPython.notebook.config.data.dragdrop); // update params
 				if (params.subdirectory) {
 					console.log('subdir:', params.subdirectory)
 				}

src/jupyter_contrib_nbextensions/nbextensions/code_font_size/code_font_size.yaml

@@ -4,4 +4,4 @@ Link: README.md
 Description: Adds toolbar buttons to increase and decrease code's font size.
              This is useful, for example, when projecting the notebook.
 Main: code_font_size.js
-Compatibility: 4.x
+Compatibility: 4.x, 5.x

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/kernel_exec_on_cell.js

@@ -7,8 +7,6 @@ define(function(require, exports, module) {
     var $ = require('jquery');
     var Jupyter = require('base/js/namespace');
     var events = require('base/js/events');
-    var utils = require('base/js/utils');
-    var ConfigSection = require('services/config').ConfigSection;
     var CodeCell = require('notebook/js/codecell').CodeCell;
 
     // this wrapper function allows config & hotkeys to be per-plugin
@@ -286,13 +284,11 @@ define(function(require, exports, module) {
 
     KernelExecOnCells.prototype.initialize_plugin = function() {
         var that = this;
-        var base_url = utils.get_body_data("baseUrl");
-        var conf_section = new ConfigSection('notebook', { base_url: base_url });
         // first, load config
-        conf_section.load()
+        Jupyter.notebook.config.loaded
             // now update default config with that loaded from server
-            .then(function on_success(config_data) {
-                $.extend(true, that.cfg, config_data[that.mod_name]);
+            .then(function on_success() {
+                $.extend(true, that.cfg, Jupyter.notebook.config.data[that.mod_name]);
             }, function on_error(err) {
                 console.warn(that.mod_log_prefix, 'error loading config:', err);
             })

src/jupyter_contrib_nbextensions/nbextensions/codefolding/main.js

@@ -147,6 +147,31 @@ define([
         cm.setOption('foldGutter', opts);
     }
 
+    /**
+     * Restore folding status from metadata
+     * @param cell
+     */
+    var restoreFolding = function (cell) {
+        if (cell.metadata.code_folding === undefined || !(cell instanceof codecell.CodeCell)) {
+            return;
+        }
+        // visit in reverse order, as otherwise nested folds un-fold outer ones
+        var lines = cell.metadata.code_folding.slice().sort();
+        for (var idx = lines.length - 1; idx >= 0; idx--) {
+            var line = lines[idx];
+            var opts = cell.code_mirror.state.foldGutter.options;
+            var linetext = cell.code_mirror.getLine(line);
+            if (linetext !== undefined) {
+                cell.code_mirror.foldCode(CodeMirror.Pos(line, 0), opts.rangeFinder);
+            }
+            else {
+                // the line doesn't exist, so we should remove it from metadata
+                cell.metadata.code_folding = lines.slice(0, idx);
+            }
+            cell.code_mirror.refresh();
+        }
+    };
+
     /**
      * Add codefolding gutter to a new cell
      *
@@ -160,6 +185,9 @@ define([
             activate_cm_folding(cell.code_mirror);
             cell.code_mirror.on('fold', updateMetadata);
             cell.code_mirror.on('unfold', updateMetadata);
+            // queue restoring folding, to run once metadata is set, hopefully.
+            // This can be useful if cells are un-deleted, for example.
+            setTimeout(function () { restoreFolding(cell); }, 500);
         }
     };
 
@@ -175,20 +203,7 @@ define([
             if ((cell instanceof codecell.CodeCell)) {
                 activate_cm_folding(cell.code_mirror);
                 /* restore folding state if previously saved */
-                if (cell.metadata.code_folding !== undefined) {
-                    for (var idx = 0; idx < cell.metadata.code_folding.length; idx++) {
-                        var line = cell.metadata.code_folding[idx];
-                        var opts = cell.code_mirror.state.foldGutter.options;
-                        var linetext = cell.code_mirror.getLine(line);
-                        if (linetext !== undefined) {
-                            cell.code_mirror.foldCode(CodeMirror.Pos(line, 0), opts.rangeFinder);
-                        } else {
-                            cell.metadata.code_folding = [];
-                            break;
-                        }
-                        cell.code_mirror.refresh();
-                    }
-                }
+                restoreFolding(cell);
                 cell.code_mirror.on('fold', updateMetadata);
                 cell.code_mirror.on('unfold', updateMetadata);
             }