another fix for beta

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

diff --git a/redakcja/static/js/wiki/view_annotations.js b/redakcja/static/js/wiki/view_annotations.js
index 7294678..b55effd 100644 (file)
--- a/redakcja/static/js/wiki/view_annotations.js
+++ b/redakcja/static/js/wiki/view_annotations.js
@@ -15,40 +15,95 @@
             this.$element = $("#side-annotations");
             this.$error = $('.error-message', this.$element);
             this.$annos = $('.annotations-list', this.$element);
             this.$element = $("#side-annotations");
             this.$error = $('.error-message', this.$element);
             this.$annos = $('.annotations-list', this.$element);

-            $('.refresh', this.$element).click(function() {
-                self.refresh(self);
+            this.$spinner = $('.spinner', this.$element);
+            this.$refresh = $('.refresh', this.$element);
+
+            this.$refresh.click(function() {
+                var $this = $(this);
+
+                self.$refresh.removeClass('active');
+                $this.addClass('active');
+                var atype = $this.attr('data-tag');
+
+                self.$annos.hide();
+                self.$error.hide();
+                self.$spinner.show(100, function(){
+                    self.refresh(self, atype);
+                });

             });
 
             });
 

-                       old_callback.call(this);
+            old_callback.call(this);

         };
 
         $.wiki.Perspective.call(this, options);
         };
 
         $.wiki.Perspective.call(this, options);

-    };
+    }

 
     AnnotationsPerspective.prototype = new $.wiki.Perspective();
 
 
     AnnotationsPerspective.prototype = new $.wiki.Perspective();
 

-    AnnotationsPerspective.prototype.refresh = function(self) {
+    AnnotationsPerspective.prototype.updateAnnotationIds = function(self){
+        self.annotationToAnchor = {};
+        $('#html-view').find('.annotation-inline-box').each(
+            function(i, annoBox) {
+                var $annoBox = $(annoBox);
+                var $anchor = $("a[name|=anchor]", $annoBox);
+                var htmlContent = $('span', $annoBox).html();
+                // TBD: perhaps use a hash of htmlContent as key
+                self.annotationToAnchor[htmlContent] = $anchor.attr('name');
+                });
+    };
+
+    AnnotationsPerspective.prototype.goToAnnotation = function(self, srcNode){
+        var content = $(srcNode).html();
+        content = content.replace(/&gt;/g, '>').replace(/&lt;/g, '<').replace(/&amp;/g, '&');
+        xml2html({
+            xml: '<root>'+content+'</root>',
+            success: function(txt) {
+                content = $(txt).html();
+                },
+            error: function(text) {
+                $.unblockUI();
+                self.$error.html(text);
+                self.$spinner.hide();
+                self.$error.show();
+            }
+        });
+
+        var anchor = self.annotationToAnchor[content];
+        if (anchor != undefined) {
+            var $htmlView = $("#html-view");
+            var top = $htmlView.offset().top + 
+                $("[name=" + anchor + "]", $htmlView).offset().top - 
+                $htmlView.children().eq(0).offset().top;
+
+            $htmlView.animate({scrollTop: top}, 250);
+        }
+    };
+
+    AnnotationsPerspective.prototype.refresh = function(self, atype) {

         var xml;
 
         var xml;
 

-        persp = $.wiki.activePerspective();
+        var persp = $.wiki.activePerspective();

         if (persp == 'CodeMirrorPerspective') {
             xml = $.wiki.perspectives[persp].codemirror.getCode();
         }
         else if (persp == 'VisualPerspective') {
             html2text({
         if (persp == 'CodeMirrorPerspective') {
             xml = $.wiki.perspectives[persp].codemirror.getCode();
         }
         else if (persp == 'VisualPerspective') {
             html2text({

-                element: $('#html-view div').get(0),
+                element: $('#html-view').find('div').get(0),

                 success: function(text){
                     xml = text;
                 },
                 error: function(text){
                     self.$error.html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');
                 success: function(text){
                     xml = text;
                 },
                 error: function(text){
                     self.$error.html('<p>Wystąpił błąd:</p><pre>' + text + '</pre>');

+                    self.$spinner.hide();
+                    self.$error.show();

                 }
             });
                 }
             });

+            self.updateAnnotationIds(self);

         }
         else {
             xml = this.doc.text;
         }
         }
         else {
             xml = this.doc.text;
         }

-        
+

         var parser = new DOMParser();
         var serializer = new XMLSerializer();
         var doc = parser.parseFromString(xml, 'text/xml');
         var parser = new DOMParser();
         var serializer = new XMLSerializer();
         var doc = parser.parseFromString(xml, 'text/xml');


@@ -56,62 +111,69 @@
 
         if (error.length > 0) {
             self.$error.html('Błąd parsowania XML.');
 
         if (error.length > 0) {
             self.$error.html('Błąd parsowania XML.');

+            self.$spinner.hide();

             self.$error.show();
             self.$error.show();

-            self.$annos.hide();

         }
         else {
         }
         else {

-            self.$error.hide();
-            self.$annos.hide();

             self.$annos.html('');
             self.$annos.html('');

-            var anno_list = new Array();
-            var annos = doc.getElementsByTagName('pe');
+            var anno_list = [];
+            var annos = $(atype, doc);

             var counter = annos.length;
             var counter = annos.length;

+            var atype_rx = atype.replace(/,/g, '|');
+            var ann_expr = new RegExp("^<("+atype_rx+")[^>]*>|</("+atype_rx+")>$", "g");

 
 

-            for (var i=0; i<annos.length; i++)
+            if (annos.length == 0)

             {
             {

-                xml_text = serializer.serializeToString(annos[i]).replace(/^<pe[^>]*>|<\/pe>$/g, "");
+                self.$annos.html('Nie ma żadnych przypisów');
+                self.$spinner.hide();
+                self.$annos.show();
+            }
+            annos.each(function (i, elem) {
+                var xml_text = serializer.serializeToString(elem).replace(ann_expr, "");

                 xml2html({
                     xml: "<akap>" + xml_text + "</akap>",
                     success: function(xml_text){
                         return function(elem){
                             elem.sortby = $(elem).text().trim();
                 xml2html({
                     xml: "<akap>" + xml_text + "</akap>",
                     success: function(xml_text){
                         return function(elem){
                             elem.sortby = $(elem).text().trim();

-                            $(elem).append("<div class='src'>"+ xml_text.replace("&", "&amp;", "g").replace("<", "&lt;", "g") +"</div>")
+                            $(elem).append("<div class='src'>"+ xml_text.replace(/&/g, "&amp;").replace(/</g, "&lt;") +"</div>");

                             anno_list.push(elem);
                             anno_list.push(elem);

+                            $(".src", elem).click(function() { self.goToAnnotation(self, this); });

                             counter--;
 
                             if (!counter) {
                                 anno_list.sort(function(a, b){return a.sortby.localeCompare(b.sortby);});
                             counter--;
 
                             if (!counter) {
                                 anno_list.sort(function(a, b){return a.sortby.localeCompare(b.sortby);});

-                                self.$annos.append(anno_list);
+                                for (i in anno_list)
+                                    self.$annos.append(anno_list[i]);
+                                self.$spinner.hide();

                                 self.$annos.show();
                             }
                                 self.$annos.show();
                             }

+

                         }
                     }(xml_text),
                     error: function(text) {
                         $.unblockUI();
                         self.$error.html(text);
                         }
                     }(xml_text),
                     error: function(text) {
                         $.unblockUI();
                         self.$error.html(text);

+                        self.$spinner.hide();

                         self.$error.show();
                     }
                 });
                         self.$error.show();
                     }
                 });

-            }
+            });

         }
         }

-    }
-
+    };

 
 

-    AnnotationsPerspective.prototype.onEnter = function(success, failure){
-        var self = this;

 
 

+    AnnotationsPerspective.prototype.onEnter = function(){

         $.wiki.Perspective.prototype.onEnter.call(this);
 
         $('.vsplitbar').not('.active').trigger('click');
         $(".vsplitbar-title").html("&darr;&nbsp;PRZYPISY&nbsp;&darr;");
         $.wiki.Perspective.prototype.onEnter.call(this);
 
         $('.vsplitbar').not('.active').trigger('click');
         $(".vsplitbar-title").html("&darr;&nbsp;PRZYPISY&nbsp;&darr;");

-
-        this.refresh(this);
+        this.$refresh.filter('.active').trigger('click');

 
     };
 
 
     };
 

-       AnnotationsPerspective.prototype.onExit = function(success, failure) {
+        AnnotationsPerspective.prototype.onExit = function(success, failure) {

 
 

-       };
+        };

 
     $.wiki.AnnotationsPerspective = AnnotationsPerspective;
 
 
     $.wiki.AnnotationsPerspective = AnnotationsPerspective;