mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-03-13 13:17:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly use requirejs where requirejs should be used

Browse Source
This commit is contained in:
Jonathan Frederic 2016-02-04 15:01:27 -08:00
parent e5e8db3670
commit 3fb25c5915
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notebook/static/base/js/namespace.js
View File

@ -8,7 +8,7 @@ var jprop = function(name, module_path){
Object.defineProperty(Jupyter, name, {
get: function() {
console.warn('accessing `'+name+'` is deprecated. Use `require("'+module_path+'")`');
return require(module_path);
return requirejs(module_path);
},
enumerable: true,
configurable: false
@ -19,7 +19,7 @@ var jglobal = function(name, module_path){
Object.defineProperty(Jupyter, name, {
get: function() {
console.warn('accessing `'+name+'` is deprecated. Use `require("'+module_path+'").'+name+'`');
return require(module_path)[name];
return requirejs(module_path)[name];
},
enumerable: true,
configurable: false

6
notebook/static/base/js/utils.js
View File

@ -20,7 +20,7 @@ define([
var load_extension = function (extension) {
return new Promise(function(resolve, reject) {
var ext_path = "nbextensions/" + extension;
require([ext_path], function(module) {
requirejs([ext_path], function(module) {
try {
if (extensions_loaded.indexOf(ext_path) < 0) {
console.log("Loading extension: " + extension);
@ -622,7 +622,7 @@ define([
CodeMirror.findModeByMIME(modename) ||
{mode: modename, mime: modename};
require([
requirejs([
// might want to use CodeMirror.modeURL here
['codemirror/mode', info.mode, info.mode].join('/'),
], function() {
@ -709,7 +709,7 @@ define([
// Try loading the view module using require.js
if (module_name) {
require([module_name], function(module) {
requirejs([module_name], function(module) {
if (module[class_name] === undefined) {
reject(new Error('Class '+class_name+' not found in module '+module_name));
} else {

9
notebook/static/notebook/js/kernelselector.js
View File

@ -4,9 +4,8 @@
define([
'base/js/namespace',
'base/js/dialog',
'base/js/utils',
'require',
], function(IPython, dialog, utils, require) {
'base/js/utils'
], function(IPython, dialog, utils) {
"use strict";
var KernelSelector = function(selector, notebook) {
@ -154,8 +153,8 @@ define([
//
// > Uncaught (in promise) TypeError: require is not a function
//
console.info('Dynamically requiring kernel.js, `require` is ', require);
require([ks.resources['kernel.js']],
console.info('Dynamically requiring kernel.js, `requirejs` is ', requirejs);
requirejs([ks.resources['kernel.js']],
function (kernel_mod) {
if (kernel_mod && kernel_mod.onload) {
kernel_mod.onload();

2
notebook/static/notebook/js/menubar.js
View File

@ -398,7 +398,7 @@ define([
.append($("<a>")
.attr('target', '_blank')
.attr('title', 'Opens in a new window')
.attr('href', require.toUrl(link.url))
.attr('href', requirejs.toUrl(link.url))
.append($("<i>")
.addClass("fa fa-external-link menu-icon pull-right")
)

4
notebook/static/terminal/js/main.js
View File

@ -1,14 +1,13 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.
requirejs(['termjs'], function(termjs) {
require([
'termjs',
'base/js/utils',
'base/js/page',
'services/config',
'terminal/js/terminado',
], function(
termjs,
utils,
page,
configmod,
@ -62,3 +61,4 @@ require([
window.terminal = terminal;
});
});