X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1a2ba641f553db5582303a52329c345d0d437f35..6d9e86ed521276c62247d48f11e5a7aaa12c53c7:/redakcja/static/js/wiki_img/wikiapi.js?ds=inline
diff --git a/redakcja/static/js/wiki_img/wikiapi.js b/redakcja/static/js/wiki_img/wikiapi.js
index 33af1766..377e4f94 100644
--- a/redakcja/static/js/wiki_img/wikiapi.js
+++ b/redakcja/static/js/wiki_img/wikiapi.js
@@ -17,9 +17,9 @@
var vname = arguments[0];
var base_path = "/images";
- if (vname == "ajax_document_text") {
- return base_path + "/text/" + arguments[1] + "/";
- }
+ if (vname == "ajax_document_text")
+ return base_path + "/text/" + arguments[1] + "/";
+
if (vname == "ajax_document_revert") {
return base_path + "/revert/" + arguments[1] + '/';
@@ -49,6 +49,18 @@
this.revision = $("*[data-key='revision']", meta).text();
this.readonly = !!$("*[data-key='readonly']", meta).text();
+ var diff = $("*[data-key='diff']", meta).text();
+ if (diff) {
+ 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.text = null;
this.has_local_changes = false;
this._lock = -1;
@@ -68,18 +80,18 @@
$.ajax({
method: "GET",
url: reverse("ajax_document_text", self.id),
- data: {"commit": self.commit},
+ data: {"revision": self.revision},
dataType: 'json',
success: function(data) {
var changed = false;
- if (self.text === null || self.commit !== data.commit) {
+ if (self.text === null || self.revision !== data.revision) {
self.text = data.text;
if (self.text === '') {
- self.text = '';
+ self.text = '';
}
self.revision = data.revision;
- self.commit = data.commit;
+// self.commit = data.commit;
changed = true;
self.triggerDocumentChanged();
};
@@ -184,7 +196,7 @@
if (data.text) {
self.text = data.text;
self.revision = data.revision;
- self.commit = data.commit;
+// self.commit = data.commit;
changed = true;
self.triggerDocumentChanged();
};
@@ -319,7 +331,7 @@
$e.find('div').each(function(i, div) {
var $div = $(div);
switch ($div.attr('type')) {
- case 'area':
+ case 'rect':
a.push([
value,
$div.attr('x1'),
@@ -361,7 +373,7 @@
$sem.attr(tag, e[0]);
$div = $(doc.createElement("div"));
if (e[1]) {
- $div.attr('type', 'area');
+ $div.attr('type', 'rect');
$div.attr('x1', e[1]);
$div.attr('y1', e[2]);
$div.attr('x2', e[3]);
@@ -373,7 +385,7 @@
$sem.append($div);
$root.append($sem);
});
- self.setText(XML(serializer.serializeToString(doc)).toXMLString());
+ self.setText(serializer.serializeToString(doc));
}