Merge branch 'staging' into calendar

CHANGELOG.md

@@ -17,6 +17,8 @@
   * don't try to join invalid channels
   * don't try to get their metadata
 * prompt premium users to cancel their subscriptions before deleting their accounts
+* check that headers for XLSX export are correctly set via the checkup app
+* guard against some type errors in the support page
 
 # 4.3.1
 

customize.dist/src/less2/pages/page-checkup.less

@@ -52,7 +52,7 @@ html, body {
 
     .advisory-text {
         display: inline-block;
-        word-break: break-all;
+        word-break: break-word;
         padding: 5px;
         //font-size: 16px;
         border: 1px solid red;

www/checkup/main.js

@@ -202,6 +202,24 @@ define([
 
     }, _alert("Login block is not working (write/read/remove)"));
 
+    assert(function (cb) {
+        var url = '/common/onlyoffice/v4/web-apps/apps/spreadsheeteditor/main/index.html';
+        var expect = {
+            'cross-origin-resource-policy': 'cross-origin',
+            'cross-origin-embedder-policy': 'require-corp',
+        };
+
+        $.ajax(url, {
+            success: function (data, textStatus, xhr) {
+                cb(!Object.keys(expect).some(function (k) {
+                    var response = xhr.getResponseHeader(k);
+                    console.log(k, response);
+                    return response !== expect[k];
+                }));
+            },
+        });
+    }, _alert("Missing HTTP headers required for XLSX export"));
+
     var row = function (cells) {
         return h('tr', cells.map(function (cell) {
             return h('td', cell);

www/common/onlyoffice/inner.js

@@ -2554,6 +2554,7 @@ define([
                 newDoc = !content.hashes || Object.keys(content.hashes).length === 0;
             } else if (!privateData.isNewFile) {
                 // This is an empty doc but not a new file: error
+                // XXX clear cache before reloading
                 UI.errorLoadingScreen(Messages.unableToDisplay, false, function () {
                     common.gotoURL('');
                 });

www/support/inner.js

@@ -203,6 +203,7 @@ define([
     };
     var showCategories = function (cat) {
         hideCategories();
+        if (!Array.isArray(cat)) { return void console.error("invalid category"); }
         cat.forEach(function (c) {
             APP.$rightside.find('.'+c).show();
         });
@@ -214,6 +215,7 @@ define([
         var metadataMgr = common.getMetadataMgr();
         var privateData = metadataMgr.getPrivateData();
         var active = privateData.category || 'tickets';
+        if (!categories[active]) { active = 'tickets'; }
         common.setHash(active);
         Object.keys(categories).forEach(function (key) {
             var $category = $('<div>', {