Revert "Backport PR #1490: Unify the codemirror imports"

This reverts commit ca70441436.

notebook/static/notebook/js/codemirror-ipython.js

@@ -5,35 +5,34 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object"){ // CommonJS
-    mod(require("codemirror/lib/codemirror")
+    mod(require("codemirror/lib/codemirror"),
+        require("codemirror/mode/python/python")
         );
   } else if (typeof define == "function" && define.amd){ // AMD
-    define(["codemirror/lib/codemirror"], mod);
+    define(["codemirror/lib/codemirror",
+            "codemirror/mode/python/python"], mod);
   } else {// Plain browser env
     mod(CodeMirror);
   }
 })(function(CodeMirror) {
     "use strict";
 
-    requirejs(['codemirror/mode/python/python'], function () {
-        CodeMirror.defineMode("ipython", function(conf, parserConf) {
-            var pythonConf = {};
-            for (var prop in parserConf) {
-                if (parserConf.hasOwnProperty(prop)) {
-                    pythonConf[prop] = parserConf[prop];
-                }
+    CodeMirror.defineMode("ipython", function(conf, parserConf) {
+        var pythonConf = {};
+        for (var prop in parserConf) {
+            if (parserConf.hasOwnProperty(prop)) {
+                pythonConf[prop] = parserConf[prop];
             }
-            pythonConf.name = 'python';
-            pythonConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");
-            if (pythonConf.version === 3) {
-                pythonConf.identifiers = new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
-            } else if (pythonConf.version === 2) {
-                pythonConf.identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-            }
-            return CodeMirror.getMode(conf, pythonConf);
-        }, 'python');
-
-        CodeMirror.defineMIME("text/x-ipython", "ipython");
+        }
+        pythonConf.name = 'python';
+        pythonConf.singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\\?]");
+        if (pythonConf.version === 3) {
+            pythonConf.identifiers = new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+        } else if (pythonConf.version === 2) {
+            pythonConf.identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+        }
+        return CodeMirror.getMode(conf, pythonConf);
+    }, 'python');
 
-    });
+    CodeMirror.defineMIME("text/x-ipython", "ipython");
 })

notebook/static/notebook/js/codemirror-ipythongfm.js

@@ -10,9 +10,15 @@
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object"){ // CommonJS
     mod(require("codemirror/lib/codemirror")
+        ,require("codemirror/addon/mode/multiplex")
+        ,require("codemirror/mode/gfm/gfm")
+        ,require("codemirror/mode/stex/stex")
         );
   } else if (typeof define == "function" && define.amd){ // AMD
     define(["codemirror/lib/codemirror"
+            ,"codemirror/addon/mode/multiplex"
+            ,"codemirror/mode/python/python"
+            ,"codemirror/mode/stex/stex"
             ], mod);
   } else {// Plain browser env
     mod(CodeMirror);
@@ -20,40 +26,37 @@
 })( function(CodeMirror){
     "use strict";
 
-    requirejs(["codemirror/addon/mode/multiplex", "codemirror/mode/gfm/gfm", "codemirror/mode/stex/stex"], function () {
+    CodeMirror.defineMode("ipythongfm", function(config, parserConfig) {
 
-        CodeMirror.defineMode("ipythongfm", function(config, parserConfig) {
+        var gfm_mode = CodeMirror.getMode(config, "gfm");
+        var tex_mode = CodeMirror.getMode(config, "stex");
 
-            var gfm_mode = CodeMirror.getMode(config, "gfm");
-            var tex_mode = CodeMirror.getMode(config, "stex");
-
-            return CodeMirror.multiplexingMode(
-                gfm_mode,
-                {
-                    open: "$", close: "$",
-                    mode: tex_mode,
-                    delimStyle: "delimit"
-                },
-                {
-                    // not sure this works as $$ is interpreted at (opening $, closing $, as defined just above)
-                    open: "$$", close: "$$",
-                    mode: tex_mode,
-                    delimStyle: "delimit"
-                },
-                {
-                    open: "\\(", close: "\\)",
-                    mode: tex_mode,
-                    delimStyle: "delimit"
-                },
-                {
-                    open: "\\[", close: "\\]",
-                    mode: tex_mode,
-                    delimStyle: "delimit"
-                }
-                // .. more multiplexed styles can follow here
-            );
-        }, 'gfm');
+        return CodeMirror.multiplexingMode(
+            gfm_mode,
+            {
+                open: "$", close: "$",
+                mode: tex_mode,
+                delimStyle: "delimit"
+            },
+            {
+                // not sure this works as $$ is interpreted at (opening $, closing $, as defined just above)
+                open: "$$", close: "$$",
+                mode: tex_mode,
+                delimStyle: "delimit"
+            },
+            {
+                open: "\\(", close: "\\)",
+                mode: tex_mode,
+                delimStyle: "delimit"
+            },
+            {
+                open: "\\[", close: "\\]",
+                mode: tex_mode,
+                delimStyle: "delimit"
+            }
+            // .. more multiplexed styles can follow here
+        );
+    }, 'gfm');
 
-        CodeMirror.defineMIME("text/x-ipythongfm", "ipythongfm");
-    });
+    CodeMirror.defineMIME("text/x-ipythongfm", "ipythongfm");
 })