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 0597140..8fb9358 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_source.js
+++ b/redakcja/static/js/wiki/view_editor_source.js
@@ -9,8 +9,8 @@
 
                        this.codemirror = CodeMirror.fromTextArea('codemirror_placeholder', {
                                parserfile: 'parsexml.js',
 
                        this.codemirror = CodeMirror.fromTextArea('codemirror_placeholder', {
                                parserfile: 'parsexml.js',

-                               path: STATIC_URL + "js/lib/codemirror/",
-                               stylesheet: STATIC_URL + "css/xmlcolors_15032010.css",
+                               path: STATIC_URL + "js/lib/codemirror-0.8/",
+                               stylesheet: STATIC_URL + "css/xmlcolors_20100906.css",

                                parserConfig: {
                                        useHTMLKludges: false
                                },
                                parserConfig: {
                                        useHTMLKludges: false
                                },


@@ -18,6 +18,7 @@
                                textWrapping: true,
                                lineNumbers: true,
                                width: "100%",
                                textWrapping: true,
                                lineNumbers: true,
                                width: "100%",

+                               height: "100%",

                                tabMode: 'spaces',
                                indentUnit: 0,
                                readOnly: CurrentDocument.readonly || false,
                                tabMode: 'spaces',
                                indentUnit: 0,
                                readOnly: CurrentDocument.readonly || false,


@@ -28,15 +29,11 @@
                                                        $(event.button).trigger('click');
                                                        event.button = null;
                                                }
                                                        $(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;
 
                                                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;
                                                var button = $("#source-editor button[data-ui-accesskey='"+c+"']");
                                                if(button.length == 0)
                                                        return false;