Do not close images from refpopups when the popup is removed

boards/static/js/image.js

@@ -149,7 +149,6 b' PopupImageViewer.prototype.view = functi'
                 'left': (win_w - img_w) / 2,
                 'top': ((win_h - img_h) / 2)
             })
-            .appendTo(postNode)
         //scaling preview
         .mousewheel(function(event, delta) {
             var cx = event.originalEvent.clientX;
@@ -175,12 +174,12 b' PopupImageViewer.prototype.view = functi'
             });
 
             return false;
-        }
-        )
+            })
             .draggable({
                 addClasses: false,
                 stack: '.img-full'
-            });
+            })
+            .appendTo($('body'));
     } else {
         existingPopups.remove();
     }

boards/static/js/refpopup.js

@@ -1,3 +1,5 b''
+var LOADING_MSG = "<div class=\"post\">" + gettext('Loading...') + "</div>";
+
 function $X(path, root) {
     return document.evaluate(path, root || document, null, 6, null);
 }
@@ -56,6 +58,7 b' function showPostPreview(e) {'
 
     var post = $('#' + pNum);
     if (post.length > 0 && isElementInViewport(post)) {
+        // If post is on the same page and visible, just highlight it
         post.addClass('highlight');
     } else {
         var x = reflink.offset().left;
@@ -65,19 +68,21 b' function showPostPreview(e) {'
         cln.id = 'pstprev_' + pNum;
         cln.className = 'post_preview';
 
-//      var newX = x < doc.body.clientWidth/2 ? 'left:' + x : 'right:' + parseInt(doc.body.clientWidth - x - reflink.width());
-//      var newY = y < doc.body.clientHeight/2 ? 'top:' + y : 'bottom:' + parseInt(doc.body.clientHeight - y - reflink.height());
         cln.style.cssText = 'left:' + x + 'px; top:' + y + 'px';
 
         cln.addEventListener('mouseout', delPostPreview, false);
 
-        cln.innerHTML = "<div class=\"post\">" + gettext('Loading...') + "</div>";
+        cln.innerHTML = LOADING_MSG;
 
         if(post.length > 0) {
-            var postdata = post.clone().wrap("<div/>").parent().html();
+            // If post is on the same page but not visible, generate preview from it
+            var postClone = post.clone();
+            postClone.removeAttr('style');
+            var postdata = postClone.wrap("<div/>").parent().html();
 
             mkPreview(cln, postdata);
         } else {
+            // If post is from other page, load it
             $.ajax({
                 url: '/api/post/' + pNum + '/?truncated'
             })
@@ -86,7 +91,6 b' function showPostPreview(e) {'
 
                     //make preview
                     mkPreview(cln, postdata);
-
                 })
                 .error(function() {
                     cln.innerHTML = "<div class=\"post\">"
@@ -109,7 +113,13 b' function delPostPreview(e) {'
             $del(clone)
         });
     } else {
-        while(el.nextSibling) $del(el.nextSibling);
+        while (el.nextSibling) {
+            if (el.nextSibling.className.startsWith('pstprev')) {
+                $del(el.nextSibling);
+            } else {
+                break;
+            }
+        }
     }
 
     $('.highlight').removeClass('highlight');