Merge pull request #364 from jupyter/revert-268-npm
Revert "Use NPM, node ES5, and browserify."
Kyle Kelley
11 years ago
commit
5556beee70
@ -1,6 +0,0 @@
|
||||
{
|
||||
"browserify": true,
|
||||
"node": true,
|
||||
"jquery": true,
|
||||
"predef": [ "requirejs", "define", "Promise", "CodeMirror"]
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
var amdWrap = require("amd-wrap-legacy");
|
||||
var glob = require("glob");
|
||||
var path = require('path');
|
||||
var fs = require('fs');
|
||||
var mkdirp = require("mkdirp");
|
||||
|
||||
var source = "./notebook/static-src";
|
||||
var destination = "./notebook/static";
|
||||
|
||||
glob(path.join(source, "**/*.js"), function(err, files) {
|
||||
if (err) {
|
||||
console.error('Could not glob files.', err);
|
||||
} else {
|
||||
files.forEach(function(file, index) {
|
||||
var toFile = path.join(destination, path.relative(source, file));
|
||||
fs.readFile(file, 'utf8', function (err, data) {
|
||||
if (err) {
|
||||
console.error('Could not read file ' + file, err);
|
||||
} else {
|
||||
mkdirp(path.dirname(toFile), function(err) {
|
||||
if (err) {
|
||||
console.error('Could not mkdirp ', err);
|
||||
} else {
|
||||
fs.writeFile(toFile, amdWrap(data), function(err) {
|
||||
if(err) {
|
||||
return console.error('Could not write file ' + toFile, err);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -1,35 +0,0 @@
|
||||
var fs = require('fs');
|
||||
var aliasify = require('aliasify');
|
||||
var browserify = require('browserify');
|
||||
var mkdirp = require("mkdirp");
|
||||
var path = require('path');
|
||||
|
||||
var aliasifyConfig = {
|
||||
aliases: {
|
||||
jqueryui: 'jquery-ui',
|
||||
termjs: 'term.js',
|
||||
caja: 'google-caja/html-css-sanitizer-minified'
|
||||
},
|
||||
verbose: false
|
||||
}
|
||||
|
||||
var b = browserify({
|
||||
paths: [
|
||||
__dirname + '/static-src',
|
||||
__dirname + '/static/components',
|
||||
],
|
||||
debug: true,
|
||||
fullPaths: true
|
||||
});
|
||||
|
||||
b.transform(aliasify, aliasifyConfig);
|
||||
var mkdirp = require("mkdirp");
|
||||
b.add(__dirname + '/static-src/' + process.argv[2]);
|
||||
var toFile = __dirname + '/static/' + process.argv[3];
|
||||
mkdirp(path.dirname(toFile), function(err) {
|
||||
if (err) {
|
||||
console.error('Could not mkdirp ', err);
|
||||
} else {
|
||||
b.bundle().pipe(fs.createWriteStream(toFile));
|
||||
}
|
||||
});
|
||||
@ -1,14 +0,0 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
var IPython = require('base/js/namespace');
|
||||
var page = require('base/js/page');
|
||||
|
||||
module.exports = function loginMain() {
|
||||
var page_instance = new page.Page();
|
||||
$('button#login_submit').addClass("btn btn-default");
|
||||
page_instance.show();
|
||||
$('input#password_input').focus();
|
||||
|
||||
IPython.page = page_instance;
|
||||
};
|
||||
@ -1,5 +0,0 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
exports.login_main = require('./loginmain');
|
||||
exports.logout_main = require('./logoutmain');
|
||||
@ -1,94 +0,0 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* jquery, jquery-ui, and bootstrap all really on weird window level logic.
|
||||
* This module handles the global loading of those tools.
|
||||
*/
|
||||
module.exports = new Promise(function(resolve, reject) {
|
||||
if (window.hasOwnProperty('jquery')) {
|
||||
resolve();
|
||||
}
|
||||
|
||||
requirejs(['jquery'], function($) {
|
||||
var jQueryProperty = {
|
||||
get: function() {
|
||||
return $;
|
||||
},
|
||||
configurable: false
|
||||
};
|
||||
Object.defineProperty(window, '$', jQueryProperty);
|
||||
Object.defineProperty(window, 'jQuery', jQueryProperty);
|
||||
console.log('jQuery loaded and available in global namespace');
|
||||
|
||||
requirejs(['jqueryui', 'bootstrap'], function() {
|
||||
if ($.prototype.modal) {
|
||||
console.log('bootstrap loaded and injected into jQuery\'s namespace');
|
||||
} else {
|
||||
reject(new Error('bootstrap not injected into jQuery prototype'));
|
||||
}
|
||||
|
||||
if ($.prototype.draggable && $.prototype.resizable) {
|
||||
console.log('jQueryUI loaded and injected into jQuery\'s namespace');
|
||||
} else {
|
||||
reject(new Error('jQueryUI not injected into jQuery prototype'));
|
||||
}
|
||||
|
||||
requirejs([
|
||||
'codemirror/lib/codemirror',
|
||||
'codemirror/mode/meta',
|
||||
'codemirror/addon/comment/comment',
|
||||
'codemirror/addon/dialog/dialog',
|
||||
'codemirror/addon/edit/closebrackets',
|
||||
'codemirror/addon/edit/matchbrackets',
|
||||
'codemirror/addon/search/searchcursor',
|
||||
'codemirror/addon/search/search',
|
||||
'codemirror/keymap/emacs',
|
||||
'codemirror/keymap/sublime',
|
||||
'codemirror/keymap/vim',
|
||||
'codemirror/mode/python/python',
|
||||
'codemirror/addon/runmode/runmode',
|
||||
'codemirror/mode/gfm/gfm',
|
||||
'notebook/js/codemirror-ipython',
|
||||
'notebook/js/codemirror-ipythongfm'
|
||||
], function(CodeMirror) {
|
||||
var codeMirrorProperty = {
|
||||
get: function() {
|
||||
return CodeMirror;
|
||||
},
|
||||
configurable: false
|
||||
};
|
||||
Object.defineProperty(window, 'CodeMirror', codeMirrorProperty);
|
||||
console.log('CodeMirror loaded and available in global namespace');
|
||||
|
||||
|
||||
requirejs(['underscore'], function(_) {
|
||||
var underscoreProperty = {
|
||||
get: function() {
|
||||
return _;
|
||||
},
|
||||
configurable: false
|
||||
};
|
||||
Object.defineProperty(window, '_', underscoreProperty);
|
||||
console.log('underscore loaded and available in global namespace');
|
||||
|
||||
resolve();
|
||||
}, function(err) {
|
||||
console.error('could not load underscore');
|
||||
reject(err);
|
||||
});
|
||||
}, function(err) {
|
||||
console.error('could not load CodeMirror and/or it\'s plugins');
|
||||
reject(err);
|
||||
});
|
||||
}, function(err) {
|
||||
console.error('could not load jqueryui and/or bootstrap');
|
||||
reject(err);
|
||||
});
|
||||
}, function(err) {
|
||||
console.error('could not load jquery');
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
@ -1,70 +0,0 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
"use strict";
|
||||
|
||||
if (!window.Jupyter) {
|
||||
var Jupyter = {};
|
||||
Jupyter.version = "4.1.0.dev";
|
||||
window.Jupyter = Jupyter;
|
||||
}
|
||||
|
||||
var jprop = function(name, loaded, module_path, global_mod) {
|
||||
if (!(window.Jupyter).hasOwnProperty(name)) {
|
||||
Object.defineProperty(window.Jupyter, name, {
|
||||
get: function() {
|
||||
console.warn('accessing `'+name+'` is deprecated. Use `require(\'' + module_path + '\')' + (global_mod ? '[\'' + name + '\']' : '') + '`');
|
||||
return global_mod ? loaded[name] : loaded;
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: false
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// expose modules
|
||||
jprop('events', require('base/js/events'), 'base/js/events');
|
||||
jprop('utils', require('base/js/utils'), 'base/js/utils');
|
||||
jprop('security', require('base/js/security'), 'base/js/security');
|
||||
jprop('keyboard', require('base/js/keyboard'), 'base/js/keyboard');
|
||||
jprop('dialog', require('base/js/dialog'), 'base/js/dialog');
|
||||
jprop('mathjaxutils', require('notebook/js/mathjaxutils'), 'notebook/js/mathjaxutils');
|
||||
|
||||
//// exposed constructors
|
||||
jprop('CommManager', require('services/kernels/comm'), 'services/kernels/comm', true);
|
||||
jprop('Comm', require('services/kernels/comm'), 'services/kernels/comm', true);
|
||||
|
||||
jprop('NotificationWidget', require('base/js/notificationwidget'), 'base/js/notificationwidget', true);
|
||||
jprop('Kernel', require('services/kernels/kernel'), 'services/kernels/kernel', true);
|
||||
jprop('Session', require('services/sessions/session'), 'services/sessions/session', true);
|
||||
jprop('LoginWidget', require('auth/js/loginwidget'), 'auth/js/loginwidget', true);
|
||||
jprop('Page', require('base/js/page'), 'base/js/page', true);
|
||||
|
||||
// notebook
|
||||
jprop('TextCell', require('notebook/js/textcell'), 'notebook/js/textcell', true);
|
||||
jprop('OutputArea', require('notebook/js/outputarea'), 'notebook/js/outputarea', true);
|
||||
jprop('KeyboardManager', require('notebook/js/keyboardmanager'), 'notebook/js/keyboardmanager', true);
|
||||
jprop('Completer', require('notebook/js/completer'), 'notebook/js/completer', true);
|
||||
jprop('Notebook', require('notebook/js/notebook'), 'notebook/js/notebook', true);
|
||||
jprop('Tooltip', require('notebook/js/tooltip'), 'notebook/js/tooltip', true);
|
||||
jprop('ToolBar', require('notebook/js/toolbar'), 'notebook/js/toolbar', true);
|
||||
jprop('SaveWidget', require('notebook/js/savewidget'), 'notebook/js/savewidget', true);
|
||||
jprop('Pager', require('notebook/js/pager'), 'notebook/js/pager', true);
|
||||
jprop('QuickHelp', require('notebook/js/quickhelp'), 'notebook/js/quickhelp', true);
|
||||
jprop('MarkdownCell', require('notebook/js/textcell'), 'notebook/js/textcell', true);
|
||||
jprop('RawCell', require('notebook/js/textcell'), 'notebook/js/textcell', true);
|
||||
jprop('Cell', require('notebook/js/cell'), 'notebook/js/cell', true);
|
||||
jprop('MainToolBar', require('notebook/js/maintoolbar'), 'notebook/js/maintoolbar', true);
|
||||
jprop('NotebookNotificationArea', require('notebook/js/notificationarea'), 'notebook/js/notificationarea', true);
|
||||
jprop('NotebookTour', require( 'notebook/js/tour'), 'notebook/js/tour', true);
|
||||
jprop('MenuBar', require( 'notebook/js/menubar'), 'notebook/js/menubar', true);
|
||||
|
||||
// tree
|
||||
jprop('SessionList', require('tree/js/sessionlist'), 'tree/js/sessionlist', true);
|
||||
|
||||
window.Jupyter._target = '_blank';
|
||||
|
||||
// deprecated since 4.0, remove in 5+
|
||||
window.IPython = window.Jupyter;
|
||||
|
||||
module.exports = window.Jupyter;
|
||||
@ -0,0 +1,14 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
define(['base/js/namespace', 'base/js/page'], function(IPython, page) {
|
||||
function login_main() {
|
||||
var page_instance = new page.Page();
|
||||
$('button#login_submit').addClass("btn btn-default");
|
||||
page_instance.show();
|
||||
$('input#password_input').focus();
|
||||
|
||||
IPython.page = page_instance;
|
||||
}
|
||||
return login_main;
|
||||
});
|
||||
@ -1,12 +1,12 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
var IPython = require('base/js/namespace');
|
||||
var page = require('base/js/page');
|
||||
|
||||
module.exports = function logoutMain() {
|
||||
define(['base/js/namespace', 'base/js/page'], function(IPython, page) {
|
||||
function logout_main() {
|
||||
var page_instance = new page.Page();
|
||||
page_instance.show();
|
||||
|
||||
IPython.page = page_instance;
|
||||
};
|
||||
}
|
||||
return logout_main;
|
||||
});
|
||||
@ -0,0 +1,9 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
define(['./loginmain', './logoutmain'], function (login_main, logout_main) {
|
||||
return {
|
||||
login_main: login_main,
|
||||
logout_main: logout_main
|
||||
};
|
||||
});
|
||||
@ -0,0 +1,82 @@
|
||||
// Copyright (c) Jupyter Development Team.
|
||||
// Distributed under the terms of the Modified BSD License.
|
||||
|
||||
|
||||
var Jupyter = Jupyter || {};
|
||||
|
||||
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);
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: false
|
||||
});
|
||||
}
|
||||
|
||||
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];
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: false
|
||||
});
|
||||
}
|
||||
|
||||
define(function(){
|
||||
"use strict";
|
||||
|
||||
// expose modules
|
||||
|
||||
jprop('utils','base/js/utils')
|
||||
|
||||
//Jupyter.load_extensions = Jupyter.utils.load_extensions;
|
||||
//
|
||||
jprop('security','base/js/security');
|
||||
jprop('keyboard','base/js/keyboard');
|
||||
jprop('dialog','base/js/dialog');
|
||||
jprop('mathjaxutils','notebook/js/mathjaxutils');
|
||||
|
||||
|
||||
//// exposed constructors
|
||||
jglobal('CommManager','services/kernels/comm')
|
||||
jglobal('Comm','services/kernels/comm')
|
||||
|
||||
jglobal('NotificationWidget','base/js/notificationwidget');
|
||||
jglobal('Kernel','services/kernels/kernel');
|
||||
jglobal('Session','services/sessions/session');
|
||||
jglobal('LoginWidget','auth/js/loginwidget');
|
||||
jglobal('Page','base/js/page');
|
||||
|
||||
// notebook
|
||||
jglobal('TextCell','notebook/js/textcell');
|
||||
jglobal('OutputArea','notebook/js/outputarea');
|
||||
jglobal('KeyboardManager','notebook/js/keyboardmanager');
|
||||
jglobal('Completer','notebook/js/completer');
|
||||
jglobal('Notebook','notebook/js/notebook');
|
||||
jglobal('Tooltip','notebook/js/tooltip');
|
||||
jglobal('Toolbar','notebook/js/toolbar');
|
||||
jglobal('SaveWidget','notebook/js/savewidget');
|
||||
jglobal('Pager','notebook/js/pager');
|
||||
jglobal('QuickHelp','notebook/js/quickhelp');
|
||||
jglobal('MarkdownCell','notebook/js/textcell');
|
||||
jglobal('RawCell','notebook/js/textcell');
|
||||
jglobal('Cell','notebook/js/cell');
|
||||
jglobal('MainToolBar','notebook/js/maintoolbar');
|
||||
jglobal('NotebookNotificationArea','notebook/js/notificationarea');
|
||||
jglobal('NotebookTour', 'notebook/js/tour');
|
||||
jglobal('MenuBar', 'notebook/js/menubar');
|
||||
|
||||
// tree
|
||||
jglobal('SessionList','tree/js/sessionlist');
|
||||
|
||||
Jupyter.version = "4.1.0.dev";
|
||||
Jupyter._target = '_blank';
|
||||
return Jupyter;
|
||||
});
|
||||
|
||||
// deprecated since 4.0, remove in 5+
|
||||
var IPython = Jupyter
|
||||
Loading…
Reference in new issue