Skip to content

W
web-apps
Commit f1e58c6a authored by Alexey Golubev's avatar Alexey Golubev Committed by Alexander.Trofimov
Browse files
Options

Merge tag 'staropramen' into develop 

staropramen
parent 1002a71d
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 1 deletion
apps/api/documents/api.js
View file @ f1e58c6a
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
_config.editorConfig.canHistoryRestore = _config.events && !!_config.events.onRequestRestore; _config.editorConfig.canHistoryRestore = _config.events && !!_config.events.onRequestRestore;
_config.editorConfig.canSendEmailAddresses = _config.events && !!_config.events.onRequestEmailAddresses; _config.editorConfig.canSendEmailAddresses = _config.events && !!_config.events.onRequestEmailAddresses;
_config.editorConfig.canRequestEditRights = _config.events && !!_config.events.onRequestEditRights; _config.editorConfig.canRequestEditRights = _config.events && !!_config.events.onRequestEditRights;
_config.frameEditorId = placeholderId;
var onMouseUp = function (evt) { var onMouseUp = function (evt) {
_processMouse(evt); _processMouse(evt);
...@@ -257,7 +258,7 @@ ...@@ -257,7 +258,7 @@
}; };
var _onMessage = function(msg) { var _onMessage = function(msg) {
if (msg) { if (msg && msg.frameEditorId == placeholderId) {
var events = _config.events || {}, var events = _config.events || {},
handler = events[msg.event], handler = events[msg.event],
res; res;
...@@ -663,6 +664,9 @@ ...@@ -663,6 +664,9 @@
} }
} }
if (config.frameEditorId)
params += "&frameEditorId=" + config.frameEditorId;
return params; return params;
} }
......
apps/common/Gateway.js
View file @ f1e58c6a
...@@ -99,6 +99,7 @@ Common.Gateway = new(function() { ...@@ -99,6 +99,7 @@ Common.Gateway = new(function() {
var _postMessage = function(msg) { var _postMessage = function(msg) {
// TODO: specify explicit origin // TODO: specify explicit origin
if (window.parent && window.JSON) { if (window.parent && window.JSON) {
msg.frameEditorId = window.frameEditorId;
window.parent.postMessage(window.JSON.stringify(msg), "*"); window.parent.postMessage(window.JSON.stringify(msg), "*");
} }
}; };
......
apps/documenteditor/embed/index.html
View file @ f1e58c6a
...@@ -239,6 +239,8 @@ ...@@ -239,6 +239,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/documenteditor/embed/index.html.deploy
View file @ f1e58c6a
...@@ -231,6 +231,8 @@ ...@@ -231,6 +231,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/documenteditor/main/index.html
View file @ f1e58c6a
...@@ -227,6 +227,8 @@ ...@@ -227,6 +227,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/documenteditor/main/index.html.deploy
View file @ f1e58c6a
...@@ -227,6 +227,8 @@ ...@@ -227,6 +227,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/documenteditor/mobile/index.html
View file @ f1e58c6a
...@@ -264,6 +264,8 @@ ...@@ -264,6 +264,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/documenteditor/mobile/index.html.deploy
View file @ f1e58c6a
...@@ -255,6 +255,8 @@ ...@@ -255,6 +255,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/presentationeditor/embed/index.html
View file @ f1e58c6a
...@@ -238,6 +238,8 @@ ...@@ -238,6 +238,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/presentationeditor/embed/index.html.deploy
View file @ f1e58c6a
...@@ -231,6 +231,8 @@ ...@@ -231,6 +231,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/presentationeditor/main/index.html
View file @ f1e58c6a
...@@ -228,6 +228,8 @@ ...@@ -228,6 +228,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/presentationeditor/main/index.html.deploy
View file @ f1e58c6a
...@@ -227,6 +227,8 @@ ...@@ -227,6 +227,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/presentationeditor/mobile/index.html
View file @ f1e58c6a
...@@ -263,6 +263,8 @@ ...@@ -263,6 +263,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/presentationeditor/mobile/index.html.deploy
View file @ f1e58c6a
...@@ -254,6 +254,8 @@ ...@@ -254,6 +254,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/spreadsheeteditor/embed/index.html
View file @ f1e58c6a
...@@ -239,6 +239,8 @@ ...@@ -239,6 +239,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/spreadsheeteditor/embed/index.html.deploy
View file @ f1e58c6a
...@@ -231,6 +231,8 @@ ...@@ -231,6 +231,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/spreadsheeteditor/main/index.html
View file @ f1e58c6a
...@@ -230,6 +230,8 @@ ...@@ -230,6 +230,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/spreadsheeteditor/main/index.html.deploy
View file @ f1e58c6a
...@@ -228,6 +228,8 @@ ...@@ -228,6 +228,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/spreadsheeteditor/mobile/index.html
View file @ f1e58c6a
...@@ -270,6 +270,8 @@ ...@@ -270,6 +270,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
apps/spreadsheeteditor/mobile/index.html.deploy
View file @ f1e58c6a
...@@ -255,6 +255,8 @@ ...@@ -255,6 +255,8 @@
loading = 'Loading...', loading = 'Loading...',
logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null; logo = params["logo"] ? ((params["logo"] !== 'none') ? ('<img src="' + encodeUrlParam(params["logo"]) + '" class="loader-logo" />') : '') : null;
window.frameEditorId = params["frameEditorId"];
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...'; else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...'; else if ( lang == 'fr') loading = 'Chargement en cours...';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7