Changeset 2531:2daf216ff255 for admin/js/_comments.js

Timestamp:

11/09/13 11:40:06 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.6

Message:

Refactoring of expandContent for list (entries, comments, trackback).
Addresses #1848

File:

• admin/js/_comments.js (modified) (2 diffs)

admin/js/_comments.js

@@ -1 @@
-dotclear.commentExpander = function(line) {
-     $('<a href="#"><img src="'+dotclear.img_plus_src+'" alt="'+dotclear.img_plus_alt+'"/></a>')
-          .click(function(e) {
-               dotclear.toggleArrow(this);
-               dotclear.viewCommentContent(line);
-               e.preventDefault();
-          })
-          .prependTo($(line).children().get(0)); // first td
-};
-
-dotclear.commentsExpander = function(line,lines) {
-     $('<a href="#"><img src="'+dotclear.img_plus_src+'" alt="'+dotclear.img_plus_alt+'"/></a>')
-          .click(function(e) {
-               dotclear.toggleArrow(this);
-               lines.each(function() {
-                    var action = dotclear.toggleArrow(this.firstChild.firstChild);
-                    dotclear.viewCommentContent(this,action);
-               });
-               e.preventDefault();
-          })
-          .prependTo($(line).children().get(0)); // first td
-};
-
-dotclear.toggleArrow = function(link,action) {
-     action = action || '';
-     var img = $(link).children().get(0);
-     if (action=='') {
-          if (img.alt==dotclear.img_plus_alt) {
-               action = 'open';
-          } else {
-               action = 'close';
-          }
-     }
-
-     if (action=='open') {
-          img.src = dotclear.img_minus_src;
-          img.alt = dotclear.img_minus_alt;
-     } else {
-          img.src = dotclear.img_plus_src;
-          img.alt = dotclear.img_plus_alt;
-     }
-
-     return action;
-}
-
 dotclear.viewCommentContent = function(line,action) {
+     var action = action || 'toggle';
      var commentId = $(line).attr('id').substr(1);     
      var tr = document.getElementById('ce'+commentId);
-     
-     if (!tr) {
+
+     if ( !tr && ( action == 'toggle' || action == 'open' ) ) {
           tr = document.createElement('tr');
           tr.id = 'ce'+commentId;
@@ -85 +41 @@
           line.parentNode.insertBefore(tr,line.nextSibling);
      }
-     else if (tr.style.display == 'none')
+     else if (tr && tr.style.display == 'none' && ( action == 'toggle' || action == 'open' ) )
      {
-          $(tr).toggle();
-          $(line).toggleClass('expand');
+          $(tr).css('display', 'table-row');
+          $(line).addClass('expand');
      }
-     else
+     else if (tr && tr.style.display != 'none' && ( action == 'toggle' || action == 'close' ) )
      {
-          $(tr).toggle();
-          $(line).toggleClass('expand');
+          $(tr).css('display', 'none');
+          $(line).removeClass('expand');
      }
 };
 
 $(function() {
-     $('#form-comments tr:not(.line)').each(function() {
-          dotclear.commentsExpander(this,$('#form-comments tr.line'));
-     });
-     $('#form-comments tr.line').each(function() {
-          dotclear.commentExpander(this);
+     $.expandContent({
+          line:$('#form-comments tr:not(.line)'),
+          lines:$('#form-comments tr.line'),
+          callback:dotclear.viewCommentContent
      });
      $('.checkboxes-helpers').each(function() {