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

[desktop] keep early requests for 'desktop' plugin

Browse source
This commit is contained in:
Maxim Kadushkin 2019-11-06 16:55:02 +03:00
parent e8a746ab37
commit 7141304b4e
4 changed files with 49 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -91,19 +91,26 @@ define([
} else } else
if (/editor:config/.test(cmd)) { if (/editor:config/.test(cmd)) {
if ( param == 'request' ) { if ( param == 'request' ) {
var opts = { if ( !!titlebuttons ) {
user: config.user, var opts = {
title: { buttons: [] } user: config.user,
}; title: { buttons: [] }
};
var header = webapp.getController('Viewport').getView('Common.Views.Header'); var header = webapp.getController('Viewport').getView('Common.Views.Header');
if ( header ) { if ( header ) {
for (var i in titlebuttons) { for (var i in titlebuttons) {
opts.title.buttons.push(_serializeHeaderButton(i, titlebuttons[i])); opts.title.buttons.push(_serializeHeaderButton(i, titlebuttons[i]));
}
}
app.execCommand('editor:config', JSON.stringify(opts));
} else
if ( !config.callback_editorconfig ) {
config.callback_editorconfig = function() {
setTimeout(function(){window.on_native_message(cmd, param);},0);
} }
} }
app.execCommand('editor:config', JSON.stringify(opts));
} }
} else } else
if (/button:click/.test(cmd)) { if (/button:click/.test(cmd)) {
@ -114,6 +121,12 @@ define([
} }
}; };
if ( !!window.native_message_cmd ) {
for ( var c in window.native_message_cmd ) {
window.on_native_message(c, window.native_message_cmd[c]);
}
}
// app.execCommand('window:features', {version: config.version, action: 'request'}); // app.execCommand('window:features', {version: config.version, action: 'request'});
app.execCommand('webapps:features', {version: config.version, eventloading:true, titlebuttons:true}); app.execCommand('webapps:features', {version: config.version, eventloading:true, titlebuttons:true});
} }
@ -190,6 +203,11 @@ define([
var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class')); var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class'));
!!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]); !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]);
if ( !!config.callback_editorconfig ) {
config.callback_editorconfig();
delete config.callback_editorconfig;
}
}); });
Common.NotificationCenter.on({ Common.NotificationCenter.on({

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

@ -212,6 +212,13 @@
logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null; logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
if ( window.AscDesktopEditor ) {
window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param;
}
}
</script> </script>
<link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css"> <link rel="stylesheet" type="text/css" href="../../../apps/documenteditor/main/resources/css/app.css">

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

@ -249,6 +249,13 @@
logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null; logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
if ( window.AscDesktopEditor ) {
window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param;
}
}
</script> </script>
<link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css"> <link rel="stylesheet" type="text/css" href="../../../apps/presentationeditor/main/resources/css/app.css">

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

@ -227,6 +227,13 @@
logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null; logo = params["headerlogo"] ? encodeUrlParam(params["headerlogo"]) : null;
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
if ( window.AscDesktopEditor ) {
window.on_native_message = function (cmd, param) {
!window.native_message_cmd && (window.native_message_cmd = []);
window.native_message_cmd[cmd] = param;
}
}
</script> </script>
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/> <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>