Merge branch 'master' of /pichat/repo

1 files changed, 13 insertions, 3 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index 026f7c2..323e05b 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -95,6 +95,18 @@ function annoyingCaps(text){
   return chunks.join(" ") 
 }
 
+var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+function imgClickHandler() {
+    // Ugly hack. Don't open new links in chat, only in logs.
+    // Ugly hack mkII: ensure middle-click opens images in new tab
+    // c.f. http://code.google.com/p/chromium/issues/detail?id=255
+    if (is_chrome && event.button != 0) {
+	event.stopPropagation();
+    } else {
+	return $('#chatrap').length == 0;
+    }
+}
+
 // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
 var LastMsgContainsImage = false
 function linkReplace(url) {
@@ -104,14 +116,12 @@ function linkReplace(url) {
     else
         linkUrl = 'http://' + url;
 
-    // Ugly hack. Don't open new links in chat, only in logs.
-    var shouldOpen = $('#chatrap').length == 0;
     var uri = parseUri(url)
     var type = getUriType(uri)
     
     if (type == 'image') {
       LastMsgContainsImage = true;
-      return "<a target='_blank' href='" + linkUrl + "' class='img-wrapper' onclick='return " + shouldOpen + "'><img src='" + linkUrl + "'></a>";
+      return "<a target='_blank' href='" + linkUrl + "' class='img-wrapper' onclick='return imgClickHandler()'><img src='" + linkUrl + "'></a>";
     } else if (type == 'youtube') {
       Youtube.startAnimation();
       return "<a target='_blank' class='youtube' href='" + linkUrl + "'>" +