diff options
| -rw-r--r-- | lib/AppConfig.php | 1 | ||||
| -rw-r--r-- | lib/Capabilities.php | 2 | ||||
| -rw-r--r-- | src/files.js | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/AppConfig.php b/lib/AppConfig.php index 0b01fcbf..bcb2ef9d 100644 --- a/lib/AppConfig.php +++ b/lib/AppConfig.php @@ -18,6 +18,7 @@ class AppConfig { private $defaults = [ 'wopi_url' => '', + 'timeout' => 15, 'watermark_text' => '{userId}', 'watermark_allGroupsList' => [], 'watermark_allTagsList' => [], diff --git a/lib/Capabilities.php b/lib/Capabilities.php index efc412ba..e8ad527a 100644 --- a/lib/Capabilities.php +++ b/lib/Capabilities.php @@ -104,6 +104,8 @@ class Capabilities implements ICapability { 'edit_groups' => $this->config->getAppValue('edit_groups'), 'use_groups' => $this->config->getAppValue('use_groups'), 'doc_format' => $this->config->getAppValue('doc_format'), + 'timeout' => $this->config->getAppValue('timeout'), + ] ], ]; diff --git a/src/files.js b/src/files.js index a6bdf5b8..572ed863 100644 --- a/src/files.js +++ b/src/files.js @@ -137,7 +137,7 @@ const odfViewer = { odfViewer.onClose() OC.Notification.showTemporary(t('richdocuments', 'Failed to load {productName} - please try again later', { productName: OC.getCapabilities().richdocuments.productName || 'Collabora Online' })) } - }, 15000) + }, (OC.getCapabilities().richdocuments.config.timeout * 1000 || 15000)) $iframe.src = documentUrl $('body').css('overscroll-behavior-y', 'none') |