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

Merge pull request #1104 from ONLYOFFICE/feature/bug-fixes

Browse source 
Feature/bug fixes
This commit is contained in:
maxkadushkin 2021-08-20 17:27:25 +03:00 committed by GitHub
parent 43fee71a25 2a0ae0db20
commit 2d08d12cd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,6 +48,11 @@
display: flex;
justify-content: center;
}
&-inner {
background: var(--f7-navbar-bg-color);
background-image: var(--f7-navbar-bg-image, var(--f7-bars-bg-image));
background-color: var(--f7-navbar-bg-color, var(--f7-bars-bg-color));
}
}
.page.page-with-subnavbar.page-with-logo {

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

@ -335,7 +335,8 @@
"txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?",
"txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
"txtSorting": "Sorting",
"txtSortSelected": "Sort selected"
"txtSortSelected": "Sort selected",
"textSelectedRange": "Selected Range"
},
"Edit": {
"notcriticalErrorTitle": "Warning",

5
apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
View file

@ -87,7 +87,10 @@ class AddLinkController extends Component {
display = args.sheet + '!' + args.url;
}
link.asc_setText(args.text == null ? null : !!args.text ? args.text : display);
if(this.displayText !== 'locked') {
link.asc_setText(args.text == null ? null : !!args.text ? args.text : display);
}
link.asc_setTooltip(args.tooltip);
api.asc_insertHyperlink(link);

3
apps/spreadsheeteditor/mobile/src/view/add/AddLink.jsx
View file

@ -61,6 +61,7 @@ const AddLinkView = props => {
let displayText = props.displayText;
const displayDisabled = displayText === 'locked';
displayText = displayDisabled ? _t.textSelectedRange : displayText;
const [stateDisplayText, setDisplayText] = useState(displayText);
const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [screenTip, setScreenTip] = useState('');
@ -89,7 +90,7 @@ const AddLinkView = props => {
value={link}
onChange={(event) => {
setLink(event.target.value);
if((!stateDisplayText || stateDisplayText === link) && stateAutoUpdate) setDisplayText(event.target.value);
if((!stateDisplayText || stateDisplayText === link) && stateAutoUpdate && !displayDisabled) setDisplayText(event.target.value);
}}
className={isIos ? 'list-input-right' : ''}
/>