Fix button multiplication issue.

[redakcja.git] / src / redakcja / static / js / wiki / view_editor_wysiwyg.js

diff --git a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
index 2e1c28d..219b405 100644 (file)
--- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -110,7 +110,7 @@
             success: function(text){
                 var t = $(text);
                 tag.replaceWith(t);
             success: function(text){
                 var t = $(text);
                 tag.replaceWith(t);

-                openForEdit(t);
+                openForEdit(t, trim=false);

             },
             error: function(){
                 tag.remove();
             },
             error: function(){
                 tag.remove();


@@ -405,7 +405,7 @@
     }
 
     /* open edition window for selected fragment */
     }
 
     /* open edition window for selected fragment */

-    function openForEdit($origin){
+    function openForEdit($origin, trim=true){

         var $box = null
 
         // annotations overlay their sub box - not their own box //
         var $box = null
 
         // annotations overlay their sub box - not their own box //


@@ -441,7 +441,7 @@
         }
 
         // start edition on this node
         }
 
         // start edition on this node

-        var $overlay = $('<div class="html-editarea"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button><button class="tytul-button akap-edit-button">tytuł dzieła</button><button class="wyroznienie-button akap-edit-button">wyróżnienie</button><button class="slowo-button akap-edit-button">słowo obce</button><button class="znak-button akap-edit-button">znak spec.</button><textarea></textarea></div>').css({
+        var $overlay = $('<div class="html-editarea"><div class="html-editarea-toolbar"><div class="html-editarea-toolbar-left"><button class="accept-button">Zapisz</button><button class="delete-button">Usuń</button></div><div class="html-editarea-toolbar-right"><button class="akap-edit-button">tytuł dzieła</button><button class="akap-edit-button">wyróżnienie</button><button class="akap-edit-button">słowo obce</button><button class="akap-edit-button">br</button><button class="akap-edit-button">znak spec.</button></div></div><textarea></textarea></div>').css({

             position: 'absolute',
             height: h,
             left: x,
             position: 'absolute',
             height: h,
             left: x,


@@ -515,7 +515,10 @@
             element: source,
             stripOuter: true,
             success: function(text){
             element: source,
             stripOuter: true,
             success: function(text){

-               let ttext = $.trim(text);
+               let ttext = text;
+               if (trim) {
+                   ttext = ttext.trim();
+               }

                 $('textarea', $overlay).val(ttext);
 
                 setTimeout(function(){
                 $('textarea', $overlay).val(ttext);
 
                 setTimeout(function(){


@@ -580,9 +583,12 @@
                     } else if (buttonName == "tytuł dzieła") {
                         startTag = "<tytul_dziela>";
                         endTag = "</tytul_dziela>";
                     } else if (buttonName == "tytuł dzieła") {
                         startTag = "<tytul_dziela>";
                         endTag = "</tytul_dziela>";

-                    } else if(buttonName == "znak spec."){
+                    } else if (buttonName == "znak spec."){

                         addSymbol();
                         return false;
                         addSymbol();
                         return false;

+                    } else if (buttonName == "br") {
+                        startTag = "<br/>";
+                        endTag = "";

                     }
 
                     var myField = textAreaOpened;
                     }
 
                     var myField = textAreaOpened;


@@ -645,15 +651,19 @@
 
                 $('#html-view').bind('mousemove', function(event){
                     var editable = $(event.target).closest('*[x-editable]');
 
                 $('#html-view').bind('mousemove', function(event){
                     var editable = $(event.target).closest('*[x-editable]');

-                    $('.active', element).not(editable).removeClass('active').children('.active-block-button').remove();
+                    $('.active', element).not(editable).removeClass('active').children('.html-editarea-toolbar').remove();

 
                     if (!editable.hasClass('active')) {
 
                     if (!editable.hasClass('active')) {

-                        editable.addClass('active').append(button);
+                        var toolbar = $("<div class='html-editarea-toolbar'><div class='html-editarea-toolbar-left'></div></div>")
+                        editable.append(toolbar);
+                        var buttonSpace = $('.html-editarea-toolbar-left', toolbar);
+                        editable.addClass('active');
+                        buttonSpace.append(button);

                         if (!editable.is('[x-edit-attribute]') &&
                             !editable.is('.annotation-inline-box') &&
                             !editable.is('[x-edit-no-format]')
                            ) {
                         if (!editable.is('[x-edit-attribute]') &&
                             !editable.is('.annotation-inline-box') &&
                             !editable.is('[x-edit-no-format]')
                            ) {

-                            editable.append(uwagaButton);
+                            buttonSpace.append(uwagaButton);

                         }
                     }
                     if (editable.is('.annotation-inline-box')) {
                         }
                     }
                     if (editable.is('.annotation-inline-box')) {


@@ -717,13 +727,13 @@
                 $(document).on('click', '.edit-button', function(event){
                     self.flush();
                     event.preventDefault();
                 $(document).on('click', '.edit-button', function(event){
                     self.flush();
                     event.preventDefault();

-                    openForEdit($(this).parent());
+                    openForEdit($(this).closest('.html-editarea-toolbar').parent());

                 });
 
                 $(document).on('click', '.uwaga-button', function(event){
                     self.flush();
                     event.preventDefault();
                 });
 
                 $(document).on('click', '.uwaga-button', function(event){
                     self.flush();
                     event.preventDefault();

-                    createUwagaBefore($(this).parent());
+                    createUwagaBefore($(this).closest('.html-editarea-toolbar').parent());

                 });
             }
 
                 });
             }
 


@@ -951,6 +961,7 @@
                let $e = $(e);
                if ($e.closest('[x-node="abstrakt"]').length) return;
                if ($e.closest('[x-node="nota_red"]').length) return;
                let $e = $(e);
                if ($e.closest('[x-node="abstrakt"]').length) return;
                if ($e.closest('[x-node="nota_red"]').length) return;

+               if ($e.closest('[x-annotation-box="true"]').length) return;

                let node = $e.attr('x-node');
                if (node == 'numeracja') {
                    number = 0;
                let node = $e.attr('x-node');
                if (node == 'numeracja') {
                    number = 0;