Commit ae0504ca authored by fettesvieh's avatar fettesvieh

updated TinyMCE to version 3.3.9.2

parent 51980485
<?xml version="1.0" encoding="UTF-8"?>
<editor>
<name>TinyMCE</name>
<version>3.3.9</version>
<version>3.3.9.2</version>
</editor>
\ No newline at end of file
......@@ -87,4 +87,14 @@
.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto}
.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)}
\ No newline at end of file
.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)}
/* IE9 fixes */
.clearlooks2.ie9 .mceTop .mceCenter {clip:auto;}
.clearlooks2.ie9 .mceMiddle {clip:auto;}
.clearlooks2.ie9 .mceMiddle .mceLeft, .clearlooks2.ie9 .mceMiddle .mceRight {top: 23px;}
.clearlooks2.ie9 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {top:13px;}
.clearlooks2.ie9 .mceModal .mceMiddle {top:23px}
.clearlooks2.ie9 .mceModal .mceMiddle .mceLeft, .clearlooks2.ie9 .mceModal .mceMiddle .mceRight {top: 0}
.clearlooks2.ie9 .mceMiddle .mceIcon {top:13px}
.clearlooks2.ie9 .mceTop .mceCenter {top:0; right:auto; left:6px; width:calc(100%-12px)}
......@@ -42,6 +42,10 @@ var SearchReplaceDialog = {
ca = f[m + '_panel_casesensitivebox'].checked;
rs = f['replace_panel_replacestring'].value;
if (tinymce.isIE) {
r = ed.getDoc().selection.createRange();
}
if (s == '')
return;
......@@ -106,6 +110,10 @@ var SearchReplaceDialog = {
se.collapse(b);
r = se.getRng();
if (tinymce.isIE) {
r = ed.getDoc().selection.createRange();
}
// Whats the point
if (!s)
return;
......
......@@ -234,8 +234,13 @@ function insertTable() {
tinymce.each(dom.select('table[_mce_new]'), function(node) {
var td = dom.select('td', node);
inst.selection.select(td[0], true);
inst.selection.collapse();
try {
// IE9 might fail to do this selection
inst.selection.select(td[0], true);
inst.selection.collapse();
} catch (ex) {
// Ignore
}
dom.setAttrib(node, '_mce_new', '');
});
......
......@@ -44,19 +44,13 @@ function toggleWordWrap(elm) {
setWrap('off');
}
var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
function resizeInputs() {
var el = document.getElementById('htmlSource');
var vp = tinyMCEPopup.dom.getViewPort(window), el;
if (!tinymce.isIE) {
wHeight = self.innerHeight - 65;
wWidth = self.innerWidth - 16;
} else {
wHeight = document.body.clientHeight - 70;
wWidth = document.body.clientWidth - 16;
}
el = document.getElementById('htmlSource');
el.style.height = Math.abs(wHeight) + 'px';
el.style.width = Math.abs(wWidth) + 'px';
if (el) {
el.style.width = (vp.w - 20) + 'px';
el.style.height = (vp.h - 65) + 'px';
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -6,7 +6,7 @@
* @package ACP3
* @subpackage Core
*/
define('ACP3_ROOT', './');
define('ACP3_ROOT', dirname(__FILE__) . '/');
require ACP3_ROOT . 'includes/common.php';
modules::outputPage();
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment