2 files changed, 9 insertions, 91 deletions

diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index 7f9dd45..a7d207c 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -67,6 +67,7 @@ var InvalidDomains = [
     "http://img.waffleimages.com",
     "http://www.worldofstock.com",
     "http://aphrodite.cooltext.com",
+    "http://www.iconarchive.com",
     "http://www.onemetal.com",
     "http://static.funnyjunk.com",
     "http://www.whimsical-wits.com",
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 1105ef3..2ea4b3b 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -2,90 +2,6 @@ var cache = {}
 var PendingMessages = {}
 var MessageContentCache = {}
 var RawFavs = {}
-
-var InvalidDomains = [
-    "http://13gb.com",
-    "http://69.42.73.10",
-    "http://amitkulkarni.info",
-    "http://catcatcat.com",
-    "http://celebskin.com",
-    "http://current.com",
-    "http://files.shroomery.org",
-    "http://guides.macrumors.com",
-    "http://henshin.250x.com",
-    "http://i.pbase.com",
-    "http://images.nintendolife.com",
-    "http://img.bettersoft.de",
-    "http://izismile.com",
-    "http://izismile.com",
-    "http://izismile.com/img",
-    "http://mytextgraphics.com",
-    "http://nexus404.com",
-    "http://nintendolife.com",
-    "http://nofatclips.com",
-    "http://portfolio.deeperstudy.com",
-    "http://ru.fishki.net",
-    "http://ski.far.ru",
-    "http://tripod.com",
-    "http://uallknow.com",
-    "http://victoryaworld.com",
-    "http://images.4chan.org",
-    "http://www.4chan.org",
-    "http://www.angelfire.com",
-    "http://www.animation-central.com",
-    "http://www.arrested.com",
-    "http://www.b3tards.com",
-    "http://www.bloody-disgusting.com",
-    "http://www.commenthaven.com",
-    "http://www.coolnotions.com",
-    "http://www.creepygif.com",
-    "http://www.dailymakeover.com",
-    "http://www.fortunecity.com",
-    "http://www.gifbin.com",
-    "http://www.goatse.fr",
-    "http://www.hail-to-the-thief.org",
-    "http://www.knowledgebase-script.com",
-    "http://www.markagame.ru",
-    "http://www.masternewmedia.org",
-    "http://www.mortalkombatonline.com",
-    "http://www.mymodernmagic.com",
-    "http://www.mystkittsdivebuddy.com",
-    "http://www.nudecelebritieshentai.com",
-    "http://www.oldtimestrongman.com",
-    "http://www.popularpages.net",
-    "http://www.retrojunk.com",
-    "http://www.schm032.com",
-    "http://www.sevenoaksart.co.uk",
-    "http://www.suicidekiss.com",
-    "http://www.thecinemasource.com",
-    "http://www.veryboy.fr",
-    "http://www.vintagecomputing.com",
-    "http://www.virtuallandmedia.com",
-    "http://www.whudat.com",
-    "http://www.willrich.supanet.com",
-    "http://www.ysmarko.com",
-    "http://www.3d-onthelevel.com",
-    "http://www.heathersanimations.com",
-    "http://fortunecity.com",
-    "http://geneology2.com",
-    "http://www.geneology2.com",
-    "http://img.waffleimages.com",
-    "http://www.worldofstock.com",
-    "http://aphrodite.cooltext.com",
-    "http://www.onemetal.com",
-    "http://static.funnyjunk.com",
-    "http://www.whimsical-wits.com",
-    "http://madsenworld.dk",
-    "http://www.oafe.net",
-    "http://www.mrbalihai.com",
-    "http://www.digyourowngrave.com",
-    "http://tripod.com",
-    "http://www.kaitaia.com",
-    "http://carsdriveingallery.com",
-    "http://xxxspacegirls.us",
-    "http://www.newlog.com.ar"
-];
-
 var MaxImagePosts = 30
 
 // todo: preload these. also, look into image sprites (no go on animating their sizes tho)
@@ -184,7 +100,7 @@ function linkReplace(url) {
     switch(getUriType(uri)) {
       case 'image':
         LastMsgContainsImage = true;
-        return "<a target='_blank' href='" + linkUrl + "'><img src='" + linkUrl + "'></a>"; break;
+        return "<a href='" + linkUrl + "' class='img-wrapper' onclick='return false'><img src='" + linkUrl + "'></a>"; break;
       case 'youtube': 
         Youtube.startAnimation();
         return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" +
@@ -1116,22 +1032,23 @@ $(function() {
     OrigTitle = $('title').text();
 });
 
-$('.msgDiv').live('mouseover', function(e) {
+$('.msgDiv .content').live('mouseover', function(e) {
     $(this).addClass('msg-hover');
 });
 
-$('.msgDiv').live('mouseout', function(e) {
+$('.msgDiv .content').live('mouseout', function(e) {
     $(this).removeClass('msg-hover');
 });
 
 
-$('.msgDiv').live('click', function(e) {
+$('.content').live('click', function(e) {
     var tagName = e.target.tagName;
-    if (tagName == 'A' || tagName == 'IMG') {
+    if (tagName == 'A') {
         return;
     }
-    var wasFavorited = $(this).hasClass("favorite");
-    var button = $(this).find('.chat-thumb');
+    var msg = $(this).parent('.msgDiv');
+    var wasFavorited = msg.hasClass("favorite");
+    var button = msg.find('.chat-thumb');
     if (wasFavorited) {
         $(button).attr("src", Imgs.chatThumbOff);
     } else {