Changeset 3878:fd5264175804 for admin/js/_post.js

Timestamp:

09/17/18 16:46:35 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Harmonize scripts used to display entries/comments/trackbacks content in lists - Spam content is displayed as HTML code only, meta key may be used to display other content HTML code (meta key = cmd key on MacOS, windows key on Windows, ...) - Server errors are now basically reported (more info in console log, as timeout, offline, …) to the user

File:

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

admin/js/_post.js

@@ -2 +2 @@
 'use strict';
 
-dotclear.viewCommentContent = function(line) {
+dotclear.viewCommentContent = function(line, action, e) {
+  action = action || 'toggle';
+  if ($(line).attr('id') == undefined) {
+    return;
+  }
+
   var commentId = $(line).attr('id').substr(1);
   var tr = document.getElementById('ce' + commentId);
+  var spam = (e.metaKey || $(line).hasClass('sts-junk'));
 
   if (!tr) {
-    tr = document.createElement('tr');
-    tr.id = 'ce' + commentId;
-    var td = document.createElement('td');
-    td.colSpan = 6;
-    td.className = 'expand';
-    tr.appendChild(td);
-
     // Get comment content
-    $.get('services.php', {
-      f: 'getCommentById',
-      id: commentId
-    }, function(data) {
-      var rsp = $(data).children('rsp')[0];
-
-      if (rsp.attributes[0].value == 'ok') {
-        var comment = $(rsp).find('comment_display_content').text();
-
-        if (comment) {
-          $(td).append(comment);
-          var comment_email = $(rsp).find('comment_email').text();
-          var comment_site = $(rsp).find('comment_site').text();
-          //          var comment_ip = $(rsp).find('comment_ip').text();
-          var comment_spam_disp = $(rsp).find('comment_spam_disp').text();
-
-          $(td).append('<p><strong>' + dotclear.msg.website +
-            '</strong> ' + comment_site + '<br />' +
-            '<strong>' + dotclear.msg.email + '</strong> ' +
-            comment_email + '<br />' + comment_spam_disp + '</p>');
-        }
+    dotclear.getCommentContent(commentId, function(content) {
+      if (content) {
+        // Content found
+        tr = document.createElement('tr');
+        tr.id = 'ce' + commentId;
+        var td = document.createElement('td');
+        td.colSpan = $(line).children('td').length;
+        td.className = 'expand';
+        tr.appendChild(td);
+        $(td).append(content);
+        $(line).addClass('expand');
+        line.parentNode.insertBefore(tr, line.nextSibling);
       } else {
-        window.alert($(rsp).find('message').text());
+        // No content, content not found or server error
+        $(line).removeClass('expand');
       }
+    }, {
+      ip: false,
+      clean: spam
     });
-
-    $(line).toggleClass('expand');
-    line.parentNode.insertBefore(tr, line.nextSibling);
-  } else if (tr.style.display == 'none') {
-    $(tr).toggle();
-    $(line).toggleClass('expand');
   } else {
     $(tr).toggle();
@@ -164 +152 @@
   $('#comments').onetabload(function() {
     $.expandContent({
+      line: $('#form-comments .comments-list tr:not(.line)'),
       lines: $('#form-comments .comments-list tr.line'),
       callback: dotclear.viewCommentContent
@@ -176 +165 @@
   $('#trackbacks').onetabload(function() {
     $.expandContent({
+      line: $('#form-trackbacks .comments-list tr:not(.line)'),
       lines: $('#form-trackbacks .comments-list tr.line'),
       callback: dotclear.viewCommentContent