Merge branch 'cp7.1.0.219' into cp7.2.0.209

cryptpad · Sep 6, 2023 · 0c450b4 · 0c450b4
2 parents bf72fd9 + 4b09e5e
commit 0c450b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js
@@ -902,6 +902,10 @@
             isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0),
             path_type;
 
+        //XXX CryptPad do not use mobile page for iOS Safari. The mobile page does not load require.js.
+        // We need require() in docscoapi.js
+        isSafari_mobile = false;
+
         path += app + "/";
         path_type = (config.type === "mobile" || isSafari_mobile)
                     ? "mobile" : (config.type === "embedded")

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
@@ -522,6 +522,9 @@ define([
                 if (data.doc) {
                     appHeader.setDocumentCaption(data.doc.title);
                 }
+
+                // XXX CryptPad: disable protect feature
+                this.permissions.protect = false;
             },
 
             onProcessSaveResult: function(data) {

diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -528,6 +528,9 @@ define([
                 this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this));
                 this.api.asc_setDocInfo(docInfo);
                 this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId);
+
+                // XXX CryptPad: disable protect feature
+                this.permissions.protect = false;
             },
 
             onProcessSaveResult: function(data) {