Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 18 insertions, 2 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index dbc110b..b322ae9 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -32,6 +32,20 @@ function linkReplace(url){
   }
 }
 
+function linkifyWithoutImage(text) {
+  LastMsgContainsImage = false
+  var URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
+  return text.replace(URLRegex, linkReplaceWithoutImage);
+}
+
+function linkReplaceWithoutImage(url){
+  var PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i;
+  var urlWithoutParams = url.replace(/\?.*$/i, "");
+  linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url;
+
+  return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>"
+}
+
 // Message Handling
 
 var ImageMsgCount = 0
@@ -315,17 +329,19 @@ function activateProfileEditable() {
 }
 
 function enableProfileEdit() {
+    $('img#contact').replaceWith('<div id="contact" class="linkify"></div>');
+    $('img#bio').replaceWith('<div id="bio" class="linkify"></div>');
     $('#contact, #bio, #avatar').addClass('editable');
     $('#avatar-editing').show();
     var resetPage = function() { location.reload() };
-    $('#edit-toggle a').text('--> Done editing <--').click(resetPage);
+    $('#edit-toggle a').text('done editing').click(resetPage);
     activateProfileEditable();
 }
 
 function initProfile() {
     $(".linkify").each(function() {
         var text = jQuery(this).text();
-        jQuery(this).html(linkify(text));
+        jQuery(this).html(linkifyWithoutImage(text));
     });    
 
     $('#edit-toggle').click(enableProfileEdit);