new codemirror.grabkeys interface

[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..b6388f1 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 ;)
         *


@@ -33,7 +33,7 @@
 
                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")
                }
 
                if (vname == "ajax_document_diff")


@@ -44,9 +44,6 @@
 
                if (vname == "ajax_publish")
                        return base_path + "/" + arguments[1] + "/publish";
 
                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 +104,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) {


@@ -222,10 +219,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,24 +234,32 @@
 
                                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() */
 
        WikiDocument.prototype.publish = function(params) {
        }; /* end of save() */
 
        WikiDocument.prototype.publish = function(params) {


@@ -323,20 +329,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);