From ceab24db2a7bf459684a650c287770b4ff090f54 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 7 Jun 2011 22:46:47 +0000
Subject: Refs #3510, #9113. Updated tinyMCE version in trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../plugins/wordcount/editor_plugin_src.js         | 54 ++++++++++++++--------
 1 file changed, 35 insertions(+), 19 deletions(-)

(limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js')

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
index bdfebf1b3..6c9a3ead2 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
@@ -9,7 +9,7 @@
  */
 
 (function() {
-    tinymce.create('tinymce.plugins.WordCount', {
+	tinymce.create('tinymce.plugins.WordCount', {
 		block : 0,
 		id : null,
 		countre : null,
@@ -18,8 +18,8 @@
 		init : function(ed, url) {
 			var t = this, last = 0;
 
-			t.countre = ed.getParam('wordcount_countregex', /\S\s+/g);
-			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$¿'"_+=\\/-]*/g);
+			t.countre = ed.getParam('wordcount_countregex', /[\w\u2019\'-]+/g); // u2019 == &rsquo;
+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$?\'\"_+=\\\/-]*/g);
 			t.id = ed.id + '-word-count';
 
 			ed.onPostRender.add(function(ed, cm) {
@@ -32,11 +32,12 @@
 
 					if (row)
 						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');
-				} else
+				} else {
 					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');
+				}
 			});
 
-            ed.onInit.add(function(ed) {
+			ed.onInit.add(function(ed) {
 				ed.selection.onSetContent.add(function() {
 					t._count(ed);
 				});
@@ -59,8 +60,29 @@
 			});
 		},
 
+		_getCount : function(ed) {
+			var tc = 0;
+			var tx = ed.getContent({ format: 'raw' });
+
+			if (tx) {
+					tx = tx.replace(/\.\.\./g, ' '); // convert ellipses to spaces
+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars
+
+					// deal with html entities
+					tx = tx.replace(/(\w+)(&.+?;)+(\w+)/, "$1$3").replace(/&.+?;/g, ' ');
+					tx = tx.replace(this.cleanre, ''); // remove numbers and punctuation
+
+					var wordArray = tx.match(this.countre);
+					if (wordArray) {
+							tc = wordArray.length;
+					}
+			}
+
+			return tc;
+		},
+
 		_count : function(ed) {
-			var t = this, tc = 0;
+			var t = this;
 
 			// Keep multiple calls from happening at the same time
 			if (t.block)
@@ -69,21 +91,15 @@
 			t.block = 1;
 
 			setTimeout(function() {
-				var tx = ed.getContent({format : 'raw'});
-
-				if (tx) {
-					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars
-					tx = tx.replace(t.cleanre, ''); // remove numbers and punctuation
-					tx.replace(t.countre, function() {tc++;}); // count the words
-				}
+					var tc = t._getCount(ed);
 
-				tinymce.DOM.setHTML(t.id, tc.toString());
+					tinymce.DOM.setHTML(t.id, tc.toString());
 
-				setTimeout(function() {t.block = 0;}, 2000);
+					setTimeout(function() {t.block = 0;}, 2000);
 			}, 1);
 		},
 
-        getInfo: function() {
+		getInfo: function() {
 			return {
 				longname : 'Word Count plugin',
 				author : 'Moxiecode Systems AB',
@@ -91,8 +107,8 @@
 				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
 				version : tinymce.majorVersion + "." + tinymce.minorVersion
 			};
-        }
-    });
+		}
+	});
 
-    tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);
+	tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);
 })();
-- 
cgit v1.2.3