#536: separator tags,

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

diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index 13435ea..8da5929 100644 (file)
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -7,8 +7,8 @@
                failure: noop
        };
        /*
                failure: noop
        };
        /*

-        * Return absolute reverse path of given named view.
-        * (at least he have it hard-coded in one place)
+        * Return absolute reverse path of given named view. (at least he have it
+        * hard-coded in one place)

         *
         * TODO: think of a way, not to hard-code it here ;)
         *
         *
         * TODO: think of a way, not to hard-code it here ;)
         *


@@ -26,6 +26,11 @@
                        return base_path + path;
                }
 
                        return base_path + path;
                }
 

+        if (vname == "ajax_document_revert") {
+            return base_path + "/" + arguments[1] + "/revert";
+        }
+
+

                if (vname == "ajax_document_history") {
 
                        return base_path + "/" + arguments[1] + "/history";
                if (vname == "ajax_document_history") {
 
                        return base_path + "/" + arguments[1] + "/history";


@@ -33,20 +38,20 @@
 
                if (vname == "ajax_document_gallery") {
 
 
                if (vname == "ajax_document_gallery") {
 

-                       return base_path + "/gallery/" + arguments[1];
+                       return base_path + "/" + arguments[1] + "/gallery";

                }
 
                if (vname == "ajax_document_diff")
                        return base_path + "/" + arguments[1] + "/diff";
 
                }
 
                if (vname == "ajax_document_diff")
                        return base_path + "/" + arguments[1] + "/diff";
 

+        if (vname == "ajax_document_rev")
+            return base_path + "/" + arguments[1] + "/rev";
+

                if (vname == "ajax_document_addtag")
                        return base_path + "/" + arguments[1] + "/tags";
 
                if (vname == "ajax_publish")
                        return base_path + "/" + arguments[1] + "/publish";
                if (vname == "ajax_document_addtag")
                        return base_path + "/" + arguments[1] + "/tags";
 
                if (vname == "ajax_publish")
                        return base_path + "/" + arguments[1] + "/publish";

-               
-               if (vname == 'ping')
-                   return base_path + '/ping/'

 
                console.log("Couldn't reverse match:", vname);
                return "/404.html";
 
                console.log("Couldn't reverse match:", vname);
                return "/404.html";


@@ -107,8 +112,8 @@
        /*
         * Fetch history of this document.
         *
        /*
         * Fetch history of this document.
         *

-        * from - First revision to fetch (default = 0)
-        * upto - Last revision to fetch (default = tip)
+        * from - First revision to fetch (default = 0) upto - Last revision to
+        * fetch (default = tip)

         *
         */
        WikiDocument.prototype.fetchHistory = function(params) {
         *
         */
        WikiDocument.prototype.fetchHistory = function(params) {


@@ -155,6 +160,24 @@
                });
        };
 
                });
        };
 

+    WikiDocument.prototype.checkRevision = function(params) {
+        /* this doesn't modify anything, so no locks */
+        var self = this;
+        $.ajax({
+            method: "GET",
+            url: reverse("ajax_document_rev", self.id),
+            dataType: 'text',
+            success: function(data) {
+                if (data == '') {
+                    if (params.error)
+                        params.error();
+                }
+                else if (data != self.revision)
+                    params.outdated();
+            }
+        });
+    };
+

        /*
         * Fetch gallery
         */
        /*
         * Fetch gallery
         */


@@ -172,7 +195,7 @@
                        },
                        error: function() {
                                self.galleryImages = [];
                        },
                        error: function() {
                                self.galleryImages = [];

-                               params['failure'](self, "<p>Nie udało się wczytać gallerii pod nazwą: '" + self.galleryLink + "'.</p>");
+                               params['failure'](self, "<p>Nie udało się wczytać galerii pod nazwą: '" + self.galleryLink + "'.</p>");

                        }
                });
        };
                        }
                });
        };


@@ -222,10 +245,11 @@
                        type: "POST",
                        dataType: "json",
                        data: data,
                        type: "POST",
                        dataType: "json",
                        data: data,

-                       timeout: 5000,

                        success: function(data) {
                                var changed = false;
 
                        success: function(data) {
                                var changed = false;
 

+                $('#header').removeClass('saving');
+

                                if (data.text) {
                                        self.text = data.text;
                                        self.revision = data.revision;
                                if (data.text) {
                                        self.text = data.text;
                                        self.revision = data.revision;


@@ -236,26 +260,73 @@
 
                                params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
                        },
 
                                params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
                        },

-                       error: function(xhr, msg) {
-                               if (msg == 'timeout') {
-                                       params['failure'](self, {
-                        "__message": "Przekroczony czas połączenia. Zmiany nie zostały zapisane."
-                    });
-                               }
-                               else {
+                       error: function(xhr) {
+                if ($('#header').hasClass('saving')) {
+                    $('#header').removeClass('saving');
+                    $.blockUI({
+                        message: "<p>Nie udało się zapisać zmian. <br/><button onclick='$.unblockUI()'>OK</button></p>"
+                    })
+                }
+                else {

                     try {
                         params['failure'](self, $.parseJSON(xhr.responseText));
                     }
                     catch (e) {
                         params['failure'](self, {
                     try {
                         params['failure'](self, $.parseJSON(xhr.responseText));
                     }
                     catch (e) {
                         params['failure'](self, {

-                            "__message": "Nie udało się zapisać - błąd serwera."
+                            "__message": "<p>Nie udało się zapisać - błąd serwera.</p>"

                         });
                     };
                         });
                     };

-                               }
+                }
+

                        }
                });
                        }
                });

+
+        $('#save-hide').click(function(){
+            $('#header').addClass('saving');
+            $.unblockUI();
+            $.wiki.blocking.unblock();
+        });

        }; /* end of save() */
 
        }; /* end of save() */
 

+    WikiDocument.prototype.revertToVersion = function(params) {
+        var self = this;
+        params = $.extend({}, noops, params);
+
+        if (params.revision >= this.revision) {
+            params.failure(self, 'Proszę wybrać rewizję starszą niż aktualna.');
+            return;
+        }
+
+        // Serialize form to dictionary
+        var data = {};
+        $.each(params['form'].serializeArray(), function() {
+            data[this.name] = this.value;
+        });
+
+        $.ajax({
+            url: reverse("ajax_document_revert", self.id),
+            type: "POST",
+            dataType: "json",
+            data: data,
+            success: function(data) {
+                if (data.text) {
+                    self.text = data.text;
+                    self.revision = data.revision;
+                    self.gallery = data.gallery;
+                    self.triggerDocumentChanged();
+
+                    params.success(self, "Udało się przywrócić wersję :)");
+                }
+                else {
+                    params.failure(self, "Przywracana wersja identyczna z aktualną. Anulowano przywracanie.");
+                }
+            },
+            error: function(xhr) {
+                params.failure(self, "Nie udało się przywrócić wersji - błąd serwera.");
+            }
+        });
+    };
+

        WikiDocument.prototype.publish = function(params) {
                params = $.extend({}, noops, params);
                var self = this;
        WikiDocument.prototype.publish = function(params) {
                params = $.extend({}, noops, params);
                var self = this;


@@ -323,20 +394,4 @@
        };
 
        $.wikiapi.WikiDocument = WikiDocument;
        };
 
        $.wikiapi.WikiDocument = WikiDocument;

-       
-       
-       var ping = function () {
-        $.ajax({
-            url : reverse('ping'),
-                       timeout: 2000,
-            complete : function () {
-                setTimeout(function () {
-                    ping();
-                }, 600000);
-            }
-        });
-    };
-       
-    ping();
-

 })(jQuery);
 })(jQuery);