Author: cdafflon
Date: 2010-04-08 13:48:52 +0200 (Thu, 08 Apr 2010)
New Revision: 29044

Modified:
   plugins/sfCKEditorPlugin/LICENSE
   plugins/sfCKEditorPlugin/README
   plugins/sfCKEditorPlugin/lib/widget/sfWidgetFormCKEditor.class.php
Log:


Modified: plugins/sfCKEditorPlugin/LICENSE
===================================================================
--- plugins/sfCKEditorPlugin/LICENSE    2010-04-08 08:07:09 UTC (rev 29043)
+++ plugins/sfCKEditorPlugin/LICENSE    2010-04-08 11:48:52 UTC (rev 29044)
@@ -1,7 +1,7 @@
-Copyright (c) Christophe Dafflon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
of this software and associated documentation files (the "Software"), to deal 
in the Software without restriction, including without limitation the rights to 
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
of the Software, and to permit persons to whom the Software is furnished to do 
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
+Copyright (c) Christophe Dafflon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
of this software and associated documentation files (the "Software"), to deal 
in the Software without restriction, including without limitation the rights to 
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
of the Software, and to permit persons to whom the Software is furnished to do 
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.

Modified: plugins/sfCKEditorPlugin/README
===================================================================
--- plugins/sfCKEditorPlugin/README     2010-04-08 08:07:09 UTC (rev 29043)
+++ plugins/sfCKEditorPlugin/README     2010-04-08 11:48:52 UTC (rev 29044)
@@ -1,68 +1,68 @@
-##How to install:##
-
-    symfony plugin:install sfCKEditorPlugin
-
-You need to create an autoload.yml in the project config directory.
-  
-    autoload:
-      ckeditor:
-        name:       ckeditor
-        path:       path/to/ckeditor/dir
-        recursive:  on
-
-You need to set the basePath of the ckeditor in an app.yml.
-  
-    all:
-      ckeditor:
-        basePath:         'path/to/ckeditor/'
-
-      
-##How to use:##
-
-    [php]
-    $this->widgetSchema['my_editor'] = new sfWidgetFormCKEditor();
-
-###Set CKEditor config param###
-
-You can set config with the ckeditor object directly
-    
-    [php]
-    $this->widgetSchema['my_editor'] = new sfWidgetFormCKEditor();
-    $editor = $this->widgetSchema['my_editor']->getEditor();
-    $editor->config['param'] = value;
-    
-Or:
-    
-    [php]
-    $this->widgetSchema['my_editor'] = new 
sfWidgetFormCKEditor(array('jsoptions'=>array('param' => 'value'));
-
-See http://ckeditor.com/ for config instructions
-
-
-
-## To use CKFinder: ##
-  
-Add in the autoload.yml file
-
-    ckfinder:
-      name:       ckfinder
-      path:       path/to/ckfinder/dir
-      recursive:  on    
-      
-In app.yml:
-
-    all:
-      ckfinder:
-        active:           true
-        basePath:         'path/to/ckfinder/'
-  
-Access to CKFinder object:
-    
-    [php]
-    $this->widgetSchema['my_editor'] = new sfWidgetFormCKEditor();
-    $finder = $this->widgetSchema['my_editor']->getFinder();
-  
-You need to configure path/to/ckfinder/config.php. See http://ckfinder.com/ 
for instructions.
-
-
+##How to install:##
+
+    symfony plugin:install sfCKEditorPlugin
+
+You need to create an autoload.yml in the project config directory.
+  
+    autoload:
+      ckeditor:
+        name:       ckeditor
+        path:       path/to/ckeditor/dir
+        recursive:  on
+
+You need to set the basePath of the ckeditor in an app.yml.
+  
+    all:
+      ckeditor:
+        basePath:         'path/to/ckeditor/'
+
+      
+##How to use:##
+
+    [php]
+    $this->widgetSchema['my_editor'] = new sfWidgetFormCKEditor();
+
+###Set CKEditor config param###
+
+You can set config with the ckeditor object directly
+    
+    [php]
+    $this->widgetSchema['my_editor'] = new sfWidgetFormCKEditor();
+    $editor = $this->widgetSchema['my_editor']->getEditor();
+    $editor->config['param'] = value;
+    
+Or:
+    
+    [php]
+    $this->widgetSchema['my_editor'] = new 
sfWidgetFormCKEditor(array('jsoptions'=>array('param' => 'value'));
+
+See http://ckeditor.com/ for config instructions
+
+
+
+## To use CKFinder: ##
+  
+Add in the autoload.yml file
+
+    ckfinder:
+      name:       ckfinder
+      path:       path/to/ckfinder/dir
+      recursive:  on    
+      
+In app.yml:
+
+    all:
+      ckfinder:
+        active:           true
+        basePath:         'path/to/ckfinder/'
+  
+Access to CKFinder object:
+    
+    [php]
+    $this->widgetSchema['my_editor'] = new sfWidgetFormCKEditor();
+    $finder = $this->widgetSchema['my_editor']->getFinder();
+  
+You need to configure path/to/ckfinder/config.php. See http://ckfinder.com/ 
for instructions.
+
+
   
\ No newline at end of file

Modified: plugins/sfCKEditorPlugin/lib/widget/sfWidgetFormCKEditor.class.php
===================================================================
--- plugins/sfCKEditorPlugin/lib/widget/sfWidgetFormCKEditor.class.php  
2010-04-08 08:07:09 UTC (rev 29043)
+++ plugins/sfCKEditorPlugin/lib/widget/sfWidgetFormCKEditor.class.php  
2010-04-08 11:48:52 UTC (rev 29044)
@@ -1,62 +1,62 @@
-<?php
-
-class sfWidgetFormCKEditor extends sfWidgetFormTextarea {
-  
-  protected $_editor;
-  protected $_finder;
-  
-  protected function configure($options = array(), $attributes = array())
-  {
-    $editorClass = 'CKEditor';
-         if (!class_exists($editorClass))
-         {
-         throw new sfConfigurationException(sprintf('CKEditor class not 
found'));    
-         }
-    $this->_editor = new $editorClass();
-    $this->_editor->basePath = sfConfig::get('app_ckeditor_basePath');
-    $this->_editor->returnOutput = true;
-    if(sfConfig::get('app_ckfinder_active', false) == 'true')
-    {
-      $finderClass = 'CKFinder';
-         if (!class_exists($finderClass))
-         {
-         throw new sfConfigurationException(sprintf('CKFinder class not 
found'));    
-         }      
-      $this->_finder = new $finderClass();
-      $this->_finder->BasePath = sfConfig::get('app_ckfinder_basePath');
-      $this->_finder->SetupCKEditorObject($this->_editor);
-    }
-    if(isset($options['jsoptions']))
-    {
-      $this->addOption('jsoptions', $options['jsoptions']);    
-    }
-    parent::configure($options, $attributes);
-  }
-  
-  public function render($name, $value = null, $attributes = array(), $errors 
= array())
-  {
-    $jsoptions = $this->getOption('jsoptions');
-    if($jsoptions)
-    {   
-      $this->setJSOptions($name, $value, $attributes, $errors);
-    }
-    return parent::render($name, $value, $attributes, 
$errors).$this->_editor->replace($name); 
-
-  }
-  protected function setJSOptions($name, $value = null, $attributes = array(), 
$errors = array())
-  {
-    $jsoptions = $this->getOption('jsoptions');
-    foreach($jsoptions as $k => $v)
-    {
-      $this->_editor->config[$k] = $v;
-    }
-  }
-  public function getEditor()
-  {
-    return $this->_editor;
-  }  
-  public function getFinder()
-  {
-    return $this->_finder;
-  }  
+<?php
+
+class sfWidgetFormCKEditor extends sfWidgetFormTextarea {
+  
+  protected $_editor;
+  protected $_finder;
+  
+  protected function configure($options = array(), $attributes = array())
+  {
+    $editorClass = 'CKEditor';
+         if (!class_exists($editorClass))
+         {
+         throw new sfConfigurationException(sprintf('CKEditor class not 
found'));    
+         }
+    $this->_editor = new $editorClass();
+    $this->_editor->basePath = sfConfig::get('app_ckeditor_basePath');
+    $this->_editor->returnOutput = true;
+    if(sfConfig::get('app_ckfinder_active', false) == 'true')
+    {
+      $finderClass = 'CKFinder';
+         if (!class_exists($finderClass))
+         {
+         throw new sfConfigurationException(sprintf('CKFinder class not 
found'));    
+         }      
+      $this->_finder = new $finderClass();
+      $this->_finder->BasePath = sfConfig::get('app_ckfinder_basePath');
+      $this->_finder->SetupCKEditorObject($this->_editor);
+    }
+    if(isset($options['jsoptions']))
+    {
+      $this->addOption('jsoptions', $options['jsoptions']);    
+    }
+    parent::configure($options, $attributes);
+  }
+  
+  public function render($name, $value = null, $attributes = array(), $errors 
= array())
+  {
+    $jsoptions = $this->getOption('jsoptions');
+    if($jsoptions)
+    {   
+      $this->setJSOptions($name, $value, $attributes, $errors);
+    }
+    return parent::render($name, $value, $attributes, 
$errors).$this->_editor->replace($name); 
+
+  }
+  protected function setJSOptions($name, $value = null, $attributes = array(), 
$errors = array())
+  {
+    $jsoptions = $this->getOption('jsoptions');
+    foreach($jsoptions as $k => $v)
+    {
+      $this->_editor->config[$k] = $v;
+    }
+  }
+  public function getEditor()
+  {
+    return $this->_editor;
+  }  
+  public function getFinder()
+  {
+    return $this->_finder;
+  }  
 }
\ No newline at end of file

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to