Merge pull request #1165 from gnestor/requirejs

Use `requirejs` vs. `require`

Author: jcb91

src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js

@@ -4,7 +4,7 @@ define([
     'require',
     'base/js/events',
     'base/js/utils',
-], function(Jupyter, $, require, events, configmod, utils) {
+], function(Jupyter, $, requirejs, events, configmod, utils) {
     "use strict";
 
     var load_extension = function() {

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/2to3.js

@@ -4,11 +4,9 @@
 // Based on: https://github.com/jfbercher/code_prettify and
 //           https://gist.github.com/takluyver/c8839593c615bb2f6e80
 
-define(function(require, exports, module) {
+define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
     'use strict';
 
-    var kernel_exec_on_cell = require('./kernel_exec_on_cell');
-
     var mod_name = '2to3';
 
     // gives default settings

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/autopep8.js

@@ -2,11 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 // Authors: @kenkoooo, @jfbercher and @jcb91
 
-define(function(require, exports, module) {
+define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
     'use strict';
 
-    var kernel_exec_on_cell = require('./kernel_exec_on_cell');
-
     var mod_name = 'autopep8';
 
     // gives default settings

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/code_prettify.js

@@ -2,11 +2,9 @@
 // Distributed under the terms of the Modified BSD License.
 // Authors: @jfbercher and @jcb91
 
-define(function(require, exports, module) {
+define(['./kernel_exec_on_cell'], function(kernel_exec_on_cell) {
     'use strict';
 
-    var kernel_exec_on_cell = require('./kernel_exec_on_cell');
-
     var mod_name = 'code_prettify';
 
     // gives default settings

src/jupyter_contrib_nbextensions/nbextensions/code_prettify/kernel_exec_on_cell.js

@@ -1,13 +1,20 @@
 // Copyright (c) Jupyter-Contrib Team.
 // Distributed under the terms of the Modified BSD License.
 
-define(function(require, exports, module) {
+define([
+    'jquery',
+    'base/js/namespace',
+    'base/js/events',
+    'notebook/js/codecell',
+], function(
+    $,
+    Jupyter,
+    events,
+    codecell
+) {
     'use strict';
 
-    var $ = require('jquery');
-    var Jupyter = require('base/js/namespace');
-    var events = require('base/js/events');
-    var CodeCell = require('notebook/js/codecell').CodeCell;
+    var CodeCell = codecell.CodeCell;
 
     // this wrapper function allows config & hotkeys to be per-plugin
     function KernelExecOnCells(mod_name, cfg) {
@@ -325,6 +332,5 @@ define(function(require, exports, module) {
             });
     };
 
-    exports.define_plugin = KernelExecOnCells;
     return {define_plugin: KernelExecOnCells};
 });

src/jupyter_contrib_nbextensions/nbextensions/codefolding/main.js

@@ -21,7 +21,7 @@ define([
     'codemirror/addon/fold/foldgutter',
     'codemirror/addon/fold/brace-fold',
     'codemirror/addon/fold/indent-fold'
-], function (Jupyter, $, require, events, configmod, codecell, CodeMirror) {
+], function (Jupyter, $, requirejs, events, configmod, codecell, CodeMirror) {
     "use strict";
 
     // define default config parameter values
@@ -221,7 +221,7 @@ define([
         var link = document.createElement("link");
         link.type = "text/css";
         link.rel = "stylesheet";
-        link.href = require.toUrl(name, 'css');
+        link.href = requirejs.toUrl(name, 'css');
         document.getElementsByTagName("head")[0].appendChild(link);
     };
 
@@ -256,7 +256,7 @@ define([
 
         if (Jupyter.notebook) {
             /* require our additional custom codefolding modes before initialising fully */
-            require(['./firstline-fold', './magic-fold'], function () {
+            requirejs(['./firstline-fold', './magic-fold'], function () {
                 if (Jupyter.notebook._fully_loaded) {
                     setTimeout(function () {
                         console.log('Codefolding: Wait for', params.init_delay, 'ms');

src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js

@@ -1,9 +1,9 @@
-(require.specified('base/js/namespace') ? define : function (deps, callback) {
+(requirejs.specified('base/js/namespace') ? define : function (deps, callback) {
 	// if here, the Jupyter namespace hasn't been specified to be loaded.
 	// This means that we're probably embedded in a page, so we need to make
 	// our definition with a specific module name
 	return define('nbextensions/collapsible_headings/main', deps, callback);
-})(['jquery', 'require'], function ($, require) {
+})(['jquery', 'require'], function ($, requirejs) {
 	"use strict";
 
 	var mod_name = 'collapsible_headings';
@@ -55,7 +55,7 @@
 	// object, but in a non-live notebook, we must construct our own version
 	var events;
 	try {
-		events = require('base/js/events');
+		events = requirejs('base/js/events');
 	}
 	catch (err) {
 		// in non-live notebook, there's no events structure, so we make our own
@@ -528,7 +528,7 @@
 	 */
 	function patch_Notebook () {
 		return new Promise(function (resolve, reject) {
-			require(['notebook/js/notebook'], function on_success (notebook) {
+			requirejs(['notebook/js/notebook'], function on_success (notebook) {
 				console.debug(log_prefix, 'patching Notebook.protoype');
 
 				// we have to patch select, since the select.Cell event is only fired
@@ -577,7 +577,7 @@
 			return Promise.resolve();
 		}
 		return new Promise(function (resolve, reject) {
-			require(['notebook/js/tooltip'], function on_success (tooltip) {
+			requirejs(['notebook/js/tooltip'], function on_success (tooltip) {
 				console.debug(log_prefix, 'patching Tooltip.prototype');
 
 				var orig_tooltip__show = tooltip.Tooltip.prototype._show;
@@ -607,7 +607,7 @@
 	 */
 	function patch_actions () {
 		return new Promise(function (resolve, reject) {
-			require(['notebook/js/tooltip'], function on_success (tooltip) {
+			requirejs(['notebook/js/tooltip'], function on_success (tooltip) {
 				console.debug(log_prefix, 'patching Jupyter up/down actions');
 
 				var kbm = Jupyter.keyboard_manager;
@@ -927,7 +927,7 @@
 		}
 
 		return new Promise (function (resolve, reject) {
-			require(['base/js/events'], function on_success (events) {
+			requirejs(['base/js/events'], function on_success (events) {
 
 				// ensure events are detached while notebook loads, in order to
 				// speed up loading (otherwise headings are updated for every
@@ -1000,13 +1000,13 @@
 				id: 'collapsible_headings_css',
 				rel: 'stylesheet',
 				type: 'text/css',
-				href: require.toUrl('./main.css')
+				href: requirejs.toUrl('./main.css')
 			})
 			.appendTo('head');
 
 		// ensure Jupyter module is defined before proceeding further
 		new Promise(function (resolve, reject) {
-			require(['base/js/namespace'], function (Jupyter_mod) {
+			requirejs(['base/js/namespace'], function (Jupyter_mod) {
 				live_notebook = true;
 				Jupyter = Jupyter_mod;
 				resolve(Jupyter);

src/jupyter_contrib_nbextensions/nbextensions/css_selector/main.js

@@ -1,5 +1,5 @@
 
-define(["require"], function(require) {
+define(["require"], function(requirejs) {
 
     /**
      * @param element {}  DOM element to which add controls
@@ -36,7 +36,7 @@ define(["require"], function(require) {
                 var cmtm = styles[val].cm || 'ipyhton'; 
                 if(cmtm != undefined){
                     try{
-                    $tlink.attr('href',require.toUrl('../../components/codemirror/theme/'+cmtm+'.css'))
+                    $tlink.attr('href',requirejs.toUrl('../../components/codemirror/theme/'+cmtm+'.css'))
                         .attr('rel','stylesheet')
                         .attr('type','text/css')
 
@@ -45,7 +45,7 @@ define(["require"], function(require) {
                     }
                     } catch(e){}
                 }
-                $link.attr('href',require.toUrl('./css/'+val+'.css'))
+                $link.attr('href',requirejs.toUrl('./css/'+val+'.css'))
                     .attr('rel','stylesheet')
                     .attr('type','text/css');
                 field.css = [val];

src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js

@@ -7,7 +7,7 @@ define([
     'require',
     'notebook/js/textcell',
     'base/js/utils',
-],   function(Jupyter, $, require, textcell, utils) {
+],   function(Jupyter, $, requirejs, textcell, utils) {
     "use strict";
 
     var MathJax = window.MathJax;

src/jupyter_contrib_nbextensions/nbextensions/execute_time/ExecuteTime.js

@@ -17,7 +17,7 @@ define([
     'base/js/events',
     'notebook/js/codecell'
 ], function (
-    require,
+    requirejs,
     $,
     moment,
     Jupyter,
@@ -286,7 +286,7 @@ define([
         $('<link/>')
             .attr({
                 rel: 'stylesheet',
-                href: require.toUrl(url),
+                href: requirejs.toUrl(url),
                 type: 'text/css'
             })
             .appendTo('head');
@@ -295,9 +295,9 @@ define([
     function load_jupyter_extension () {
         // try to load jquery-ui
         if ($.ui === undefined && options.highlight.use) {
-            require(['jquery-ui'], function ($) {}, function (err) {
+            requirejs(['jquery-ui'], function ($) {}, function (err) {
                 // try to load using the older, non-standard name (without hyphen)
-                require(['jqueryui'], function ($) {}, function (err) {
+                requirejs(['jqueryui'], function ($) {}, function (err) {
                     console.log(log_prefix, 'couldn\'t find jquery-ui, so no animations');
                 });
             });