Enano CMS (1.1.x): comparison includes/clientside/tinymce/plugins/media/editor_plugin_src.js

Mercurial Mercurial > repos > enano-1.1 / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

includes/clientside/tinymce/plugins/media/editor_plugin_src.js

changeset 778	57ce13805b6f
parent 588	20484deb89cd
child 1193	e3b94bd055dc

equal deleted inserted replaced

-:488665d49417
+:57ce13805b6f
 /**
-* $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.
 */
 				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
 			};
 			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
 			ed.addCommand('mceMedia', function() {
 				ed.windowManager.open({
 					mceItemShockWave : 'shockwave',
 					mceItemWindowsMedia : 'windowsmedia',
 					mceItemQuickTime : 'quicktime',
 					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");
 				if (ed.theme.onResolveName) {
 						}
 					});
 				}
 			});
-			ed.onBeforeSetContent.add(function(ed, o) {
+			ed.onBeforeSetContent.add(t._objectsToSpans, t);
-				var h = o.content;
-				h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
-					var o = t._parse(c);
-					return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
-				});
-				h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
-				h = h.replace(/<embed([^>]*)\/>/gi, '<span class="mceItemEmbed" $1>');
-				h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
-				h = h.replace(/<\/(object|embed)([^>]*)>/gi, '</span>');
-				h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_value=') + ' class="mceItemParam"></span>'});
-				h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
-				o.content = h;
-			});
 			ed.onSetContent.add(function() {
 				t._spansToImgs(ed.getBody());
 			});
 					});
 				}
 			});
 			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')) {
 				function getAttr(s, n) {
 					n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
 				version : tinymce.majorVersion + "." + tinymce.minorVersion
 			};
 		},
 		// Private methods
+		_objectsToSpans : function(ed, o) {
+			var t = this, h = o.content;
+			h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
+				var o = t._parse(c);
+				return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
+			});
+			h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
+			h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');
+			h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
+			h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');
+			h = h.replace(/<\/embed>/gi, '');
+			h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});
+			h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
+			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;
 		},
 		_spansToImgs : function(p) {
 				}
 			});
 		},
 		_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', {
 				src : this.url + '/img/trans.gif',
 				width : dom.getAttrib(n, 'width') || 100,
 				height : dom.getAttrib(n, 'height') || 100,
 				'class' : cl
 			});
 			// 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)
 					pa[na] = v;
 			});
 			// 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
 			if (pa.movie) {
 				pa.src = pa.movie;
 				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;
 			im.title = this._serialize(pa);

Enano CMS (1.1.x)