#6214 pass CodeCell to TreeWidget

twosigma · Feb 7, 2018 · e088b37 · e088b37
1 parent fc1e495
commit e088b37
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/js/notebook/src/tree.js b/js/notebook/src/tree.js
@@ -25,13 +25,15 @@ define([
 
   var $ = require('jquery');
   var Widget = require('@phosphor/widgets').Widget;
+  var CodeCell = require('notebook/js/codecell').CodeCell;
 
   function load() {
+    console.log('tree.js load()');
     var TreeWidget = require('./tree/TreeWidget').default;
     var options = {
       baseUrl: (Jupyter.notebook_list || Jupyter.notebook).base_url,
       isLab: false,
-      CodeCell: Jupyter.CodeCell,
+      CodeCell: CodeCell,
     };
     var bxWidget = new TreeWidget(options);
 

diff --git a/js/notebook/src/tree/Models/UIOptionsModel.ts b/js/notebook/src/tree/Models/UIOptionsModel.ts
@@ -19,12 +19,13 @@ import IUIOptions from "../Types/IUIOptions";
 
 export default class UIOptionsModel {
 
-  constructor(private widget: UIOptionsWidgetInterface) {
+  constructor(private widget: UIOptionsWidgetInterface, private CodeCell) {
 
   }
 
   public update(options: IUIOptions) {
     this.widget.onLoad(options);
+    this.CodeCell.options_default.cm_config.autoCloseBrackets = options.auto_close;
   }
 
 }
diff --git a/js/notebook/src/tree/TreeWidget.ts b/js/notebook/src/tree/TreeWidget.ts
@@ -65,7 +65,7 @@ export default class TreeWidget extends Panel {
     let uiOptionsModel;
     if (false === this.options.isLab) {
       uiOptionsWidget = new UIOptionsWidget();
-      uiOptionsModel = new UIOptionsModel(uiOptionsWidget);
+      uiOptionsModel = new UIOptionsModel(uiOptionsWidget, this.options.CodeCell);
     }
 
     this._model = new TreeWidgetModel(

diff --git a/js/notebook/webpack.config.js b/js/notebook/webpack.config.js
@@ -197,7 +197,7 @@ module.exports = [
     resolve: resolve,
     externals: [
       'base/js/namespace',
-      'base/js/utils',
+      'notebook/js/codecell',
       'require',
     ],
     watchOptions: {