Upgrade TinyMCE to 3.4.2, fixes bugs 11955, 11992
This commit is contained in:
Colin Kuskie
parent
faddfc5d8a
commit
38de00f931
422 changed files with 17224 additions and 23491 deletions
|
|
@ -1,10 +1,11 @@
|
|||
/**
|
||||
* $Id: editable_selects.js 867 2008-06-09 20:33:40Z spocke $
|
||||
* editable_selects.js
|
||||
*
|
||||
* Makes select boxes editable.
|
||||
* Copyright 2009, Moxiecode Systems AB
|
||||
* Released under LGPL License.
|
||||
*
|
||||
* @author Moxiecode
|
||||
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
|
||||
* License: http://tinymce.moxiecode.com/license
|
||||
* Contributing: http://tinymce.moxiecode.com/contributing
|
||||
*/
|
||||
|
||||
var TinyMCE_EditableSelects = {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,24 @@
|
|||
/**
|
||||
* $Id: form_utils.js 1184 2009-08-11 11:47:27Z spocke $
|
||||
* form_utils.js
|
||||
*
|
||||
* Various form utilitiy functions.
|
||||
* Copyright 2009, Moxiecode Systems AB
|
||||
* Released under LGPL License.
|
||||
*
|
||||
* @author Moxiecode
|
||||
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
|
||||
* License: http://tinymce.moxiecode.com/license
|
||||
* Contributing: http://tinymce.moxiecode.com/contributing
|
||||
*/
|
||||
|
||||
var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
|
||||
|
||||
function getColorPickerHTML(id, target_form_element) {
|
||||
var h = "";
|
||||
var h = "", dom = tinyMCEPopup.dom;
|
||||
|
||||
h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
|
||||
h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"> </span></a>';
|
||||
if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
|
||||
label.id = label.id || dom.uniqueId();
|
||||
}
|
||||
|
||||
h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
|
||||
h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"> <span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
|
||||
|
||||
return h;
|
||||
}
|
||||
|
|
@ -66,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
|
|||
if (!form_obj || !form_obj.elements[field_name])
|
||||
return;
|
||||
|
||||
if (!value)
|
||||
value = "";
|
||||
|
||||
var sel = form_obj.elements[field_name];
|
||||
|
||||
var found = false;
|
||||
|
|
@ -170,7 +178,7 @@ function convertHexToRGB(col) {
|
|||
}
|
||||
|
||||
function trimSize(size) {
|
||||
return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
|
||||
return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
|
||||
}
|
||||
|
||||
function getCSSSize(size) {
|
||||
|
|
@ -182,6 +190,9 @@ function getCSSSize(size) {
|
|||
// Add px
|
||||
if (/^[0-9]+$/.test(size))
|
||||
size += 'px';
|
||||
// Sanity check, IE doesn't like broken values
|
||||
else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
|
||||
return "";
|
||||
|
||||
return size;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,210 +0,0 @@
|
|||
/**
|
||||
* $Id: mclayer.js 520 2008-01-07 16:30:32Z spocke $
|
||||
*
|
||||
* Moxiecode floating layer script.
|
||||
*
|
||||
* @author Moxiecode
|
||||
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
|
||||
*/
|
||||
|
||||
function MCLayer(id) {
|
||||
this.id = id;
|
||||
this.settings = new Array();
|
||||
this.blockerElement = null;
|
||||
this.isMSIE = navigator.appName == "Microsoft Internet Explorer";
|
||||
this.events = false;
|
||||
this.autoHideCallback = null;
|
||||
}
|
||||
|
||||
MCLayer.prototype = {
|
||||
moveRelativeTo : function(re, p, a) {
|
||||
var rep = this.getAbsPosition(re);
|
||||
var w = parseInt(re.offsetWidth);
|
||||
var h = parseInt(re.offsetHeight);
|
||||
var x, y;
|
||||
|
||||
switch (p) {
|
||||
case "tl":
|
||||
break;
|
||||
|
||||
case "tr":
|
||||
x = rep.absLeft + w;
|
||||
y = rep.absTop;
|
||||
break;
|
||||
|
||||
case "bl":
|
||||
break;
|
||||
|
||||
case "br":
|
||||
break;
|
||||
}
|
||||
|
||||
this.moveTo(x, y);
|
||||
},
|
||||
|
||||
moveBy : function(dx, dy) {
|
||||
var e = this.getElement();
|
||||
var x = parseInt(e.style.left);
|
||||
var y = parseInt(e.style.top);
|
||||
|
||||
e.style.left = (x + dx) + "px";
|
||||
e.style.top = (y + dy) + "px";
|
||||
|
||||
this.updateBlocker();
|
||||
},
|
||||
|
||||
moveTo : function(x, y) {
|
||||
var e = this.getElement();
|
||||
|
||||
e.style.left = x + "px";
|
||||
e.style.top = y + "px";
|
||||
|
||||
this.updateBlocker();
|
||||
},
|
||||
|
||||
show : function() {
|
||||
MCLayer.visibleLayer = this;
|
||||
|
||||
this.getElement().style.display = 'block';
|
||||
this.updateBlocker();
|
||||
},
|
||||
|
||||
hide : function() {
|
||||
this.getElement().style.display = 'none';
|
||||
this.updateBlocker();
|
||||
},
|
||||
|
||||
setAutoHide : function(s, cb) {
|
||||
this.autoHideCallback = cb;
|
||||
this.registerEventHandlers();
|
||||
},
|
||||
|
||||
getElement : function() {
|
||||
return document.getElementById(this.id);
|
||||
},
|
||||
|
||||
updateBlocker : function() {
|
||||
if (!this.isMSIE)
|
||||
return;
|
||||
|
||||
var e = this.getElement();
|
||||
var b = this.getBlocker();
|
||||
var x = this.parseInt(e.style.left);
|
||||
var y = this.parseInt(e.style.top);
|
||||
var w = this.parseInt(e.offsetWidth);
|
||||
var h = this.parseInt(e.offsetHeight);
|
||||
|
||||
b.style.left = x + 'px';
|
||||
b.style.top = y + 'px';
|
||||
b.style.width = w + 'px';
|
||||
b.style.height = h + 'px';
|
||||
b.style.display = e.style.display;
|
||||
},
|
||||
|
||||
getBlocker : function() {
|
||||
if (!this.blockerElement) {
|
||||
var d = document, b = d.createElement("iframe");
|
||||
|
||||
b.style.cssText = 'display: none; left: 0px; position: absolute; top: 0';
|
||||
b.src = 'javascript:false;';
|
||||
b.frameBorder = '0';
|
||||
b.scrolling = 'no';
|
||||
|
||||
d.body.appendChild(b);
|
||||
this.blockerElement = b;
|
||||
}
|
||||
|
||||
return this.blockerElement;
|
||||
},
|
||||
|
||||
getAbsPosition : function(n) {
|
||||
var p = {absLeft : 0, absTop : 0};
|
||||
|
||||
while (n) {
|
||||
p.absLeft += n.offsetLeft;
|
||||
p.absTop += n.offsetTop;
|
||||
n = n.offsetParent;
|
||||
}
|
||||
|
||||
return p;
|
||||
},
|
||||
|
||||
registerEventHandlers : function() {
|
||||
if (!this.events) {
|
||||
var d = document;
|
||||
|
||||
this.addEvent(d, 'mousedown', MCLayer.prototype.onMouseDown);
|
||||
|
||||
this.events = true;
|
||||
}
|
||||
},
|
||||
|
||||
addEvent : function(o, n, h) {
|
||||
if (o.attachEvent)
|
||||
o.attachEvent("on" + n, h);
|
||||
else
|
||||
o.addEventListener(n, h, false);
|
||||
},
|
||||
|
||||
onMouseDown : function(e) {
|
||||
e = typeof(e) == "undefined" ? window.event : e;
|
||||
var b = document.body;
|
||||
var l = MCLayer.visibleLayer;
|
||||
|
||||
if (l) {
|
||||
var mx = l.isMSIE ? e.clientX + b.scrollLeft : e.pageX;
|
||||
var my = l.isMSIE ? e.clientY + b.scrollTop : e.pageY;
|
||||
var el = l.getElement();
|
||||
var x = parseInt(el.style.left);
|
||||
var y = parseInt(el.style.top);
|
||||
var w = parseInt(el.offsetWidth);
|
||||
var h = parseInt(el.offsetHeight);
|
||||
|
||||
if (!(mx > x && mx < x + w && my > y && my < y + h)) {
|
||||
MCLayer.visibleLayer = null;
|
||||
|
||||
if (l.autoHideCallback && l.autoHideCallback(l, e, mx, my))
|
||||
return true;
|
||||
|
||||
l.hide();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
addCSSClass : function(e, c) {
|
||||
this.removeCSSClass(e, c);
|
||||
var a = this.explode(' ', e.className);
|
||||
a[a.length] = c;
|
||||
e.className = a.join(' ');
|
||||
},
|
||||
|
||||
removeCSSClass : function(e, c) {
|
||||
var a = this.explode(' ', e.className), i;
|
||||
|
||||
for (i=0; i<a.length; i++) {
|
||||
if (a[i] == c)
|
||||
a[i] = '';
|
||||
}
|
||||
|
||||
e.className = a.join(' ');
|
||||
},
|
||||
|
||||
explode : function(d, s) {
|
||||
var ar = s.split(d);
|
||||
var oar = new Array();
|
||||
|
||||
for (var i = 0; i<ar.length; i++) {
|
||||
if (ar[i] != "")
|
||||
oar[oar.length] = ar[i];
|
||||
}
|
||||
|
||||
return oar;
|
||||
},
|
||||
|
||||
parseInt : function(s) {
|
||||
if (s == null || s == '')
|
||||
return 0;
|
||||
|
||||
return parseInt(s);
|
||||
}
|
||||
}
|
||||
114
www/extras/tinymce/jscripts/tiny_mce/utils/mctabs.js
vendored
114
www/extras/tinymce/jscripts/tiny_mce/utils/mctabs.js
vendored
|
|
@ -1,14 +1,16 @@
|
|||
/**
|
||||
* $Id: mctabs.js 758 2008-03-30 13:53:29Z spocke $
|
||||
* mctabs.js
|
||||
*
|
||||
* Moxiecode DHTML Tabs script.
|
||||
* Copyright 2009, Moxiecode Systems AB
|
||||
* Released under LGPL License.
|
||||
*
|
||||
* @author Moxiecode
|
||||
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
|
||||
* License: http://tinymce.moxiecode.com/license
|
||||
* Contributing: http://tinymce.moxiecode.com/contributing
|
||||
*/
|
||||
|
||||
function MCTabs() {
|
||||
this.settings = [];
|
||||
this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
|
||||
};
|
||||
|
||||
MCTabs.prototype.init = function(settings) {
|
||||
|
|
@ -27,26 +29,62 @@ MCTabs.prototype.getParam = function(name, default_value) {
|
|||
return value;
|
||||
};
|
||||
|
||||
MCTabs.prototype.displayTab = function(tab_id, panel_id) {
|
||||
var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
|
||||
MCTabs.prototype.showTab =function(tab){
|
||||
tab.className = 'current';
|
||||
tab.setAttribute("aria-selected", true);
|
||||
tab.setAttribute("aria-expanded", true);
|
||||
tab.tabIndex = 0;
|
||||
};
|
||||
|
||||
MCTabs.prototype.hideTab =function(tab){
|
||||
var t=this;
|
||||
|
||||
tab.className = '';
|
||||
tab.setAttribute("aria-selected", false);
|
||||
tab.setAttribute("aria-expanded", false);
|
||||
tab.tabIndex = -1;
|
||||
};
|
||||
|
||||
MCTabs.prototype.showPanel = function(panel) {
|
||||
panel.className = 'current';
|
||||
panel.setAttribute("aria-hidden", false);
|
||||
};
|
||||
|
||||
MCTabs.prototype.hidePanel = function(panel) {
|
||||
panel.className = 'panel';
|
||||
panel.setAttribute("aria-hidden", true);
|
||||
};
|
||||
|
||||
MCTabs.prototype.getPanelForTab = function(tabElm) {
|
||||
return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
|
||||
};
|
||||
|
||||
MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
|
||||
var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
|
||||
|
||||
tabElm = document.getElementById(tab_id);
|
||||
|
||||
if (panel_id === undefined) {
|
||||
panel_id = t.getPanelForTab(tabElm);
|
||||
}
|
||||
|
||||
panelElm= document.getElementById(panel_id);
|
||||
panelContainerElm = panelElm ? panelElm.parentNode : null;
|
||||
tabElm = document.getElementById(tab_id);
|
||||
tabContainerElm = tabElm ? tabElm.parentNode : null;
|
||||
selectionClass = this.getParam('selection_class', 'current');
|
||||
selectionClass = t.getParam('selection_class', 'current');
|
||||
|
||||
if (tabElm && tabContainerElm) {
|
||||
nodes = tabContainerElm.childNodes;
|
||||
|
||||
// Hide all other tabs
|
||||
for (i = 0; i < nodes.length; i++) {
|
||||
if (nodes[i].nodeName == "LI")
|
||||
nodes[i].className = '';
|
||||
if (nodes[i].nodeName == "LI") {
|
||||
t.hideTab(nodes[i]);
|
||||
}
|
||||
}
|
||||
|
||||
// Show selected tab
|
||||
tabElm.className = 'current';
|
||||
t.showTab(tabElm);
|
||||
}
|
||||
|
||||
if (panelElm && panelContainerElm) {
|
||||
|
|
@ -55,11 +93,15 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id) {
|
|||
// Hide all other panels
|
||||
for (i = 0; i < nodes.length; i++) {
|
||||
if (nodes[i].nodeName == "DIV")
|
||||
nodes[i].className = 'panel';
|
||||
t.hidePanel(nodes[i]);
|
||||
}
|
||||
|
||||
if (!avoid_focus) {
|
||||
tabElm.focus();
|
||||
}
|
||||
|
||||
// Show selected panel
|
||||
panelElm.className = 'current';
|
||||
t.showPanel(panelElm);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -72,5 +114,49 @@ MCTabs.prototype.getAnchor = function() {
|
|||
return "";
|
||||
};
|
||||
|
||||
// Global instance
|
||||
|
||||
//Global instance
|
||||
var mcTabs = new MCTabs();
|
||||
|
||||
tinyMCEPopup.onInit.add(function() {
|
||||
var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
|
||||
|
||||
each(dom.select('div.tabs'), function(tabContainerElm) {
|
||||
var keyNav;
|
||||
|
||||
dom.setAttrib(tabContainerElm, "role", "tablist");
|
||||
|
||||
var items = tinyMCEPopup.dom.select('li', tabContainerElm);
|
||||
var action = function(id) {
|
||||
mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
|
||||
mcTabs.onChange.dispatch(id);
|
||||
};
|
||||
|
||||
each(items, function(item) {
|
||||
dom.setAttrib(item, 'role', 'tab');
|
||||
dom.bind(item, 'click', function(evt) {
|
||||
action(item.id);
|
||||
});
|
||||
});
|
||||
|
||||
dom.bind(dom.getRoot(), 'keydown', function(evt) {
|
||||
if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
|
||||
keyNav.moveFocus(evt.shiftKey ? -1 : 1);
|
||||
tinymce.dom.Event.cancel(evt);
|
||||
}
|
||||
});
|
||||
|
||||
each(dom.select('a', tabContainerElm), function(a) {
|
||||
dom.setAttrib(a, 'tabindex', '-1');
|
||||
});
|
||||
|
||||
keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
|
||||
root: tabContainerElm,
|
||||
items: items,
|
||||
onAction: action,
|
||||
actOnFocus: true,
|
||||
enableLeftRight: true,
|
||||
enableUpDown: true
|
||||
}, tinyMCEPopup.dom);
|
||||
});
|
||||
});
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
/**
|
||||
* $Id: validate.js 758 2008-03-30 13:53:29Z spocke $
|
||||
* validate.js
|
||||
*
|
||||
* Various form validation methods.
|
||||
* Copyright 2009, Moxiecode Systems AB
|
||||
* Released under LGPL License.
|
||||
*
|
||||
* @author Moxiecode
|
||||
* @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
|
||||
* License: http://tinymce.moxiecode.com/license
|
||||
* Contributing: http://tinymce.moxiecode.com/contributing
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -31,7 +32,7 @@ var Validator = {
|
|||
},
|
||||
|
||||
isSize : function(s) {
|
||||
return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
|
||||
return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
|
||||
},
|
||||
|
||||
isId : function(s) {
|
||||
|
|
@ -95,8 +96,10 @@ var AutoValidator = {
|
|||
var i, nl, s = this.settings, c = 0;
|
||||
|
||||
nl = this.tags(f, 'label');
|
||||
for (i=0; i<nl.length; i++)
|
||||
for (i=0; i<nl.length; i++) {
|
||||
this.removeClass(nl[i], s.invalid_cls);
|
||||
nl[i].setAttribute('aria-invalid', false);
|
||||
}
|
||||
|
||||
c += this.validateElms(f, 'input');
|
||||
c += this.validateElms(f, 'select');
|
||||
|
|
@ -108,6 +111,33 @@ var AutoValidator = {
|
|||
invalidate : function(n) {
|
||||
this.mark(n.form, n);
|
||||
},
|
||||
|
||||
getErrorMessages : function(f) {
|
||||
var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
|
||||
nl = this.tags(f, "label");
|
||||
for (i=0; i<nl.length; i++) {
|
||||
if (this.hasClass(nl[i], s.invalid_cls)) {
|
||||
field = document.getElementById(nl[i].getAttribute("for"));
|
||||
values = { field: nl[i].textContent };
|
||||
if (this.hasClass(field, s.min_cls, true)) {
|
||||
message = ed.getLang('invalid_data_min');
|
||||
values.min = this.getNum(field, s.min_cls);
|
||||
} else if (this.hasClass(field, s.number_cls)) {
|
||||
message = ed.getLang('invalid_data_number');
|
||||
} else if (this.hasClass(field, s.size_cls)) {
|
||||
message = ed.getLang('invalid_data_size');
|
||||
} else {
|
||||
message = ed.getLang('invalid_data');
|
||||
}
|
||||
|
||||
message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
|
||||
return values[b] || '{#' + b + '}';
|
||||
});
|
||||
messages.push(message);
|
||||
}
|
||||
}
|
||||
return messages;
|
||||
},
|
||||
|
||||
reset : function(e) {
|
||||
var t = ['label', 'input', 'select', 'textarea'];
|
||||
|
|
@ -118,8 +148,10 @@ var AutoValidator = {
|
|||
|
||||
for (i=0; i<t.length; i++) {
|
||||
nl = this.tags(e.form ? e.form : e, t[i]);
|
||||
for (j=0; j<nl.length; j++)
|
||||
for (j=0; j<nl.length; j++) {
|
||||
this.removeClass(nl[j], s.invalid_cls);
|
||||
nl[j].setAttribute('aria-invalid', false);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -200,6 +232,7 @@ var AutoValidator = {
|
|||
var s = this.settings;
|
||||
|
||||
this.addClass(n, s.invalid_cls);
|
||||
n.setAttribute('aria-invalid', 'true');
|
||||
this.markLabels(f, n, s.invalid_cls);
|
||||
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue