Merge pull request #4064 from Carreau/default_mode

Store default codemirror mode in only 1 place

IPython/html/static/notebook/js/cell.js

@@ -323,8 +323,13 @@ var IPython = (function (IPython) {
                 }
             }
         }
-        // fallback on default (python)
-        var default_mode = this.default_mode || 'text/plain';
+        // fallback on default
+        var default_mode
+        try {
+            default_mode = this._options.cm_config.mode;
+        } catch(e) {
+            default_mode = 'text/plain';
+        }
         this.code_mirror.setOption('mode', default_mode);
     };
 

IPython/html/static/notebook/js/codecell.js

@@ -65,7 +65,6 @@ var IPython = (function (IPython) {
         this.code_mirror = null;
         this.input_prompt_number = null;
         this.collapsed = false;
-        this.default_mode = 'ipython';
         this.cell_type = "code";