HTML editing fixes, upgrade to TinyMCE v3.0.6

4 files changed, 66 insertions, 87 deletions

diff --git a/program/js/tiny_mce/plugins/visualchars/editor_plugin.js b/program/js/tiny_mce/plugins/visualchars/editor_plugin.js
index a35875409..e1e4238a3 100644
--- a/program/js/tiny_mce/plugins/visualchars/editor_plugin.js
+++ b/program/js/tiny_mce/plugins/visualchars/editor_plugin.js
@@ -1 +1 @@
-tinyMCE.importPluginLanguagePack('visualchars');var TinyMCE_VisualCharsPlugin={getInfo:function(){return{longname:'Visual characters',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',version:tinyMCE.majorVersion+"."+tinyMCE.minorVersion}},initInstance:function(inst){inst.visualChars={state:false}},getControlHTML:function(cn){switch(cn){case"visualchars":return tinyMCE.getButtonHTML(cn,'lang_visualchars_desc','{$pluginurl}/images/visualchars.gif','mceVisualChars',false)}return""},execCommand:function(editor_id,element,command,user_interface,value){var inst=tinyMCE.getInstanceById(editor_id);switch(command){case"mceVisualChars":this._toggleVisualChars(editor_id,inst);return true}return false},cleanup:function(type,content,inst){if(type=="insert_to_editor_dom"||type=="get_from_editor_dom"){inst.visualChars.state=true;this._toggleVisualChars(inst.editorId,inst)}return content},_toggleVisualChars:function(editor_id,inst){var nl,i,h,d=inst.getDoc(),b=inst.getBody(),nv,s=inst.selection,bo;inst.visualChars.state=!inst.visualChars.state;bo=s.getBookmark(true);tinyMCE.switchClass(editor_id+'_visualchars',inst.visualChars.state?'mceButtonSelected':'mceButtonNormal');if(inst.visualChars.state){nl=tinyMCE.selectNodes(b,function(n){return n.nodeType==3&&n.nodeValue&&n.nodeValue.indexOf('\u00a0')!=-1});for(i=0;i<nl.length;i++){nv=nl[i].nodeValue;nv=nv.replace(/(\u00a0+)/g,'<span class="mceItemHiddenVisualChar">$1</span>');nv=nv.replace(/\u00a0/g,'\u00b7');tinyMCE.setOuterHTML(nl[i],nv,d)}}else{nl=tinyMCE.selectNodes(b,function(n){return n.nodeType==1&&n.nodeName=='SPAN'&&n.className=='mceItemHiddenVisualChar'});for(i=0;i<nl.length;i++)tinyMCE.setOuterHTML(nl[i],nl[i].innerHTML.replace(/(&middot;|\u00b7)/g,'&nbsp;'),d)}}};tinyMCE.addPlugin("visualchars",TinyMCE_VisualCharsPlugin);
\ No newline at end of file
+(function(){tinymce.create('tinymce.plugins.VisualChars',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceVisualChars',t._toggleVisualChars,t);ed.addButton('visualchars',{title:'visualchars.desc',cmd:'mceVisualChars'});ed.onBeforeGetContent.add(function(ed,o){if(t.state){t.state=true;t._toggleVisualChars();}});},getInfo:function(){return{longname:'Visual characters',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_toggleVisualChars:function(){var t=this,ed=t.editor,nl,i,h,d=ed.getDoc(),b=ed.getBody(),nv,s=ed.selection,bo;t.state=!t.state;ed.controlManager.setActive('visualchars',t.state);if(t.state){nl=[];tinymce.walk(b,function(n){if(n.nodeType==3&&n.nodeValue&&n.nodeValue.indexOf('\u00a0')!=-1)nl.push(n);},'childNodes');for(i=0;i<nl.length;i++){nv=nl[i].nodeValue;nv=nv.replace(/(\u00a0+)/g,'<span class="mceItemHidden mceVisualNbsp">$1</span>');nv=nv.replace(/\u00a0/g,'\u00b7');ed.dom.setOuterHTML(nl[i],nv,d);}}else{nl=tinymce.grep(ed.dom.select('span',b),function(n){return ed.dom.hasClass(n,'mceVisualNbsp');});for(i=0;i<nl.length;i++)ed.dom.setOuterHTML(nl[i],nl[i].innerHTML.replace(/(&middot;|\u00b7)/g,'&nbsp;'),d);}}});tinymce.PluginManager.add('visualchars',tinymce.plugins.VisualChars);})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js b/program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
index fb7236de2..02ec4e698 100644
--- a/program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -1,89 +1,73 @@
 /**

- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $

+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $

  *

  * @author Moxiecode

- * @copyright Copyright © 2004-2007, Moxiecode Systems AB, All rights reserved.

+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.

  */

 

-/* Import plugin specific language pack */

-tinyMCE.importPluginLanguagePack('visualchars');

-

-var TinyMCE_VisualCharsPlugin = {

-	getInfo : function() {

-		return {

-			longname : 'Visual characters',

-			author : 'Moxiecode Systems AB',

-			authorurl : 'http://tinymce.moxiecode.com',

-			infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',

-			version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion

-		};

-	},

-

-	initInstance : function(inst) {

-		inst.visualChars = {

-			state : false

-		};

-	},

-

-	getControlHTML : function(cn) {

-		switch (cn) {

-			case "visualchars":

-				return tinyMCE.getButtonHTML(cn, 'lang_visualchars_desc', '{$pluginurl}/images/visualchars.gif', 'mceVisualChars', false);

-		}

-

-		return "";

-	},

-

-	execCommand : function(editor_id, element, command, user_interface, value) {

-		var inst = tinyMCE.getInstanceById(editor_id);

-

-		switch (command) {

-			case "mceVisualChars":

-				this._toggleVisualChars(editor_id, inst);

-				return true;

-		}

-

-		return false;

-	},

-

-	cleanup : function(type, content, inst) {

-		if (type == "insert_to_editor_dom" || type == "get_from_editor_dom") {

-			inst.visualChars.state = true;

-			this._toggleVisualChars(inst.editorId, inst);

-		}

-

-		return content;

-	},

-

-	// Private plugin internal methods

-

-	_toggleVisualChars : function(editor_id, inst) {

-		var nl, i, h, d = inst.getDoc(), b = inst.getBody(), nv, s = inst.selection, bo;

-

-		inst.visualChars.state = !inst.visualChars.state;

-

-		bo = s.getBookmark(true);

-

-		tinyMCE.switchClass(editor_id + '_visualchars', inst.visualChars.state ? 'mceButtonSelected' : 'mceButtonNormal');

-

-		if (inst.visualChars.state) {

-			nl = tinyMCE.selectNodes(b, function(n) {return n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1;});

-

-			for (i=0; i<nl.length; i++) {

-				nv = nl[i].nodeValue;

-				nv = nv.replace(/(\u00a0+)/g, '<span class="mceItemHiddenVisualChar">$1</span>');

-				nv = nv.replace(/\u00a0/g, '\u00b7');

-				tinyMCE.setOuterHTML(nl[i], nv, d);

+(function() {

+	tinymce.create('tinymce.plugins.VisualChars', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);

+

+			// Register buttons

+			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});

+

+			ed.onBeforeGetContent.add(function(ed, o) {

+				if (t.state) {

+					t.state = true;

+					t._toggleVisualChars();

+				}

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Visual characters',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		_toggleVisualChars : function() {

+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo;

+

+			t.state = !t.state;

+			ed.controlManager.setActive('visualchars', t.state);

+

+			if (t.state) {

+				nl = [];

+				tinymce.walk(b, function(n) {

+					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)

+						nl.push(n);

+				}, 'childNodes');

+

+				for (i=0; i<nl.length; i++) {

+					nv = nl[i].nodeValue;

+					nv = nv.replace(/(\u00a0+)/g, '<span class="mceItemHidden mceVisualNbsp">$1</span>');

+					nv = nv.replace(/\u00a0/g, '\u00b7');

+					ed.dom.setOuterHTML(nl[i], nv, d);

+				}

+			} else {

+				nl = tinymce.grep(ed.dom.select('span', b), function(n) {

+					return ed.dom.hasClass(n, 'mceVisualNbsp');

+				});

+

+				for (i=0; i<nl.length; i++)

+					ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);

 			}

-		} else {

-			nl = tinyMCE.selectNodes(b, function(n) {return n.nodeType == 1 && n.nodeName == 'SPAN' && n.className == 'mceItemHiddenVisualChar';});

-

-			for (i=0; i<nl.length; i++)

-				tinyMCE.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);

 		}

+	});

 

-		//s.moveToBookmark(bo);

-	}

-};

-

-tinyMCE.addPlugin("visualchars", TinyMCE_VisualCharsPlugin);

+	// Register plugin

+	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);

+})();
\ No newline at end of file
diff --git a/program/js/tiny_mce/plugins/visualchars/images/visualchars.gif b/program/js/tiny_mce/plugins/visualchars/images/visualchars.gif
deleted file mode 100644
index 3b4293e06..000000000
--- a/program/js/tiny_mce/plugins/visualchars/images/visualchars.gif
+++ /dev/null
diff --git a/program/js/tiny_mce/plugins/visualchars/langs/en.js b/program/js/tiny_mce/plugins/visualchars/langs/en.js
deleted file mode 100644
index a82a4ee57..000000000
--- a/program/js/tiny_mce/plugins/visualchars/langs/en.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// EN lang variables

-

-tinyMCE.addToLang('visualchars',{

-desc : 'Visual control characters on/off.'

-});