From fdebedd10352a5d3d8f4e101cc36045b5e583f7d Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Wed, 9 May 2012 17:11:59 +1200
Subject: [PATCH] BUGFIX Ensure the form inside htmleditorfield-dialog element
 is redrawn when the form is lazy loaded by AJAX.

---
 forms/HtmlEditorField.php     | 5 +++--
 javascript/HtmlEditorField.js | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index 8cfabd8d4..271da6152 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -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>'
diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 944924473..d6686ebf6 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -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();