extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Mailvelope in infolog.edit

Browse Source
This commit is contained in:
ralf 2022-09-08 11:27:02 +02:00
parent a10938ab2b
commit 9f4fb1343d
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/js/jsapi/egw_app.ts
View File

@ -153,10 +153,10 @@ export abstract class EgwApp
* Initialization and setup goes here, but the etemplate2 object * Initialization and setup goes here, but the etemplate2 object
* is not yet ready. * is not yet ready.
*/ */
constructor(appname : string) constructor(appname : string, _wnd? : Window)
{ {
this.appname = appname; this.appname = appname;
this.egw = egw(this.appname, window); this.egw = egw(this.appname, _wnd || window);
// Initialize sidebox for non-popups. // Initialize sidebox for non-popups.
// ID set server side // ID set server side
@ -1961,14 +1961,15 @@ export abstract class EgwApp
*/ */
mailvelopeOpenKeyring() mailvelopeOpenKeyring()
{ {
var self = this; let self = this;
let mailvelope = this.egw.window.mailvelope; // use Mailvelope of correct window
return new Promise(function(_resolve, _reject) return new Promise(function(_resolve, _reject)
{ {
if (self.mailvelope_keyring) _resolve(self.mailvelope_keyring); if (self.mailvelope_keyring) _resolve(self.mailvelope_keyring);
var resolve = _resolve; let resolve = _resolve;
var reject = _reject; let reject = _reject;
mailvelope.getKeyring('egroupware').then(function(_keyring) mailvelope.getKeyring('egroupware').then(function(_keyring)
{ {
@ -2015,7 +2016,7 @@ export abstract class EgwApp
// if yes, hide settings dialog // if yes, hide settings dialog
jQuery(mvelo_settings_selector).each(function(index, item : any) jQuery(mvelo_settings_selector).each(function(index, item : any)
{ {
if (!item.src.match(/keyBackupDialog.html/,'ig')) item.remove(); if (!item.src.match(/keyBackupDialog.html/,'ig')) item.remove();
}); });
jQuery('button#mailvelope_close_settings').remove(); jQuery('button#mailvelope_close_settings').remove();

2
api/js/jsapi/egw_json.js
View File

@ -584,7 +584,7 @@ egw.extend('json', egw.MODULE_WND_LOCAL, function(_app, _wnd)
// check if we need a not yet instantiated app.js object --> instantiate it now // check if we need a not yet instantiated app.js object --> instantiate it now
else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'function') else if (i == 1 && parts[0] == 'app' && typeof app.classes[parts[1]] === 'function')
{ {
parent = parent[parts[1]] = new app.classes[parts[1]](); parent = parent[parts[1]] = new app.classes[parts[1]](parts[1], _wnd);
} }
} }
if (typeof parent[func] == 'function') if (typeof parent[func] == 'function')

8
infolog/js/app.ts
View File

@ -110,7 +110,7 @@ class InfologApp extends EgwApp
if (this.et2.getArrayMgr('content').data.info_des && if (this.et2.getArrayMgr('content').data.info_des &&
this.et2.getArrayMgr('content').data.info_des.indexOf(this.begin_pgp_message) != -1) this.et2.getArrayMgr('content').data.info_des.indexOf(this.begin_pgp_message) != -1)
{ {
this.mailvelopeAvailable(jQuery.proxy(function () { this.mailvelopeAvailable(() => {
this.toggleEncrypt(); this.toggleEncrypt();
// Decrypt history on hover // Decrypt history on hover
@ -119,7 +119,7 @@ class InfologApp extends EgwApp
jQuery(history.getDOMNode(history)) jQuery(history.getDOMNode(history))
.tooltip('option','position',{my:'top left', at: 'top left', of: history.getDOMNode(history)}); .tooltip('option','position',{my:'top left', at: 'top left', of: history.getDOMNode(history)});
}, this)); });
// This disables the diff in history // This disables the diff in history
var history = this.et2.getArrayMgr('content').getEntry('history'); var history = this.et2.getArrayMgr('content').getEntry('history');
history['status-widgets'].De = 'description'; history['status-widgets'].De = 'description';
@ -761,10 +761,10 @@ class InfologApp extends EgwApp
} }
if(!this.egw.user('apps').stylite) if(!this.egw.user('apps').stylite)
{ {
this.egw.message(this.egw.lang('InfoLog encryption requires EPL Subscription')+': <a href="http://www.egroupware.org/EPL">www.egroupware.org/EPL</a>'); this.egw.message(this.egw.lang('InfoLog encryption requires EPL Subscription')+': <a href="https://www.egroupware.org/EPL">www.egroupware.org/EPL</a>');
return; return;
} }
egw.applyFunc('app.stylite.toggleEncrypt', [_event, _widget, _node]); this.egw.applyFunc('app.stylite.toggleEncrypt', [_event, _widget, _node]);
} }