Changeset 2609:c26642f775e2 for admin/js

Timestamp:

12/10/13 09:00:09 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

2468:d7fda5a0bd39 (diff), 2608:3365c9df16a6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with default

File:

• admin/js/_post.js (modified) (13 diffs)

admin/js/_post.js

@@ -1 @@
-dotclear.commentExpander = function(line) {
-     var td = line.firstChild;
-
-     var img = document.createElement('img');
-     img.src = dotclear.img_plus_src;
-     img.alt = dotclear.img_plus_alt;
-     img.className = 'expand';
-     $(img).css('cursor','pointer');
-     img.line = line;
-     img.onclick = function() { dotclear.viewCommentContent(this,this.line); };
-
-     td.insertBefore(img,td.firstChild);
-};
-
-dotclear.viewCommentContent = function(img,line) {
-     var commentId = line.id.substr(1);
-
+dotclear.viewCommentContent = function(line,action) {
+     var commentId = $(line).attr('id').substr(1);
      var tr = document.getElementById('ce'+commentId);
 
@@ -26 +11 @@
           tr.appendChild(td);
 
-          img.src = dotclear.img_minus_src;
-          img.alt = dotclear.img_minus_alt;
-
           // Get comment content
           $.get('services.php',{f:'getCommentById',id: commentId},function(data) {
@@ -60 +42 @@
           $(tr).toggle();
           $(line).toggleClass('expand');
-          img.src = dotclear.img_minus_src;
-          img.alt = dotclear.img_minus_alt;
      }
      else
@@ -67 +47 @@
           $(tr).toggle();
           $(line).toggleClass('expand');
-          img.src = dotclear.img_plus_src;
-          img.alt = dotclear.img_plus_alt;
      }
 };
@@ -90 +68 @@
                     $(this).val(last_post_format);
                }
-               
+
                $('.format_control > *').addClass('hide');
                $('.format_control:not(.control_no_'+$(this).val()+') > *').removeClass('hide');
@@ -102 +80 @@
      if (document.getElementById('comment_content')) {
           var commentTb = new jsToolBar(document.getElementById('comment_content'));
+          commentTb.draw('xhtml');
      }
 
@@ -128 +107 @@
           a.className = 'button ';
           $(a).click(function() {
-               
+
                excerpt_content = $('#post_excerpt').css('display') != 'none' ? $('#post_excerpt').val() : $('#excerpt-area iframe').contents().find('body').html();
-               post_content    = $('#post_content').css('display') != 'none' ? $('#post_content').val() : $('#content-area iframe').contents().find('body').html();
-               
+               post_content   = $('#post_content').css('display') != 'none' ? $('#post_content').val() : $('#content-area iframe').contents().find('body').html();
+
                var params = {
                     xd_check: dotclear.nonce,
@@ -146 +125 @@
                          return false;
                     }
-                         
+
                     $('.message, .success, .error, .warning-msg').remove();
 
@@ -152 +131 @@
                          var p = document.createElement('p');
                          p.id = 'markup-validator';
-                         
+
                          $(p).addClass('success');
                          $(p).text(dotclear.msg.xhtml_valid);
@@ -162 +141 @@
                          var div = document.createElement('div');
                          div.id = 'markup-validator';
-                         
+
                          $(div).addClass('error');
                          $(div).html('<p><strong>' + dotclear.msg.xhtml_not_valid + '</strong></p>' + $(data).find('errors').text());
@@ -185 +164 @@
 
           a.appendChild(document.createTextNode(dotclear.msg.xhtml_validator));
-          
+
           $('.format_control > *').addClass('hide');
           $('.format_control:not(.control_no_'+last_post_format+') > *').removeClass('hide');
@@ -266 +245 @@
 
      $('#comments').onetabload(function() {
-          $('#form-comments .comments-list tr.line').each(function() {
-               dotclear.commentExpander(this);
+          $.expandContent({
+               lines:$('#form-comments .comments-list tr.line'),
+               callback:dotclear.viewCommentContent
           });
           $('#form-comments .checkboxes-helpers').each(function() {
@@ -277 +257 @@
 
      $('#trackbacks').onetabload(function() {
-          $('#form-trackbacks .comments-list tr.line').each(function() {
-               dotclear.commentExpander(this);
+          $.expandContent({
+               lines:$('#form-trackbacks .comments-list tr.line'),
+               callback:dotclear.viewCommentContent
           });
           $('#form-trackbacks .checkboxes-helpers').each(function() {