cleanup whitespace

pull/37/head
Matthias Bussonnier 12 years ago
parent 3de3ef9add
commit b24e69b058

@ -30,9 +30,9 @@ define([
* @param:
* options: dictionary
* Dictionary of keyword arguments.
* events: $(Events) instance
* events: $(Events) instance
* config: dictionary
* keyboard_manager: KeyboardManager instance
* keyboard_manager: KeyboardManager instance
*/
options = options || {};
this.keyboard_manager = options.keyboard_manager;
@ -183,7 +183,7 @@ define([
if((cur.line !== 0 || cur.ch !==0) && event.keyCode === 38){
event._ipkmIgnore = true;
}
var nLastLine = editor.lastLine()
var nLastLine = editor.lastLine()
if( ( event.keyCode === 40)
&& (( cur.line !== nLastLine)
|| ( cur.ch !== editor.getLineHandle(nLastLine).text.length))
@ -192,8 +192,8 @@ define([
}
// if this is an edit_shortcuts shortcut, the global keyboard/shortcut
// manager will handle it
if (shortcuts.handles(event)) {
return true;
if (shortcuts.handles(event)) {
return true;
}
return false;
@ -543,26 +543,26 @@ define([
}
var open = modes[mode].open || "%%";
var close = modes[mode].close || "%%end";
var mmode = mode;
mode = mmode.substr(6);
if(current_mode == mmode){
var magic_mode = mode;
mode = magic_mode.substr(6);
if(current_mode == magic_mode){
return;
}
utils.requireCodeMirrorMode(mode, function () {
// create on the fly a mode that switch between
// plain/text and something else, otherwise `%%` is
// source of some highlight issues.
CodeMirror.defineMode(mmode, function(config) {
CodeMirror.defineMode(magic_mode, function(config) {
return CodeMirror.multiplexingMode(
CodeMirror.getMode(config, 'text/plain'),
// always set someting on close
// always set something on close
{open: open, close: close,
mode: CodeMirror.getMode(config, mode),
delimStyle: "delimit"
}
);
});
that.code_mirror.setOption('mode', mmode);
that.code_mirror.setOption('mode', magic_mode);
});
return;
}

@ -5,18 +5,18 @@
(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",
define(["codemirror/lib/codemirror",
"codemirror/mode/python/python"], mod);
} else {// Plain browser env
mod(CodeMirror);
}
})(function(CodeMirror) {
"use strict";
CodeMirror.defineMode("ipython", function(conf, parserConf) {
var pythonConf = {};
for (var prop in parserConf) {
@ -36,4 +36,3 @@
CodeMirror.defineMIME("text/x-ipython", "ipython");
})

@ -1,7 +1,7 @@
// IPython GFM (GitHub Flavored Markdown) mode is just a slightly altered GFM
// Mode with support for latex.
// IPython GFM (GitHub Flavored Markdown) mode is just a slightly altered GFM
// Mode with support for latex.
//
// Latex support was supported by Codemirror GFM as of
// Latex support was supported by Codemirror GFM as of
// https://github.com/codemirror/CodeMirror/pull/567
// But was later removed in
// https://github.com/codemirror/CodeMirror/commit/d9c9f1b1ffe984aee41307f3e927f80d1f23590c
@ -15,7 +15,7 @@
,require("codemirror/mode/stex/stex")
);
} else if (typeof define == "function" && define.amd){ // AMD
define(["codemirror/lib/codemirror"
define(["codemirror/lib/codemirror"
,"codemirror/addon/mode/multiplex"
,"codemirror/mode/python/python"
,"codemirror/mode/stex/stex"
@ -27,10 +27,10 @@
"use strict";
CodeMirror.defineMode("ipythongfm", function(config, parserConfig) {
var gfm_mode = CodeMirror.getMode(config, "gfm");
var tex_mode = CodeMirror.getMode(config, "stex");
return CodeMirror.multiplexingMode(
gfm_mode,
{
@ -57,8 +57,6 @@
// .. more multiplexed styles can follow here
);
}, 'gfm');
CodeMirror.defineMIME("text/x-ipythongfm", "ipythongfm");
CodeMirror.defineMIME("text/x-ipythongfm", "ipythongfm");
})

Loading…
Cancel
Save