X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/afdb8fd05511c5280e8ee251389cb893786eb810..07edfacbb61a558c8760b20591b2f2723034e414:/platforma/static/js/main.js

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 8b55af96..f94e04ee 100644
--- 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) {
@@ -398,7 +398,7 @@ function html(element) {
         return true;
     }
 	
-	var ANNOT_ALLOWED = ['wyroznienie'];
+	var ANNOT_ALLOWED = ['wyroznienie', 'slowo_obce', 'osoba'];
 	
 	function html2plainText(fragment) {
 		var text = "";
@@ -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) {
@@ -661,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();
@@ -715,7 +715,7 @@ function refreshHistory(callback){
 					+'<td>'+ this[1]+'</td></tr>')			
 			});							
 			$.unblockUI();	
-			callback();
+			if(callback) callback();
 		}
 	});
 };
@@ -763,13 +763,14 @@ $(function() {
     CodeMirror.fromTextArea('id_text', {
         parserfile: 'parsexml.js',
         path: STATIC_URL + "js/lib/codemirror/",
-        stylesheet: STATIC_URL + "css/xmlcolors.css",
+        stylesheet: STATIC_URL + "css/xmlcolors_15032010.css",
         parserConfig: {
             useHTMLKludges: false
         },
-        iframeClass: 'xml-iframe',
+        iframeClass: 'xml-iframe',		
         textWrapping: true,
-		/* lineNumbers: true, */
+		lineNumbers: true, 
+		width: "100%",
         tabMode: 'spaces',
         indentUnit: 0,
         initCallback: function(editor) {
@@ -886,15 +887,18 @@ $(function() {
     $('.vsplitbar').click(function() {
         if ($('#sidebar').width() == 0) {
             $('#sidebar').width(480).css({right: 0}).show();
-            $('#source-editor, #simple-editor').css({right: 495});
+            $('#editor .editor').css({right: 495});
             $('.vsplitbar').css({right: 480}).addClass('active');
         } else {
             $('#sidebar').width(0).hide();
-            $('#source-editor, #simple-editor').css({right: 15});
+            $('#editor .editor').css({right: 15});
             $('.vsplitbar').css({right: 0}).removeClass('active');
         }
         $(window).resize();
     });
-                
+	
+	$(window).bind('beforeunload', function(event) {
+		return "Na stronie mogą być niezapisane zmiany.";								
+	});                
 
 });