bugfix

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

diff --git a/src/redakcja/static/js/wiki/wikiapi.js b/src/redakcja/static/js/wiki/wikiapi.js
index 8df3ef5..28450ce 100644 (file)
--- a/src/redakcja/static/js/wiki/wikiapi.js
+++ b/src/redakcja/static/js/wiki/wikiapi.js
@@ -198,6 +198,10 @@
        WikiDocument.prototype.refreshGallery = function(params) {
                params = $.extend({}, noops, params);
                var self = this;
        WikiDocument.prototype.refreshGallery = function(params) {
                params = $.extend({}, noops, params);
                var self = this;

+               if (!self.galleryLink) {
+                       params['failure'](self, 'Brak galerii.');
+                       return;
+               }

                $.ajax({
                        method: "GET",
                        url: reverse("ajax_document_gallery", self.galleryLink),
                $.ajax({
                        method: "GET",
                        url: reverse("ajax_document_gallery", self.galleryLink),


@@ -218,7 +222,7 @@
                         var msg = "Nie udało się wczytać galerii o nazwie: '" + self.galleryLink + "'.";
                 }
                                self.galleryImages = [];
                         var msg = "Nie udało się wczytać galerii o nazwie: '" + self.galleryLink + "'.";
                 }
                                self.galleryImages = [];

-                               params['failure'](self, "<p>" + msg + "</p>");
+                               params['failure'](self, msg);

                        }
                });
        };
                        }
                });
        };


@@ -414,6 +418,7 @@
 
 
     WikiDocument.prototype.getLength = function(params) {
 
 
     WikiDocument.prototype.getLength = function(params) {

+        params = $.extend({}, noops, params);

         var xml = this.text.replace(/\/(\s+)/g, '<br />$1');
         var parser = new DOMParser();
         var doc = parser.parseFromString(xml, 'text/xml');
         var xml = this.text.replace(/\/(\s+)/g, '<br />$1');
         var parser = new DOMParser();
         var doc = parser.parseFromString(xml, 'text/xml');


@@ -423,7 +428,13 @@
             throw "Not an XML document.";
         }
         $.xmlns["rdf"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; 
             throw "Not an XML document.";
         }
         $.xmlns["rdf"] = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; 

-        $('rdf|RDF, motyw, pa, pe, pr, pt', doc).remove();
+        $('rdf|RDF', doc).remove();
+        if (params.noFootnotes) {
+            $('pa, pe, pr, pt', doc).remove();
+        }
+       if (params.noThemes) {
+           $('motyw', doc).remove();
+        }

         var text = $(doc).text();
         text = $.trim(text.replace(/\s{2,}/g, ' '));
         return text.length;
         var text = $(doc).text();
         text = $.trim(text.replace(/\s{2,}/g, ' '));
         return text.length;