Merge branch 'release-0.9.7'

[Sone.git] / src / main / resources / static / javascript / sone.js

diff --git a/src/main/resources/static/javascript/sone.js b/src/main/resources/static/javascript/sone.js
index a003780..84be0d4 100644 (file)
--- a/src/main/resources/static/javascript/sone.js
+++ b/src/main/resources/static/javascript/sone.js
@@ -1535,7 +1535,9 @@ function loadLinkedElements(links) {
        });
        if (failedElements.length > 0) {
                failedElements.forEach(function(element) {
-                       $(getLinkedElement(element.link)).remove()
+                       getLinkedElements(element.link).each(function() {
+                               $(this).remove()
+                       });
                });
        }
        var loadedElements = links.filter(function(element) {
@@ -1549,15 +1551,17 @@ function loadLinkedElements(links) {
                }, function (data, textStatus) {
                        if ((data != null) && (data.success)) {
                                data.linkedElements.forEach(function (linkedElement) {
-                                       $(getLinkedElement(linkedElement.link)).replaceWith(linkedElement.html);
+                                       getLinkedElements(linkedElement.link).each(function() {
+                                               $(this).replaceWith(linkedElement.html);
+                                       });
                                });
                        }
                });
        }
 }
 
-function getLinkedElement(link) {
-       return $(".linked-element[title='" + link + "']")[0]
+function getLinkedElements(link) {
+       return $(".linked-element[title='" + link + "']")
 }
 
 /**
@@ -1642,13 +1646,15 @@ function updatePostTime(postId, timeText, refreshTime, tooltip) {
  *            Comma-separated post IDs
  */
 function updatePostTimes(postIds) {
-       ajaxGet("getTimes.ajax", { "posts" : postIds }, function(data, textStatus) {
-               if ((data != null) && data.success) {
-                       $.each(data.postTimes, function(index, value) {
-                               updatePostTime(index, value.timeText, value.refreshTime, value.tooltip);
-                       });
-               }
-       });
+       if (postIds != "") {
+        ajaxGet("getTimes.ajax", {"posts": postIds}, function (data, textStatus) {
+            if ((data != null) && data.success) {
+                $.each(data.postTimes, function (index, value) {
+                    updatePostTime(index, value.timeText, value.refreshTime, value.tooltip);
+                });
+            }
+        });
+    }
 }
 
 /**
@@ -1679,13 +1685,15 @@ function updateReplyTime(replyId, timeText, refreshTime, tooltip) {
  *            Comma-separated post IDs
  */
 function updateReplyTimes(replyIds) {
-       ajaxGet("getTimes.ajax", { "replies" : replyIds }, function(data, textStatus) {
-               if ((data != null) && data.success) {
-                       $.each(data.replyTimes, function(index, value) {
-                               updateReplyTime(index, value.timeText, value.refreshTime, value.tooltip);
-                       });
-               }
-       });
+       if (replyIds != "") {
+        ajaxGet("getTimes.ajax", {"replies": replyIds}, function (data, textStatus) {
+            if ((data != null) && data.success) {
+                $.each(data.replyTimes, function (index, value) {
+                    updateReplyTime(index, value.timeText, value.refreshTime, value.tooltip);
+                });
+            }
+        });
+    }
 }
 
 function resetActivity() {