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

[SSE mobile] Fix Bug 52077

Browse source
This commit is contained in:
SergeyEzhin 2021-08-19 21:12:31 +03:00
parent d9622b84eb
commit bd326bcdfa
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -334,7 +334,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?", "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\"", "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"",
"txtSorting": "Sorting", "txtSorting": "Sorting",
"txtSortSelected": "Sort selected" "txtSortSelected": "Sort selected",
"textSelectedRange": "Selected Range"
}, },
"Edit": { "Edit": {
"notcriticalErrorTitle": "Warning", "notcriticalErrorTitle": "Warning",

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

@ -87,7 +87,10 @@ class AddLinkController extends Component {
display = args.sheet + '!' + args.url; display = args.sheet + '!' + args.url;
} }
if(this.displayText !== 'locked') {
link.asc_setText(args.text == null ? null : !!args.text ? args.text : display); link.asc_setText(args.text == null ? null : !!args.text ? args.text : display);
}
link.asc_setTooltip(args.tooltip); link.asc_setTooltip(args.tooltip);
api.asc_insertHyperlink(link); 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; let displayText = props.displayText;
const displayDisabled = displayText === 'locked'; const displayDisabled = displayText === 'locked';
displayText = displayDisabled ? _t.textSelectedRange : displayText; displayText = displayDisabled ? _t.textSelectedRange : displayText;
const [stateDisplayText, setDisplayText] = useState(displayText); const [stateDisplayText, setDisplayText] = useState(displayText);
const [stateAutoUpdate, setAutoUpdate] = useState(true); const [stateAutoUpdate, setAutoUpdate] = useState(true);
const [screenTip, setScreenTip] = useState(''); const [screenTip, setScreenTip] = useState('');
@ -89,7 +90,7 @@ const AddLinkView = props => {
value={link} value={link}
onChange={(event) => { onChange={(event) => {
setLink(event.target.value); 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' : ''} className={isIos ? 'list-input-right' : ''}
/> />