From 19989e32667e653d9dd65066ba26c91562a3cdc8 Mon Sep 17 00:00:00 2001 From: wei <> Date: Fri, 28 Apr 2006 05:22:14 +0000 Subject: Fixed #68 and update TinyMCE to 2.0.5.1 --- framework/3rdParty/TinyMCE/tiny_mce.md5 | 2 +- framework/3rdParty/TinyMCE/tiny_mce.tar | Bin 3051520 -> 3164160 bytes framework/3rdParty/readme.html | 2 +- framework/Web/Javascripts/js/validator.js | 4 + framework/Web/Javascripts/prado/validation3.js | 4 + framework/Web/UI/WebControls/THtmlArea.php | 99 +++++++++++-------------- 6 files changed, 55 insertions(+), 56 deletions(-) (limited to 'framework') diff --git a/framework/3rdParty/TinyMCE/tiny_mce.md5 b/framework/3rdParty/TinyMCE/tiny_mce.md5 index 861556e5..1ee34468 100644 --- a/framework/3rdParty/TinyMCE/tiny_mce.md5 +++ b/framework/3rdParty/TinyMCE/tiny_mce.md5 @@ -1 +1 @@ -b79c5807630d8324b2c968eb563e9076 *tiny_mce.tar +505c2761e878f40d5451115bd5643355 *tiny_mce.tar diff --git a/framework/3rdParty/TinyMCE/tiny_mce.tar b/framework/3rdParty/TinyMCE/tiny_mce.tar index f57b3509..663abb34 100644 Binary files a/framework/3rdParty/TinyMCE/tiny_mce.tar and b/framework/3rdParty/TinyMCE/tiny_mce.tar differ diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html index 923e9056..ea5b05db 100644 --- a/framework/3rdParty/readme.html +++ b/framework/3rdParty/readme.html @@ -37,7 +37,7 @@ projects. TinyMCE - TinyMCE Javascript Content Editor (v2.0.2) + TinyMCE Javascript Content Editor (v2.0.5.1) GNU LIBRARY GENERAL PUBLIC LICENSE System.Web.UI.WebControls.THtmlArea TinyMCE is a powerful WYSIWYG editor control for web browsers such as MSIE or Mozilla that enables the user to edit HTML contents in a more user friendly way. diff --git a/framework/Web/Javascripts/js/validator.js b/framework/Web/Javascripts/js/validator.js index 4519357c..88dfb25e 100644 --- a/framework/Web/Javascripts/js/validator.js +++ b/framework/Web/Javascripts/js/validator.js @@ -434,6 +434,10 @@ getValidationValue : function(control) this.observeDatePickerChanges(); return Prado.WebUI.TDatePicker.getDropDownDate(control).getTime(); } + case 'THtmlArea': + if(typeof tinyMCE != "undefined") +tinyMCE.triggerSave(); +return this.trim($F(control)); default: if(this.isListControlType()) return this.getFirstSelectedListValue(); diff --git a/framework/Web/Javascripts/prado/validation3.js b/framework/Web/Javascripts/prado/validation3.js index d5da977f..1f154fec 100644 --- a/framework/Web/Javascripts/prado/validation3.js +++ b/framework/Web/Javascripts/prado/validation3.js @@ -772,6 +772,10 @@ Prado.WebUI.TBaseValidator.prototype = return Prado.WebUI.TDatePicker.getDropDownDate(control).getTime(); } + case 'THtmlArea': + if(typeof tinyMCE != "undefined") + tinyMCE.triggerSave(); + return this.trim($F(control)); default: if(this.isListControlType()) return this.getFirstSelectedListValue(); diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index 8e5fcd16..254754ae 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -78,44 +78,44 @@ Prado::using('System.Web.UI.WebControls.TTextBox'); */ class THtmlArea extends TTextBox { - // Qiang: need to clean up the following (too inefficient) + /** + * @var array list of locale => language file pairs. + */ private static $_langs = array( - 'da' => array('da'), - 'fa' => array('fa'), - 'hu' => array('hu'), - 'nb' => array('nb'), - 'pt_br' => array('pt_BR'), - 'sk' => array('sk'), - 'zh_tw_utf8' => array('zh_TW', 'zh_HK'), - 'ar' => array('ar'), - 'de' => array('de'), - 'fi' => array('fi'), - 'is' => array('is'), - 'nl' => array('nl'), - 'sv' => array('sv'), - 'ca' => array('ca'), - 'el' => array('el'), - 'fr' => array('fr'), - 'it' => array('it'), - 'nn' => array('nn'), //what is nn? -// 'ru' => array('ru'), - 'th' => array('th'), - 'cs' => array('cs'), - 'en' => array('en'), - 'fr_ca' => array('fr_CA'), - 'ja' => array('ja'), - 'pl' => array('pl'), -// 'ru_KOI8-R' => array('ru'), /// what is this? - 'zh_cn' => array('zh_CN'), - 'cy' => array('cy'), //what is this? - 'es' => array('es'), - 'he' => array('he'), - 'ko' => array('ko'), - 'pt' => array('pt'), - 'ru_UTF-8' => array('ru'), - 'tr' => array('tr'), - 'si' => array('si'), -// 'zh_tw' => array('zh_TW'), + 'ar' => 'ar', + 'ca' => 'ca', + 'cs' => 'cs', + 'da' => 'da', + 'de' => 'de', + 'el' => 'el', + 'en' => 'en', + 'es' => 'es', + 'fa' => 'fa', + 'fi' => 'fi', + 'fr' => 'fr', + 'fr_CA' => 'fr_ca', + 'he' => 'he', + 'hu' => 'hu', + 'is' => 'is', + 'it' => 'it', + 'ja' => 'ja', + 'ko' => 'ko', + 'nb' => 'nb', + 'nl' => 'nl', + 'pl' => 'pl', + 'pt' => 'pt', + 'pt_BR' => 'pt_br', + 'ru' => 'ru_UTF-8', + 'si' => 'si', + 'sk' => 'sk', + 'sv' => 'sv', + 'th' => 'th', + 'tr' => 'tr', + 'vi' => 'vi', + 'zh' => 'zh_cn_utf8', + 'zh_CN' => 'zh_cn_utf8', + 'zh_HK' => 'zh_tw_utf8', + 'zh_TW' => 'zh_tw_utf8' ); /** @@ -271,9 +271,12 @@ class THtmlArea extends TTextBox $options['elements'] = $this->getClientID(); $options['language'] = $this->getLanguageSuffix($this->getCulture()); $options['theme'] = 'advanced'; - $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'; + + //make it basic advanced to fit into 1 line of buttons. + $options['theme_advanced_buttons1'] = 'bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright, justifyfull,separator,bullist,numlist,separator,undo,redo,separator,link,unlink,separator,charmap,separator,code,help'; + $options['theme_advanced_buttons2'] = ' '; $options['theme_advanced_buttons3'] = ' '; + $options['theme_advanced_toolbar_location'] = 'top'; $options['theme_advanced_toolbar_align'] = 'left'; $options['theme_advanced_path_location'] = 'bottom'; @@ -312,22 +315,10 @@ class THtmlArea extends TTextBox if(!is_null($app)) $variants = $app->getCultureVariants($culture); - //default the variant to "en" - if(count($variants) == 0) - { - if(empty($culture)) - return 'en'; - $variants[] = strtolower($culture); - } - - // TODO: triple loops??? - foreach(self::$_langs as $js => $langs) + foreach($variants as $variant) { - foreach($variants as $variant) - { - if(in_array($variant, $langs)) - return $js; - } + if(isset(self::$_langs[$variant])) + return self::$_langs[$variant]; } return 'en'; -- cgit v1.2.3