remove reverse deps in Kernel and cleanup Namespace

This commit is contained in:
Matthias Bussonnier 2015-05-18 17:11:38 -07:00
parent 8d0ae844f5
commit 85fd9fff23
2 changed files with 10 additions and 9 deletions

View File

@ -5,17 +5,22 @@ var Jupyter = Jupyter || {};
define(function(){
"use strict";
// expose modules
Jupyter.utils = require('base/js/utils');
Jupyter.load_extensions = Jupyter.utils.load_extensions;
Jupyter.security = require('base/js/security');
Jupyter.keyboard = require('base/js/keyboard');
Jupyter.dialog = require('base/js/dialog');
Jupyter.NotificationWidget = require('base/js/notificationwidget');
Jupyter.load_extensions = utils.load_extensions;
// exposed constructors
var comm = require('services/kernels/comm');
Jupyter.CommManager = comm.CommManager;
Jupyter.Comm = comm.Comm;
Juppyter.CommManager = comm.CommManager;
Juppyter.Comm = comm.Comm;
Jupyter.NotificationWidget = require('base/js/notificationwidget').NotificationWidget;
Jupyter.Kernel = require('services/kernels/kernel').Kernel;
Jupyter.version = "4.0.0.dev";
Jupyter._target = '_blank';

View File

@ -2,13 +2,12 @@
// Distributed under the terms of the Modified BSD License.
define([
'base/js/namespace',
'jquery',
'base/js/utils',
'./comm',
'./serialize',
'base/js/events'
], function(IPython, $, utils, comm, serialize, events) {
], function($, utils, comm, serialize, events) {
"use strict";
/**
@ -1058,8 +1057,5 @@ define([
}
};
// Backwards compatability.
IPython.Kernel = Kernel;
return {'Kernel': Kernel};
});