minor fixes: #860, #861, #870

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

diff --git a/redakcja/static/js/wiki/xslt.js b/redakcja/static/js/wiki/xslt.js
index 791cf1a..67216eb 100644 (file)
--- a/redakcja/static/js/wiki/xslt.js
+++ b/redakcja/static/js/wiki/xslt.js
@@ -58,7 +58,6 @@ function withThemes(code_block, onError)
 }
 
 
 }
 
 

-

 function xml2html(options) {
     withStylesheets(function() {
         var xml = options.xml.replace(/\/(\s+)/g, '<br />$1');
 function xml2html(options) {
     withStylesheets(function() {
         var xml = options.xml.replace(/\/(\s+)/g, '<br />$1');


@@ -80,7 +79,10 @@ function xml2html(options) {
         }
 
         if (error.length > 0 && options.error) {
         }
 
         if (error.length > 0 && options.error) {

-            options.error(error.text());
+            source = $('sourcetext', doc);
+            source_text = source.text();
+            source.text('');
+            options.error(error.text(), source_text);

         } else {
             options.success(doc.firstChild);
 
         } else {
             options.success(doc.firstChild);
 


@@ -271,7 +273,7 @@ HTMLSerializer.prototype.serialize = function(rootElement, stripOuter)
                                if(xnode === 'wers') {
                                        /* push children */
                                        if(self._verseBefore(token.node))
                                if(xnode === 'wers') {
                                        /* push children */
                                        if(self._verseBefore(token.node))

-                                               self.result += '/';
+                                               self.result += '/\n';

                                        self._pushChildren(token.node);
                                        break;
                                };
                                        self._pushChildren(token.node);
                                        break;
                                };