From 037b499cb22b09e07c02134f73f19da2d36aefcf Mon Sep 17 00:00:00 2001
From: ilvalle <paolo.valleri@gmail.com>
Date: Thu, 17 Oct 2013 16:32:22 +0200
Subject: [PATCH] correct editor's mode when editing javascript

---
 applications/admin/controllers/default.py     | 2 +-
 applications/admin/views/default/edit_js.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py
index 5963d260..51faf83a 100644
--- a/applications/admin/controllers/default.py
+++ b/applications/admin/controllers/default.py
@@ -606,7 +606,7 @@ def edit():
     elif filename[-4:] == '.css':
         filetype = 'css'
     elif filename[-3:] == '.js':
-        filetype = 'js'
+        filetype = 'javascript'
     else:
         filetype = 'html'
 
diff --git a/applications/admin/views/default/edit_js.html b/applications/admin/views/default/edit_js.html
index 7562d108..8096fbd9 100644
--- a/applications/admin/views/default/edit_js.html
+++ b/applications/admin/views/default/edit_js.html
@@ -78,7 +78,7 @@
             return marker;
        }
 
-        {{if filetype in ('html', 'js', 'css'):}}
+        {{if filetype in ('html', 'javascript', 'css'):}}
         // must be here or break emmet/zencoding 
         CodeMirror.defaults.extraKeys["Ctrl-S"] =
             function(instance) {