pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 12:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2969 from ONLYOFFICE/fix/bugfix

Browse Source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova
2024-04-27 12:52:48 +03:00
committed by GitHub
parent d22bbd5d0b b6ae5df29f
commit bb5a881d87
9 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/common/main/lib/component/Button.js
View File

@ -763,8 +763,14 @@ define([
btnIconEl = $(this.el).find('i.icon');
if (opts && (opts.curr || opts.next) && btnIconEl) {
var svgIcon = $(this.el).find('.icon use.zoom-int');
!!opts.curr && (btnIconEl.removeClass(opts.curr));
!!opts.next && !btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next));
if (opts.curr) {
btnIconEl.removeClass(opts.curr);
me.iconCls = me.iconCls.replace(opts.curr, '').trim();
}
if (opts.next) {
!btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next));
(me.iconCls.indexOf(opts.next)<0) && (me.iconCls += ' ' + opts.next);
}
svgIcon.length && !!opts.next && svgIcon.attr('href', '#' + opts.next);
if ( !!me.options.signals ) {

1
apps/pdfeditor/main/app/controller/DocumentHolder.js
View File

@ -345,6 +345,7 @@ define([
view.mnuDeletePage.on('click', _.bind(me.onDeletePage, me));
view.mnuRotatePageRight.on('click', _.bind(me.onRotatePage, me, 90));
view.mnuRotatePageLeft.on('click', _.bind(me.onRotatePage, me, 270));
view.menuImgReplace.menu.on('item:click', _.bind(me.onImgReplace, me));
}
},

4
apps/pdfeditor/main/app/view/FileMenuPanels.js
View File

@ -118,7 +118,7 @@ define([
this.$el.html(this.template({rows:this.formats,
fileType: (this.fileType || 'docx').toLowerCase(),
header: /*this.textDownloadAs*/ Common.Locale.get('btnDownloadCaption', {name:'DE.Views.FileMenu', default:this.textDownloadAs})}));
header: /*this.textDownloadAs*/ Common.Locale.get('btnDownloadCaption', {name:'PDFE.Views.FileMenu', default:this.textDownloadAs})}));
$('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
@ -236,7 +236,7 @@ define([
this.$el.html(this.template({rows:this.formats,
fileType: (this.fileType || 'docx').toLowerCase(),
header: /*this.textSaveCopyAs*/ Common.Locale.get('btnSaveCopyAsCaption', {name:'DE.Views.FileMenu', default:this.textSaveCopyAs})}));
header: /*this.textSaveCopyAs*/ Common.Locale.get('btnSaveCopyAsCaption', {name:'PDFE.Views.FileMenu', default:this.textSaveCopyAs})}));
$('.btn-doc-format',this.el).on('click', _.bind(this.onFormatClick,this));
if (_.isUndefined(this.scroller)) {

17
apps/pdfeditor/main/locale/en.json
View File

@ -142,6 +142,8 @@
"Common.Views.About.txtPoweredBy": "Powered by",
"Common.Views.About.txtTel": "tel.: ",
"Common.Views.About.txtVersion": "Version ",
"Common.Views.Chat.textChat": "Chat",
"Common.Views.Chat.textClosePanel": "Close chat",
"Common.Views.Chat.textSend": "Send",
"Common.Views.Comments.mniAuthorAsc": "Author A to Z",
"Common.Views.Comments.mniAuthorDesc": "Author Z to A",
@ -1426,6 +1428,7 @@
"PDFE.Views.InsTab.tipInsertTextArt": "Insert Text Art",
"PDFE.Views.InsTab.tipInsertVerticalText": "Insert vertical text box",
"PDFE.Views.InsTab.tipPageNum": "Insert page number",
"PDFE.Views.InsTab.mniCustomTable": "Insert custom table",
"PDFE.Views.LeftMenu.tipAbout": "About",
"PDFE.Views.LeftMenu.tipChat": "Chat",
"PDFE.Views.LeftMenu.tipComments": "Comments",
@ -1911,6 +1914,14 @@
"PDFE.Views.Toolbar.txtObjectsAlign": "Align selected objects",
"PDFE.Views.Toolbar.txtPageAlign": "Align to Page",
"PDFE.Views.Toolbar.txtUngroup": "Ungroup",
"PDFE.Views.Toolbar.textEditMode": "Edit PDF",
"PDFE.Views.Toolbar.tipEditMode": "Add or edit text, shapes, images etc.",
"PDFE.Views.Toolbar.capBtnRecognize": "Recognize Page",
"PDFE.Views.Toolbar.tipRecognize": "Recognize page",
"PDFE.Views.Toolbar.capBtnTextComment": "Text Comment",
"PDFE.Views.Toolbar.capBtnTextCallout": "Text Callout",
"PDFE.Views.Toolbar.tipInsertTextComment": "Insert text comment",
"PDFE.Views.Toolbar.tipInsertTextCallout": "Insert text callout",
"PDFE.Views.ViewTab.textAlwaysShowToolbar": "Always Show Toolbar",
"PDFE.Views.ViewTab.textDarkDocument": "Dark Document",
"PDFE.Views.ViewTab.textFitToPage": "Fit To Page",
@ -1926,9 +1937,5 @@
"PDFE.Views.ViewTab.tipFitToPage": "Fit to page",
"PDFE.Views.ViewTab.tipFitToWidth": "Fit to width",
"PDFE.Views.ViewTab.tipHeadings": "Headings",
"PDFE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
"PDFE.Views.ViewTab.textEditMode": "Edit PDF",
"PDFE.Views.ViewTab.tipEditMode": "Add or edit text, shapes, images etc.",
"PDFE.Views.ViewTab.capBtnRecognize": "Recognize Page",
"PDFE.Views.ViewTab.tipRecognize": "Recognize page"
"PDFE.Views.ViewTab.tipInterfaceTheme": "Interface theme"
}

3
apps/pdfeditor/main/locale/ru.json
View File

@ -142,6 +142,8 @@
"Common.Views.About.txtPoweredBy": "Разработано",
"Common.Views.About.txtTel": "тел.: ",
"Common.Views.About.txtVersion": "Версия",
"Common.Views.Chat.textChat": "Чат",
"Common.Views.Chat.textClosePanel": "Закрыть чат",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.mniAuthorAsc": "По автору от А до Я",
"Common.Views.Comments.mniAuthorDesc": "По автору от Я до А",
@ -1403,6 +1405,7 @@
"PDFE.Views.InsTab.tipInsertTextArt": "Вставить объект Text Art",
"PDFE.Views.InsTab.tipInsertVerticalText": "Вставить вертикальную надпись",
"PDFE.Views.InsTab.tipPageNum": "Вставить номер страницы",
"PDFE.Views.InsTab.mniCustomTable": "Пользовательская таблица",
"PDFE.Views.LeftMenu.tipAbout": "О программе",
"PDFE.Views.LeftMenu.tipChat": "Чат",
"PDFE.Views.LeftMenu.tipComments": "Комментарии",

2
apps/presentationeditor/main/locale/en.json
View File

@ -554,6 +554,8 @@
"Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?",
"Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?",
"Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?",
"Common.Views.Chat.textChat": "Chat",
"Common.Views.Chat.textClosePanel": "Close chat",
"Common.Views.Chat.textSend": "Send",
"Common.Views.Comments.mniAuthorAsc": "Author A to Z",
"Common.Views.Comments.mniAuthorDesc": "Author Z to A",

2
apps/presentationeditor/main/locale/ru.json
View File

@ -554,6 +554,8 @@
"Common.Views.AutoCorrectDialog.warnReplace": "Элемент автозамены для %1 уже существует. Вы хотите заменить его?",
"Common.Views.AutoCorrectDialog.warnReset": "Все добавленные вами автозамены будут удалены, а для измененных будут восстановлены исходные значения. Вы хотите продолжить?",
"Common.Views.AutoCorrectDialog.warnRestore": "Элемент автозамены для %1 будет сброшен на исходное значение. Вы хотите продолжить?",
"Common.Views.Chat.textChat": "Чат",
"Common.Views.Chat.textClosePanel": "Закрыть чат",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.mniAuthorAsc": "По автору от А до Я",
"Common.Views.Comments.mniAuthorDesc": "По автору от Я до А",

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

@ -394,6 +394,8 @@
"Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?",
"Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?",
"Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?",
"Common.Views.Chat.textChat": "Chat",
"Common.Views.Chat.textClosePanel": "Close chat",
"Common.Views.Chat.textSend": "Send",
"Common.Views.Comments.mniAuthorAsc": "Author A to Z",
"Common.Views.Comments.mniAuthorDesc": "Author Z to A",

2
apps/spreadsheeteditor/main/locale/ru.json
View File

@ -394,6 +394,8 @@
"Common.Views.AutoCorrectDialog.warnReplace": "Элемент автозамены для %1 уже существует. Вы хотите заменить его?",
"Common.Views.AutoCorrectDialog.warnReset": "Все добавленные вами автозамены будут удалены, а для измененных будут восстановлены исходные значения. Вы хотите продолжить?",
"Common.Views.AutoCorrectDialog.warnRestore": "Элемент автозамены для %1 будет сброшен на исходное значение. Вы хотите продолжить?",
"Common.Views.Chat.textChat": "Чат",
"Common.Views.Chat.textClosePanel": "Закрыть чат",
"Common.Views.Chat.textSend": "Отправить",
"Common.Views.Comments.mniAuthorAsc": "По автору от А до Я",
"Common.Views.Comments.mniAuthorDesc": "По автору от Я до А",