Bug #20268 » rtehtmlarea_bugfix_10834_trunk.patch
| typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (copie de travail) | ||
|---|---|---|
|
}
|
||
|
}
|
||
|
if (newClasses.length == 0) {
|
||
|
if (!HTMLArea.is_opera) el.removeAttribute(HTMLArea.is_gecko ? "class" : "className");
|
||
|
else el.className = '';
|
||
|
if (!HTMLArea.is_opera) {
|
||
|
el.removeAttribute("class");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
el.removeAttribute("className");
|
||
|
}
|
||
|
} else {
|
||
|
el.className = '';
|
||
|
}
|
||
|
} else {
|
||
|
el.className = newClasses.join(" ");
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js (copie de travail) | ||
|---|---|---|
|
}
|
||
|
}
|
||
|
}
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"));
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", "class");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
this.addAllowedAttribute("className");
|
||
|
}
|
||
|
this.indentedList = null;
|
||
|
|
||
|
/*
|
||
| ... | ... | |
|
},
|
||
|
|
||
|
/*
|
||
|
* This function adds an attribute to the array of allowed attributes on inline elements
|
||
|
* This function adds an attribute to the array of attributes allowed on block elements
|
||
|
*
|
||
|
* @param string attribute: the name of the attribute to be added to the array
|
||
|
*
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js (copie de travail) | ||
|---|---|---|
|
newNode.style.cssText = node.style.cssText;
|
||
|
}
|
||
|
if (node.className) {
|
||
|
newNode.setAttribute("className", node.className);
|
||
|
newNode.setAttribute("class", node.className);
|
||
|
if (!newNode.className) {
|
||
|
// IE before IE8
|
||
|
newNode.setAttribute("className", node.className);
|
||
|
}
|
||
|
} else {
|
||
|
newNode.removeAttribute("class");
|
||
|
newNode.removeAttribute("className");
|
||
|
}
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/InlineElements/inline-elements.js (copie de travail) | ||
|---|---|---|
|
if (this.editor.plugins.TextStyle && this.editor.plugins.TextStyle.instance) {
|
||
|
this.allowedAttributes = this.editor.plugins.TextStyle.instance.allowedAttributes;
|
||
|
} else {
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"));
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", "class");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
this.addAllowedAttribute("className");
|
||
|
}
|
||
|
}
|
||
|
// Getting tags configuration for inline elements
|
||
|
if (this.editorConfiguration.buttons.textstyle) {
|
||
| ... | ... | |
|
newElement.setAttribute(this.allowedAttributes[i], attributeValue);
|
||
|
}
|
||
|
}
|
||
|
// In IE, the above fails to update the class and style attributes.
|
||
|
if (HTMLArea.is_ie) {
|
||
|
if (element.style.cssText) {
|
||
|
newElement.style.cssText = element.style.cssText;
|
||
|
}
|
||
|
if (element.className) {
|
||
|
newElement.setAttribute("class", element.className);
|
||
|
if (!newElement.className) {
|
||
|
// IE before IE8
|
||
|
newElement.setAttribute("className", element.className);
|
||
|
}
|
||
|
} else {
|
||
|
newElement.removeAttribute("class");
|
||
|
// IE before IE8
|
||
|
newElement.removeAttribute("className");
|
||
|
}
|
||
|
}
|
||
|
|
||
|
if (this.tags && this.tags[tagName] && this.tags[tagName].allowedClasses) {
|
||
|
if (newElement.className && /\S/.test(newElement.className)) {
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/Language/language.js (copie de travail) | ||
|---|---|---|
|
this.allowedAttributes = this.editor.getPluginInstance("BlockElements").allowedAttributes;
|
||
|
}
|
||
|
if (!this.allowedAttributes) {
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"));
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", "class");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
this.allowedAttributes.push("className");
|
||
|
}
|
||
|
}
|
||
|
/*
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/SelectFont/select-font.js (copie de travail) | ||
|---|---|---|
|
this.editor.getPluginInstance("BlockElements").addAllowedAttribute("style");
|
||
|
}
|
||
|
if (!this.allowedAttributes) {
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"), "style");
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", "class", "style");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
this.allowedAttributes.push("className");
|
||
|
}
|
||
|
}
|
||
|
/*
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/TableOperations/table-operations.js (copie de travail) | ||
|---|---|---|
|
newCell.style.cssText = element.style.cssText;
|
||
|
}
|
||
|
if (element.className) {
|
||
|
newCell.setAttribute("className", element.className);
|
||
|
newCell.setAttribute("class", element.className);
|
||
|
if (!newCell.className) {
|
||
|
// IE before IE8
|
||
|
newCell.setAttribute("className", element.className);
|
||
|
}
|
||
|
} else {
|
||
|
newCell.removeAttribute("class");
|
||
|
// IE before IE8
|
||
|
newCell.removeAttribute("className");
|
||
|
}
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/TextStyle/text-style.js (copie de travail) | ||
|---|---|---|
|
this.REInlineTags = /^(abbr|acronym|b|bdo|big|cite|code|del|dfn|em|i|ins|kbd|q|samp|small|span|strike|strong|sub|sup|tt|u|var)$/;
|
||
|
|
||
|
// Allowed attributes on inline elements
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"));
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", "class");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
this.addAllowedAttribute("className");
|
||
|
}
|
||
|
|
||
|
/*
|
||
|
* Registering plugin "About" information
|
||
| typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js (copie de travail) | ||
|---|---|---|
|
this.editor.plugins.BlockElements.instance.addAllowedAttribute("style");
|
||
|
}
|
||
|
if (!this.allowedAttributes) {
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"), "style");
|
||
|
this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", "class", "style");
|
||
|
if (HTMLArea.is_ie) {
|
||
|
this.allowedAttributes.push("className");
|
||
|
}
|
||
|
}
|
||
|
/*
|
||