fixes

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

diff --git a/src/redakcja/static/js/wiki/xslt.js b/src/redakcja/static/js/wiki/xslt.js
index 43db29b..1980446 100644 (file)
--- a/src/redakcja/static/js/wiki/xslt.js
+++ b/src/redakcja/static/js/wiki/xslt.js
@@ -17,21 +17,20 @@ function withStylesheets(code_block, onError)
     if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({
     if (!xml2htmlStylesheet) {
        $.blockUI({message: 'Ładowanie arkuszy stylów...'});
        $.ajax({

-               url: STATIC_URL + 'xsl/wl2html_client.xsl?20171106',
-               dataType: 'xml',
-               timeout: 10000,
-               success: function(data) {
+            url: '/wlxml/wl2html.xsl',
+            dataType: 'xml',
+            timeout: 10000,
+            success: function(data) {

                xml2htmlStylesheet = createXSLT(data);
                 $.unblockUI();
                xml2htmlStylesheet = createXSLT(data);
                 $.unblockUI();

-                               code_block();
-
+               code_block();

             },
             },

-                       error: onError
+           error: onError

         })
     }
         })
     }

-       else {
-               code_block();
-       }
+    else {
+       code_block();
+    }

 }
 
 
 }
 
 


@@ -61,6 +60,20 @@ function xml2html(options) {
             source.text('');
             options.error(error.text(), source_text);
         } else {
             source.text('');
             options.error(error.text(), source_text);
         } else {

+            let galleryUrl = new URL(
+                options.base,
+                window.location.href
+            );
+            $("img", $(doc.childNodes)).each(function() {
+                $(this).attr(
+                    'src',
+                    new URL(
+                        $(this).attr('src'),
+                        galleryUrl
+                    )
+                );
+            })
+

             options.success(doc.childNodes);
 
             $.themes.withCanon(function(canonThemes) {
             options.success(doc.childNodes);
 
             $.themes.withCanon(function(canonThemes) {


@@ -157,7 +170,7 @@ HTMLSerializer.prototype._verseBefore = function(node) {
 }
 
 HTMLSerializer.prototype._nodeIgnored = function(node) {
 }
 
 HTMLSerializer.prototype._nodeIgnored = function(node) {

-    return node.getAttribute('x-node') == 'wers';
+    return node.getAttribute('x-auto-node') == 'true';

 }
 
 HTMLSerializer.prototype._ignoredWithWhitespace = function(node) {
 }
 
 HTMLSerializer.prototype._ignoredWithWhitespace = function(node) {


@@ -339,7 +352,7 @@ HTMLSerializer.prototype._serializeElement = function(node) {
                };
 
                self.result += ' ' + self._join(nsData.prefix, node.getAttribute('x-attr-name-'+this));
                };
 
                self.result += ' ' + self._join(nsData.prefix, node.getAttribute('x-attr-name-'+this));

-               self.result += '="'+node.getAttribute('x-attr-value-'+this) +'"';
+               self.result += '="' + node.getAttribute('x-attr-value-'+this).replace(/&/g, '&').replace(/"/g, '"') + '"';

        });
 
        /* print new namespace declarations */
        });
 
        /* print new namespace declarations */