X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cf891d5c934a7d112f3c36ad82b256917a096fca..404423b9a4cbc22700fdf1f76b65973af374c378:/platforma/static/js/main.js

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 1a281c40..89ffeafb 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -308,8 +308,6 @@ function html(element) {
             return false;
         }
 
-        console.log('Selection point:', node);
-        
         node = $(node);
         var xtype = node.attr('x-node');
 
@@ -317,10 +315,6 @@ function html(element) {
             xtype == 'motyw' || xtype == 'begin' || xtype == 'end') {
             return false;
         }
-
-        // this is hopefully redundant
-        //if(! node.is('*.utwor *') )
-        //    return false;
         
         // don't allow themes inside annotations
         if( node.is('*[x-annotation-box] *') )
@@ -334,7 +328,6 @@ function html(element) {
         var selection = window.getSelection();
         var n = selection.rangeCount;
 
-        console.log("Range count:", n);
         if (n == 0) {
             window.alert("Nie zaznaczono żadnego obszaru");
             return false;
@@ -360,9 +353,11 @@ function html(element) {
         range.insertNode(tag[0]);
 
         xml2html({
-            xml: '<pr><slowo_obce>'+text+'</slowo_obce></pr>',
+            xml: '<pr><slowo_obce>'+text+'</slowo_obce> --- </pr>',
             success: function(text) {
-                tag.replaceWith(text);
+                var t = $(text);
+                tag.replaceWith(t);
+                openForEdit(t);
             },
             error: function() {
                 tag.remove();
@@ -370,13 +365,12 @@ function html(element) {
             }
         })
     }
-
+    
     function addTheme()
     {
         var selection = window.getSelection();
         var n = selection.rangeCount;
 
-        console.log("Range count:", n);
         if(n == 0) {
             window.alert("Nie zaznaczono żadnego obszaru");
             return false;
@@ -390,7 +384,6 @@ function html(element) {
 
         // remember the selected range
         var range = selection.getRangeAt(0);
-        console.log(range.startContainer, range.startOffset, range.endContainer, range.endOffset);
 
         // verify if the start/end points make even sense -
         // they must be inside a x-node (otherwise they will be discarded)
@@ -415,9 +408,6 @@ function html(element) {
         spoint.setStart(range.startContainer, range.startOffset);
         epoint.setStart(range.endContainer, range.endOffset);
 
-        console.log('spoint', spoint.startContainer, spoint.startOffset, spoint.endContainer, spoint.endOffset);
-        console.log('epoint', epoint.startContainer, epoint.startOffset, epoint.endContainer, epoint.endOffset);
-
         var mtag, btag, etag, errors;
 
         // insert theme-ref
@@ -441,6 +431,7 @@ function html(element) {
                                 spoint.insertNode(btag[0])
                                 btag.replaceWith(text);
                                 selection.removeAllRanges();
+                                openForEdit($('.motyw[theme-class=' + id + ']'));
                             }
                         });
                     }
@@ -449,6 +440,10 @@ function html(element) {
         });
     }
     
+    // function removeTheme($origin) {
+    //     
+    // }
+    
     function openForEdit($origin)
     {       
         var $box = null
@@ -456,7 +451,6 @@ function html(element) {
         // annotations overlay their sub box - not their own box //
         if($origin.is(".annotation-inline-box")) {
             $box = $("*[x-annotation-box]", $origin);
-            console.log('annotation!', $box);
         } else {
             $box = $origin;
         }
@@ -466,35 +460,53 @@ function html(element) {
         var w = $box.outerWidth();
         var h = $box.innerHeight();
     
-        console.log('width:', w, 'height:', h);
-
+        if ($origin.is(".annotation-inline-box")) {
+            w = Math.max(w, 400);
+            h = Math.max(h, 60);
+        }
+        
         // start edition on this node
-        var $overlay = $('<div class="html-editarea"><textarea></textarea></div>').css({
+        var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button><textarea></textarea></div>').css({
             position: 'absolute',
             height: h,
             left: x,
             top: y,
             width: w
-            // right: 0
-        }).appendTo($box[0].offsetParent || element).show();
+        }).appendTo($box[0].offsetParent || $box.parent()).show();
+        
+        if ($origin.is('.motyw')) {
+            $('textarea', $overlay).autocomplete(['Ala ma kota', 'Kot ma Alę', 'HIV', 'motyw'], {
+                autoFill: true,
+                multiple: true,
+                selectFirst: true
+            });
+        }
+        
+        $('.delete-button', $overlay).click(function() {
+            if ($origin.is('.motyw')) {
+                $('[theme-class=' + $origin.attr('theme-class') + ']').remove();
+            } else {
+                $origin.remove();
+            }
+            $overlay.remove();
+            $(document).unbind('click.blur-overlay');
+            return false;
+        })
         
-        console.log($overlay, $box[0].offsetParent || element);
         
         var serializer = new XMLSerializer();
-    
-        console.log($box.html());
+        
         html2xml({
             xml: serializer.serializeToString($box[0]),
             inner: true,
             success: function(text) {
                 $('textarea', $overlay).val($.trim(text));
-                console.log($.trim(text));
                 
                 setTimeout(function() {
-                    $('textarea', $overlay).focus();
-                }, 100);
+                    $('textarea', $overlay).elastic().focus();
+                }, 50);
                 
-                $('textarea', $overlay).one('blur', function(event) {
+                function save(argument) {
                     var nodeName = $box.attr('x-node') || 'pe';
                     xml2html({
                         xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '</' + nodeName + '>',
@@ -507,7 +519,35 @@ function html(element) {
                             alert('Błąd! ' + text);
                         }
                     })
+                }
+                
+                $('.accept-button', $overlay).click(function() {
+                    save();
                 });
+                
+                $(document).bind('click.blur-overlay', function(event) {
+                    if ($(event.target).parents('.html-editarea').length > 0) {
+                        return;
+                    }
+                    save();
+                    
+                    $(document).unbind('click.blur-overlay');
+                });
+                
+                // $('textarea', $overlay).one('blur', function(event) {
+                //     var nodeName = $box.attr('x-node') || 'pe';
+                //     xml2html({
+                //         xml: '<' + nodeName + '>' + $('textarea', $overlay).val() + '</' + nodeName + '>',
+                //         success: function(element) {
+                //             $box.html($(element).html());
+                //             $overlay.remove();
+                //         },
+                //         error: function(text) {
+                //             $overlay.remove();
+                //             alert('Błąd! ' + text);
+                //         }
+                //     })
+                // });
             }, error: function(text) {
                 alert('Błąd! ' + text);
             }
@@ -519,6 +559,8 @@ function html(element) {
         openForEdit($(this).parent());
     });
     
+
+    
     var button = $('<button class="edit-button">Edytuj</button>');
     $(element).bind('mousemove', function(event) {
         var editable = $(event.target).closest('*[x-editable]');
@@ -583,8 +625,6 @@ $(function() {
                         comment: $('#komentarz').val()
                     };
 
-                    console.log(data);
-
                     $.ajax({
                         url: document.location.href,
                         type: "POST",
@@ -595,7 +635,6 @@ $(function() {
                                 editor.setCode(data.text);
                                 $('#document-revision').html(data.revision);
                             } else {
-                                console.log(data.errors);
                                 alert(data.errors);
                             }
                             $.unblockUI();