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

Merge branch hotfix/v6.1.1 into master

Browse source
This commit is contained in:
papacarlo 2021-01-28 08:26:57 +00:00
parent a8237f4538 29b7faed4f
commit 5261f6f962
17 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/view/OpenDialog.js
View file

@ -68,6 +68,7 @@ define([
preview : options.preview,
warning : options.warning,
codepages : options.codepages,
warningMsg : options.warningMsg,
width : width,
height : height,
header : true,
@ -85,7 +86,7 @@ define([
'<% if (warning) { %>',
'<div>',
'<div class="icon img-commonctrl warn"></div>',
'<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
'<div style="padding-left: 50px;"><div style="font-size: 12px;">' + (typeof _options.warningMsg=='string' ? _options.warningMsg : t.txtProtected) + '</div>',
'<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="width: 290px;"></div></div>',
'</div>',

10
apps/common/mobile/lib/controller/Collaboration.js
View file

@ -851,7 +851,7 @@ define([
}
} else {
$('.comment-resolve, .comment-menu, .add-reply, .reply-menu').removeClass('disabled');
if (this.showComments.length > 1) {
if (this.showComments && this.showComments.length > 1) {
$('.prev-comment, .next-comment').removeClass('disabled');
}
}
@ -863,7 +863,7 @@ define([
$('.comment-menu').single('click', _.buffered(this.initMenuComments, 100, this));
$('.reply-menu').single('click', _.buffered(this.initReplyMenu, 100, this));
$('.comment-resolve').single('click', _.bind(this.onClickResolveComment, this, false));
if (this.showComments.length === 1) {
if (this.showComments && this.showComments.length === 1) {
$('.prev-comment, .next-comment').addClass('disabled');
}
},
@ -921,7 +921,7 @@ define([
$('.reply-menu').single('click', _.buffered(me.initReplyMenu, 100, me));
$('.comment-resolve').single('click', _.bind(me.onClickResolveComment, me, false));
if (me.showComments.length === 1) {
if (me.showComments && me.showComments.length === 1) {
$('.prev-comment, .next-comment').addClass('disabled');
}
@ -998,7 +998,7 @@ define([
},
onViewPrevComment: function() {
if (this.showComments.length > 0) {
if (this.showComments && this.showComments.length > 0) {
if (this.indexCurrentComment - 1 < 0) {
this.indexCurrentComment = this.showComments.length - 1;
} else {
@ -1015,7 +1015,7 @@ define([
},
onViewNextComment: function() {
if (this.showComments.length > 0) {
if (this.showComments && this.showComments.length > 0) {
if (this.indexCurrentComment + 1 === this.showComments.length) {
this.indexCurrentComment = 0;
} else {

1
apps/documenteditor/main/app/controller/Main.js
View file

@ -2088,6 +2088,7 @@ define([
closeFile: me.appOptions.canRequestClose,
type: Common.Utils.importTextType.DRM,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
warningMsg: advOptions,
validatePwd: !!me._state.isDRM,
handler: function (result, value) {
me.isShowOpenDialog = false;

2
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -1329,7 +1329,7 @@ define([
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
text: (typeof advOptions=='string' ? advOptions : me.txtProtected),
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: buttons
});

1
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1884,6 +1884,7 @@ define([
closeFile: me.appOptions.canRequestClose,
type: Common.Utils.importTextType.DRM,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
warningMsg: advOptions,
validatePwd: !!me._state.isDRM,
handler: function (result, value) {
me.isShowOpenDialog = false;

2
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -1218,7 +1218,7 @@ define([
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
text: (typeof advOptions=='string' ? advOptions : me.txtProtected),
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: buttons
});

1
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1826,6 +1826,7 @@ define([
closeFile: me.appOptions.canRequestClose,
type: Common.Utils.importTextType.DRM,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
warningMsg: advOptions,
validatePwd: !!me._state.isDRM,
handler: function (result, value) {
me.isShowOpenDialog = false;

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

@ -1223,7 +1223,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "Die Operation, die Sie durchführen möchten, kann viel Zeit in Anspruch nehmen. <br> Soll sie fortgesetzt werden?",
"SSE.Controllers.Toolbar.warnMergeLostData": "Nur die Daten aus der oberen linken Zelle bleiben nach der Vereinigung.<br>Möchten Sie wirklich fortsetzen?",
"SSE.Controllers.Viewport.textFreezePanes": "Fenster fixieren",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Schatten für fixierte Bereiche anzeigen",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Schatten für fixierte Bereiche anzeigen",
"SSE.Controllers.Viewport.textHideFBar": "Formelleiste verbergen",
"SSE.Controllers.Viewport.textHideGridlines": "Gitternetzlinien verbergen",
"SSE.Controllers.Viewport.textHideHeadings": "Überschriften verbergen",

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

@ -1224,7 +1224,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.<br>Are you sure you want to continue?",
"SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell. <br>Are you sure you want to continue?",
"SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Show Frozen Panes Shadow",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Show Frozen Panes Shadow",
"SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar",
"SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines",
"SSE.Controllers.Viewport.textHideHeadings": "Hide Headings",

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

@ -1223,7 +1223,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "La operación que está a punto de realizar podría tomar mucho tiempo para completar.<br>¿Está seguro que desea continuar?",
"SSE.Controllers.Toolbar.warnMergeLostData": "En la celda unida permanecerán sólo los datos de la celda de la esquina superior izquierda.<br>Está seguro de que quiere continuar?",
"SSE.Controllers.Viewport.textFreezePanes": "Inmovilizar paneles",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Mostrar la sombra de paneles inmovilizados",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Mostrar la sombra de paneles inmovilizados",
"SSE.Controllers.Viewport.textHideFBar": "Ocultar barra de fórmulas",
"SSE.Controllers.Viewport.textHideGridlines": "Ocultar cuadrícula",
"SSE.Controllers.Viewport.textHideHeadings": "Ocultar títulos",

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

@ -1223,7 +1223,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "L'opération que vous êtes sur le point d'effectuer peut prendre beaucoup de temps.<br>Êtes-vous sûr de vouloir continuer ?",
"SSE.Controllers.Toolbar.warnMergeLostData": "Seulement les données de la cellule supérieure gauche seront conservées dans la cellule fusionnée.<br>Êtes-vous sûr de vouloir continuer ?",
"SSE.Controllers.Viewport.textFreezePanes": "Verrouiller les volets",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Afficher les ombres des volets verrouillés",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Afficher les ombres des volets verrouillés",
"SSE.Controllers.Viewport.textHideFBar": "Masquer la barre de formule",
"SSE.Controllers.Viewport.textHideGridlines": "Masquer le quadrillage",
"SSE.Controllers.Viewport.textHideHeadings": "Masquer les en-têtes",

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

@ -1223,7 +1223,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "実行しようとしている操作は、完了するまでにかなり時間がかかる可能性があります。<br>続行しますか？",
"SSE.Controllers.Toolbar.warnMergeLostData": "マージされたセルに左上のセルからのデータのみが残ります。<br>続行してもよろしいです？",
"SSE.Controllers.Viewport.textFreezePanes": "ウィンドウ枠の固定",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "固定されたウィンドウ枠の影を表示する",
"SSE.Controllers.Viewport.textFreezePanesShadow": "固定されたウィンドウ枠の影を表示する",
"SSE.Controllers.Viewport.textHideFBar": "数式バーを表示しない",
"SSE.Controllers.Viewport.textHideGridlines": "枠線を非表示にする",
"SSE.Controllers.Viewport.textHideHeadings": "見出しを表示しない",

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

@ -1221,7 +1221,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "De bewerking die u gaat uitvoeren, kan nogal veel tijd in beslag nemen.<br>Wilt u doorgaan?",
"SSE.Controllers.Toolbar.warnMergeLostData": "Alleen de gegevens in de cel linksboven blijven behouden in de samengevoegde cel.<br>Wilt u doorgaan?",
"SSE.Controllers.Viewport.textFreezePanes": "Deelvensters blokkeren",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Schaduw van geblokkeerde deelvensters weergeven",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Schaduw van geblokkeerde deelvensters weergeven",
"SSE.Controllers.Viewport.textHideFBar": "Formulebalk verbergen",
"SSE.Controllers.Viewport.textHideGridlines": "Rasterlijnen verbergen",
"SSE.Controllers.Viewport.textHideHeadings": "Koppen verbergen",

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

@ -1223,7 +1223,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "A operação que você está prestes a realizar pode levar muito tempo para concluir.<br>Você tem certeza de que deseja continuar?",
"SSE.Controllers.Toolbar.warnMergeLostData": "Apenas os dados da célula superior esquerda permanecerá na célula mesclada.<br>Você tem certeza de que deseja continuar? ",
"SSE.Controllers.Viewport.textFreezePanes": "Congelar painéis",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Mostrar sombra congelada dos painéis",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Mostrar sombra congelada dos painéis",
"SSE.Controllers.Viewport.textHideFBar": "Ocultar barra de fórmulas",
"SSE.Controllers.Viewport.textHideGridlines": "Ocultar linhas de grade",
"SSE.Controllers.Viewport.textHideHeadings": "Ocultar títulos",

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

@ -1224,7 +1224,7 @@
"SSE.Controllers.Toolbar.warnLongOperation": "Для завершения операции, которую вы собираетесь выполнить, может потребоваться довольно много времени.<br>Вы действительно хотите продолжить?",
"SSE.Controllers.Toolbar.warnMergeLostData": "В объединенной ячейке останутся только данные из левой верхней ячейки.<br>Вы действительно хотите продолжить?",
"SSE.Controllers.Viewport.textFreezePanes": "Закрепить области",
"SSE.Controllers.Viewport.textFreezePanesShadow:": "Показывать тень для закрепленных областей",
"SSE.Controllers.Viewport.textFreezePanesShadow": "Показывать тень для закрепленных областей",
"SSE.Controllers.Viewport.textHideFBar": "Скрыть строку формул",
"SSE.Controllers.Viewport.textHideGridlines": "Скрыть линии сетки",
"SSE.Controllers.Viewport.textHideHeadings": "Скрыть заголовки",

9
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -237,7 +237,12 @@ define([
break;
case 'viewcomment':
me.view.hideMenu();
SSE.getController('Common.Controllers.Collaboration').showCommentModal();
var cellinfo = this.api.asc_getCellInfo(),
comments = cellinfo.asc_getComments();
if (comments.length) {
SSE.getController('Common.Controllers.Collaboration').apiShowComments(comments[0].asc_getId());
SSE.getController('Common.Controllers.Collaboration').showCommentModal();
}
break;
case 'addcomment':
me.view.hideMenu();
@ -248,7 +253,7 @@ define([
if ('showActionSheet' == event && _actionSheets.length > 0) {
_.delay(function () {
_.each(_actionSheets, function (action) {
action.text = action.caption
action.text = action.caption;
action.onClick = function () {
me.onContextMenuClick(null, action.event)
}

2
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -1425,7 +1425,7 @@ define([
me._state.openDlg = uiApp.modal({
title: me.advDRMOptions,
text: me.txtProtected,
text: (typeof advOptions=='string' ? advOptions : me.txtProtected),
afterText: '<div class="input-field"><input type="password" name="modal-password" placeholder="' + me.advDRMPassword + '" class="modal-text-input"></div>',
buttons: buttons
});