diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-09-14 12:52:48 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-09-14 13:05:56 +0300 |
| commit | 6ba4efdf3d489950e513211d42dd3bc32f1147de (patch) | |
| tree | 22f05f6e201a2c174ace528668b57f19aa4fe194 /src | |
| parent | 94dab7f3eac3a376645b0234cd3d22c21dd30031 (diff) | |
arm64: Adapt CapabilitiesService and document.js
Signed-off-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/document.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/document.js b/src/document.js index ad7ee856..63640e6b 100644 --- a/src/document.js +++ b/src/document.js @@ -39,7 +39,9 @@ const checkProxyStatus = () => { } else if (val.error === 'exec_disabled') { document.getElementById('proxyLoadingMessage').textContent = t('richdocuments', 'Error: Exec disabled in PHP, please enable it, or setup a standalone server.') } else if (val.error === 'not_linux' || val.error === 'not_x86_64') { - document.getElementById('proxyLoadingMessage').textContent = t('richdocuments', 'Error: Not running on x86-64 Linux, please setup a standalone server.') + document.getElementById('proxyLoadingMessage').textContent = t('richdocuments', 'Error: Not running on x86-64 Linux, please setup a standalone server or the correct version of Collabora Online Built-in server for your platform.') + } else if (val.error === 'not_linux' || val.error === 'not_aarch64') { + document.getElementById('proxyLoadingMessage').textContent = t('richdocuments', 'Error: Not running on ARM64 Linux, please setup a standalone server or the correct version of Collabora Online Built-in server for your platform.') } else if (val.error === 'no_fontconfig') { document.getElementById('proxyLoadingMessage').textContent = t('richdocuments', 'Error: The fontconfig library is not installed on your server, please install it or setup a standalone server.') } else if (val.error === 'no_glibc') { @@ -62,7 +64,7 @@ const checkProxyStatus = () => { } const showLoadingIndicator = () => { - if (OC.appswebroots.richdocumentscode && Config.get('urlsrc').indexOf('proxy.php') >= 0) { + if ((OC.appswebroots.richdocumentscode || OC.appswebroots.richdocumentscode_arm64) && Config.get('urlsrc').indexOf('proxy.php') >= 0) { checkProxyStatus() } else { document.getElementById('loadingContainer').classList.add('icon-loading') |