extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-18 04:20:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix navigation issues in file select popup

Browse Source
This commit is contained in:
nathangray
2020-03-25 13:48:04 -06:00
parent 895b1ebee9
commit 22f498d6e2
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/etemplate/et2_widget_vfs.js
View File

@@ -855,7 +855,7 @@ var et2_vfsUpload = /** @class */ (function (_super) {
while (this._children.length > 0) { while (this._children.length > 0) {
var node = this._children[this._children.length - 1]; var node = this._children[this._children.length - 1];
this.removeChild(node); this.removeChild(node);
node.destroy(); node.destroy();
} }
this.progress.empty(); this.progress.empty();
this.list.empty(); this.list.empty();
@@ -918,8 +918,8 @@ var et2_vfsUpload = /** @class */ (function (_super) {
for (var child_index = this._children.length - 1; child_index >= 0; child_index--) { for (var child_index = this._children.length - 1; child_index >= 0; child_index--) {
var child = this._children[child_index]; var child = this._children[child_index];
if (child.options.value.path === file_data.path) { if (child.options.value.path === file_data.path) {
this.removeChild(child); this.removeChild(child);
child.destroy(); child.destroy();
} }
} }
} }
@@ -1144,6 +1144,8 @@ var et2_vfsSelect = /** @class */ (function (_super) {
resizable: false resizable: false
}, et2_widget_dialog_1.et2_dialog._create_parent('api')); }, et2_widget_dialog_1.et2_dialog._create_parent('api'));
this.dialog.template.uniqueId = 'api.vfsSelectUI'; this.dialog.template.uniqueId = 'api.vfsSelectUI';
app.vfsSelectUI.et2 = this.dialog.template.widgetContainer;
app.vfsSelectUI.vfsSelectWidget = this;
// Don't rely only on app_name to fetch et2 object as app_name may not // Don't rely only on app_name to fetch et2 object as app_name may not
// always represent current app of the window, e.g.: mail admin account. // always represent current app of the window, e.g.: mail admin account.
// Try to fetch et2 from its template name. // Try to fetch et2 from its template name.
@@ -1159,10 +1161,8 @@ var et2_vfsSelect = /** @class */ (function (_super) {
// widgets and since we can not have a etemplate_exec_id specifically // widgets and since we can not have a etemplate_exec_id specifically
// for dialog template our best shot is to inherit its parent etemplate_exec_id. // for dialog template our best shot is to inherit its parent etemplate_exec_id.
this.dialog.template.etemplate_exec_id = et2.etemplate_exec_id; this.dialog.template.etemplate_exec_id = et2.etemplate_exec_id;
app.vfsSelectUI.et2 = this.dialog.template.widgetContainer;
// Keep the dialog always at the top // Keep the dialog always at the top
this.dialog.div.parent().css({ "z-index": 100000 }); this.dialog.div.parent().css({ "z-index": 100000 });
app.vfsSelectUI.vfsSelectWidget = this;
this.dialog.div.on('load', function (e) { this.dialog.div.on('load', function (e) {
app.vfsSelectUI.et2_ready(app.vfsSelectUI.et2, 'api.vfsSelectUI'); app.vfsSelectUI.et2_ready(app.vfsSelectUI.et2, 'api.vfsSelectUI');
}); });

4
api/js/etemplate/et2_widget_vfs.ts
View File

@@ -1398,6 +1398,8 @@ export class et2_vfsSelect extends et2_inputWidget
resizable: false resizable: false
}, et2_dialog._create_parent('api')); }, et2_dialog._create_parent('api'));
this.dialog.template.uniqueId = 'api.vfsSelectUI'; this.dialog.template.uniqueId = 'api.vfsSelectUI';
app.vfsSelectUI.et2 = this.dialog.template.widgetContainer;
app.vfsSelectUI.vfsSelectWidget = this;
// Don't rely only on app_name to fetch et2 object as app_name may not // Don't rely only on app_name to fetch et2 object as app_name may not
// always represent current app of the window, e.g.: mail admin account. // always represent current app of the window, e.g.: mail admin account.
@@ -1417,10 +1419,8 @@ export class et2_vfsSelect extends et2_inputWidget
// for dialog template our best shot is to inherit its parent etemplate_exec_id. // for dialog template our best shot is to inherit its parent etemplate_exec_id.
this.dialog.template.etemplate_exec_id = et2.etemplate_exec_id; this.dialog.template.etemplate_exec_id = et2.etemplate_exec_id;
app.vfsSelectUI.et2 = this.dialog.template.widgetContainer;
// Keep the dialog always at the top // Keep the dialog always at the top
this.dialog.div.parent().css({"z-index": 100000}); this.dialog.div.parent().css({"z-index": 100000});
app.vfsSelectUI.vfsSelectWidget = this;
this.dialog.div.on('load', function(e) { this.dialog.div.on('load', function(e) {
app.vfsSelectUI.et2_ready(app.vfsSelectUI.et2, 'api.vfsSelectUI'); app.vfsSelectUI.et2_ready(app.vfsSelectUI.et2, 'api.vfsSelectUI');
}); });

2
api/js/etemplate/vfsSelectUI.js
View File

@@ -42,7 +42,7 @@ var vfsSelectUI = /** @class */ (function (_super) {
function vfsSelectUI() { function vfsSelectUI() {
var _this = var _this =
// call parent // call parent
_super.call(this) || this; _super.call(this, 'vfsSelectUI') || this;
_this.egw.langRequireApp(_this.egw.window, 'filemanager'); _this.egw.langRequireApp(_this.egw.window, 'filemanager');
return _this; return _this;
} }

2
api/js/etemplate/vfsSelectUI.ts
View File

@@ -36,7 +36,7 @@ export class vfsSelectUI extends EgwApp
constructor() constructor()
{ {
// call parent // call parent
super(); super('vfsSelectUI');
this.egw.langRequireApp(this.egw.window, 'filemanager'); this.egw.langRequireApp(this.egw.window, 'filemanager');
} }