summaryrefslogtreecommitdiff
path: root/static/js
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-05-21 19:23:47 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-05-21 19:23:47 -0400
commitda2c9221e6e9b3fc3cd75ff1824ce77f8539e01b (patch)
tree31ea24c9ffb059f6ea36025964d9ada6e8eb2de0 /static/js
parent83aee3dd09c05a8b7840f9f439fee46a34eb9d57 (diff)
sostler prod commit
Diffstat (limited to 'static/js')
-rw-r--r--static/js/invalid_domains.js1
-rw-r--r--static/js/pichat.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index 398edf9..b2c703c 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -65,6 +65,7 @@ var InvalidDomains = [
"http://geneology2.com",
"http://www.geneology2.com",
"http://www.onemetal.com",
+ "http://static.funnyjunk.com",
"http://www.kaitaia.com",
"http://carsdriveingallery.com",
"http://xxxspacegirls.us",
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 9b58b5c..f8be6c1 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -475,7 +475,7 @@ function activateProfileEditable() {
};
if ($('#avatar-editing').length > 0)
- setupUploadAvatar('upload');
+ setupUploadAvatar('uploadp');
var textareaOpts = { 'default_text': 'Enter here!',
'callback': onSubmit,