do not show display name on mobile when profile picture is present
This commit is contained in:
parent
92d57cb5a7
commit
20b740f8e4
|
@ -17,4 +17,10 @@
|
||||||
transition: width 100ms;
|
transition: width 100ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* do not show display name on mobile when profile picture is present */
|
||||||
|
#header .avatardiv.avatardiv-shown + #expandDisplayName {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
if (OC.currentUser) {
|
if (OC.currentUser) {
|
||||||
$('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true);
|
var callback = function() {
|
||||||
|
// do not show display name on mobile when profile picture is present
|
||||||
|
if($('#header .avatardiv').children().length > 0) {
|
||||||
|
$('#header .avatardiv').addClass('avatardiv-shown');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
$('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true, callback);
|
||||||
// Personal settings
|
// Personal settings
|
||||||
$('#avatar .avatardiv').avatar(OC.currentUser, 128);
|
$('#avatar .avatardiv').avatar(OC.currentUser, 128);
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,10 +39,15 @@
|
||||||
* This will behave like the first example, but it will hide the avatardiv, if
|
* This will behave like the first example, but it will hide the avatardiv, if
|
||||||
* it will display the default placeholder. undefined is the ie8fix from
|
* it will display the default placeholder. undefined is the ie8fix from
|
||||||
* example 4 and can be either true, or false/undefined, to be ignored.
|
* example 4 and can be either true, or false/undefined, to be ignored.
|
||||||
|
*
|
||||||
|
* 6. $('.avatardiv').avatar('jdoe', 128, undefined, true, callback);
|
||||||
|
* This will behave like the above example, but it will call the function
|
||||||
|
* defined in callback after the avatar is placed into the DOM.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
(function ($) {
|
(function ($) {
|
||||||
$.fn.avatar = function(user, size, ie8fix, hidedefault) {
|
$.fn.avatar = function(user, size, ie8fix, hidedefault, callback) {
|
||||||
if (typeof(size) === 'undefined') {
|
if (typeof(size) === 'undefined') {
|
||||||
if (this.height() > 0) {
|
if (this.height() > 0) {
|
||||||
size = this.height();
|
size = this.height();
|
||||||
|
@ -91,6 +96,9 @@
|
||||||
$div.html('<img src="'+url+'">');
|
$div.html('<img src="'+url+'">');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(typeof callback === 'function') {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -52,9 +52,11 @@ function updateAvatar (hidedefault) {
|
||||||
|
|
||||||
if(hidedefault) {
|
if(hidedefault) {
|
||||||
$headerdiv.hide();
|
$headerdiv.hide();
|
||||||
|
$('#header .avatardiv').removeClass('avatardiv-shown');
|
||||||
} else {
|
} else {
|
||||||
$headerdiv.css({'background-color': ''});
|
$headerdiv.css({'background-color': ''});
|
||||||
$headerdiv.avatar(OC.currentUser, 32, true);
|
$headerdiv.avatar(OC.currentUser, 32, true);
|
||||||
|
$('#header .avatardiv').addClass('avatardiv-shown');
|
||||||
}
|
}
|
||||||
$displaydiv.css({'background-color': ''});
|
$displaydiv.css({'background-color': ''});
|
||||||
$displaydiv.avatar(OC.currentUser, 128, true);
|
$displaydiv.avatar(OC.currentUser, 128, true);
|
||||||
|
|
Loading…
Reference in New Issue