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

Merge branch 'staging' into form

This commit is contained in:
yflory 2022-10-26 17:51:17 +02:00
parent e9540b9a00 7eeb6bb165
commit b8b485c99d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
temp.md
View File

2
www/calendar/inner.js
View File

@ -1443,7 +1443,7 @@ APP.recurrenceRule = {
freq: 'daily',
by: { day: weekValue }
});
options.push({
options.splice(2, 0, {
tag: 'a',
attributes: {
'class': 'cp-calendar-recurrence',

16
www/common/drive-ui.js
View File

@ -1152,10 +1152,10 @@ define([
var FILTER_BY = "filterBy";
var refresh = APP.refresh = function () {
var refresh = APP.refresh = function (cb) {
var type = APP.store[FILTER_BY];
var path = type ? [FILTER, type, currentPath] : currentPath;
APP.displayDirectory(path);
APP.displayDirectory(path, undefined, cb);
};
// `app`: true (force open wiht the app), false (force open in preview),
@ -4289,10 +4289,12 @@ define([
appStatus.ready(true);
};
var displayDirectory = APP.displayDirectory = function (path, force) {
var displayDirectory = APP.displayDirectory = function (path, force, cb) {
cb = cb || function () {};
if (APP.closed || (APP.$content && !$.contains(document.documentElement, APP.$content[0]))) { return; }
if (history.isHistoryMode) {
return void _displayDirectory(path, force);
_displayDirectory(path, force);
return void cb();
}
if (!manager.comparePath(currentPath, path)) {
removeSelected();
@ -4301,6 +4303,7 @@ define([
copyObjectValue(files, proxy.drive);
updateSharedFolders(sframeChan, manager, files, folders, function () {
_displayDirectory(path, force);
cb();
});
});
};
@ -5346,8 +5349,9 @@ define([
};
APP.FM = common.createFileManager(fmConfig);
refresh();
UI.removeLoadingScreen();
refresh(function () {
UI.removeLoadingScreen();
});
/*
if (!APP.team) {