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

resolve conflict

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-15 17:08:34 +09:00
parent c609294e1f 191e38472e
commit bf7d38e080
4 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,9 +17,21 @@ editor.setSize("100%", "auto");
// Hijack tab key to enter two spaces intead
editor.setOption("extraKeys", {
Tab: function(mc) {
var spaces = Array(mc.getOption("indentUnit") + 1).join(" ");
mc.replaceSelection(spaces);
Tab: function(cm) {
if (cm.somethingSelected()){
cm.indentSelection("add");
} else {
var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
cm.replaceSelection(spaces);
}
},
"Shift-Tab": function(cm) {
if (cm.somethingSelected()){
cm.indentSelection("subtract");
} else {
var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
cm.replaceSelection(spaces);
}
},