diff -r 488665d49417 -r 57ce13805b6f includes/clientside/tinymce/plugins/media/editor_plugin_src.js --- a/includes/clientside/tinymce/plugins/media/editor_plugin_src.js Sun Dec 21 15:35:46 2008 -0500 +++ b/includes/clientside/tinymce/plugins/media/editor_plugin_src.js Sun Dec 21 16:28:00 2008 -0500 @@ -1,5 +1,5 @@ /** - * $Id: editor_plugin_src.js 870 2008-06-13 09:25:41Z spocke $ + * $Id: editor_plugin_src.js 952 2008-11-03 17:56:04Z spocke $ * * @author Moxiecode * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved. @@ -21,7 +21,7 @@ ed.onPreInit.add(function() { // Force in _value parameter this extra parameter is required for older Opera versions - ed.serializer.addRules('param[name|value|_value]'); + ed.serializer.addRules('param[name|value|_mce_value]'); }); // Register commands @@ -52,6 +52,12 @@ mceItemRealMedia : 'realmedia' }; + ed.selection.onSetContent.add(function() { + t._spansToImgs(ed.getBody()); + }); + + ed.selection.onBeforeSetContent.add(t._objectsToSpans, t); + if (ed.settings.content_css !== false) ed.dom.loadCSS(url + "/css/content.css"); @@ -78,24 +84,7 @@ } }); - ed.onBeforeSetContent.add(function(ed, o) { - var h = o.content; - - h = h.replace(/]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) { - var o = t._parse(c); - - return ' ' + ed.dom.encode(c) + '

' - }); - - h = h.replace(/]*)>/gi, ''); - h = h.replace(/]*)\/>/gi, ''); - h = h.replace(/]*)>/gi, ''); - h = h.replace(/<\/(object|embed)([^>]*)>/gi, ''); - h = h.replace(/]*)>/gi, function(a, b) {return ''}); - h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam">'); - - o.content = h; - }); + ed.onBeforeSetContent.add(t._objectsToSpans, t); ed.onSetContent.add(function() { t._spansToImgs(ed.getBody()); @@ -173,7 +162,7 @@ }); ed.onPostProcess.add(function(ed, o) { - o.content = o.content.replace(/_value=/g, 'value='); + o.content = o.content.replace(/_mce_value=/g, 'value='); }); if (ed.getParam('media_use_script')) { @@ -211,35 +200,68 @@ }, // Private methods + _objectsToSpans : function(ed, o) { + var t = this, h = o.content; + + h = h.replace(/]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) { + var o = t._parse(c); + + return ' ' + ed.dom.encode(c) + '

' + }); + + h = h.replace(/]*)>/gi, ''); + h = h.replace(/]*)\/?>/gi, ''); + h = h.replace(/]*)>/gi, ''); + h = h.replace(/<\/(object)([^>]*)>/gi, ''); + h = h.replace(/<\/embed>/gi, ''); + h = h.replace(/]*)>/gi, function(a, b) {return ''}); + h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam">'); + + o.content = h; + }, _buildObj : function(o, n) { - var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title); + var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc; + + stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash'; p.width = o.width = dom.getAttrib(n, 'width') || 100; p.height = o.height = dom.getAttrib(n, 'height') || 100; - ob = dom.create('span', { - mce_name : 'object', - classid : "clsid:" + o.classid, - codebase : o.codebase, - width : o.width, - height : o.height - }); - if (p.src) p.src = ed.convertURL(p.src, 'src', n); + if (stc) { + ob = dom.create('span', { + mce_name : 'object', + type : 'application/x-shockwave-flash', + data : p.src, + width : o.width, + height : o.height + }); + } else { + ob = dom.create('span', { + mce_name : 'object', + classid : "clsid:" + o.classid, + codebase : o.codebase, + width : o.width, + height : o.height + }); + } + each (p, function(v, k) { - if (!/^(width|height|codebase|classid)$/.test(k)) { + if (!/^(width|height|codebase|classid|_cx|_cy)$/.test(k)) { // Use url instead of src in IE for Windows media if (o.type == 'application/x-mplayer2' && k == 'src') k = 'url'; - dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v}); + if (v) + dom.add(ob, 'span', {mce_name : 'param', name : k, '_mce_value' : v}); } }); - dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p)); + if (!stc) + dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p)); return ob; }, @@ -313,7 +335,9 @@ }, _createImg : function(cl, n) { - var im, dom = this.editor.dom, pa = {}, ti = ''; + var im, dom = this.editor.dom, pa = {}, ti = '', args; + + args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality']; // Create image im = dom.create('img', { @@ -324,7 +348,7 @@ }); // Setup base parameters - each(['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode'], function(na) { + each(args, function(na) { var v = dom.getAttrib(n, na); if (v) @@ -334,7 +358,7 @@ // Add optional parameters each(dom.select('span', n), function(n) { if (dom.hasClass(n, 'mceItemParam')) - pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value'); + pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value'); }); // Use src not movie @@ -343,6 +367,17 @@ delete pa.movie; } + // Merge with embed args + n = dom.select('.mceItemEmbed', n)[0]; + if (n) { + each(args, function(na) { + var v = dom.getAttrib(n, na); + + if (v && !pa[na]) + pa[na] = v; + }); + } + delete pa.width; delete pa.height;