From 19991fe899e0619f965dcefd6bf552d8cd0445ee Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 12 Jun 2012 20:50:45 +0000
Subject: [PATCH] I guess jQuery adapter doesn't work quite yet, fix
 get/set_value()

---
 etemplate/js/et2_widget_htmlarea.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/etemplate/js/et2_widget_htmlarea.js b/etemplate/js/et2_widget_htmlarea.js
index 497b62e467..15b88f68f3 100644
--- a/etemplate/js/et2_widget_htmlarea.js
+++ b/etemplate/js/et2_widget_htmlarea.js
@@ -76,18 +76,28 @@ var et2_htmlarea = et2_inputWidget.extend({
 
 	doLoadingFinished: function() {
 		this._super.apply(this, arguments);
-		this.htmlNode.ckeditor(function() {},this.ck_props);
+		var self = this;
+		this.htmlNode.ckeditor(function() {
+			// If value is set, pass it in here.
+			this.setData(self.value);
+			delete self.value;
+		},this.ck_props);
 	},
 
 	destroy: function() {
 		this.htmlNode.ckeditorGet().destroy(true);
 	},
 	set_value: function(_value) {
-		this.htmlNode.val(_value);
+		try {
+			this.htmlNode.ckeditorGet().setData(_value);
+		} catch (e) {
+			// CK editor not ready - callback will do it
+			this.value = _value;
+		}
 	},
 
 	getValue: function() {
-		return this.htmlNode.val();
+		return this.htmlNode.ckeditorGet().getData();
 	}
 });