Revert for define arguments

gnestor · gnestor · commit 6981dcbb173c · 2017-11-30T17:34:59.000-08:00
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js b/src/jupyter_contrib_nbextensions/nbextensions/addbefore/main.js
@@ -1,7 +1,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'base/js/events',
     'base/js/utils',
 ], function(Jupyter, $, requirejs, events, configmod, utils) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/codefolding/main.js b/src/jupyter_contrib_nbextensions/nbextensions/codefolding/main.js
@@ -12,7 +12,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'base/js/events',
     'services/config',
     'notebook/js/codecell',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js b/src/jupyter_contrib_nbextensions/nbextensions/collapsible_headings/main.js
@@ -3,7 +3,7 @@
 	// 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', 'requirejs'], function ($, requirejs) {
+})(['jquery', 'require'], function ($, requirejs) {
 	"use strict";
 
 	var mod_name = 'collapsible_headings';
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/css_selector/main.js b/src/jupyter_contrib_nbextensions/nbextensions/css_selector/main.js
@@ -1,5 +1,5 @@
 
-define(["requirejs"], function(requirejs) {
+define(["require"], function(requirejs) {
 
     /**
      * @param element {}  DOM element to which add controls
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js b/src/jupyter_contrib_nbextensions/nbextensions/equation-numbering/main.js
@@ -4,7 +4,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'notebook/js/textcell',
     'base/js/utils',
 ],   function(Jupyter, $, requirejs, textcell, utils) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/execute_time/ExecuteTime.js b/src/jupyter_contrib_nbextensions/nbextensions/execute_time/ExecuteTime.js
@@ -10,7 +10,7 @@
 // A double click on the timing box makes it disappear
 
 define([
-    'requirejs',
+    'require',
     'jquery',
     'moment',
     'base/js/namespace',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js b/src/jupyter_contrib_nbextensions/nbextensions/exercise/main.js
@@ -24,7 +24,7 @@ Then clicking on the toolbar button transforms these cells into a "solution" whi
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'base/js/events',
     'nbextensions/rubberband/main'
 ], function(IPython, $, requirejs, events, rubberband) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/exercise2/main.js
@@ -43,7 +43,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'base/js/events',
     'nbextensions/rubberband/main'
 ], function(IPython, $, requirejs, events, rubberband) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js b/src/jupyter_contrib_nbextensions/nbextensions/help_panel/help_panel.js
@@ -1,7 +1,7 @@
 // Add help panel at right side of notebook window
 
 define([
-    'requirejs',
+    'require',
     'jqueryui',
     'base/js/namespace',
     'base/js/events',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/highlighter/highlighter.js b/src/jupyter_contrib_nbextensions/nbextensions/highlighter/highlighter.js
@@ -294,7 +294,7 @@ $("#remove_highlights")
 
 //******************************* MAIN FUNCTION **************************
 
-define(["requirejs",
+define(["require",
     'base/js/namespace'
 ], function(requirejs, Jupyter) {
 
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/keyboard_shortcut_editor/main.js b/src/jupyter_contrib_nbextensions/nbextensions/keyboard_shortcut_editor/main.js
@@ -1,6 +1,6 @@
 define([
 	'jquery',
-	'requirejs',
+	'require',
 	'base/js/namespace',
 	'base/js/dialog',
 	'base/js/events',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/livemdpreview/livemdpreview.js b/src/jupyter_contrib_nbextensions/nbextensions/livemdpreview/livemdpreview.js
@@ -1,6 +1,6 @@
 define([
     'jquery',
-    'requirejs',
+    'require',
     'base/js/namespace',
     'base/js/events',
     'base/js/utils',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/move_selected_cells/main.js b/src/jupyter_contrib_nbextensions/nbextensions/move_selected_cells/main.js
@@ -14,7 +14,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'base/js/events'
 ], function(Jupyter, $, requirejs, events, rubberband) {
     "use strict";
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js b/src/jupyter_contrib_nbextensions/nbextensions/notify/notify.js
@@ -11,7 +11,7 @@ Add this file to $(ipython locate)/nbextensions/
 define([
   "jquery",
   "base/js/namespace",
-  "requirejs",
+  "require",
 ], function ($, Jupyter, requirejs) {
   "use strict";
 
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/python-markdown/main.js b/src/jupyter_contrib_nbextensions/nbextensions/python-markdown/main.js
@@ -10,7 +10,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'notebook/js/cell',
     'base/js/security',
     'components/marked/lib/marked',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/rubberband/main.js b/src/jupyter_contrib_nbextensions/nbextensions/rubberband/main.js
@@ -7,7 +7,7 @@ define([
     'jquery',
     'base/js/events',
     'base/js/keyboard',
-    'requirejs'
+    'require'
 ], function(IPython, $, events, keyboard, requirejs) {
     "use strict";
 
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js b/src/jupyter_contrib_nbextensions/nbextensions/runtools/main.js
@@ -3,7 +3,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'base/js/events',
     'services/config',
     'base/js/utils',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/skip-traceback/main.js b/src/jupyter_contrib_nbextensions/nbextensions/skip-traceback/main.js
@@ -4,7 +4,7 @@
 define([
     'base/js/namespace',
     'jquery',
-    'requirejs',
+    'require',
     'notebook/js/outputarea',
 ], function (
     Jupyter,
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/main.js b/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/main.js
@@ -1,5 +1,5 @@
 define([
-    "requirejs",
+    "require",
     "jquery",
     "base/js/namespace",
     "./snippets_submenu_python",
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenu_python.js b/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenu_python.js
@@ -1,5 +1,5 @@
 define([
-    "requirejs",
+    "require",
     "./snippets_submenus_python/numpy",
     "./snippets_submenus_python/scipy",
     "./snippets_submenus_python/matplotlib",
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/numpy.js b/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/numpy.js
@@ -1,5 +1,5 @@
 define([
-    "requirejs",
+    "require",
     "./numpy_ufuncs",
     "./numpy_polynomial",
 ], function (requirejs, numpy_ufuncs, numpy_polynomial) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/python.js b/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/python.js
@@ -1,5 +1,5 @@
 define([
-    "requirejs",
+    "require",
     "./python_regex",
 ], function (requirejs, python_regex) {
     return {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/scipy.js b/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/scipy.js
@@ -1,5 +1,5 @@
 define([
-    "requirejs",
+    "require",
     "./scipy_constants",
     "./scipy_special",
 ], function (requirejs, scipy_constants, scipy_special) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/sympy.js b/src/jupyter_contrib_nbextensions/nbextensions/snippets_menu/snippets_submenus_python/sympy.js
@@ -1,5 +1,5 @@
 define([
-    "requirejs",
+    "require",
     "./sympy_functions",
     "./sympy_assumptions",
 ], function (requirejs, sympy_functions, sympy_assumptions) {
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js b/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/main.js
@@ -1,5 +1,5 @@
 define([
-	'requirejs',
+	'require',
 	'jquery',
 	'base/js/events',
 	'base/js/namespace',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/typo/typo.js b/src/jupyter_contrib_nbextensions/nbextensions/spellchecker/typo/typo.js
@@ -4,7 +4,7 @@ this is a requirejs-compatible adaptation of typo.js from
 essentially just wrapping it in a define call.
 */
 
-define(['requirejs'], function (requirejs) {
+define(['require'], function (requirejs) {
 'use strict';
 
 /**
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/table_beautifier/main.js b/src/jupyter_contrib_nbextensions/nbextensions/table_beautifier/main.js
@@ -9,7 +9,7 @@
 */
 
 define([
-  'requirejs',
+  'require',
   'jquery',
   'base/js/events'
  ], function (
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js
@@ -3,7 +3,7 @@
 // See the history of contributions in README.md
 
 define([
-    'requirejs',
+    'require',
     'jquery',
     'base/js/namespace',
     'base/js/events',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
@@ -4,7 +4,7 @@
     // 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/toc2/toc2', deps, callback);
-})(['jquery', 'requirejs'], function($, requirejs) {
+})(['jquery', 'require'], function($, requirejs) {
     "use strict";
 
     var IPython;
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/tree-filter/index.js b/src/jupyter_contrib_nbextensions/nbextensions/tree-filter/index.js
@@ -3,7 +3,7 @@
  */
 
 define([
-    'requirejs',
+    'require',
     'jqueryui',
     'base/js/namespace',
     'base/js/utils',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js b/src/jupyter_contrib_nbextensions/nbextensions/varInspector/main.js
@@ -1,5 +1,5 @@
 define([
-    'requirejs',
+    'require',
     'jquery',
     'base/js/namespace',
     'base/js/events',
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js b/src/jupyter_contrib_nbextensions/nbextensions/zenmode/main.js
@@ -10,7 +10,7 @@
 */
 
 define([
-    "requirejs",
+    "require",
     "jquery",
     "base/js/namespace",
     "base/js/events"
