X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7094d00cd82535cfd1db00e7bd85e2a01161da83..bdabaaf2da173e1778667f69f125925dcb9149df:/redakcja/static/js/wiki/xslt.js
diff --git a/redakcja/static/js/wiki/xslt.js b/redakcja/static/js/wiki/xslt.js
index 99266732..46726c18 100644
--- a/redakcja/static/js/wiki/xslt.js
+++ b/redakcja/static/js/wiki/xslt.js
@@ -17,7 +17,7 @@ function withStylesheets(code_block, onError)
if (!xml2htmlStylesheet) {
$.blockUI({message: 'Åadowanie arkuszy stylów...'});
$.ajax({
- url: STATIC_URL + 'xsl/wl2html_client.xsl?20101123',
+ url: STATIC_URL + 'xsl/wl2html_client.xsl?20110520',
dataType: 'xml',
timeout: 10000,
success: function(data) {
@@ -61,6 +61,7 @@ function withThemes(code_block, onError)
function xml2html(options) {
withStylesheets(function() {
var xml = options.xml.replace(/\/(\s+)/g, '
$1');
+ xml = xml.replace(/([^a-zA-Z0-9Ä
ÄÄÅÅóÅźżÄÄÄÅÅÃÅŹŻ\s<>«»\\*_!,:;?%."'=#()\/-]+)/g, '$1');
var parser = new DOMParser();
var serializer = new XMLSerializer();
var doc = parser.parseFromString(xml, 'text/xml');
@@ -84,7 +85,7 @@ function xml2html(options) {
source.text('');
options.error(error.text(), source_text);
} else {
- options.success(doc.firstChild);
+ options.success(doc.childNodes);
withThemes(function(canonThemes) {
if (canonThemes != null) {
@@ -254,6 +255,11 @@ HTMLSerializer.prototype.serialize = function(rootElement, stripOuter)
self.result += text_buffer;
text_buffer = token.node.nodeValue;
break;
+ case COMMENT_NODE:
+ self.result += text_buffer;
+ text_buffer = '';
+ self.result += '';
+ break;
};
};
self.result += text_buffer;
@@ -384,4 +390,4 @@ function html2text(params) {
} catch(e) {
params.error("Nie udaÅo siÄ zserializowaÄ tekstu:" + e)
}
-}
\ No newline at end of file
+}