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

Merge pull request #575 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-11-19 14:11:01 +03:00 committed by GitHub
parent 8cc3480f83 565605643d
commit 34f323a672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/CaptionDialog.js
View file

@ -434,7 +434,7 @@ define([
event.preventDefault(); event.preventDefault();
} }
} else if (key === 'Delete') { } else if (key === 'Delete') {
if (event.target.selectionStart < me.positionCaption - 1) { if (event.target.selectionStart < me.positionCaption) {
event.preventDefault(); event.preventDefault();
} }
} else if (key !== 'End') { } else if (key !== 'End') {

2
apps/documenteditor/main/locale/en.json
View file

@ -1815,7 +1815,7 @@
"DE.Views.Links.capBtnInsLink": "Hyperlink", "DE.Views.Links.capBtnInsLink": "Hyperlink",
"DE.Views.Links.confirmDeleteFootnotes": "Do you want to delete all footnotes?", "DE.Views.Links.confirmDeleteFootnotes": "Do you want to delete all footnotes?",
"DE.Views.Links.mniConvertNote": "Convert All Notes", "DE.Views.Links.mniConvertNote": "Convert All Notes",
"DE.Views.Links.mniDelFootnote": "Delete All Footnotes", "DE.Views.Links.mniDelFootnote": "Delete All Notes",
"DE.Views.Links.mniInsEndnote": "Insert Endnote", "DE.Views.Links.mniInsEndnote": "Insert Endnote",
"DE.Views.Links.mniInsFootnote": "Insert Footnote", "DE.Views.Links.mniInsFootnote": "Insert Footnote",
"DE.Views.Links.mniNoteSettings": "Notes Settings", "DE.Views.Links.mniNoteSettings": "Notes Settings",

4
apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js
View file

@ -277,7 +277,7 @@ define([
error: this.textRenameError, error: this.textRenameError,
value: rec.get('name'), value: rec.get('name'),
validation: function(value) { validation: function(value) {
return value.length<=128 ? true : me.textLongName; return value.length<128 ? true : me.textLongName;
}, },
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
@ -362,7 +362,7 @@ define([
textRenameLabel: 'Rename view', textRenameLabel: 'Rename view',
textRenameError: 'View name must not be empty.', textRenameError: 'View name must not be empty.',
warnDeleteView: "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?", warnDeleteView: "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?",
textLongName: 'View name is limited to 128 characters.' textLongName: 'Enter a name that is less than 128 characters.'
}, SSE.Views.ViewManagerDlg || {})); }, SSE.Views.ViewManagerDlg || {}));
}); });

2
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2953,7 +2953,7 @@
"SSE.Views.ViewManagerDlg.tipIsLocked": "This element is being edited by another user.", "SSE.Views.ViewManagerDlg.tipIsLocked": "This element is being edited by another user.",
"SSE.Views.ViewManagerDlg.txtTitle": "Sheet View Manager", "SSE.Views.ViewManagerDlg.txtTitle": "Sheet View Manager",
"SSE.Views.ViewManagerDlg.warnDeleteView": "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?", "SSE.Views.ViewManagerDlg.warnDeleteView": "You are trying to delete the currently enabled view '%1'.<br>Close this view and delete it?",
"SSE.Views.ViewManagerDlg.textLongName": "View name is limited to 128 characters.", "SSE.Views.ViewManagerDlg.textLongName": "Enter a name that is less than 128 characters.",
"SSE.Views.ViewTab.capBtnFreeze": "Freeze Panes", "SSE.Views.ViewTab.capBtnFreeze": "Freeze Panes",
"SSE.Views.ViewTab.capBtnSheetView": "Sheet View", "SSE.Views.ViewTab.capBtnSheetView": "Sheet View",
"SSE.Views.ViewTab.textClose": "Close", "SSE.Views.ViewTab.textClose": "Close",