Changeset 2477 for trunk/framework/Web/UI

Timestamp:

07/17/2008 03:45:08 AM (6 months ago)

Author:

tof

Message:

Fixed #844 - Upgraded to TinyMCE 3.1.0.1

Files:

• trunk/framework/Web/UI/WebControls/THtmlArea.php (modified) (3 diffs)

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

@@ -302 +302 @@
                 if($this->getEnableCompression())
                         $this->preLoadCompressedScript();
-                $this->applyJavascriptFixes();
 
                 parent::addAttributesToRender($writer);
@@ -350 +349 @@
 
         /**
-         * Changes the TinyMCE triggerSave() function to allow for missing textareas.
-         */
-        protected function applyJavascriptFixes()
-        {
-                $scripts = $this->getPage()->getClientScript();
-                $js = <<<EOD
-if(typeof(tinyMCE)!='undefined')
-{
-        TinyMCE_Control.prototype.triggerSave_old = TinyMCE_Control.prototype.triggerSave;
-        TinyMCE_Control.prototype.triggerSave = function(skip_cleanup, skip_callback)
-        {
-                if(this.getDoc()!=null)
-                        this.triggerSave_old(skip_cleanup, skip_callback);
-        }
-}
-EOD;
-                if(!$scripts->isEndScriptRegistered('prado:THtmlArea:fix'))
-                        $scripts->registerEndScript('prado:THtmlArea:fix', $js);
-        }
-
-        /**
          * Registers the editor javascript file and code to initialize the editor.
          */
@@ -435 +413 @@
                 $options['theme_advanced_buttons1'] = 'formatselect,fontselect,fontsizeselect,separator,bold,italic,underline,strikethrough,sub,sup';
                 $options['theme_advanced_buttons2'] = 'justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,outdent,indent,separator,forecolor,backcolor,separator,hr,link,unlink,image,charmap,separator,removeformat,code,help';
-                $options['theme_advanced_buttons3'] = ' ';
+                $options['theme_advanced_buttons3'] = '';
 
                 $options['theme_advanced_toolbar_location'] = 'top';