Changeset 1495

Timestamp:

11/15/2006 05:54:00 PM (2 years ago)

Author:

wei

Message:

add custom plugin path for THtmlArea

Location:

trunk/framework/Web

Files:

• TAssetManager.php (modified) (1 diff)
• UI/WebControls/THtmlArea.php (modified) (4 diffs)

trunk/framework/Web/TAssetManager.php

@@ -220 +220 @@
          * @todo a generic solution to ignore certain directories and files
          */
-        protected function copyDirectory($src,$dst)
+        public function copyDirectory($src,$dst)
         {
                 if(!is_dir($dst))

trunk/framework/Web/UI/WebControls/THtmlArea.php

@@ -125 +125 @@
         public function __construct()
         {
-                $this->setWidth('450px');
+                $this->setWidth('470px');
                 $this->setHeight('250px');
         }
@@ -210 +210 @@
         {
                 $this->setViewState('Options', $value, '');
+        }
+
+        /**
+         * @param string path to custom plugins to be copied.
+         */
+        public function setCustomPluginPath($value)
+        {
+                $this->setViewState('CustomPluginPath', $value);
+        }
+
+        /**
+         * @return string path to custom plugins to be copied.
+         */
+        public function getCustomPluginPath()
+        {
+                return $this->getViewState('CustomPluginPath');
         }
 
@@ -259 +275 @@
                 if($tarfile===null || $md5sum===null)
                         throw new TConfigurationException('htmlarea_tarfile_invalid');
-                return $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
+                $url = $this->getApplication()->getAssetManager()->publishTarFile($tarfile, $md5sum);
+                $this->copyCustomPlugins($url);
+                return $url;
+        }
+
+        protected function copyCustomPlugins($url)
+        {
+                if($plugins = $this->getCustomPluginPath())
+                {
+                        $assets = $this->getApplication()->getAssetManager();
+                        $path = is_dir($plugins) ? $plugins : Prado::getPathOfNameSpace($plugins);
+                        $dest = $assets->getBasePath().'/'.basename($url).'/tiny_mce/plugins/';
+                        if(!is_dir($dest) || $this->getApplication()->getMode()!==TApplicationMode::Performance)
+                                $assets->copyDirectory($path, $dest);
+                }
         }
 
@@ -296 +326 @@
         {
                 $options = array();
-                $substrings = preg_split('/\n|,\n/', trim($string));
+                $substrings = preg_split('/,\s*\n|\n/', trim($string));
                 foreach($substrings as $bits)
                 {
-                        $option = explode(":",$bits);
+                        $option = explode(":",$bits,2);
+
                         if(count($option) == 2)
                                 $options[trim($option[0])] = trim(preg_replace('/\'|"/','',  $option[1]));