Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #912 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-06-02 15:50:49 +03:00 committed by GitHub
parent 46b4a68ec4 ae35a1b94f
commit ac109145b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/documents/api.js
View file

@ -866,7 +866,7 @@
path += app + "/"; path += app + "/";
path += (config.type === "mobile" || isSafari_mobile) path += (config.type === "mobile" || isSafari_mobile)
? "mobile" ? "mobile"
: (config.type === "embedded" || (app=='documenteditor') && (config.document.permissions.fillForms===true) && (config.document.permissions.edit === false) && (config.editorConfig.mode !== 'view')) : (config.type === "embedded" || (app=='documenteditor') && config.document.permissions && (config.document.permissions.fillForms===true) && (config.document.permissions.edit === false) && (config.editorConfig.mode !== 'view'))
? "embed" ? "embed"
: "main"; : "main";

2
apps/common/Gateway.js
View file

@ -151,7 +151,7 @@ if (window.Common === undefined) {
var _onMessage = function(msg) { var _onMessage = function(msg) {
// TODO: check message origin // TODO: check message origin
if (msg.origin !== window.parentOrigin && msg.origin !== window.location.origin) return; if (msg.origin !== window.parentOrigin && msg.origin !== window.location.origin && !(msg.origin==="null" && (window.parentOrigin==="file://" || window.location.origin==="file://"))) return;
var data = msg.data; var data = msg.data;
if (Object.prototype.toString.apply(data) !== '[object String]' || !window.JSON) { if (Object.prototype.toString.apply(data) !== '[object String]' || !window.JSON) {