Merge pull request #7 from spekary/master

bugfix-AjaxTextUpdate

control_registry.inc.php

@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Called by the ModelConnector Designer to create a list of controls appropriate for the given database field type.
+ * The control will  be available in the list of controls that appear in ModelConnector desginer dialog
+ * in the ControlClass entry.
+ */
+
+$controls[QControlCategoryType::Blob][] = 'QCubed\Plugin\QCKEditor';
+$controls[QControlCategoryType::Text][] = 'QCubed\Plugin\QCKEditor';
+

examples/ckeditor.php

@@ -5,12 +5,24 @@
 
 	class SampleForm extends QForm {
 		protected $txtEditor;
+		protected $btnSubmit;
+		protected $pnlResult;
 
 		protected function Form_Create() {
 			$this->txtEditor = new QCKEditor($this);
 			$this->txtEditor->Text = '<b>Something</b> to start with.';
+
+			$this->btnSubmit = new QButton($this);
+			$this->btnSubmit->Text = "Submit";
+			$this->btnSubmit->AddAction(new QClickEvent(), new QAjaxAction('submit_click'));
+
+			$this->pnlResult = new QPanel($this);
+			$this->pnlResult->HtmlEntities = true;
+		}
+
+		protected function submit_click($strFormId, $strControlId, $param) {
+			$this->pnlResult->Text = $this->txtEditor->Text;
 		}
 	}
 
 	SampleForm::Run('SampleForm');
-?>

examples/ckeditor.tpl.php

@@ -8,6 +8,9 @@
 		to create a text editing block with full HTML editing capabilities. The text returned from it is HTML.
 		</p>
 		<?php $this->txtEditor->Render(); ?>
+		<?php $this->btnSubmit->Render(); ?>
+		<h3>The HTML you typed:</h3>
+		<?php $this->pnlResult->Render(); ?>
 	</div>
 
 <?php $this->RenderEnd(); ?>

includes/QCKEditorBase.php

@@ -29,7 +29,14 @@ public function getJqSetupFunction() {
 
 	// currently cannot use ajax
 	public function GetControlJavaScript() {
-		return sprintf('jQuery("#%s").%s(%s)', $this->getJqControlId(), $this->getJqSetupFunction(), $this->strJsReadyFunc);
+		$strFormId = $this->Form->FormId;
+		$strControlId = $this->strControlId;
+		$strReadyFunc = 'null';
+		if ($this->strJsReadyFunc) {
+			$strReadyFunc = $this->strJsReadyFunc;
+		}
+		$strJs = "function() {qcubed.qckeditor(this, '{$strFormId}', '{$strControlId}', {$strReadyFunc});}";
+		return sprintf('jQuery("#%s").%s(%s)', $this->getJqControlId(), $this->getJqSetupFunction(), $strJs);
 	}
 
 	public function GetEndScript() {
@@ -40,7 +47,9 @@ public function __set($strName, $mixValue) {
 
 		//$this->blnModified = true;
 		switch ($strName) {
-			case "ReadyFunction":	// The name of a javascript function to call after the CKEditor instance is ready, so that you can do further initialization
+			case "ReadyFunction":
+				// The name of a javascript function to call after the CKEditor instance is ready, so that you can do further initialization
+				// This function will receive the formId and controlId as parameters, and "this" will be the ckeditor instance.
 				try {
 					$this->strJsReadyFunc = QType::Cast($mixValue, QType::String);
 					break;

js/QCKSetup.js

@@ -1,4 +1,20 @@
 // CKEditor Setup Functions
 
-	// Must be path to ckeditor relative to DOCROOT
-    var CKEDITOR_BASEPATH = qc.baseDir + "/vendor/ckeditor/ckeditor/";
+// Must be path to ckeditor relative to DOCROOT
+var CKEDITOR_BASEPATH = qc.baseDir + "/vendor/ckeditor/ckeditor/";
+
+// Insert a custom startup function into qcubed to help us retrieve data during ajax calls.
+qcubed.qckeditor = function (inst, formId, controlId, customReadyFunc) {
+    // We need to do this on the qposting event because blur and change are delayed and fire after button events.
+    $j('#' + formId).on('qposting', function() {
+        if (inst.checkDirty()) { // provided by ckeditor
+            // This works because the jquery adapter provides a .val() function, which is what qcubed.js uses
+            // We could also call qcubed.setAdditionalPostVar here
+            $j('#' + controlId).change();
+        }
+    });
+
+    if (customReadyFunc) {
+        customReadyFunc.call(inst, formId, controlId);
+    }
+};