tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Set Editor if getEditor() is null rather than onmatch

Browse Source
This commit is contained in:
Simon Welsh 2012-05-19 15:51:09 +12:00 committed by Ingo Schommer
parent 5b0734943f
commit 31db970fb2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
javascript/HtmlEditorField.js
View File

@ -354,7 +354,6 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
var titleEl = this.find(':header:first'); var titleEl = this.find(':header:first');
this.getDialog().attr('title', titleEl.text()); this.getDialog().attr('title', titleEl.text());
this.setEditor(ss.editorWrappers['default']());
this._super(); this._super();
this.redraw(); this.redraw();
@ -378,6 +377,19 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
updateFromEditor: function() { updateFromEditor: function() {
this.getEditor().onopen(); this.getEditor().onopen();
window._ss_htmleditorfield_bookmark = this.getEditor().createBookmark(); window._ss_htmleditorfield_bookmark = this.getEditor().createBookmark();
},
createEditor: function(){
return ss.editorWrappers['default']();
},
/**
* Get the tinyMCE editor
*/
getEditor: function(){
var val = this._super();
if(!val) {
this.setEditor(val = this.createEditor());
}
return val;
} }
}); });