Merge pull request #214 from niphlod/fix/admin_emmet

fixes keyboard shortcuts in admin when modifying js or css files
2013-09-18 08:05:49 -07:00
parent cfe825f94a 3c8e7a1364
commit 67349627f4
1 changed files with 2 additions and 2 deletions
--- a/applications/admin/views/default/edit_js.html
+++ b/applications/admin/views/default/edit_js.html
@@ -79,8 +79,8 @@
            return marker;
       }

-        {{if filetype=='html':}}
-        // must be here or break emmet/zencoding for html
+        {{if filetype in ('html', 'js', 'css'):}}
+        // must be here or break emmet/zencoding 
        CodeMirror.defaults.extraKeys["Ctrl-S"] =
            function(instance) {
                doClickSave();};