* Improved document layout in Firefox.

[redakcja.git] / platforma / static / js / main.js

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index a92dfe4..3f4d30c 100644 (file)
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -328,8 +328,8 @@ function reverseTransform(editor, cont, errorCont, dontBlock) {
         $.blockUI({message: 'Ładowanie...'});
     }
     setTimeout(function() {
-        html2xml({
-            xml: serializer.serializeToString($('#html-view div').get(0)),
+        html2text({
+                       element: $('#html-view div').get(0),            
             success: function(text) {
                 editor.setCode(text);
                 if (!dontBlock) {
@@ -595,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));
                 
@@ -616,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) {
@@ -659,6 +659,13 @@ function html(element) {
         if (!editable.hasClass('active')) {
             editable.addClass('active').append(button);
         }
+        if (editable.is('.annotation-inline-box')) {
+            $('*[x-annotation-box]', editable)
+                .css({position: 'absolute', left: event.clientX - editable.offset().left + 5, top: event.clientY - editable.offset().top + 5})
+                .show();
+        } else {
+            $('*[x-annotation-box]').hide();
+        }
     });
 
     $('.motyw').live('click', function() {
@@ -760,9 +767,10 @@ $(function() {
         parserConfig: {
             useHTMLKludges: false
         },
-        iframeClass: 'xml-iframe',
+        iframeClass: 'xml-iframe',             
         textWrapping: true,
-               /* lineNumbers: true, */
+               lineNumbers: true, 
+               width: "100%",
         tabMode: 'spaces',
         indentUnit: 0,
         initCallback: function(editor) {