Source fixes: avoid race and wait a minute after uploading to prevent unnecessary...

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

diff --git a/src/redakcja/static/js/wiki/view_summary.js b/src/redakcja/static/js/wiki/view_summary.js
index 099a0e8..bb65530 100644 (file)
--- a/src/redakcja/static/js/wiki/view_summary.js
+++ b/src/redakcja/static/js/wiki/view_summary.js
@@ -1,61 +1,54 @@
 (function($){
 
-       function SummaryPerspective(options) {
-               var old_callback = options.callback || function() {};
-
-               options.callback = function() {
-                       var self = this;
-
-                       // first time page is rendered
-               $('#summary-cover-refresh').click(function() {
-                               self.refreshCover();
-                       });
-
-               old_callback.call(this);
-               }
-
-               $.wiki.Perspective.call(this, options);
-    };
-
-    SummaryPerspective.prototype = new $.wiki.Perspective();
-
-       SummaryPerspective.prototype.refreshCover = function() {
-               $('#summary-cover-refresh').attr('disabled', 'disabled');
-               this.doc.refreshCover({
-                       success: function(text) {
-                               $('#summary-cover').attr('src', text);
-                       $('#summary-cover-refresh').removeAttr('disabled');
-                       }
-               });
-       };
-
-    SummaryPerspective.prototype.showCharCount = function() {
-        var cc;
-        try {
-            cc = this.doc.getLength();
-            $('#charcount_untagged').hide();
+    class SummaryPerspective extends $.wiki.Perspective {
+        constructor(options) {
+            super(options);
+            var self = this;
+
+            // first time page is rendered
+            $('#summary-cover-refresh').click(function() {
+                self.refreshCover();
+            });
         }
-        catch (e) {
-            $('#charcount_untagged').show();
-            cc = this.doc.text.replace(/\s{2,}/g, ' ').length;
-        }
-        $('#charcount').html(cc);
-        $('#charcount_pages').html((Math.round(cc/18)/100).toLocaleString());
-    }
 
-    SummaryPerspective.prototype.freezeState = function(){
-        // must
-    };
+        refreshCover() {
+            $('#summary-cover-refresh').attr('disabled', 'disabled');
+            this.doc.refreshCover({
+                success: function(text) {
+                    $('#summary-cover').attr('src', text);
+                    $('#summary-cover-refresh').removeAttr('disabled');
+                }
+            });
+        }
 
-       SummaryPerspective.prototype.onEnter = function(success, failure){
-               $.wiki.Perspective.prototype.onEnter.call(this);
-               
-               this.showCharCount();
+        showCharCount() {
+            var cc;
+            try {
+                $('#charcounts_text').show();
+                $('#charcounts_raw').hide();
+                cc = this.doc.getLength({noFootnotes: true, noThemes: true});
+                $('#charcount').html(cc);
+                $('#charcount_pages').html((Math.round(cc/18)/100).toLocaleString());
+
+                cc = this.doc.getLength();
+                $('#charcount_full').html(cc);
+                $('#charcount_full_pages').html((Math.round(cc/18)/100).toLocaleString());
+            }
+            catch (e) {
+                $('#charcounts_text').hide();
+                $('#charcounts_raw').show();
+                cc = this.doc.text.replace(/\s{2,}/g, ' ').length;
+                $('#charcount_raw').html(cc);
+                $('#charcount_raw_pages').html((Math.round(cc/18)/100).toLocaleString());
+            }
+        }
 
-               console.log("Entered summery view");
-       };
+        onEnter(success, failure){
+            super.onEnter();
 
-       $.wiki.SummaryPerspective = SummaryPerspective;
+            this.showCharCount();
+        }
+    }
+    $.wiki.SummaryPerspective = SummaryPerspective;
 
 })(jQuery);
-