Allow empty value in metadata

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

diff --git a/redakcja/static/js/wiki/view_editor_wysiwyg.js b/redakcja/static/js/wiki/view_editor_wysiwyg.js
index a4dc874..23abde0 100644 (file)
--- a/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -203,7 +203,7 @@
             'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
             'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
             'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',
             'Ê','ê','Ë','ë','Ē','ē','Ě','ě','Ġ','ġ','Ħ','ħ','Í','í','Î','î',
             'Ī','ī','Ĭ','ĭ','Ľ','ľ','Ñ','ñ','Ň','ň','Ó','ó','Ö','ö',
             'Ô','ô','Ō','ō','Ǒ','ǒ','Œ','œ','Ø','ø','Ř','ř','Š',

-            'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú',
+            'š','Ş','ş','Ť','ť','Ţ','ţ','Ű','ű','Ú','ú','Ù','ù',

             'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
             'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
             'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',
             'Ü','ü','Ů','ů','Ū','ū','Û','û','Ŭ','ŭ',
             'Ý','ý','Ž','ž','ß','Ð','ð','Þ','þ','А','а','Б',
             'б','В','в','Г','г','Д','д','Е','е','Ё','ё','Ж',


@@ -218,7 +218,7 @@
             'Τ','τ','Υ','υ','Φ','φ','Χ','χ','Ψ','ψ','Ω','ω','–',
             '—','¡','¿','$','¢','£','€','©','®','°','¹','²','³',
             '¼','½','¾','†','§','‰','•','←','↑','→','↓',
             'Τ','τ','Υ','υ','Φ','φ','Χ','χ','Ψ','ψ','Ω','ω','–',
             '—','¡','¿','$','¢','£','€','©','®','°','¹','²','³',
             '¼','½','¾','†','§','‰','•','←','↑','→','↓',

-            '„','”','„”','«','»','«»','’','[',']','~','|','−','·',
+            '„','”','„”','«','»','«»','»«','’','[',']','~','|','−','·',

             '×','÷','≈','≠','±','≤','≥','∈'];
             var tableContent = "<tr>";
             
             '×','÷','≈','≠','±','≤','≥','∈'];
             var tableContent = "<tr>";
             


@@ -257,7 +257,7 @@
                 // if we want to surround text with quotes
                 // not sure if just check if value has length == 2
                 
                 // if we want to surround text with quotes
                 // not sure if just check if value has length == 2
                 

-                if(insertVal == '„”' || insertVal == '«»'){
+                if (insertVal.length == 2) {

                     var startTag = insertVal[0];
                     var endTag = insertVal[1];
                                var textAreaOpened = editArea;                                                  
                     var startTag = insertVal[0];
                     var endTag = insertVal[1];
                                var textAreaOpened = editArea;                                                  


@@ -376,7 +376,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"><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><button class="luka-button akap-edit-button">luka</button><button class="zastap-button akap-edit-button">zastąp</button><textarea></textarea></div>').css({

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


@@ -467,12 +467,10 @@
                         }
                     })
                     
                         }
                     })
                     

-                    var msg = $("<div class='saveNotify'><p>Twoje zmiany zostały naniesione na tekst źródłowy. Pamiętaj, że aby zmiany zostały utrwalone <span>należy je zapisać</span>!</p><p class='notifyTip'>Ta wiadomość zostanie automatycznie zamknięta za 6 sekund.</p></div>");
+                    var msg = $("<div class='saveNotify'><p>Pamiętaj, żeby zapisać swoje zmiany.</p></div>");

                     $("#base").prepend(msg);
                     $("#base").prepend(msg);

-                    $("#save-button").css({border: '2px solid #801000', backgroundColor: '#E1C1C1'});
-                    $('#base .saveNotify').fadeOut(7000, function(){
+                    $('#base .saveNotify').fadeOut(3000, function(){

                         $(this).remove(); 
                         $(this).remove(); 

-                        $("#save-button").css({border: '1px solid black'});

                     });
                 }
 
                     });
                 }
 


@@ -494,6 +492,12 @@
                        } else if(buttonName == "znak spec."){
                            addSymbol();
                            return false;
                        } else if(buttonName == "znak spec."){
                            addSymbol();
                            return false;

+                       } else if (buttonName == "luka") {
+                               startTag = "<luka>";
+                               endTag = "</luka>";
+                       } else if (buttonName == "zastąp") {
+                               startTag = "<zastap rozw=\"\">";
+                               endTag = "</zastap>";

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


@@ -639,7 +643,8 @@
             return _finalize(failure);
 
         html2text({
             return _finalize(failure);
 
         html2text({

-            element: $('#html-view div').get(0),
+            element: $('#html-view').get(0),
+            stripOuter: true,

             success: function(text){
                 self.doc.setText(text);
                 _finalize(success);
             success: function(text){
                 self.doc.setText(text);
                 _finalize(success);