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

Merge branch 'hotfix/v6.1.1' into release/v6.2.0

Browse source
This commit is contained in:
Julia Radzhabova 2021-01-19 11:26:24 +03:00
parent 336ac0062d 29b7faed4f
commit 0dd5a8a5de
10 changed files with 11 additions and 7 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>',

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

@ -2098,6 +2098,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/main/index.html.deploy
View file

@ -169,7 +169,7 @@
var re = /chrome\/(\d+)/i.exec(userAgent);
if (!!re && !!re[1] && !(re[1] > 49)) {
setTimeout(function () {
document.getElementsByTagName('body')[0].className += "winxp";
document.getElementsByTagName('html')[0].className += "winxp";
},0);
}
}

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

@ -1339,7 +1339,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

@ -1888,6 +1888,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/main/index.html.deploy
View file

@ -206,7 +206,7 @@
var re = /chrome\/(\d+)/i.exec(userAgent);
if (!!re && !!re[1] && !(re[1] > 49)) {
setTimeout(function () {
document.getElementsByTagName('body')[0].className += "winxp";
document.getElementsByTagName('html')[0].className += "winxp";
},0);
}
}

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

@ -1224,7 +1224,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

@ -1834,6 +1834,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/index.html.deploy
View file

@ -206,7 +206,7 @@
var re = /chrome\/(\d+)/i.exec(userAgent);
if (!!re && !!re[1] && !(re[1] > 49)) {
setTimeout(function () {
document.getElementsByTagName('body')[0].className += "winxp";
document.getElementsByTagName('html')[0].className += "winxp";
},0);
}
}

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

@ -1430,7 +1430,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
});