X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3cff6e4a3f7e7acceacbc621f9196204b508121e..161780c3fe42e97b8459a923916aff615b5e4c40:/redakcja/static/js/wiki/view_editor_source.js?ds=inline diff --git a/redakcja/static/js/wiki/view_editor_source.js b/redakcja/static/js/wiki/view_editor_source.js index 9fc99227..8fb93589 100644 --- 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', - 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 }, @@ -18,6 +18,7 @@ textWrapping: true, lineNumbers: true, width: "100%", + height: "100%", tabMode: 'spaces', indentUnit: 0, readOnly: CurrentDocument.readonly || false, @@ -28,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; @@ -100,6 +97,10 @@ console.log('Exiting', this.doc); this.doc.setText(this.codemirror.getCode()); + if ($('.vsplitbar').hasClass('active') && $('#SearchPerspective').hasClass('active')) { + $.wiki.switchToTab('#ScanGalleryPerspective'); + } + if(success) success(); }