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

Merge pull request #881 from ONLYOFFICE/feature/pr32-fix-bug-50414

Browse source 
[all] fix bug 50414
This commit is contained in:
maxkadushkin 2021-05-14 15:37:14 +03:00 committed by GitHub
parent abed29a24c 1e175f338a
commit 1945456b9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/controller/Desktop.js
View file

@ -48,7 +48,7 @@ define([
uithemes: true uithemes: true
}; };
var native = window.native || window.AscDesktopEditor; var native = window.desktop || window.AscDesktopEditor;
!!native && native.execCommand('webapps:features', JSON.stringify(features)); !!native && native.execCommand('webapps:features', JSON.stringify(features));
var Desktop = function () { var Desktop = function () {

6
apps/documenteditor/main/index.html.deploy
View file

@ -212,12 +212,12 @@
window.parentOrigin = params["parentOrigin"]; window.parentOrigin = params["parentOrigin"];
if ( window.AscDesktopEditor ) { if ( window.AscDesktopEditor ) {
window.native = window.AscDesktopEditor; window.desktop = window.AscDesktopEditor;
window.on_native_message = function (cmd, param) { window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []); !window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param; window.native_message_cmd[cmd] = param;
} }
window.native.execCommand('webapps:entry', ''); window.desktop.execCommand('webapps:entry', '');
} }
</script> </script>
@ -230,7 +230,7 @@
<div id="viewport"></div> <div id="viewport"></div>
<script> <script>
if ( window.native ) { if ( window.desktop ) {
var logo = document.getElementsByClassName('loading-logo'); var logo = document.getElementsByClassName('loading-logo');
if ( !!logo && logo.length ) { if ( !!logo && logo.length ) {
logo[0].setAttribute('style','display:none;'); logo[0].setAttribute('style','display:none;');

6
apps/presentationeditor/main/index.html.deploy
View file

@ -259,12 +259,12 @@
} }
if ( window.AscDesktopEditor ) { if ( window.AscDesktopEditor ) {
window.native = window.AscDesktopEditor; window.desktop = window.AscDesktopEditor;
window.on_native_message = function (cmd, param) { window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []); !window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param; window.native_message_cmd[cmd] = param;
} }
window.native.execCommand('webapps:entry', ''); window.desktop.execCommand('webapps:entry', '');
} }
</script> </script>
@ -288,7 +288,7 @@
<div id="viewport"></div> <div id="viewport"></div>
<script> <script>
if ( window.native ) { if ( window.desktop ) {
var logo = document.getElementsByClassName('loading-logo'); var logo = document.getElementsByClassName('loading-logo');
if ( !!logo && logo.length ) { if ( !!logo && logo.length ) {
logo[0].setAttribute('style','display:none;'); logo[0].setAttribute('style','display:none;');

6
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -254,12 +254,12 @@
window.parentOrigin = params["parentOrigin"]; window.parentOrigin = params["parentOrigin"];
if ( window.AscDesktopEditor ) { if ( window.AscDesktopEditor ) {
window.native = window.AscDesktopEditor; window.desktop = window.AscDesktopEditor;
window.on_native_message = function (cmd, param) { window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []); !window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param; window.native_message_cmd[cmd] = param;
} }
window.native.execCommand('webapps:entry', ''); window.desktop.execCommand('webapps:entry', '');
} }
</script> </script>
@ -288,7 +288,7 @@
<div id="viewport"></div> <div id="viewport"></div>
<script> <script>
if ( window.native ) { if ( window.desktop ) {
var logo = document.getElementsByClassName('loading-logo'); var logo = document.getElementsByClassName('loading-logo');
if ( !!logo && logo.length ) { if ( !!logo && logo.length ) {
logo[0].setAttribute('style','display:none;'); logo[0].setAttribute('style','display:none;');