dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean the UI on first use of a pad (hide chat and reduce help)

This commit is contained in:
yflory 2019-03-28 11:41:59 +01:00
parent 7d4589bdb0
commit 723631c78c
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-ui-elements.js
View File

@ -1173,7 +1173,9 @@ define([
common.getAttribute(['hideHelp', type], function (err, val) {
//if ($(window).height() < 800 || $(window).width() < 800) { return void toggleHelp(true); }
if (val === true) { return void toggleHelp(true); }
if (!val && ($(window).height() < 800 || $(window).width() < 800)) {
// Note: Help is always hidden by default now, to avoid displaying to many things in the UI
// This is why we have (true || ...)
if (!val && (true || $(window).height() < 800 || $(window).width() < 800)) {
return void showMore();
}
});

4
www/common/common-util.js
View File

@ -306,6 +306,10 @@ define([], function () {
];
};
Util.isSmallScreen = function () {
return window.innerHeight < 800 || window.innerWidth < 800;
};
return Util;
});
}(self));

12
www/common/toolbar3.js
View File

@ -413,7 +413,7 @@ MessengerUI, Messages) {
});
show();
Common.getAttribute(['toolbar', 'userlist-drawer'], function (err, val) {
if (val === false || ($(window).height() < 800 && $(window).width() < 800)) {
if (val === false || Util.isSmallScreen()) {
return void hide();
}
show();
@ -457,7 +457,11 @@ MessengerUI, Messages) {
config.$contentContainer.prepend($content);
}
var hide = function () {
var hide = function (closed) {
if (!closed) {
// It means it's the initial state so we're going to make the icon blink
$button.addClass('cp-toolbar-notification');
}
$content.hide();
$button.removeClass('cp-toolbar-button-active');
config.$contentContainer.removeClass('cp-chat-visible');
@ -482,8 +486,8 @@ MessengerUI, Messages) {
});
show();
Common.getAttribute(['toolbar', 'chat-drawer'], function (err, val) {
if (val === false || ($(window).height() < 800 || $(window).width() < 800)) {
return void hide();
if (!val || Util.isSmallScreen()) {
return void hide(val === false);
}
show();
});