From a9bf7dfccea39d452ef06affa578ef934d3357e0 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 14 Jun 2013 11:25:06 +0200
Subject: [PATCH] Fixed HtmlEditorField.js editor instanciation

Wasn't parsing data-editor attrs correctly.
Using proper instances of the underlying editor now,
instead of relying on "active editor" states which get
wonky once they lose focus (e.g. when opening a dialog).
---
 javascript/HtmlEditorField.js | 41 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 3b2e5cf74..203680c5e 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -14,6 +14,9 @@ var ss = ss || {};
  */
 ss.editorWrappers = {};
 ss.editorWrappers.tinyMCE = (function() {
+	
+	var instance;
+
 	return {
 		init: function(config) {
 			if(!ss.editorWrappers.tinyMCE.initialized) {
@@ -25,7 +28,7 @@ ss.editorWrappers.tinyMCE = (function() {
 		 * @return Mixed Implementation specific object
 		 */
 		getInstance: function() {
-			return tinyMCE.activeEditor;
+			return this.instance;
 		},
 		/**
 		 * Invoked when a content-modifying UI is opened.
@@ -55,10 +58,10 @@ ss.editorWrappers.tinyMCE = (function() {
 		 * @param Function
 		 */
 		create: function(domID, config) {
-			var ed = new tinymce.Editor(domID, config);
+			this.instance = new tinymce.Editor(domID, config);
 
 			// Patch TinyMCE events into underlying textarea field.
-			ed.onInit.add(function(ed) {
+			this.instance.onInit.add(function(ed) {
 				jQuery(ed.getElement()).trigger('editorinit');
 
 				// Periodically check for inline changes when focused, 
@@ -79,7 +82,7 @@ ss.editorWrappers.tinyMCE = (function() {
 					clearInterval(interval);
 				});
 			});
-			ed.onChange.add(function(ed, l) {
+			this.instance.onChange.add(function(ed, l) {
 				// Update underlying textarea on every change, so external handlers
 				// such as changetracker have a chance to trigger properly.
 				ed.save();
@@ -87,7 +90,7 @@ ss.editorWrappers.tinyMCE = (function() {
 			});
 			// Add more events here as needed.
 
-			ed.render();
+			this.instance.render();
 		},
 		/**
 		 * Redraw the editor contents
@@ -252,7 +255,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 			 * Constructor: onmatch
 			 */
 			onadd: function() {
-				var edClass = this.data('editor') || ss.editorWrappers['default'], ed = edClass();
+				var edClass = this.data('editor') || 'default', ed = ss.editorWrappers[edClass]();
 				this.setEditor(ed);
 
 				// Using a global config (generated through HTMLEditorConfig PHP logic).
@@ -360,10 +363,11 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 					return text.charAt(0).toUpperCase() + text.slice(1).toLowerCase();
 				};
 
-				var url = $('#cms-editor-dialogs').data('url' + capitalize(type) + 'form'),
+				var self = this, url = $('#cms-editor-dialogs').data('url' + capitalize(type) + 'form'),
 					dialog = $('.htmleditorfield-' + type + 'dialog');
 
 				if(dialog.length) {
+					dialog.getForm().setElement(this);
 					dialog.open();
 				} else {
 					// Show a placeholder for instant feedback. Will be replaced with actual
@@ -374,6 +378,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 						url: url,
 						success: function(html) {
 							dialog.html(html);
+							dialog.getForm().setElement(self);
 							dialog.trigger('dialogopen');
 						}
 					});
@@ -414,15 +419,17 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 		 */
 		$('form.htmleditorfield-form').entwine({
 			Selection: null,
+
+			// Implementation-dependent serialization of the current editor selection state
 			Bookmark: null,
+			
+			// DOMElement pointing to the currently active textarea
+			Element: null,
 
 			setSelection: function(node) {
 				return this._super($(node));
 			},
 
-			// Wrapper for various HTML editors
-			Editor: null,
-
 			onadd: function() {
 				// Move title from headline to (jQuery compatible) title attribute
 				var titleEl = this.find(':header:first');
@@ -433,7 +440,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 			onremove: function() {
 				this.setSelection(null);
 				this.setBookmark(null);
-				this.setEditor(null);
+				this.setElement(null);
 
 				this._super();
 			},
@@ -472,19 +479,11 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 				}
 			},
 
-			createEditor: function(){
-				return ss.editorWrappers['default']();
-			},
-
 			/**
-			 * Get the tinyMCE editor
+			 * @return Object ss.editorWrapper instance
 			 */
 			getEditor: function(){
-				var val = this._super();
-				if(!val) {
-					this.setEditor(val = this.createEditor());
-				}
-				return val;
+				return this.getElement().getEditor();
 			},
 
 			modifySelection: function(callback) {