Merge branch 'zuber-view-refactor'

[redakcja.git] / project / templates / explorer / panels / xmleditor.html

diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html
index 7691269..74a6877 100644 (file)
--- a/project/templates/explorer/panels/xmleditor.html
+++ b/project/templates/explorer/panels/xmleditor.html
@@ -16,9 +16,12 @@ panel_hooks = {
 
        var texteditor = CodeMirror.fromTextArea(textareaId, {            
             parserfile: 'parsexml.js',
-            path: "{{STATIC_URL}}js/codemirror/",
+            path: "{{STATIC_URL}}js/lib/codemirror/",
+            width: 'auto',
             stylesheet: "{{STATIC_URL}}css/xmlcolors.css",
             parserConfig: {useHTMLKludges: false},
+            textWrapping: false,
+            lineNumbers: true,
             onChange: function() {
                self.fireEvent('contentChanged');
             },
@@ -33,8 +36,11 @@ panel_hooks = {
             }
         })
 
-        $(texteditor.frame).css({width: '100%', height: '100%'});    
+        $('.CodeMirror-content-wrapper').css({
+            width: '100%', height: '100%' });
+                    
         this.texteditor = texteditor;
+        self._endload();       
     },
 
        unload: function() { 
@@ -55,8 +61,8 @@ panel_hooks = {
        },
 
         toolbarResized: function() {
-            $('.iframe-container', self.contentDiv).css('top',
-                    $('.toolbar', self.contentDiv).outerHeight() );
+            $('.iframe-container', this.contentDiv).css('top',
+                    $('.toolbar', this.contentDiv).outerHeight() );
         }
 };