Refs #3510, #9113. Updated tinyMCE version in trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 69 insertions, 49 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
index a924fabac..9757aec9c 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
@@ -70,10 +70,8 @@
 					t._done();

 			});

 

-			ed.onInit.add(function() {

-				if (ed.settings.content_css !== false)

-					ed.dom.loadCSS(url + '/css/content.css');

-			});

+			if (ed.settings.content_css !== false)

+				ed.contentCSS.push(url + '/css/content.css');

 

 			ed.onClick.add(t._showMenu, t);

 			ed.onContextMenu.add(t._showMenu, t);

@@ -132,6 +130,9 @@
 						var o = {icon : 1}, mi;

 

 						o.onclick = function() {

+							if (v == t.selectedLang) {

+								return;

+							}

 							mi.setSelected(1);

 							t.selectedItem.setSelected(0);

 							t.selectedItem = mi;

@@ -220,21 +221,11 @@
 		},

 

 		_markWords : function(wl) {

-			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];

-			var se = ed.selection, b = se.getBookmark();

-

-			each(wl, function(v) {

-				w += (w ? '|' : '') + v;

-			});

-

-			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');

-			r2 = new RegExp('^(' + w + ')', 'g');

-			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');

-			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');

-			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');

+			var ed = this.editor, dom = ed.dom, doc = ed.getDoc(), se = ed.selection, b = se.getBookmark(), nl = [],

+				w = wl.join('|'), re = this._getSeparators(), rx = new RegExp('(^|[' + re + '])(' + w + ')(?=[' + re + ']|$)', 'g');

 

 			// Collect all text nodes

-			this._walk(this.editor.getBody(), function(n) {

+			this._walk(ed.getBody(), function(n) {

 				if (n.nodeType == 3) {

 					nl.push(n);

 				}

@@ -242,18 +233,49 @@
 

 			// Wrap incorrect words in spans

 			each(nl, function(n) {

-				var v;

-

-				if (n.nodeType == 3) {

-					v = n.nodeValue;

-

-					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {

-						v = dom.encode(v);

-						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');

-						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');

-

-						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);

+				var node, elem, txt, pos, v = n.nodeValue;

+

+				if (rx.test(v)) {

+					// Encode the content

+					v = dom.encode(v);

+					// Create container element

+					elem = dom.create('span', {'class' : 'mceItemHidden'});

+

+					// Following code fixes IE issues by creating text nodes

+					// using DOM methods instead of innerHTML.

+					// Bug #3124: <PRE> elements content is broken after spellchecking.

+					// Bug #1408: Preceding whitespace characters are removed

+					// @TODO: I'm not sure that both are still issues on IE9.

+					if (tinymce.isIE) {

+						// Enclose mispelled words with temporal tag

+						v = v.replace(rx, '$1<mcespell>$2</mcespell>');

+						// Loop over the content finding mispelled words

+						while ((pos = v.indexOf('<mcespell>')) != -1) {

+							// Add text node for the content before the word

+							txt = v.substring(0, pos);

+							if (txt.length) {

+								node = doc.createTextNode(dom.decode(txt));

+								elem.appendChild(node);

+							}

+							v = v.substring(pos+10);

+							pos = v.indexOf('</mcespell>');

+							txt = v.substring(0, pos);

+							v = v.substring(pos+11);

+							// Add span element for the word

+							elem.appendChild(dom.create('span', {'class' : 'mceItemHiddenSpellWord'}, txt));

+						}

+						// Add text node for the rest of the content

+						if (v.length) {

+							node = doc.createTextNode(dom.decode(v));

+							elem.appendChild(node);

+						}

+					} else {

+						// Other browsers preserve whitespace characters on innerHTML usage

+						elem.innerHTML = v.replace(rx, '$1<span class="mceItemHiddenSpellWord">$2</span>');

 					}

+

+					// Finally, replace the node with the container

+					dom.replace(elem, n);

 				}

 			});

 

@@ -261,26 +283,20 @@
 		},

 

 		_showMenu : function(ed, e) {

-			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin());

+			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin()), wordSpan = e.target;

 

-			if (!m) {

-				p1 = DOM.getPos(ed.getContentAreaContainer());

-				//p2 = DOM.getPos(ed.getContainer());

-

-				m = ed.controlManager.createDropMenu('spellcheckermenu', {

-					offset_x : p1.x,

-					offset_y : p1.y,

-					'class' : 'mceNoIcons'

-				});

+			e = 0; // Fixes IE memory leak

 

+			if (!m) {

+				m = ed.controlManager.createDropMenu('spellcheckermenu', {'class' : 'mceNoIcons'});

 				t._menu = m;

 			}

 

-			if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) {

+			if (dom.hasClass(wordSpan, 'mceItemHiddenSpellWord')) {

 				m.removeAll();

 				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

 

-				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) {

+				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(wordSpan.innerHTML)], function(r) {

 					var ignoreRpc;

 

 					m.removeAll();

@@ -289,7 +305,7 @@
 						m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

 						each(r, function(v) {

 							m.add({title : v, onclick : function() {

-								dom.replace(ed.getDoc().createTextNode(v), e.target);

+								dom.replace(ed.getDoc().createTextNode(v), wordSpan);

 								t._checkDone();

 							}});

 						});

@@ -302,9 +318,9 @@
 					m.add({

 						title : 'spellchecker.ignore_word',

 						onclick : function() {

-							var word = e.target.innerHTML;

+							var word = wordSpan.innerHTML;

 

-							dom.remove(e.target, 1);

+							dom.remove(wordSpan, 1);

 							t._checkDone();

 

 							// tell the server if we need to

@@ -320,7 +336,7 @@
 					m.add({

 						title : 'spellchecker.ignore_words',

 						onclick : function() {

-							var word = e.target.innerHTML;

+							var word = wordSpan.innerHTML;

 

 							t._removeWords(dom.decode(word));

 							t._checkDone();

@@ -340,9 +356,9 @@
 						m.add({

 							title : 'spellchecker.learn_word',

 							onclick : function() {

-								var word = e.target.innerHTML;

+								var word = wordSpan.innerHTML;

 

-								dom.remove(e.target, 1);

+								dom.remove(wordSpan, 1);

 								t._checkDone();

 

 								ed.setProgressState(1);

@@ -356,9 +372,13 @@
 					m.update();

 				});

 

-				ed.selection.select(e.target);

-				p1 = dom.getPos(e.target);

-				m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y);

+				p1 = dom.getPos(ed.getContentAreaContainer());

+				m.settings.offset_x = p1.x;

+				m.settings.offset_y = p1.y;

+

+				ed.selection.select(wordSpan);

+				p1 = dom.getPos(wordSpan);

+				m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);

 

 				return tinymce.dom.Event.cancel(e);

 			} else