diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-23 18:47:25 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-23 18:47:25 +0400 |
| commit | 9aa164f3813dca15269e6a081fc9965890acc3d8 (patch) | |
| tree | eef6df4d203a654323704c43d97b6ddc861fc326 /core | |
| parent | 8c69a5388eeb6414d866758debaced903b468d76 (diff) | |
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')
| -rw-r--r-- | core/js/jquery.avatar.js | 6 | ||||
| -rw-r--r-- | core/js/placeholder.js | 6 |
2 files changed, 6 insertions, 6 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(); diff --git a/core/js/placeholder.js b/core/js/placeholder.js index ee2a8ce84c4..47cff780d2f 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -30,7 +30,7 @@ * * And call this from Javascript: * - * $('#albumart').placeholder('The Album Title'); + * $('#albumart').imageplaceholder('The Album Title'); * * Which will result in: * @@ -38,7 +38,7 @@ * * You may also call it like this, to have a different background, than the seed: * - * $('#albumart').placeholder('The Album Title', 'Album Title'); + * $('#albumart').imageplaceholder('The Album Title', 'Album Title'); * * Resulting in: * @@ -47,7 +47,7 @@ */ (function ($) { - $.fn.placeholder = function(seed, text) { + $.fn.imageplaceholder = function(seed, text) { // set optional argument "text" to value of "seed" if undefined text = text || seed; |