extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some popups restricted to just one popup window

Browse Source 
- Admin -> Edit user
- Mail -> View source & View header
This commit is contained in:
nathangray 2020-03-23 09:57:06 -06:00
parent 28fb99ba51
commit 7e1da8d909
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/js/app.js
View File

@ -43,19 +43,19 @@ var AdminApp = /** @class */ (function (_super) {
* @memberOf app.classes.admin * @memberOf app.classes.admin
*/ */
function AdminApp() { function AdminApp() {
var _this = var _this =
// call parent // call parent
_super.call(this, 'admin') || this; _super.call(this, 'admin') || this;
/** /**
* reference to iframe * reference to iframe
* *
* {et2_iframe} * {et2_iframe}
*/ */
_this.iframe = null; _this.iframe = null;
/** /**
* reference to nextmatch * reference to nextmatch
* *
* {et2_extension_nextmatch} * {et2_extension_nextmatch}
*/ */
_this.nm = null; _this.nm = null;
/** /**
@ -771,7 +771,7 @@ var AdminApp = /** @class */ (function (_super) {
params.account_id = _senders[0].id.split('::').pop(); // get last :: separated part params.account_id = _senders[0].id.split('::').pop(); // get last :: separated part
break; break;
} }
this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup); this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup, 'admin');
}; };
/** /**
* Submit statistic * Submit statistic

4
admin/js/app.ts
View File

@ -895,13 +895,13 @@ class AdminApp extends EgwApp
case 'copy': case 'copy':
params.owner = '0'; params.owner = '0';
params.copy = true; params.copy = true;
// Fall through // Fall through
default: default:
params.account_id = _senders[0].id.split('::').pop(); // get last :: separated part params.account_id = _senders[0].id.split('::').pop(); // get last :: separated part
break; break;
} }
this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup); this.egw.open_link(this.egw.link('/index.php', params), 'admin', popup, 'admin');
} }
/** /**

2
mail/js/app.js
View File

@ -2616,7 +2616,7 @@ app.classes.mail = AppJS.extend(
*/ */
mail_displayHeaderLines: function(_url) { mail_displayHeaderLines: function(_url) {
// only used by right clickaction // only used by right clickaction
egw_openWindowCentered(_url,'mail_display_headerLines','870','600',window.outerWidth/2,window.outerHeight/2); egw.openPopup(_url, '870', '600', null, 'mail');
}, },
/** /**