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

[Mobile] For Bug 54642. Fix macros autostart

Browse source
This commit is contained in:
Julia Radzhabova 2022-05-23 19:16:02 +03:00
parent 7a52d21254
commit ab0d4a4982
10 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/mobile/resources/less/common.less
View file

@ -905,6 +905,11 @@ input[type="number"]::-webkit-inner-spin-button {
} }
} }
.dlg-macros-request {
.dialog-text {
word-break: break-word;
}
}
// Skeleton of document // Skeleton of document
@keyframes flickerAnimation { @keyframes flickerAnimation {

3
apps/documenteditor/mobile/locale/en.json
View file

@ -533,8 +533,7 @@
"warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.", "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
"warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"warnProcessRightsChange": "You don't have permission to edit this file.", "warnProcessRightsChange": "You don't have permission to edit this file.",
"textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?", "textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?"
"textRememberMacros": "Remember my choice for all macros"
}, },
"Settings": { "Settings": {
"advDRMOptions": "Protected File", "advDRMOptions": "Protected File",

3
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -1036,12 +1036,13 @@ class MainController extends Component {
f7.dialog.create({ f7.dialog.create({
title: _t.notcriticalErrorTitle, title: _t.notcriticalErrorTitle,
text: _t.textRequestMacros.replace('%1', url), text: _t.textRequestMacros.replace('%1', url),
cssClass: 'dlg-macros-request',
content: `<div class="checkbox-in-modal"> content: `<div class="checkbox-in-modal">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="checkbox-show-macros" /> <input type="checkbox" name="checkbox-show-macros" />
<i class="icon-checkbox"></i> <i class="icon-checkbox"></i>
</label> </label>
<span class="right-text">${_t.textRememberMacros}</span> <span class="right-text">${_t.textRemember}</span>
</div>`, </div>`,
buttons: [{ buttons: [{
text: _t.textYes, text: _t.textYes,

2
apps/documenteditor/mobile/src/index_dev.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' data: blob:"> <meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob:">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
<meta name="theme-color" content="#007aff"> <meta name="theme-color" content="#007aff">

3
apps/presentationeditor/mobile/locale/en.json
View file

@ -127,8 +127,7 @@
"warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.", "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
"warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"warnProcessRightsChange": "You don't have permission to edit the file.", "warnProcessRightsChange": "You don't have permission to edit the file.",
"textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?", "textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?"
"textRememberMacros": "Remember my choice for all macros"
} }
}, },
"Error": { "Error": {

3
apps/presentationeditor/mobile/src/controller/Main.jsx
View file

@ -847,12 +847,13 @@ class MainController extends Component {
f7.dialog.create({ f7.dialog.create({
title: _t.notcriticalErrorTitle, title: _t.notcriticalErrorTitle,
text: _t.textRequestMacros.replace('%1', url), text: _t.textRequestMacros.replace('%1', url),
cssClass: 'dlg-macros-request',
content: `<div class="checkbox-in-modal"> content: `<div class="checkbox-in-modal">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="checkbox-show-macros" /> <input type="checkbox" name="checkbox-show-macros" />
<i class="icon-checkbox"></i> <i class="icon-checkbox"></i>
</label> </label>
<span class="right-text">${_t.textRememberMacros}</span> <span class="right-text">${_t.textRemember}</span>
</div>`, </div>`,
buttons: [{ buttons: [{
text: _t.textYes, text: _t.textYes,

2
apps/presentationeditor/mobile/src/index_dev.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' data: blob:"> <meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob:">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
<meta name="theme-color" content="#007aff"> <meta name="theme-color" content="#007aff">

3
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -161,8 +161,7 @@
"warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.", "warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact %1 sales team for personal upgrade terms.",
"warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"warnProcessRightsChange": "You don't have permission to edit the file.", "warnProcessRightsChange": "You don't have permission to edit the file.",
"textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?", "textRequestMacros": "A macro makes a request to URL. Do you want to allow the request to the %1?"
"textRememberMacros": "Remember my choice for all macros"
} }
}, },
"Error": { "Error": {

3
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -818,12 +818,13 @@ class MainController extends Component {
f7.dialog.create({ f7.dialog.create({
title: _t.notcriticalErrorTitle, title: _t.notcriticalErrorTitle,
text: _t.textRequestMacros.replace('%1', url), text: _t.textRequestMacros.replace('%1', url),
cssClass: 'dlg-macros-request',
content: `<div class="checkbox-in-modal"> content: `<div class="checkbox-in-modal">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="checkbox-show-macros" /> <input type="checkbox" name="checkbox-show-macros" />
<i class="icon-checkbox"></i> <i class="icon-checkbox"></i>
</label> </label>
<span class="right-text">${_t.textRememberMacros}</span> <span class="right-text">${_t.textRemember}</span>
</div>`, </div>`,
buttons: [{ buttons: [{
text: _t.textYes, text: _t.textYes,

2
apps/spreadsheeteditor/mobile/src/index_dev.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' data: blob:"> <meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: blob:">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
<meta name="theme-color" content="#007aff"> <meta name="theme-color" content="#007aff">