From d9344fc349e8c5765898c90bf5061e56cd21c8a0 Mon Sep 17 00:00:00 2001 From: svncommit <devs@roundcube.net> Date: Tue, 15 Apr 2008 17:22:00 -0400 Subject: [PATCH] HTML editing fixes, upgrade to TinyMCE v3.0.6 --- program/js/tiny_mce/plugins/visualchars/editor_plugin_src.js | 124 ++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 70 deletions(-) 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 fb7236d..02ec4e6 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'); +(function() { + tinymce.create('tinymce.plugins.VisualChars', { + init : function(ed, url) { + var t = this; -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 - }; - }, + t.editor = ed; - initInstance : function(inst) { - inst.visualChars = { - state : false - }; - }, + // Register commands + ed.addCommand('mceVisualChars', t._toggleVisualChars, t); - getControlHTML : function(cn) { - switch (cn) { - case "visualchars": - return tinyMCE.getButtonHTML(cn, 'lang_visualchars_desc', '{$pluginurl}/images/visualchars.gif', 'mceVisualChars', false); - } + // Register buttons + ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'}); - return ""; - }, + ed.onBeforeGetContent.add(function(ed, o) { + if (t.state) { + t.state = true; + t._toggleVisualChars(); + } + }); + }, - execCommand : function(editor_id, element, command, user_interface, value) { - var inst = tinyMCE.getInstanceById(editor_id); + 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 + }; + }, - switch (command) { - case "mceVisualChars": - this._toggleVisualChars(editor_id, inst); - return true; - } + // Private methods - return false; - }, + _toggleVisualChars : function() { + var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo; - 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); - } + t.state = !t.state; + ed.controlManager.setActive('visualchars', t.state); - return content; - }, + if (t.state) { + nl = []; + tinymce.walk(b, function(n) { + if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1) + nl.push(n); + }, 'childNodes'); - // Private plugin internal methods + 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'); + }); - _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); + for (i=0; i<nl.length; i++) + ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(·|\u00b7)/g, ' '), 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(/(·|\u00b7)/g, ' '), d); } + }); - //s.moveToBookmark(bo); - } -}; - -tinyMCE.addPlugin("visualchars", TinyMCE_VisualCharsPlugin); + // Register plugin + tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars); +})(); \ No newline at end of file -- Gitblit v1.9.1