gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

force merge conflict for stream viewers

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-15 17:06:05 +09:00
parent fcc1af0ed7
commit c609294e1f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/js/lib/bonfire/bonfireFramework_v0.1.2.js
View File

@ -17,10 +17,13 @@ editor.setSize("100%", "auto");
// Hijack tab key to enter two spaces intead // Hijack tab key to enter two spaces intead
editor.setOption("extraKeys", { editor.setOption("extraKeys", {
Tab: function(cm) { Tab: function(mc) {
var spaces = Array(cm.getOption("indentUnit") + 1).join(" "); var spaces = Array(mc.getOption("indentUnit") + 1).join(" ");
cm.replaceSelection(spaces); mc.replaceSelection(spaces);
}, },
"Ctrl-Enter": function() { "Ctrl-Enter": function() {
bonfireExecute(); bonfireExecute();
return false; return false;