[MERGE] Merged branch fixing recurring bug with ClEditor.
bzr revid: tde@openerp.com-20121029143527-6libgkpudmo2xlu8
This commit is contained in:
commit
e79b8e2912
|
@ -295,7 +295,12 @@
|
|||
|
||||
// Bind the window resize event when the width or height is auto or %
|
||||
if (/auto|%/.test("" + options.width + options.height))
|
||||
$(window).resize(function() {refresh(editor);});
|
||||
$(window).resize(function() {
|
||||
// CHM Note MonkeyPatch: if the DOM is not remove, refresh the cleditor
|
||||
if(editor.$main.parent().parent().size()) {
|
||||
refresh(editor);
|
||||
}
|
||||
});
|
||||
|
||||
// Create the iframe and resize the controls
|
||||
refresh(editor);
|
||||
|
@ -562,7 +567,7 @@
|
|||
//==================
|
||||
// Private Functions
|
||||
//==================
|
||||
|
||||
|
||||
// checksum - returns a checksum using the Adler-32 method
|
||||
function checksum(text)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue