made the form pass thee ckeditor service to the form widget

ornicar · Mar 7, 2010 · 11fde3c · 11fde3c
1 parent 3d577d4
commit 11fde3c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/dmWidget/dmWidgetContentCkEditorForm.php b/lib/dmWidget/dmWidgetContentCkEditorForm.php
@@ -7,7 +7,10 @@ public function configure()
   {
     parent::configure();
 
-    $this->widgetSchema['html'] = new sfWidgetFormTextareaDmCkEditor();
+    $this->widgetSchema['html'] = new sfWidgetFormTextareaDmCkEditor(array(
+      'ckeditor' => $this->getService('ckeditor')
+    ));
+
     $this->validatorSchema['html'] = new sfValidatorString();
   }
 

diff --git a/lib/widget/sfWidgetFormTextareaDmCkEditor.php b/lib/widget/sfWidgetFormTextareaDmCkEditor.php
@@ -20,6 +20,8 @@ protected function configure($options = array(), $attributes = array())
 
     $this->setOption('config', array_merge($this->getDefaultConfig(), dmArray::get($options, 'config', array())));
 
+    $this->addOption('ckeditor');
+
     return parent::configure($options, $attributes);
   }
 
@@ -49,7 +51,11 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
       json_encode($this->getOption('config'))
     ));
 
-    $value = sfContext::getInstance()->get('ckeditor')->render($value);
+    if($ckEditor = $this->getOption('ckeditor'))
+    {
+      $value = $ckEditor->render($value);
+    }
+
     return parent::render($name, $value, $attributes, $errors);
   }