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

Fix (remove) vertical scrollbar on popups with CKEDITOR

Browse Source
This commit is contained in:
nathangray 2019-01-24 09:25:56 -07:00
parent 77beec33d2
commit df23011e7e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@ etemplate2.prototype.resize = function(e)
var appHeader = jQuery('#divAppboxHeader');
//Calculate the excess height
excess_height = egw(window).is_popup()? jQuery(window).height() - jQuery(self.DOMContainer).height() - appHeader.outerHeight()+11: false;
excess_height = egw(window).is_popup()? jQuery(window).height() - jQuery(self.DOMContainer).height() - appHeader.outerHeight()+1: false;
// Recalculate excess height if the appheader is shown
if (appHeader.length > 0 && appHeader.is(':visible')) excess_height -= appHeader.outerHeight()-9;

9
api/js/jsapi/egw.js
View File

@ -306,13 +306,12 @@
{
CKEDITOR.once('instanceReady',function() {
// Trigger a resize again once CKEDITOR is ready
window.resizeTo(egw_getWindowOuterWidth(), egw_getWindowOuterHeight() );
window.setTimeout(function() {
window.resizeTo(egw_getWindowOuterWidth(), egw_getWindowOuterHeight());
},100);
});
}
else
{
window.setTimeout(resize_popup, 50);
}
window.setTimeout(resize_popup, 50);
});
}
var et2 = new etemplate2(node, "EGroupware\\Api\\Etemplate::ajax_process_content");