woblink fixes

[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 f39f7a8..decc733 100644 (file)
--- a/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
+++ b/src/redakcja/static/js/wiki/view_editor_wysiwyg.js
@@ -526,6 +526,7 @@
                                 $origin.html($(element).html());
                             }
                             $overlay.remove();
                                 $origin.html($(element).html());
                             }
                             $overlay.remove();

+                            $.wiki.activePerspective().flush();

                         },
                         error: function(text){
                             alert('Błąd! ' + text);
                         },
                         error: function(text){
                             alert('Błąd! ' + text);


@@ -639,36 +640,43 @@
                 self.caret = new Caret(element);
 
                 $('#insert-reference-button').click(function(){
                 self.caret = new Caret(element);
 
                 $('#insert-reference-button').click(function(){

+                    self.flush();

                     self.addReference();
                     return false;
                 });
 
                 $('#insert-annotation-button').click(function(){
                     self.addReference();
                     return false;
                 });
 
                 $('#insert-annotation-button').click(function(){

+                    self.flush();

                     addAnnotation();
                     return false;
                 });
 
                 $('#insert-theme-button').click(function(){
                     addAnnotation();
                     return false;
                 });
 
                 $('#insert-theme-button').click(function(){

+                    self.flush();

                     addTheme();
                     return false;
                 });
 
                 $(".insert-inline-tag").click(function() {
                     addTheme();
                     return false;
                 });
 
                 $(".insert-inline-tag").click(function() {

+                    self.flush();

                     self.insertInlineTag($(this).attr('data-tag'));
                     return false;
                 });
 
                 $(".insert-char").click(function() {
                     self.insertInlineTag($(this).attr('data-tag'));
                     return false;
                 });
 
                 $(".insert-char").click(function() {

+                    self.flush();

                     addSymbol(caret=self.caret);
                     return false;
                 });
 
                 $(document).on('click', '.edit-button', function(event){
                     addSymbol(caret=self.caret);
                     return false;
                 });
 
                 $(document).on('click', '.edit-button', function(event){

+                    self.flush();

                     event.preventDefault();
                     openForEdit($(this).parent());
                 });
 
                 $(document).on('click', '.uwaga-button', function(event){
                     event.preventDefault();
                     openForEdit($(this).parent());
                 });
 
                 $(document).on('click', '.uwaga-button', function(event){

+                    self.flush();

                     event.preventDefault();
                     createUwagaBefore($(this).parent());
                 });
                     event.preventDefault();
                     createUwagaBefore($(this).parent());
                 });


@@ -679,6 +687,7 @@
             });
 
             element.on('click', '.annotation', function(event) {
             });
 
             element.on('click', '.annotation', function(event) {

+                self.flush();

                 event.preventDefault();
                 event.redakcja_caret_ignore = true;
                 $('[x-annotation-box]', $(this).parent()).toggleClass('editing');
                 event.preventDefault();
                 event.redakcja_caret_ignore = true;
                 $('[x-annotation-box]', $(this).parent()).toggleClass('editing');


@@ -706,6 +715,8 @@
 
                     var htmlView = $('#html-view');
                     htmlView.html(element);
 
                     var htmlView = $('#html-view');
                     htmlView.html(element);

+                    if ('PropertiesPerspective' in $.wiki.perspectives)
+                        $.wiki.perspectives.PropertiesPerspective.enable();

 
                     _finalize(success);
                 },
 
                     _finalize(success);
                 },


@@ -717,44 +728,51 @@
                     _finalize(failure);
                 }
             });
                     _finalize(failure);
                 }
             });

-        };
+        }
+
+        flush() {
+            let self = this;
+            return new Promise((resolve, reject) => {
+                if ($('#html-view .error').length > 0) {
+                    reject()
+                } else {
+                    //return _finalize(failure);
+                    html2text({
+                        element: $('#html-view').get(0),
+                        stripOuter: true,
+                        success: (text) => {
+                            self.doc.setText(text);
+                            resolve();
+                        },
+                        error: (text) => {
+                            reject(text);
+                            //$('#source-editor').html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
+                        }
+                    });
+                }
+            });
+        }

 
         onExit(success, failure) {
             var self = this;
 
             self.caret.detach();
 
 
         onExit(success, failure) {
             var self = this;
 
             self.caret.detach();
 

-            $.wiki.exitTab('#PropertiesPerspective');
-
-            $.blockUI({
-                message: 'Zapisywanie widoku...'
-            });
-
-            function _finalize(callback){
-                $.unblockUI();
-                if (callback)
-                    callback();
-            }
-
-            if ($('#html-view .error').length > 0)
-                return _finalize(failure);
+            if ('PropertiesPerspective' in $.wiki.perspectives)
+                $.wiki.perspectives.PropertiesPerspective.disable();

 
 

-            html2text({
-                element: $('#html-view').get(0),
-                stripOuter: true,
-                success: function(text){
-                    self.doc.setText(text);
-                    _finalize(success);
-                },
-                error: function(text){
-                    $('#source-editor').html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
-                    _finalize(failure);
-                }
+            self.flush().then(() => {
+                success && success();
+            }).catch((e) => {
+                // TODO report
+                console.log('REJECTED!', e);
+                failure && failure();

             });
         };
 
         insertInlineTag(tag) {
             this.caret.detach();
             });
         };
 
         insertInlineTag(tag) {
             this.caret.detach();

+            let self = this;

 
             let selection = window.getSelection();
             var n = selection.rangeCount;
 
             let selection = window.getSelection();
             var n = selection.rangeCount;


@@ -824,6 +842,7 @@
                         success: function(html) {
                             // What if no end?
                             node.insertBefore($(html)[0], end);
                         success: function(html) {
                             // What if no end?
                             node.insertBefore($(html)[0], end);

+                            self.flush();

                         }
                     });
                 },
                         }
                     });
                 },