summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-03-01 02:27:00 -0500
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-03-01 02:27:00 -0500
commitc93c582470447fd266c66be082a59ce46a8ecf68 (patch)
treef6326d20550107aacd824a3e2b9819c20152f183 /static
parent74a478501390729a82c0d40abc38016c512965ff (diff)
Fixed click-to-edit
Diffstat (limited to 'static')
-rwxr-xr-xstatic/js/pichat.js18
1 files changed, 17 insertions, 1 deletions
diff --git a/static/js/pichat.js b/static/js/pichat.js
index dbc110b..3c69994 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,6 +329,8 @@ 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() };
@@ -325,7 +341,7 @@ function enableProfileEdit() {
function initProfile() {
$(".linkify").each(function() {
var text = jQuery(this).text();
- jQuery(this).html(linkify(text));
+ jQuery(this).html(linkifyWithoutImage(text));
});
$('#edit-toggle').click(enableProfileEdit);