holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

let height callback know if called for an iframe or div, and add 120px for iframe in Pixelegg template to get ride of scroll bars

Browse Source
This commit is contained in:
Ralf Becker 2014-02-17 15:06:07 +00:00
parent b94aee7fc6
commit be51681cae
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pixelegg/js/slider.js
View File

@ -123,8 +123,15 @@ egw_LAB.wait(function() {
}); });
// Override jdots height calcluation /**
egw_fw.prototype.getIFrameHeight = function() * Callback to calculate height of browser iframe or div
*
* Override jdots height calcluation
*
* @param {object} _iframe dom node of iframe or null for div
* @returns number in pixel
*/
egw_fw.prototype.getIFrameHeight = function(iframe)
{ {
$header = $j(this.tabsUi.appHeaderContainer); $header = $j(this.tabsUi.appHeaderContainer);
var content = $j(this.tabsUi.activeTab.contentDiv); var content = $j(this.tabsUi.activeTab.contentDiv);
@ -133,6 +140,9 @@ egw_LAB.wait(function() {
- $header.outerHeight() - $j(this.tabsUi.contHeaderDiv).outerHeight() - (content.outerHeight(true) - content.height()) - $header.outerHeight() - $j(this.tabsUi.contHeaderDiv).outerHeight() - (content.outerHeight(true) - content.height())
// Not sure where this comes from... // Not sure where this comes from...
+ 5; + 5;
// can only avoid scrollbar for iframe, if I add here 120px
if (iframe) height += 120;
//console.log("getIFrameHeight("+iframe+") returning "+height+(iframe?' (iframe)':''));
return height; return height;
}; };