summaryrefslogtreecommitdiffstats
path: root/core/js/jquery.avatar.js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-10-23 16:47:25 +0200
committerVincent Petry <pvince81@owncloud.com>2013-10-23 16:47:25 +0200
commit9aa164f3813dca15269e6a081fc9965890acc3d8 (patch)
treeeef6df4d203a654323704c43d97b6ddc861fc326 /core/js/jquery.avatar.js
parent8c69a5388eeb6414d866758debaced903b468d76 (diff)
downloadnextcloud-server-9aa164f3813dca15269e6a081fc9965890acc3d8.tar.gz
nextcloud-server-9aa164f3813dca15269e6a081fc9965890acc3d8.zip
Renamed current placeholder jquery plugin to imageplaceholder
This is to prevent conflicts with jquery libs that handle text placeholders in IE8
Diffstat (limited to 'core/js/jquery.avatar.js')
-rw-r--r--core/js/jquery.avatar.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 00068101726..dbab032b971 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -60,7 +60,7 @@
if (typeof(this.data('user')) !== 'undefined') {
user = this.data('user');
} else {
- this.placeholder('x');
+ this.imageplaceholder('x');
return;
}
}
@@ -76,9 +76,9 @@
if (typeof(result) === 'object') {
if (!hidedefault) {
if (result.data && result.data.displayname) {
- $div.placeholder(user, result.data.displayname);
+ $div.imageplaceholder(user, result.data.displayname);
} else {
- $div.placeholder(user);
+ $div.imageplaceholder(user);
}
} else {
$div.hide();