Upgrade TinyMCE to 3.2.7. Fixes bug #10993.
This commit is contained in:
Colin Kuskie
parent
dae7215922
commit
a2a2bac440
140 changed files with 8023 additions and 3591 deletions
|
|
@ -1,68 +1,16 @@
|
|||
#id, #name, #hspace, #vspace, #class_name, #align {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
#hspace, #vspace {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode {
|
||||
width: 100px;
|
||||
}
|
||||
|
||||
#flash_base, #flash_flashvars {
|
||||
width: 240px;
|
||||
}
|
||||
|
||||
#width, #height {
|
||||
width: 40px;
|
||||
}
|
||||
|
||||
#src, #media_type {
|
||||
width: 250px;
|
||||
}
|
||||
|
||||
#class {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
#prev {
|
||||
margin: 0;
|
||||
border: 1px solid black;
|
||||
width: 99%;
|
||||
height: 230px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.panel_wrapper div.current {
|
||||
height: 390px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.mceAddSelectValue {
|
||||
background-color: #DDDDDD;
|
||||
}
|
||||
|
||||
#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume {
|
||||
width: 70px;
|
||||
}
|
||||
|
||||
#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume {
|
||||
width: 70px;
|
||||
}
|
||||
|
||||
#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks {
|
||||
width: 70px;
|
||||
}
|
||||
|
||||
#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle {
|
||||
width: 90px;
|
||||
}
|
||||
|
||||
#qt_qtsrc {
|
||||
width: 200px;
|
||||
}
|
||||
#id, #name, #hspace, #vspace, #class_name, #align { width: 100px }
|
||||
#hspace, #vspace { width: 50px }
|
||||
#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
|
||||
#flash_base, #flash_flashvars { width: 240px }
|
||||
#width, #height { width: 40px }
|
||||
#src, #media_type { width: 250px }
|
||||
#class { width: 120px }
|
||||
#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }
|
||||
.panel_wrapper div.current { height: 390px; overflow: auto }
|
||||
#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
|
||||
.mceAddSelectValue { background-color: #DDDDDD }
|
||||
#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
|
||||
#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
|
||||
#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
|
||||
#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
|
||||
#qt_qtsrc { width: 200px }
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* $Id: editor_plugin_src.js 615 2008-02-20 23:18:01Z spocke $
|
||||
* $Id: editor_plugin_src.js 1222 2009-09-03 17:26:47Z spocke $
|
||||
*
|
||||
* @author Moxiecode
|
||||
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
|
||||
|
|
@ -19,6 +19,11 @@
|
|||
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|_mce_value]');
|
||||
});
|
||||
|
||||
// Register commands
|
||||
ed.addCommand('mceMedia', function() {
|
||||
ed.windowManager.open({
|
||||
|
|
@ -47,9 +52,16 @@
|
|||
mceItemRealMedia : 'realmedia'
|
||||
};
|
||||
|
||||
ed.dom.loadCSS(url + "/css/content.css");
|
||||
ed.selection.onSetContent.add(function() {
|
||||
t._spansToImgs(ed.getBody());
|
||||
});
|
||||
|
||||
if (ed.theme.onResolveName) {
|
||||
ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);
|
||||
|
||||
if (ed.settings.content_css !== false)
|
||||
ed.dom.loadCSS(url + "/css/content.css");
|
||||
|
||||
if (ed.theme && ed.theme.onResolveName) {
|
||||
ed.theme.onResolveName.add(function(th, o) {
|
||||
if (o.name == 'img') {
|
||||
each(lo, function(v, k) {
|
||||
|
|
@ -72,23 +84,7 @@
|
|||
}
|
||||
});
|
||||
|
||||
ed.onBeforeSetContent.add(function(ed, o) {
|
||||
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(/<\/(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.onBeforeSetContent.add(t._objectsToSpans, t);
|
||||
|
||||
ed.onSetContent.add(function() {
|
||||
t._spansToImgs(ed.getBody());
|
||||
|
|
@ -166,17 +162,17 @@
|
|||
});
|
||||
|
||||
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);
|
||||
function getAttr(s, n) {
|
||||
n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
|
||||
|
||||
return n ? ed.dom.decode(n[1]) : '';
|
||||
};
|
||||
return n ? ed.dom.decode(n[1]) : '';
|
||||
};
|
||||
|
||||
ed.onPostProcess.add(function(ed, o) {
|
||||
ed.onPostProcess.add(function(ed, o) {
|
||||
if (ed.getParam('media_use_script')) {
|
||||
o.content = o.content.replace(/<img[^>]+>/g, function(im) {
|
||||
var cl = getAttr(im, 'class');
|
||||
|
||||
|
|
@ -189,8 +185,8 @@
|
|||
|
||||
return im;
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
getInfo : function() {
|
||||
|
|
@ -204,30 +200,72 @@
|
|||
},
|
||||
|
||||
// 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', {
|
||||
id : p.id,
|
||||
mce_name : 'object',
|
||||
type : 'application/x-shockwave-flash',
|
||||
data : p.src,
|
||||
style : dom.getAttrib(n, 'style'),
|
||||
width : o.width,
|
||||
height : o.height
|
||||
});
|
||||
} else {
|
||||
ob = dom.create('span', {
|
||||
id : p.id,
|
||||
mce_name : 'object',
|
||||
classid : "clsid:" + o.classid,
|
||||
style : dom.getAttrib(n, 'style'),
|
||||
codebase : o.codebase,
|
||||
width : o.width,
|
||||
height : o.height
|
||||
});
|
||||
}
|
||||
|
||||
each (p, function(v, k) {
|
||||
if (!/^(width|height|codebase|classid)$/.test(k))
|
||||
dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v});
|
||||
if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {
|
||||
// Use url instead of src in IE for Windows media
|
||||
if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)
|
||||
k = 'url';
|
||||
|
||||
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, style : dom.getAttrib(n, 'style')}, p));
|
||||
|
||||
return ob;
|
||||
},
|
||||
|
|
@ -301,18 +339,21 @@
|
|||
},
|
||||
|
||||
_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', 'data'];
|
||||
|
||||
// Create image
|
||||
im = dom.create('img', {
|
||||
src : this.url + '/img/trans.gif',
|
||||
width : dom.getAttrib(n, 'width') || 100,
|
||||
height : dom.getAttrib(n, 'height') || 100,
|
||||
style : dom.getAttrib(n, 'style'),
|
||||
'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)
|
||||
|
|
@ -322,7 +363,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
|
||||
|
|
@ -331,6 +372,23 @@
|
|||
delete pa.movie;
|
||||
}
|
||||
|
||||
// No src try data
|
||||
if (!pa.src) {
|
||||
pa.src = pa.data;
|
||||
delete pa.data;
|
||||
}
|
||||
|
||||
// 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;
|
||||
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ function insertMedia() {
|
|||
tinyMCEPopup.restoreSelection();
|
||||
|
||||
if (!AutoValidator.validate(f)) {
|
||||
alert(ed.getLang('invalid_data'));
|
||||
tinyMCEPopup.alert(ed.getLang('invalid_data'));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -218,7 +218,7 @@ function insertMedia() {
|
|||
break;
|
||||
}
|
||||
|
||||
if (fe.width != f.width.value || fe.height != f.height.height)
|
||||
if (fe.width != f.width.value || fe.height != f.height.value)
|
||||
ed.execCommand('mceRepaint');
|
||||
|
||||
fe.title = serializeParameters();
|
||||
|
|
@ -359,7 +359,9 @@ function changedType(t) {
|
|||
d.getElementById('shockwave_options').style.display = 'none';
|
||||
d.getElementById('wmp_options').style.display = 'none';
|
||||
d.getElementById('rmp_options').style.display = 'none';
|
||||
d.getElementById(t + '_options').style.display = 'block';
|
||||
|
||||
if (t)
|
||||
d.getElementById(t + '_options').style.display = 'block';
|
||||
}
|
||||
|
||||
function serializeParameters() {
|
||||
|
|
@ -467,7 +469,7 @@ function setBool(pl, p, n) {
|
|||
if (typeof(pl[n]) == "undefined")
|
||||
return;
|
||||
|
||||
document.forms[0].elements[p + "_" + n].checked = pl[n];
|
||||
document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';
|
||||
}
|
||||
|
||||
function setStr(pl, p, n) {
|
||||
|
|
@ -488,7 +490,7 @@ function getBool(p, n, d, tv, fv) {
|
|||
tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
|
||||
fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
|
||||
|
||||
return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');
|
||||
return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");
|
||||
}
|
||||
|
||||
function getStr(p, n, d) {
|
||||
|
|
@ -598,14 +600,17 @@ function generatePreview(c) {
|
|||
pl.name = !pl.name ? 'eobj' : pl.name;
|
||||
pl.align = !pl.align ? '' : pl.align;
|
||||
|
||||
h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
|
||||
// Avoid annoying warning about insecure items
|
||||
if (!tinymce.isIE || document.location.protocol != 'https:') {
|
||||
h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
|
||||
|
||||
for (n in pl) {
|
||||
h += '<param name="' + n + '" value="' + pl[n] + '">';
|
||||
for (n in pl) {
|
||||
h += '<param name="' + n + '" value="' + pl[n] + '">';
|
||||
|
||||
// Add extra url parameter if it's an absolute URL
|
||||
if (n == 'src' && pl[n].indexOf('://') != -1)
|
||||
h += '<param name="url" value="' + pl[n] + '" />';
|
||||
// Add extra url parameter if it's an absolute URL
|
||||
if (n == 'src' && pl[n].indexOf('://') != -1)
|
||||
h += '<param name="url" value="' + pl[n] + '" />';
|
||||
}
|
||||
}
|
||||
|
||||
h += '<embed type="' + type + '" ';
|
||||
|
|
@ -613,7 +618,11 @@ function generatePreview(c) {
|
|||
for (n in pl)
|
||||
h += n + '="' + pl[n] + '" ';
|
||||
|
||||
h += '></embed></object>';
|
||||
h += '></embed>';
|
||||
|
||||
// Avoid annoying warning about insecure items
|
||||
if (!tinymce.isIE || document.location.protocol != 'https:')
|
||||
h += '</object>';
|
||||
|
||||
p.innerHTML = "<!-- x --->" + h;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
<script type="text/javascript" src="../../utils/form_utils.js"></script>
|
||||
<script type="text/javascript" src="../../utils/editable_selects.js"></script>
|
||||
<link href="css/media.css" rel="stylesheet" type="text/css" />
|
||||
<base target="_self" />
|
||||
</head>
|
||||
<body style="display: none">
|
||||
<form onsubmit="insertMedia();return false;" action="#">
|
||||
|
|
@ -33,7 +32,7 @@
|
|||
<option value="flash">Flash</option>
|
||||
<!-- <option value="flv">Flash video (FLV)</option> -->
|
||||
<option value="qt">Quicktime</option>
|
||||
<option value="shockwave">Shockware</option>
|
||||
<option value="shockwave">Shockwave</option>
|
||||
<option value="wmp">Windows Media</option>
|
||||
<option value="rmp">Real Media</option>
|
||||
</select>
|
||||
|
|
@ -52,7 +51,7 @@
|
|||
</tr>
|
||||
<tr id="linklistrow">
|
||||
<td><label for="linklist">{#media_dlg.list}</label></td>
|
||||
<td id="linklistcontainer"> </td>
|
||||
<td id="linklistcontainer"><select id="linklist"><option value=""></option></select></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><label for="width">{#media_dlg.size}</label></td>
|
||||
|
|
@ -260,8 +259,7 @@
|
|||
<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>
|
||||
<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>
|
||||
|
||||
<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>
|
||||
<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue