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

* Etemplate: Fix historylog did not render until you resize the window

Browse Source
This commit is contained in:
nathangray 2020-09-11 13:11:52 -06:00
parent edd6b990fa
commit db20617d0f
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/js/etemplate/et2_widget_historylog.js
View File

@ -167,13 +167,12 @@ var et2_historylog = /** @class */ (function (_super) {
jQuery(this.dataview.getHeaderContainerNode(i)).text(et2_historylog.columns[i].caption); jQuery(this.dataview.getHeaderContainerNode(i)).text(et2_historylog.columns[i].caption);
} }
// Register a resize callback // Register a resize callback
var self = this;
jQuery(window).on('resize.' + this.options.value.app + this.options.value.id, function () { jQuery(window).on('resize.' + this.options.value.app + this.options.value.id, function () {
if (self && typeof self.dynheight != 'undefined') if (this && typeof this.dynheight != 'undefined')
self.dynheight.update(function (_w, _h) { this.dynheight.update(function (_w, _h) {
self.dataview.resize(_w, _h); this.dataview.resize(_w, _h);
}); }.bind(this));
}); }.bind(this));
}; };
/** /**
* Destroys all * Destroys all
@ -389,11 +388,6 @@ var et2_historylog = /** @class */ (function (_super) {
// Pass the fetch call to the API // Pass the fetch call to the API
this.egw().dataFetch(this.getInstanceManager().etemplate_exec_id, _queriedRange, this._filters, this.id, function (_response) { this.egw().dataFetch(this.getInstanceManager().etemplate_exec_id, _queriedRange, this._filters, this.id, function (_response) {
_callback.call(this, _response); _callback.call(this, _response);
// This seems to prevent unwanted scrollbars
historylog.div.hide();
window.setTimeout(function () {
historylog.div.show();
}.bind(historylog), 100);
}, _context, []); }, _context, []);
}; };
// Needed by interface // Needed by interface

14
api/js/etemplate/et2_widget_historylog.ts
View File

@ -252,13 +252,12 @@ export class et2_historylog extends et2_valueWidget implements et2_IDataProvider
} }
// Register a resize callback // Register a resize callback
const self = this;
jQuery(window).on('resize.' +this.options.value.app + this.options.value.id, function() jQuery(window).on('resize.' +this.options.value.app + this.options.value.id, function()
{ {
if (self && typeof self.dynheight != 'undefined') self.dynheight.update(function(_w, _h) { if (this && typeof this.dynheight != 'undefined') this.dynheight.update(function(_w, _h) {
self.dataview.resize(_w, _h); this.dataview.resize(_w, _h);
}); }.bind(this));
}); }.bind(this));
} }
/** /**
@ -540,11 +539,6 @@ export class et2_historylog extends et2_valueWidget implements et2_IDataProvider
this.id, this.id,
function(_response) { function(_response) {
_callback.call(this,_response); _callback.call(this,_response);
// This seems to prevent unwanted scrollbars
historylog.div.hide();
window.setTimeout(function() {
historylog.div.show();
}.bind(historylog),100);
}, },
_context, _context,
[] []