audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] really fix errors in popup dialogs

Browse Source 
[IMP] also mark the form as dirty the second time we adit an object
This commit is contained in:
Holger Brunn
2013-04-17 17:25:38 +02:00
parent 1990130853
commit 67d9371e21
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ openerp.web_ckeditor4 = function(openerp)
fragment.writeHtml(ckeditor_writer);
return ckeditor_writer.getHtml();
};
default_ckeditor_filter = new CKEDITOR.filter(
{
'*':
@@ -122,10 +123,7 @@ openerp.web_ckeditor4 = function(openerp)
{
'beforeUndoImage': function()
{
if(!self.is_dirty())
{
self.on_ui_change();
}
self.on_ui_change();
},
},
},
@@ -163,7 +161,11 @@ openerp.web_ckeditor4 = function(openerp)
}
else
{
self.editor.setData(value || '');
//set_value is called shortly before saving and closing
//popups. if we don't suppress ckeditor's events about
//that, we get a lot of strange errors concerning
//already cleaned up elements
self.editor.setData(value || '', null, true);
}
}
this._super.apply(this, arguments);
@@ -174,7 +176,7 @@ openerp.web_ckeditor4 = function(openerp)
{
if(this.editor)
{
this.$element.find('textarea').detach();
this.editor.destroy();
}
return this._super.apply(this, arguments);
}