Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] reference errors in gecko browsers when 

having the ckeditor in a popup and closing it
pull/213/head
Holger Brunn 2015-09-04 13:04:50 +02:00
parent 35e3fb189e
commit baf39c849b
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web_ckeditor4/static/src/js/web_ckeditor4.js
View File

@ -47,6 +47,21 @@ openerp.web_ckeditor4 = function(instance)
}
return ckeditor_addFunction_org(fn, scope);
};
var ckeditor_setTimeout_org = CKEDITOR.tools.setTimeout,
ckeditor_timeouts = {};
//we need to collect timeouts in order to cancel them to avoid errors on
//cleaning up
CKEDITOR.tools.setTimeout = function(func, milliseconds, scope, args, ownerWindow)
{
var result = ckeditor_setTimeout_org.apply(this, arguments);
console.log(arguments);
if(!ckeditor_timeouts[scope])
{
ckeditor_timeouts[scope] = [];
}
ckeditor_timeouts[scope].push(result);
return result;
}
CKEDITOR.on('dialogDefinition', function(e)
{
@ -199,8 +214,16 @@ openerp.web_ckeditor4 = function(instance)
{
if(this.editor)
{
this.editor.removeAllListeners();
this.editor.destroy();
this.editor._.editable = null;
this.editor.destroy(true);
if(ckeditor_timeouts[this.editor])
{
_.each(ckeditor_timeouts[this.editor], function(timeout)
{
clearTimeout(timeout);
});
delete ckeditor_timeouts[this.editor];
}
this.editor = null;
}
},