X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f938afb8ab4cb091d12e0ef0311eaea14b774798..e9f489960eb8a1fc8c1fc39123589a9358c5d569:/redakcja/static/js/wiki/wikiapi.js

diff --git a/redakcja/static/js/wiki/wikiapi.js b/redakcja/static/js/wiki/wikiapi.js
index 27ab97e2..3907e8e2 100644
--- a/redakcja/static/js/wiki/wikiapi.js
+++ b/redakcja/static/js/wiki/wikiapi.js
@@ -7,43 +7,48 @@
 		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 ;)
 	 *
 	 */
 	function reverse() {
 		var vname = arguments[0];
-		var base_path = "/documents";
+		var base_path = "/editor";
 
 		if (vname == "ajax_document_text") {
-			var path = "/" + arguments[1] + "/text";
+			var path = "/text/" + arguments[1] + '/';
 
 		if (arguments[2] !== undefined)
-				path += "/" + arguments[2];
+				path += arguments[2] + '/';
 
 			return base_path + path;
 		}
 
+        if (vname == "ajax_document_revert") {
+            return base_path + "/revert/" + arguments[1] + '/';
+        }
+
+
 		if (vname == "ajax_document_history") {
 
-			return base_path + "/" + arguments[1] + "/history";
+			return base_path + "/history/" + arguments[1] + '/';
 		}
 
 		if (vname == "ajax_document_gallery") {
 
-			return base_path + "/gallery/" + arguments[1];
+			return base_path + "/gallery/" + arguments[1] + '/';
 		}
 
 		if (vname == "ajax_document_diff")
-			return base_path + "/" + arguments[1] + "/diff";
+			return base_path + "/diff/" + arguments[1] + '/';
 
-		if (vname == "ajax_document_addtag")
-			return base_path + "/" + arguments[1] + "/tags";
+        if (vname == "ajax_document_rev")
+            return base_path + "/rev/" + arguments[1] + '/';
 
-		if (vname == "ajax_publish")
-			return base_path + "/" + arguments[1] + "/publish";
+		if (vname == "ajax_document_pubmark")
+			return base_path + "/pubmark/" + arguments[1] + '/';
 
 		console.log("Couldn't reverse match:", vname);
 		return "/404.html";
@@ -54,12 +59,23 @@
 	 */
 	function WikiDocument(element_id) {
 		var meta = $('#' + element_id);
-		this.id = meta.attr('data-document-name');
+		this.id = meta.attr('data-book') + '/' + meta.attr('data-chunk');
 
 		this.revision = $("*[data-key='revision']", meta).text();
 		this.readonly = !!$("*[data-key='readonly']", meta).text();
 
 		this.galleryLink = $("*[data-key='gallery']", meta).text();
+
+        var diff = $("*[data-key='diff']", meta).text();
+        diff = diff.split(',');
+        if (diff.length == 2 && diff[0] < diff[1])
+            this.diff = diff;
+        else if (diff.length == 1) {
+            diff = parseInt(diff);
+            if (diff != NaN)
+                this.diff = [diff - 1, diff];
+        }
+
 		this.galleryImages = [];
 		this.text = null;
 		this.has_local_changes = false;
@@ -104,8 +120,8 @@
 	/*
 	 * 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) {
@@ -152,6 +168,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
 	 */
@@ -169,7 +203,7 @@
 			},
 			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>");
 			}
 		});
 	};
@@ -208,11 +242,7 @@
 			data[this.name] = this.value;
 		});
 
-		var metaComment = '<!--';
-		metaComment += '\n\tgallery:' + self.galleryLink;
-		metaComment += '\n-->\n'
-
-		data['textsave-text'] = metaComment + self.text;
+		data['textsave-text'] = self.text;
 
 		$.ajax({
 			url: reverse("ajax_document_text", self.id),
@@ -222,6 +252,8 @@
 			success: function(data) {
 				var changed = false;
 
+                $('#header').removeClass('saving');
+
 				if (data.text) {
 					self.text = data.text;
 					self.revision = data.revision;
@@ -233,19 +265,72 @@
 				params['success'](self, changed, ((changed && "Udało się zapisać :)") || "Twoja wersja i serwera jest identyczna"));
 			},
 			error: function(xhr) {
-				try {
-					params['failure'](self, $.parseJSON(xhr.responseText));
-				}
-				catch (e) {
-					params['failure'](self, {
-						"__message": "<p>Nie udało się zapisać - błąd serwera.</p>"
-					});
-				};
+                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, {
+                            "__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.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;
@@ -272,11 +357,12 @@
 			}
 		});
 	};
-	WikiDocument.prototype.setTag = function(params) {
+
+	WikiDocument.prototype.pubmark = function(params) {
 		params = $.extend({}, noops, params);
 		var self = this;
 		var data = {
-			"addtag-id": self.id,
+			"pubmark-id": self.id,
 		};
 
 		/* unpack form */
@@ -285,7 +371,7 @@
 		});
 
 		$.ajax({
-			url: reverse("ajax_document_addtag", self.id),
+			url: reverse("ajax_document_pubmark", self.id),
 			type: "POST",
 			dataType: "json",
 			data: data,