[limb-svn] r5932 - in 3.x/trunk/limb/wysiwyg: settings src/template/components src/template/tags

[svn at limb-project.com]

Author: pachanga
Date: 2007-06-04 16:30:26 +0400 (Mon, 04 Jun 2007)
New Revision: 5932
URL: http://fisheye.limb-project.com/changelog/limb/?cs=5932

Modified:
   3.x/trunk/limb/wysiwyg/settings/wysiwyg.ini
   3.x/trunk/limb/wysiwyg/src/template/components/lmbWysiwygComponent.class.php
   3.x/trunk/limb/wysiwyg/src/template/tags/wysiwyg.tag.php
Log:
-- new wysiwyg attribute for <wysiwyg> tag, using this attribute you can specify which settings section will be used for this instance of richedit component

Modified: 3.x/trunk/limb/wysiwyg/settings/wysiwyg.ini
===================================================================
--- 3.x/trunk/limb/wysiwyg/settings/wysiwyg.ini	2007-06-04 09:30:08 UTC (rev 5931)
+++ 3.x/trunk/limb/wysiwyg/settings/wysiwyg.ini	2007-06-04 12:30:26 UTC (rev 5932)
@@ -3,14 +3,14 @@
 ;============================
 
 wysiwyg = FCKEditor
+
+[FCKEditor]
+runtimeIncludeFile = limb/wysiwyg/src/template/components/lmbFCKEditorComponent.class.php
+runtimeComponentName = lmbFCKEditorComponent
 width = 600px
 height = 400px
 cols = 100
 rows = 15
-
-[FCKEditor]
-runtimeIncludeFile = limb/wysiwyg/src/template/components/lmbFCKEditorComponent.class.php
-runtimeComponentName = lmbFCKEditorComponent
 base_path = /shared/wysiwyg/fckeditor/
 Config[CustomConfigurationsPath] = /shared/wysiwyg/fckeditor/fckconfig.js
 ToolbarSet = Default
@@ -18,6 +18,10 @@
 [TinyMCE]
 runtimeIncludeFile = limb/wysiwyg/src/template/components/lmbTinyMCEComponent.class.php
 runtimeComponentName = lmbTinyMCEComponent
+width = 600px
+height = 400px
+cols = 100
+rows = 15
 base_path = /shared/wysiwyg/tiny_mce/
 editor[mode] = "textareas"
 editor[theme] = "advanced"

Modified: 3.x/trunk/limb/wysiwyg/src/template/components/lmbWysiwygComponent.class.php
===================================================================
--- 3.x/trunk/limb/wysiwyg/src/template/components/lmbWysiwygComponent.class.php	2007-06-04 09:30:08 UTC (rev 5931)
+++ 3.x/trunk/limb/wysiwyg/src/template/components/lmbWysiwygComponent.class.php	2007-06-04 12:30:26 UTC (rev 5932)
@@ -29,19 +29,17 @@
   {
     if($value = $this->ini->getOption($option, $this->group))
       return $value;
-
-    if($this->group != 'default')
-      return $this->ini->getOption($option);
     return '';
   }
 
-  function initWysiwyg($ini_file_name, $group = 'default')
+  function initWysiwyg($ini_file_name, $group = null)
   {
     $this->ini = lmbToolkit :: instance()->getConf($ini_file_name);
     $this->group = $group;
 
     if(!$this->getAttribute('rows'))
       $this->setAttribute('rows', $this->getIniOption('rows'));
+
     if(!$this->getAttribute('cols'))
       $this->setAttribute('cols', $this->getIniOption('cols'));
 
@@ -52,7 +50,5 @@
       $this->setAttribute('height', $this->getIniOption('height'));
 
   }
-
 }
-
 ?>
\ No newline at end of file

Modified: 3.x/trunk/limb/wysiwyg/src/template/tags/wysiwyg.tag.php
===================================================================
--- 3.x/trunk/limb/wysiwyg/src/template/tags/wysiwyg.tag.php	2007-06-04 09:30:08 UTC (rev 5931)
+++ 3.x/trunk/limb/wysiwyg/src/template/tags/wysiwyg.tag.php	2007-06-04 12:30:26 UTC (rev 5932)
@@ -20,7 +20,7 @@
   var $runtimeComponentName = 'lmbWysiwygComponent';
   var $runtimeIncludeFile = 'limb/wysiwyg/src/template/components/lmbWysiwygComponent.class.php';
   var $ini_file_name = 'wysiwyg.ini';
-  var $type = '';
+  var $type;
 
   function prepare()
   {
@@ -31,9 +31,10 @@
   {
     $ini = lmbToolkit :: instance()->getConf($this->ini_file_name);
 
-    if(!$this->type = $ini->getOption('wysiwyg'))
+    if(($this->type = $this->getAttribute('wysiwyg')) == '' &&
+       ($this->type = $ini->getOption('wysiwyg')) == '')
     {
-       $this->type = 'default';
+       $this->type = null;
        return;
     }