Latest TinyMCE, has new load options and bugfixes.

git-svn-id: http://svn.automattic.com/wordpress/trunk@8512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-07-31 04:01:30 +00:00
parent a465f3ac7d
commit fddd74d5b9
30 changed files with 247 additions and 154 deletions
--- a/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
+++ b/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
@@ -3,7 +3,7 @@
 <head>
 	<title></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<script type="text/javascript" src="../../tiny_mce.js?ver=311"></script>
+	<script type="text/javascript" src="../../tiny_mce.js?ver=311b"></script>
 	<script type="text/javascript">
 		function patchCallback(settings, key) {
 			if (settings[key])
--- a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
--- a/wp-includes/js/tinymce/plugins/inlinepopups/template.htm
+++ b/wp-includes/js/tinymce/plugins/inlinepopups/template.htm
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Template for dialogs</title>
-<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=311" />
+<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=311b" />
 </head>
 <body>

--- a/wp-includes/js/tinymce/plugins/media/js/media.js
+++ b/wp-includes/js/tinymce/plugins/media/js/media.js
@@ -183,7 +183,7 @@ function insertMedia() {
 	tinyMCEPopup.restoreSelection();

 	if (!AutoValidator.validate(f)) {
-		alert(ed.getLang('invalid_data'));
+		tinyMCEPopup.alert(ed.getLang('invalid_data'));
 		return false;
 	}

--- a/wp-includes/js/tinymce/plugins/media/media.htm
+++ b/wp-includes/js/tinymce/plugins/media/media.htm
@@ -2,13 +2,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>{#media_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
-	<script type="text/javascript" src="js/media.js?ver=311"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js?ver=311"></script>
-	<script type="text/javascript" src="../../utils/validate.js?ver=311"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js?ver=311"></script>
-	<link href="css/media.css?ver=311" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311b"></script>
+	<script type="text/javascript" src="js/media.js?ver=311b"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js?ver=311b"></script>
+	<script type="text/javascript" src="../../utils/validate.js?ver=311b"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js?ver=311b"></script>
+	<link href="css/media.css?ver=311b" rel="stylesheet" type="text/css" />
 	<base target="_self" />
 </head>
 <body style="display: none">
--- a/wp-includes/js/tinymce/plugins/paste/blank.htm
+++ b/wp-includes/js/tinymce/plugins/paste/blank.htm
@@ -2,7 +2,7 @@
 <head>
 <title>blank_page</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link href="css/blank.css?ver=311" rel="stylesheet" type="text/css" />
+<link href="css/blank.css?ver=311b" rel="stylesheet" type="text/css" />
 <base target="_self" />
 <script type="text/javascript">
 function init() {
--- a/wp-includes/js/tinymce/plugins/paste/pastetext.htm
+++ b/wp-includes/js/tinymce/plugins/paste/pastetext.htm
@@ -2,8 +2,8 @@
 <head>
 	<title>{#paste.paste_text_desc}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
-	<script type="text/javascript" src="js/pastetext.js?ver=311"></script>
+	<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311b"></script>
+	<script type="text/javascript" src="js/pastetext.js?ver=311b"></script>
 	<base target="_self" />
 </head>
 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
--- a/wp-includes/js/tinymce/plugins/paste/pasteword.htm
+++ b/wp-includes/js/tinymce/plugins/paste/pasteword.htm
@@ -2,9 +2,9 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<title>{#paste.paste_word_desc}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311"></script>
-	<script type="text/javascript" src="js/pasteword.js?ver=311"></script>
-	<link href="css/pasteword.css?ver=311" rel="stylesheet" type="text/css" />
+	<script type="text/javascript" src="../../tiny_mce_popup.js?ver=311b"></script>
+	<script type="text/javascript" src="js/pasteword.js?ver=311b"></script>
+	<link href="css/pasteword.css?ver=311b" rel="stylesheet" type="text/css" />
 	<base target="_self" />
 </head>
 <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
--- a/wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * This class was contributed by Michel Weimerskirch.
+ *
+ * @author Moxiecode
+ * @copyright Copyright <20> 2004-2007, Moxiecode Systems AB, All rights reserved.
+ */
+
+class EnchantSpell extends SpellChecker {
+	/**
+	 * Spellchecks an array of words.
+	 *
+	 * @param String $lang Selected language code (like en_US or de_DE). Shortcodes like "en" and "de" work with enchant >= 1.4.1
+	 * @param Array $words Array of words to check.
+	 * @return Array of misspelled words.
+	 */
+	function &checkWords($lang, $words) {
+		$r = enchant_broker_init();
+		
+		if (enchant_broker_dict_exists($r,$lang)) {
+			$d = enchant_broker_request_dict($r, $lang);
+			
+			$returnData = array();
+			foreach($words as $key => $value) {
+				$correct = enchant_dict_check($d, $value);
+				if(!$correct) {
+					$returnData[] = trim($value);
+				}
+			}
+	
+			return $returnData;
+			enchant_broker_free_dict($d);
+		} else {
+
+		}
+		enchant_broker_free($r);
+	}
+
+	/**
+	 * Returns suggestions for a specific word.
+	 *
+	 * @param String $lang Selected language code (like en_US or de_DE). Shortcodes like "en" and "de" work with enchant >= 1.4.1
+	 * @param String $word Specific word to get suggestions for.
+	 * @return Array of suggestions for the specified word.
+	 */
+	function &getSuggestions($lang, $word) {
+		$r = enchant_broker_init();
+		$suggs = array();
+
+		if (enchant_broker_dict_exists($r,$lang)) {
+			$d = enchant_broker_request_dict($r, $lang);
+			$suggs = enchant_dict_suggest($d, $word);
+
+			enchant_broker_free_dict($d);
+		} else {
+
+		}
+		enchant_broker_free($r);
+
+		return $suggs;
+	}
+}
+
+?>
--- a/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpellShell.php
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpellShell.php
@@ -103,10 +103,10 @@ class PSpellShell extends SpellChecker {
 		$this->_tmpfile = tempnam($this->_config['PSpellShell.tmp'], "tinyspell");

 		if(preg_match("#win#i", php_uname()))
-			return $this->_config['PSpellShell.aspell'] . " -a --lang=". $lang . " --encoding=utf-8 -H < " . $this->_tmpfile . " 2>&1";
+			return $this->_config['PSpellShell.aspell'] . " -a --lang=". escapeshellarg($lang) . " --encoding=utf-8 -H < " . $this->_tmpfile . " 2>&1";

-		return "cat ". $this->_tmpfile ." | " . $this->_config['PSpellShell.aspell'] . " -a --encoding=utf-8 -H --lang=". $lang;
+		return "cat ". $this->_tmpfile ." | " . $this->_config['PSpellShell.aspell'] . " -a --encoding=utf-8 -H --lang=". escapeshellarg($lang);
 	}
 }

-?>
+?>
--- a/wp-includes/js/tinymce/plugins/spellchecker/classes/SpellChecker.php
+++ b/wp-includes/js/tinymce/plugins/spellchecker/classes/SpellChecker.php
@@ -20,7 +20,7 @@ class SpellChecker {
 	 * Simple loopback function everything that gets in will be send back.
 	 *
 	 * @param $args.. Arguments.
-	 * @return {Array} Array of all input arguments.
+	 * @return {Array} Array of all input arguments. 
 	 */
 	function &loopback(/* args.. */) {
 		return func_get_args();
--- a/wp-includes/js/tinymce/plugins/spellchecker/config.php
+++ b/wp-includes/js/tinymce/plugins/spellchecker/config.php
@@ -3,6 +3,7 @@
 	$config['general.engine'] = 'GoogleSpell';
 	//$config['general.engine'] = 'PSpell';
 	//$config['general.engine'] = 'PSpellShell';
+	//$config['general.remote_rpc_url'] = 'http://some.other.site/some/url/rpc.php';

 	// PSpell settings
 	$config['PSpell.mode'] = PSPELL_FAST;
--- a/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js
@@ -15,7 +15,7 @@
 				author : 'Moxiecode Systems AB',
 				authorurl : 'http://tinymce.moxiecode.com',
 				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
+				version : "2.0.2"
 			};
 		},

@@ -312,7 +312,7 @@
 		},

 		_sendRPC : function(m, p, cb) {
-			var t = this, url = t.editor.getParam("spellchecker_rpc_url", this.url+"/rpc.php");
+			var t = this, url = t.editor.getParam("spellchecker_rpc_url", this.url+'/rpc.php');

 			if (url == '{backend}') {
 				t.editor.setProgressState(0);
--- a/wp-includes/js/tinymce/plugins/spellchecker/rpc.php
+++ b/wp-includes/js/tinymce/plugins/spellchecker/rpc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * $Id: rpc.php 354 2007-11-05 20:48:49Z spocke $
+ * $Id: rpc.php 822 2008-04-28 13:45:03Z spocke $
 *
 * @author Moxiecode
 * @copyright Copyright <20> 2004-2007, Moxiecode Systems AB, All rights reserved.
@@ -51,6 +51,42 @@ if (!$raw) {
 if (!$raw)
 	die('{"result":null,"id":null,"error":{"errstr":"Could not get raw post data.","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}');

+// Passthrough request to remote server
+if (isset($config['general.remote_rpc_url'])) {
+	$url = parse_url($config['general.remote_rpc_url']);
+
+	// Setup request
+	$req = "POST " . $url["path"] . " HTTP/1.0\r\n";
+	$req .= "Connection: close\r\n";
+	$req .= "Host: " . $url['host'] . "\r\n";
+	$req .= "Content-Length: " . strlen($raw) . "\r\n";
+	$req .= "\r\n" . $raw;
+
+	if (!isset($url['port']) || !$url['port'])
+		$url['port'] = 80;
+
+	$errno = $errstr = "";
+
+	$socket = fsockopen($url['host'], intval($url['port']), $errno, $errstr, 30);
+	if ($socket) {
+		// Send request headers
+		fputs($socket, $req);
+
+		// Read response headers and data
+		$resp = "";
+		while (!feof($socket))
+				$resp .= fgets($socket, 4096);
+
+		fclose($socket);
+
+		// Split response header/data
+		$resp = explode("\r\n\r\n", $resp);
+		echo $resp[1]; // Output body
+	}
+
+	die();
+}
+
 // Get JSON data
 $json = new Moxiecode_JSON();
 $input = $json->decode($raw);
--- a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
@@ -5,13 +5,13 @@
 <title></title>

 <script type="text/javascript" src="js/editimage.js?ver=311e"></script>
-<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
+<script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>

 <link rel="stylesheet" href="css/editimage.css?ver=311e" type="text/css" media="all" />
 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6" type="text/css" media="all" />
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
-	document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311" type="text/css" media="all" />');
+	document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311b" type="text/css" media="all" />');
 </script>
 <base target="_self" />
 </head>