Merge branch 'master' into with-dvcs

[redakcja.git] / redakcja / static / js / wiki / view_editor_source.js

diff --git a/redakcja/static/js/wiki/view_editor_source.js b/redakcja/static/js/wiki/view_editor_source.js
index 6975f9b..8fb9358 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_source.js
+++ b/redakcja/static/js/wiki/view_editor_source.js
@@ -9,7 +9,7 @@
 
                        this.codemirror = CodeMirror.fromTextArea('codemirror_placeholder', {
                                parserfile: 'parsexml.js',
-                               path: STATIC_URL + "js/lib/codemirror/",
+                               path: STATIC_URL + "js/lib/codemirror-0.8/",
                                stylesheet: STATIC_URL + "css/xmlcolors_20100906.css",
                                parserConfig: {
                                        useHTMLKludges: false
@@ -29,15 +29,11 @@
                                                        $(event.button).trigger('click');
                                                        event.button = null;
                                                }
-                                       }, function(event) {
-                                               /* CM reports characters 2 times - as event and as code */
-                                               if((typeof event) != "object")
-                                                       return false;
-
+                                       }, function(keycode, event) {
                                                if(!event.altKey)
                                                        return false;
 
-                                               var c = String.fromCharCode(event.keyCode).toLowerCase();
+                                               var c = String.fromCharCode(keycode).toLowerCase();
                                                var button = $("#source-editor button[data-ui-accesskey='"+c+"']");
                                                if(button.length == 0)
                                                        return false;