Merge pull request #214 from niphlod/fix/admin_emmet

fixes keyboard shortcuts in admin when modifying js or css files
This commit is contained in:
mdipierro committed 2013-09-18 08:05:49 -07:00
commit 67349627f4
1 file changed
+2 -2
@@ -79,8 +79,8 @@
return marker; return marker;
} }
{{if filetype=='html':}} {{if filetype in ('html', 'js', 'css'):}}
// must be here or break emmet/zencoding for html // must be here or break emmet/zencoding
CodeMirror.defaults.extraKeys["Ctrl-S"] = CodeMirror.defaults.extraKeys["Ctrl-S"] =
function(instance) { function(instance) {
doClickSave();}; doClickSave();};