diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 9eebc135a..f12a5cfe1 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -586,7 +586,7 @@
border: @scaled-one-px-value solid @border-regular-control;
.equation-icon {
- .background-ximage-v2('toolbar/math.png', 1500px, @commonimage: true);
+ .background-ximage-all('toolbar/math.png', 1500px, @commonimage: true);
opacity: @component-normal-icon-opacity;
.theme-dark & {
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 9566d0c48..90bf0416a 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -4157,7 +4157,18 @@ define([
Common.NotificationCenter.trigger('protect:signature', 'visible', this._isDisabled, datavalue);//guid, can edit settings for requested signature
break;
case 3:
- this.api.asc_RemoveSignature(datavalue); //guid
+ var me = this;
+ Common.UI.warning({
+ title: this.notcriticalErrorTitle,
+ msg: this.txtRemoveWarning,
+ buttons: ['ok', 'cancel'],
+ primary: 'ok',
+ callback: function(btn) {
+ if (btn == 'ok') {
+ me.api.asc_RemoveSignature(datavalue);
+ }
+ }
+ });
break;
}
},
@@ -4644,6 +4655,9 @@ define([
textRemComboBox: 'Remove Combo Box',
textRemDropdown: 'Remove Dropdown',
textRemPicture: 'Remove Image',
- textRemField: 'Remove Text Field'
+ textRemField: 'Remove Text Field',
+ txtRemoveWarning: 'Do you want to remove this signature?
It can\'t be undone.',
+ notcriticalErrorTitle: 'Warning'
+
}, DE.Views.DocumentHolder || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 1f3fff994..1d65805c3 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1577,6 +1577,8 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+ "DE.Views.DocumentHolder.txtRemoveWarning": "Do you want to remove this signature?
It can't be undone.",
+ "DE.Views.DocumentHolder.notcriticalErrorTitle": "Warning",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 049e84baf..96de84ff3 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -1575,6 +1575,8 @@
"DE.Views.DocumentHolder.txtUngroup": "Разгруппировать",
"DE.Views.DocumentHolder.updateStyleText": "Обновить стиль %1",
"DE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание",
+ "DE.Views.DocumentHolder.txtRemoveWarning": "Вы хотите удалить эту подпись?
Это нельзя отменить.",
+ "DE.Views.DocumentHolder.notcriticalErrorTitle": "Внимание",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Границы и заливка",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Буквица",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Поля",
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index 23adfc909..e9a8f79c4 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -3499,7 +3499,18 @@ define([
Common.NotificationCenter.trigger('protect:signature', 'visible', this._isDisabled, datavalue);//guid, can edit settings for requested signature
break;
case 3:
- this.api.asc_RemoveSignature(datavalue); //guid
+ var me = this;
+ Common.UI.warning({
+ title: this.notcriticalErrorTitle,
+ msg: this.txtRemoveWarning,
+ buttons: ['ok', 'cancel'],
+ primary: 'ok',
+ callback: function(btn) {
+ if (btn == 'ok') {
+ me.api.asc_RemoveSignature(datavalue);
+ }
+ }
+ });
break;
}
},
@@ -3774,7 +3785,8 @@ define([
txtImportWizard: 'Text Import Wizard',
textPasteSpecial: 'Paste special',
textStopExpand: 'Stop automatically expanding tables',
- textAutoCorrectSettings: 'AutoCorrect options'
+ textAutoCorrectSettings: 'AutoCorrect options',
+ txtRemoveWarning: 'Do you want to remove this signature?
It can\'t be undone.'
}, SSE.Controllers.DocumentHolder || {}));
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 93bd71a70..61caf14f9 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -569,6 +569,7 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard",
"SSE.Controllers.DocumentHolder.txtWidth": "Width",
+ "SSE.Controllers.DocumentHolder.txtRemoveWarning": "Do you want to remove this signature?
It can't be undone.",
"SSE.Controllers.FormulaDialog.sCategoryAll": "All",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database",
diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json
index 534848032..1f79c532e 100644
--- a/apps/spreadsheeteditor/main/locale/ru.json
+++ b/apps/spreadsheeteditor/main/locale/ru.json
@@ -569,6 +569,7 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Отменить авторазвертывание таблицы",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Использовать мастер импорта текста",
"SSE.Controllers.DocumentHolder.txtWidth": "Ширина",
+ "SSE.Controllers.DocumentHolder.txtRemoveWarning": "Вы хотите удалить эту подпись?
Это нельзя отменить.",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Все",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Аналитические",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Базы данных",