Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed

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

diff --git a/redakcja/static/js/wiki/view_history.js b/redakcja/static/js/wiki/view_history.js
index fe3af69..85adca0 100644 (file)
--- a/redakcja/static/js/wiki/view_history.js
+++ b/redakcja/static/js/wiki/view_history.js
@@ -5,16 +5,26 @@
 
                options.callback = function() {
                        var self = this;
 
                options.callback = function() {
                        var self = this;

+            if (CurrentDocument.diff) {
+                rev_from = CurrentDocument.diff[0];
+                rev_to = CurrentDocument.diff[1];
+                this.doc.fetchDiff({
+                    from: rev_from,
+                    to: rev_to,
+                    success: function(doc, data){
+                        var result = $.wiki.newTab(doc, ''+rev_from +' -> ' + rev_to, 'DiffPerspective');
+
+                        $(result.view).html(data);
+                        $.wiki.switchToTab(result.tab);
+                    }
+                });
+            }

 
                        // first time page is rendered
                $('#make-diff-button').click(function() {
                                self.makeDiff();
                        });
 
 
                        // first time page is rendered
                $('#make-diff-button').click(function() {
                                self.makeDiff();
                        });
 

-                       $('#tag-changeset-button').click(function() {
-                               self.showTagForm();
-                       });
-

                        $('#pubmark-changeset-button').click(function() {
                                self.showPubmarkForm();
                        });
                        $('#pubmark-changeset-button').click(function() {
                                self.showPubmarkForm();
                        });


@@ -132,18 +142,6 @@
         });
     };
 
         });
     };
 

-       HistoryPerspective.prototype.showTagForm = function(){
-               var selected = $('#changes-list .entry.selected');
-
-               if (selected.length != 1) {
-            window.alert("Musisz zaznaczyć dokładnie jedną wersję.");
-            return;
-        }
-
-               var version = parseInt($("*[data-stub-value='version']", selected[0]).text());
-               $.wiki.showDialog('#add_tag_dialog', {'revision': version});
-       };
-

        HistoryPerspective.prototype.showPubmarkForm = function(){
                var selected = $('#changes-list .entry.selected');
 
        HistoryPerspective.prototype.showPubmarkForm = function(){
                var selected = $('#changes-list .entry.selected');