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

[Desktop] Don't show warning when open password-protected offline file

Browse source
This commit is contained in:
Julia Radzhabova 2018-04-28 14:13:52 +03:00
parent 3d6ebf252c
commit ae09b32f56
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,10 +55,11 @@ define([
_.extend(_options, { _.extend(_options, {
closable : false, closable : false,
width : (options.preview) ? 414 : ((options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? 370 : 262),
height : (options.preview) ? 277 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : 187),
header : true,
preview : options.preview, preview : options.preview,
warning : options.warning,
width : (options.preview) ? 414 : ((options.type == Asc.c_oAscAdvancedOptionsID.DRM && options.warning) ? 370 : 262),
height : (options.preview) ? 277 : ((options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 190 : (options.warning ? 187 : 147)),
header : true,
cls : 'open-dlg', cls : 'open-dlg',
contentTemplate : '', contentTemplate : '',
title : (options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? t.txtTitleProtected : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT'), title : (options.type == Asc.c_oAscAdvancedOptionsID.DRM) ? t.txtTitleProtected : t.txtTitle.replace('%1', (options.type == Asc.c_oAscAdvancedOptionsID.CSV) ? 'CSV' : 'TXT'),
@ -70,12 +71,19 @@ define([
'<div class="box" style="height:' + (_options.height - 85) + 'px;">', '<div class="box" style="height:' + (_options.height - 85) + 'px;">',
'<div class="content-panel" >', '<div class="content-panel" >',
'<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>', '<% if (type == Asc.c_oAscAdvancedOptionsID.DRM) { %>',
'<% if (warning) { %>',
'<div>', '<div>',
'<div class="icon img-commonctrl warn"/>', '<div class="icon img-commonctrl warn"/>',
'<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>', '<div style="padding-left: 50px;"><div style="font-size: 12px;">' + t.txtProtected+ '</div>',
'<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>', '<label class="header" style="margin-top: 15px;">' + t.txtPassword + '</label>',
'<div id="id-password-txt" style="width: 240px;"></div></div>', '<div id="id-password-txt" style="width: 240px;"></div></div>',
'</div>', '</div>',
'<% } else { %>',
'<div>',
'<label class="header">' + t.txtPassword + '</label>',
'<div id="id-password-txt"></div>',
'</div>',
'<% } %>',
'<% } else { %>', '<% } else { %>',
'<div style="display: inline-block; margin-bottom:15px;margin-right: 10px;">', '<div style="display: inline-block; margin-bottom:15px;margin-right: 10px;">',
'<label class="header">' + t.txtEncoding + '</label>', '<label class="header">' + t.txtEncoding + '</label>',
@ -120,6 +128,7 @@ define([
this.handler = _options.handler; this.handler = _options.handler;
this.type = _options.type; this.type = _options.type;
this.preview = _options.preview; this.preview = _options.preview;
this.warning = _options.warning || false;
this.closable = _options.closable; this.closable = _options.closable;
this.codepages = _options.codepages; this.codepages = _options.codepages;
this.settings = _options.settings; this.settings = _options.settings;

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

@ -1857,6 +1857,7 @@ define([
me._state.openDlg = new Common.Views.OpenDialog({ me._state.openDlg = new Common.Views.OpenDialog({
closable: me.appOptions.canRequestClose, closable: me.appOptions.canRequestClose,
type: type, type: type,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
validatePwd: !!me._state.isDRM, validatePwd: !!me._state.isDRM,
handler: function (result, value) { handler: function (result, value) {
me.isShowOpenDialog = false; me.isShowOpenDialog = false;

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

@ -1712,6 +1712,7 @@ define([
me._state.openDlg = new Common.Views.OpenDialog({ me._state.openDlg = new Common.Views.OpenDialog({
closable: me.appOptions.canRequestClose, closable: me.appOptions.canRequestClose,
type: type, type: type,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
validatePwd: !!me._state.isDRM, validatePwd: !!me._state.isDRM,
handler: function (result, value) { handler: function (result, value) {
me.isShowOpenDialog = false; me.isShowOpenDialog = false;

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

@ -1537,6 +1537,7 @@ define([
me._state.openDlg = new Common.Views.OpenDialog({ me._state.openDlg = new Common.Views.OpenDialog({
closable: me.appOptions.canRequestClose, closable: me.appOptions.canRequestClose,
type: type, type: type,
warning: !(me.appOptions.isDesktopApp && me.appOptions.isOffline),
validatePwd: !!me._state.isDRM, validatePwd: !!me._state.isDRM,
handler: function (result, value) { handler: function (result, value) {
me.isShowOpenDialog = false; me.isShowOpenDialog = false;