fixes

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

diff --git a/src/redakcja/static/js/wiki/view_history.js b/src/redakcja/static/js/wiki/view_history.js
index 8744995..6e30639 100644 (file)
--- a/src/redakcja/static/js/wiki/view_history.js
+++ b/src/redakcja/static/js/wiki/view_history.js
@@ -1,10 +1,10 @@
 (function($){
 
     function HistoryPerspective(options) {
 (function($){
 
     function HistoryPerspective(options) {

-               var old_callback = options.callback || function() {};
+       var old_callback = options.callback || function() {};

 
 

-               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];
             if (CurrentDocument.diff) {
                 rev_from = CurrentDocument.diff[0];
                 rev_to = CurrentDocument.diff[1];


@@ -20,41 +20,41 @@
                 });
             }
 
                 });
             }
 

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

 
 

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

 
 

-               $('#doc-revert-button').click(function() {
-                   self.revertDialog();
-               });
+           $('#doc-revert-button').click(function() {
+               self.revertDialog();
+           });

 
 

-                       $('#open-preview-button').click(function(event) {
-                               var selected = $('#changes-list .entry.selected');
+           $('#open-preview-button').click(function(event) {
+               var selected = $('#changes-list .entry.selected');

 
 

-                               if (selected.length != 1) {
-                           window.alert("Wybierz dokładnie *jedną* wersję.");
-                       return;
-                       }
+               if (selected.length != 1) {
+                    window.alert("Wybierz dokładnie *jedną* wersję.");
+                    return;
+               }

 
 

-                               var version = parseInt($("*[data-stub-value='version']", selected[0]).text());
-                               window.open($(this).attr('data-basehref') + "?revision=" + version);
+               var version = parseInt($("*[data-stub-value='version']", selected[0]).text());
+               window.open($(this).attr('data-basehref') + "?revision=" + version);

 
 

-                               event.preventDefault();
-                       });
+               event.preventDefault();
+           });

 
 

-                    $(document).on('click', '#changes-list .entry', function(){
+            $(document).on('click', '#changes-list .entry', function(){

                var $this = $(this);
 
                var selected_count = $("#changes-list .entry.selected").length;
 
                if ($this.hasClass('selected')) {
                var $this = $(this);
 
                var selected_count = $("#changes-list .entry.selected").length;
 
                if ($this.hasClass('selected')) {

-                       $this.removeClass('selected');
-                       selected_count -= 1;
+                    $this.removeClass('selected');
+                    selected_count -= 1;

                }
                else {
                    if (selected_count  < 2) {
                }
                else {
                    if (selected_count  < 2) {


@@ -64,18 +64,27 @@
                };
 
                $('#history-view-editor .toolbar button').attr('disabled', 'disabled').
                };
 
                $('#history-view-editor .toolbar button').attr('disabled', 'disabled').

-                            filter('*[data-enabled-when~="' + selected_count + '"]').
+                    filter('*[data-enabled-when~="' + selected_count + '"]').

                    attr('disabled', null);
                    attr('disabled', null);

-               });
+            });

 
 

-                    $(document).on('click', '#changes-list span.tag', function(event){
-                   return false;
-               });
+            $(document).on('click', '#changes-list span.tag', function(event){
+                return false;
+            });

 
 

-               old_callback.call(this);
-               }
+            $('#history-view').on('scroll', function() {
+                if (self.finished || self.fetching) return;
+                var elemTop = $('#history-view .message-box').offset().top;
+                var windowH = $(window).innerHeight();
+                if (elemTop - 20 < windowH) {
+                    self.triggerFetch();
+                }
+            });
+
+            old_callback.call(this);
+       }

 
 

-               $.wiki.Perspective.call(this, options);
+       $.wiki.Perspective.call(this, options);

     };
 
     HistoryPerspective.prototype = new $.wiki.Perspective();
     };
 
     HistoryPerspective.prototype = new $.wiki.Perspective();


@@ -86,61 +95,67 @@
 
     HistoryPerspective.prototype.onEnter = function(success, failure){
         $.wiki.Perspective.prototype.onEnter.call(this);
 
     HistoryPerspective.prototype.onEnter = function(success, failure){
         $.wiki.Perspective.prototype.onEnter.call(this);

+        this.startFetching();
+        success && success();
+    };

 
 

-        $.blockUI({
-            message: 'Odświeżanie historii...'
-        });
+    HistoryPerspective.prototype.startFetching = function() {
+        $('#history-view .message-box').html('Wczytywanie historii…').show();
+        $('#changes-list').html('');
+        this.finished = false;
+        this.befored = '';
+        this.triggerFetch();
+    };
+    HistoryPerspective.prototype.stopFetching = function() {
+        self.finished = true;
+        $('#history-view .message-box').hide()
+    };

 
 

-        function _finalize(s){
-            $.unblockUI();

 
 

-            if (s) {
-                if (success)
-                    success();
-            }
-            else {
-                if (failure)
-                    failure();
-            }
+    HistoryPerspective.prototype.triggerFetch = function() {
+        var self = this;
+        self.fetching = true;
+
+        function _finalize() {
+            self.fetching = false;

         }
 
         function _failure(doc, message){
             $('#history-view .message-box').html('Nie udało się odświeżyć historii:' + message).show();
         }
 
         function _failure(doc, message){
             $('#history-view .message-box').html('Nie udało się odświeżyć historii:' + message).show();

-            _finalize(false);
+            _finalize();

         };
 
         function _success(doc, data){
         };
 
         function _success(doc, data){

-            $('#history-view .message-box').hide();
+            //$('#history-view .message-box').hide(); ONLY AFTER LAST!

             var changes_list = $('#changes-list');
             var $stub = $('#history-view .row-stub');
             var changes_list = $('#changes-list');
             var $stub = $('#history-view .row-stub');

-            changes_list.html('');

 
 

-                       var tags = $('select#id_addtag-tag option');
+            if (!data.length) {
+                self.stopFetching();
+            }

 
             $.each(data, function(){
                 $.wiki.renderStub({
 
             $.each(data, function(){
                 $.wiki.renderStub({

-                                       container: changes_list,
-                                       stub: $stub,
-                                       data: this,
-                                       filters: {
-//                                             tag: function(value) {
-//                                                     return tags.filter("*[value='"+value+"']").text();
-//                                             }
-//                        description: function(value) {
-//                                                 return value.replace('\n', ');
-//                                             }
-                                       }
-                               });
+                   container: changes_list,
+                   stub: $stub,
+                   data: this,
+               });
+                self.before = this.version;
+                if (this.version == 1) {
+                    self.stopFetching();
+                }

             });
 
             });
 

-            _finalize(true);
+            _finalize();

         };
 
         };
 

-        return this.doc.fetchHistory({
+        this.doc.fetchHistory({

             success: _success,
             success: _success,

-            failure: _failure
+            failure: _failure,
+            before: this.before,

         });
         });

-    };
+    }
+

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