1 files changed, 20 insertions, 4 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index fdbfc8d..4a89d2c 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -266,6 +266,7 @@ function removeOldMessages(){
 }
 
 var TextEnabled = Preferences.getProperty("chat.textEnabled", "true") == "true";
+var ImgsEnabled = Preferences.getProperty("chat.imgsEnabled", "true") == "true";
 
 function setTextEnable() {
     if ($(this).attr('checked')) {
@@ -281,6 +282,20 @@ function setTextEnable() {
     }
 };
 
+function setImgsEnable() {
+    if ($(this).attr('checked')) {
+        ImgsEnabled = true;
+        Preferences.setProperty("chat.imgsEnabled", "true");
+        track('UI', 'ImgsEnabled');
+        $('.contains-image').show();
+    } else {
+        ImgsEnabled = false;
+        Preferences.setProperty("chat.imgsEnabled", "false");
+        track('UI', 'ImgsDisabled');
+        $('.contains-image').hide();
+    }
+};
+
 function buildMsgContent(content) {
     if (content.substr(0,6) == "<safe>")
         return content.substr(6,content.length - 13)
@@ -298,7 +313,7 @@ function buildMessageDiv(msg, isLoading) {
     var msgId = ('msg_id' in msg) ? 'id="message-' + msg.msg_id + '"' : '';
     var loadingClass = isLoading ? ' loading' : '';
     var containsImageClass = LastMsgContainsImage ? ' contains-image' : '';
-    var displayStyle = (TextEnabled || LastMsgContainsImage) ? '' : ' style="display: none"';
+    var displayStyle = ((ImgsEnabled && LastMsgContainsImage) || (TextEnabled && !LastMsgContainsImage)) ? '' : ' style="display: none"';
 
     return '<div class="msgDiv dump ' + loadingClass + containsImageClass + '" ' + msgId + displayStyle + '>'
         + '<span class="nick"><b><a href="http://dump.fm/' + nick + ' ">' + nick + '</a></b>'
@@ -569,10 +584,11 @@ function initChat() {
         var content = dump.find(".content")
         MessageContentCache[dump.attr("id").substr(8)] = content.text()
         content.html(buildMsgContent(content.text()));
-        if (!TextEnabled && !dump.hasClass('contains-image'))
-            dump.hide();
+
+        if ((ImgsEnabled && dump.hasClass('contains-image')) || (TextEnabled && !dump.hasClass('contains-image')))
+            dump.show();            
         else
-            dump.show();
+            dump.hide();
     });
 
     $('#msgInput').keyup(ifEnter(submitMessage));