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

Merge pull request #417 from halkyon/sapphire

Browse Source 
---

Ensure the lazy loaded form inside htmleditorfield-dialog is redrawn when lazy loaded. This fixes the initial state for the insert link dialog form.

Also ensure the link form uses "internal" as the default, so the initial state doesnt show all fields, just those associated with the first radio option "internal".

This also fixes http://open.silverstripe.org/ticket/7273.
This commit is contained in:
Ingo Schommer 2012-05-09 11:26:01 +02:00
commit f546ab2a70
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forms/HtmlEditorField.php
View File

@ -313,8 +313,9 @@ class HtmlEditorField_Toolbar extends RequestHandler {
'external' => _t('HtmlEditorField.LINKEXTERNAL', 'Another website'),
'anchor' => _t('HtmlEditorField.LINKANCHOR', 'Anchor on this page'),
'email' => _t('HtmlEditorField.LINKEMAIL', 'Email address'),
'file' => _t('HtmlEditorField.LINKFILE', 'Download a file'),
)
'file' => _t('HtmlEditorField.LINKFILE', 'Download a file'),
),
'internal'
),
new LiteralField('Step2',
'<div class="step2">' . sprintf($numericLabelTmpl, '2', _t('HtmlEditorField.DETAILS', 'Details')) . '</div>'

3
javascript/HtmlEditorField.js
View File

@ -295,6 +295,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
url: url,
success: function(html) {
dialog.html(html);
dialog.getForm().redraw();
}
});
}
@ -330,7 +331,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
},
ondialogopen: function(e) {
this.getForm().updateFromEditor();
this.redraw();
this.getForm().redraw();
},
ondialogclose: function(e) {
this.getForm().resetFields();