X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FTinyMCE%2Fjs%2Fplugins%2Fpaste%2Feditor_plugin_src.js;h=9f8d39f73016efcff74133f1606f1d0e53a24257;hb=d67b8fdae83d948bf997a7f7cdbb71b52d9481e9;hp=ad9740f3fe1c82ee967594fccf73e5af1dc44546;hpb=0ed9000fd34497644829a4d0ef700bdea519771f;p=quix0rs-gnu-social.git
diff --git a/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
index ad9740f3fe..9f8d39f730 100644
--- a/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
@@ -10,9 +10,9 @@
(function() {
var each = tinymce.each,
- entities = null,
defs = {
paste_auto_cleanup_on_paste : true,
+ paste_enable_default_filters : true,
paste_block_drop : false,
paste_retain_style_properties : "none",
paste_strip_class_attributes : "mso",
@@ -25,6 +25,7 @@
paste_dialog_height : "400",
paste_text_use_dialog : false,
paste_text_sticky : false,
+ paste_text_sticky_default : false,
paste_text_notifyalways : false,
paste_text_linebreaktype : "p",
paste_text_replacements : [
@@ -63,13 +64,19 @@
ed.execCallback('paste_postprocess', pl, o);
});
+ ed.onKeyDown.addToTop(function(ed, e) {
+ // Block ctrl+v from adding an undo level since the default logic in tinymce.Editor will add that
+ if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))
+ return false; // Stop other listeners
+ });
+
// Initialize plain text flag
- ed.pasteAsPlainText = false;
+ ed.pasteAsPlainText = getParam(ed, 'paste_text_sticky_default');
// This function executes the process handlers and inserts the contents
// force_rich overrides plain text mode set by user, important for pasting with execCommand
function process(o, force_rich) {
- var dom = ed.dom;
+ var dom = ed.dom, rng;
// Execute pre process handlers
t.onPreProcess.dispatch(t, o);
@@ -77,11 +84,22 @@
// Create DOM structure
o.node = dom.create('div', 0, o.content);
+ // If pasting inside the same element and the contents is only one block
+ // remove the block and keep the text since Firefox will copy parts of pre and h1-h6 as a pre element
+ if (tinymce.isGecko) {
+ rng = ed.selection.getRng(true);
+ if (rng.startContainer == rng.endContainer && rng.startContainer.nodeType == 3) {
+ // Is only one block node and it doesn't contain word stuff
+ if (o.node.childNodes.length === 1 && /^(p|h[1-6]|pre)$/i.test(o.node.firstChild.nodeName) && o.content.indexOf('__MCE_ITEM__') === -1)
+ dom.remove(o.node.firstChild, true);
+ }
+ }
+
// Execute post process handlers
t.onPostProcess.dispatch(t, o);
// Serialize content
- o.content = ed.serializer.serialize(o.node, {getInner : 1});
+ o.content = ed.serializer.serialize(o.node, {getInner : 1, forced_root_block : ''});
// Plain text option active?
if ((!force_rich) && (ed.pasteAsPlainText)) {
@@ -91,9 +109,6 @@
ed.pasteAsPlainText = false;
ed.controlManager.setActive("pastetext", false);
}
- } else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) {
- // Handle insertion of contents containing block elements separately
- t._insertBlockContent(ed, dom, o.content);
} else {
t._insert(o.content);
}
@@ -132,38 +147,46 @@
// hidden div and placing the caret inside it and after the browser paste
// is done it grabs that contents and processes that
function grabContent(e) {
- var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY;
+ var n, or, rng, oldRng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY, textContent;
// Check if browser supports direct plaintext access
- if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) {
- e.preventDefault();
- process({content : (e.clipboardData || dom.doc.dataTransfer).getData('Text')}, true);
- return;
+ if (e.clipboardData || dom.doc.dataTransfer) {
+ textContent = (e.clipboardData || dom.doc.dataTransfer).getData('Text');
+
+ if (ed.pasteAsPlainText) {
+ e.preventDefault();
+ process({content : textContent.replace(/\r?\n/g, '
')});
+ return;
+ }
}
if (dom.get('_mcePaste'))
return;
// Create container to paste into
- n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste'}, '\uFEFF
');
+ n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste', 'data-mce-bogus' : '1'}, '\uFEFF\uFEFF');
// If contentEditable mode we need to find out the position of the closest element
if (body != ed.getDoc().body)
posY = dom.getPos(ed.selection.getStart(), body).y;
else
- posY = body.scrollTop;
+ posY = body.scrollTop + dom.getViewPort(ed.getWin()).y;
// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles
+ // If also needs to be in view on IE or the paste would fail
dom.setStyles(n, {
position : 'absolute',
- left : -10000,
- top : posY,
+ left : tinymce.isGecko ? -40 : 0, // Need to move it out of site on Gecko since it will othewise display a ghost resize rect for the div
+ top : posY - 25,
width : 1,
height : 1,
overflow : 'hidden'
});
if (tinymce.isIE) {
+ // Store away the old range
+ oldRng = sel.getRng();
+
// Select the container
rng = dom.doc.body.createTextRange();
rng.moveToElementText(n);
@@ -174,14 +197,23 @@
// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due
// to IE security settings so we pass the junk though better than nothing right
- if (n.innerHTML === '\uFEFF') {
+ if (n.innerHTML === '\uFEFF\uFEFF') {
ed.execCommand('mcePasteWord');
e.preventDefault();
return;
}
- // Process contents
- process({content : n.innerHTML});
+ // Restore the old range and clear the contents before pasting
+ sel.setRng(oldRng);
+ sel.setContent('');
+
+ // For some odd reason we need to detach the the mceInsertContent call from the paste event
+ // It's like IE has a reference to the parent element that you paste in and the selection gets messed up
+ // when it tries to restore the selection
+ setTimeout(function() {
+ // Process contents
+ process({content : n.innerHTML});
+ }, 0);
// Block the real paste event
return tinymce.dom.Event.cancel(e);
@@ -196,46 +228,51 @@
or = ed.selection.getRng();
- // Move caret into hidden div
+ // Move select contents inside DIV
n = n.firstChild;
rng = ed.getDoc().createRange();
rng.setStart(n, 0);
- rng.setEnd(n, 1);
+ rng.setEnd(n, 2);
sel.setRng(rng);
// Wait a while and grab the pasted contents
window.setTimeout(function() {
- var h = '', nl = dom.select('div.mcePaste');
+ var h = '', nl;
- // WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string
- each(nl, function(n) {
- var child = n.firstChild;
+ // Paste divs duplicated in paste divs seems to happen when you paste plain text so lets first look for that broken behavior in WebKit
+ if (!dom.select('div.mcePaste > div.mcePaste').length) {
+ nl = dom.select('div.mcePaste');
- // WebKit inserts a DIV container with lots of odd styles
- if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {
- dom.remove(child, 1);
- }
+ // WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string
+ each(nl, function(n) {
+ var child = n.firstChild;
- // WebKit duplicates the divs so we need to remove them
- each(dom.select('div.mcePaste', n), function(n) {
- dom.remove(n, 1);
- });
+ // WebKit inserts a DIV container with lots of odd styles
+ if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {
+ dom.remove(child, 1);
+ }
- // Remove apply style spans
- each(dom.select('span.Apple-style-span', n), function(n) {
- dom.remove(n, 1);
- });
+ // Remove apply style spans
+ each(dom.select('span.Apple-style-span', n), function(n) {
+ dom.remove(n, 1);
+ });
- // Remove bogus br elements
- each(dom.select('br[_mce_bogus]', n), function(n) {
- dom.remove(n);
- });
+ // Remove bogus br elements
+ each(dom.select('br[data-mce-bogus]', n), function(n) {
+ dom.remove(n);
+ });
- h += n.innerHTML;
- });
+ // WebKit will make a copy of the DIV for each line of plain text pasted and insert them into the DIV
+ if (n.parentNode.className != 'mcePaste')
+ h += n.innerHTML;
+ });
+ } else {
+ // Found WebKit weirdness so force the content into plain text mode
+ h = '
' + dom.encode(textContent).replace(/\r?\n/g, ''; + } // Remove the nodes - each(nl, function(n) { + each(dom.select('div.mcePaste'), function(n) { dom.remove(n); }); @@ -256,7 +293,7 @@ if (getParam(ed, "paste_auto_cleanup_on_paste")) { // Is it's Opera or older FF use key handler if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) { - ed.onKeyDown.add(function(ed, e) { + ed.onKeyDown.addToTop(function(ed, e) { if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45)) grabContent(e); }); @@ -268,17 +305,19 @@ } } - // Block all drag/drop events - if (getParam(ed, "paste_block_drop")) { - ed.onInit.add(function() { + ed.onInit.add(function() { + ed.controlManager.setActive("pastetext", ed.pasteAsPlainText); + + // Block all drag/drop events + if (getParam(ed, "paste_block_drop")) { ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) { e.preventDefault(); e.stopPropagation(); return false; }); - }); - } + } + }); // Add legacy support t._legacySupport(); @@ -295,8 +334,6 @@ }, _preProcess : function(pl, o) { - //console.log('Before preprocess:' + o.content); - var ed = this.editor, h = o.content, grep = tinymce.grep, @@ -304,6 +341,8 @@ trim = tinymce.trim, len, stripClass; + //console.log('Before preprocess:' + o.content); + function process(items) { each(items, function(v) { // Remove or replace @@ -313,6 +352,23 @@ h = h.replace(v[0], v[1]); }); } + + if (ed.settings.paste_enable_default_filters == false) { + return; + } + + // IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser + if (tinymce.isIE && document.documentMode >= 9) { + // IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser + process([[/(?:
') + '
]+(?:MsoListParagraph)[^>]+>)/gi, '$1__MCE_ITEM__'] // Convert mso-list and symbol paragraphs to item markers (FF)
]);
}
@@ -484,6 +541,11 @@
]);
}
+ process([
+ // Copy paste from Java like Open Office will produce this junk on FF
+ [/Version:[\d.]+\nStartHTML:\d+\nEndHTML:\d+\nStartFragment:\d+\nEndFragment:\d+/gi, '']
+ ]);
+
// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").
// Note:- paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.
stripClass = getParam(ed, "paste_strip_class_attributes");
@@ -503,7 +565,7 @@
};
h = h.replace(/ class="([^"]+)"/gi, removeClasses);
- h = h.replace(/ class=(\w+)/gi, removeClasses);
+ h = h.replace(/ class=([\-\w]+)/gi, removeClasses);
}
// Remove spans option
@@ -522,6 +584,10 @@
_postProcess : function(pl, o) {
var t = this, ed = t.editor, dom = ed.dom, styleProps;
+ if (ed.settings.paste_enable_default_filters == false) {
+ return;
+ }
+
if (o.wordContent) {
// Remove named anchors or TOC links
each(dom.select('a', o.node), function(a) {
@@ -573,14 +639,14 @@
if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {
each(dom.select('*[style]', o.node), function(el) {
el.removeAttribute('style');
- el.removeAttribute('_mce_style');
+ el.removeAttribute('data-mce-style');
});
} else {
if (tinymce.isWebKit) {
// We need to compress the styles on WebKit since if you paste it will become
// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles
each(dom.select('*', o.node), function(el) {
- el.removeAttribute('_mce_style');
+ el.removeAttribute('data-mce-style');
});
}
}
@@ -603,11 +669,11 @@
val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/ /g, '\u00a0');
// Detect unordered lists look for bullets
- if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val))
+ if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*\u00a0*/.test(val))
type = 'ul';
// Detect ordered lists 1., a. or ixv.
- if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val))
+ if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0+/.test(val))
type = 'ol';
// Check if node value matches the list pattern: o
@@ -637,9 +703,9 @@
var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');
// Remove span with the middot or the number
- if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html))
+ if (type == 'ul' && /^__MCE_ITEM__[\u2022\u00b7\u00a7\u00d8o\u25CF]/.test(html))
dom.remove(span);
- else if (/^[\s\S]*\w+\.( |\u00a0)*\s*/.test(html))
+ else if (/^__MCE_ITEM__[\s\S]*\w+\.( |\u00a0)*\s*/.test(html))
dom.remove(span);
});
@@ -647,7 +713,7 @@
// Remove middot/list items
if (type == 'ul')
- html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*( |\u00a0)+\s*/, '');
+ html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*( |\u00a0)+\s*/, '');
else
html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.( |\u00a0)+\s*/, '');
@@ -667,65 +733,6 @@
o.node.innerHTML = html.replace(/__MCE_ITEM__/g, '');
},
- /**
- * This method will split the current block parent and insert the contents inside the split position.
- * This logic can be improved so text nodes at the start/end remain in the start/end block elements
- */
- _insertBlockContent : function(ed, dom, content) {
- var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker';
-
- function select(n) {
- var r;
-
- if (tinymce.isIE) {
- r = ed.getDoc().body.createTextRange();
- r.moveToElementText(n);
- r.collapse(false);
- r.select();
- } else {
- sel.select(n, 1);
- sel.collapse(false);
- }
- }
-
- // Insert a marker for the caret position
- this._insert('', 1);
- marker = dom.get(markerId);
- parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td');
-
- // If it's a parent block but not a table cell
- if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) {
- // Split parent block
- marker = dom.split(parentBlock, marker);
-
- // Insert nodes before the marker
- each(dom.create('div', 0, content).childNodes, function(n) {
- last = marker.parentNode.insertBefore(n.cloneNode(true), marker);
- });
-
- // Move caret after marker
- select(last);
- } else {
- dom.setOuterHTML(marker, content);
- sel.select(ed.getBody(), 1);
- sel.collapse(0);
- }
-
- // Remove marker if it's left
- while (elm = dom.get(markerId))
- dom.remove(elm);
-
- // Get element, position and height
- elm = sel.getStart();
- vp = dom.getViewPort(ed.getWin());
- y = ed.dom.getPos(elm).y;
- elmHeight = elm.clientHeight;
-
- // Is element within viewport if not then scroll it into view
- if (y < vp.y || y + elmHeight > vp.y + vp.h)
- ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25;
- },
-
/**
* Inserts the specified contents at the caret position.
*/
@@ -736,8 +743,7 @@
if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)
ed.getDoc().execCommand('Delete', false, null);
- // It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents
- ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo});
+ ed.execCommand('mceInsertContent', false, h, {skip_undo : skip_undo});
},
/**
@@ -769,9 +775,6 @@
};
if ((typeof(h) === "string") && (h.length > 0)) {
- if (!entities)
- entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(",");
-
// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line
if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) {
process([
@@ -790,26 +793,12 @@
[/<\/t[dh]>\s*