X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3ffb4cfcbc5dbbbe4926b48bd44ab73c037fe504..cb50c78e7f77e5416fa405db18d142c96d16a543:/platforma/static/js/main.js diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js index a044b87d..cdcc21a8 100644 --- a/platforma/static/js/main.js +++ b/platforma/static/js/main.js @@ -328,9 +328,8 @@ function reverseTransform(editor, cont, errorCont, dontBlock) { $.blockUI({message: 'Åadowanie...'}); } setTimeout(function() { - html2xml({ - htmlElement: $('#html-view div').get(0), - /* xml: serializer.serializeToString($('#html-view div').get(0)), */ + html2text({ + element: $('#html-view div').get(0), success: function(text) { editor.setCode(text); if (!dontBlock) { @@ -596,9 +595,9 @@ function html(element) { var serializer = new XMLSerializer(); - html2xml({ - xml: serializer.serializeToString($box[0]), - inner: true, + html2text({ + element: $box[0], + stripOuter: true, success: function(text) { $('textarea', $overlay).val($.trim(text)); @@ -617,7 +616,7 @@ function html(element) { xml2html({ xml: '<' + nodeName + '>' + insertedText + '' + nodeName + '>', success: function(element) { - $box.html($(element).html()); + $origin.html($(element).html()); $overlay.remove(); }, error: function(text) { @@ -662,7 +661,7 @@ function html(element) { } if (editable.is('.annotation-inline-box')) { $('*[x-annotation-box]', editable) - .css({width: 300, position: 'absolute', left: event.clientX - editable.offset().left + 5, top: event.clientY - editable.offset().top + 5}) + .css({position: 'absolute', left: event.clientX - editable.offset().left + 5, top: event.clientY - editable.offset().top + 5}) .show(); } else { $('*[x-annotation-box]').hide(); @@ -716,7 +715,7 @@ function refreshHistory(callback){ +'