Changeset 29994 for trunk/src/wp-includes/js/tinymce/plugins/paste/plugin.js

Timestamp:

10/23/2014 02:07:15 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE: update to 4.1.6+. Adds support for cache-busting when auto-loading JS and CSS. Change the tests to run in /build. Changelog: ​https://github.com/tinymce/tinymce/blob/master/changelog.txt.
Fixes #30079

File:

• trunk/src/wp-includes/js/tinymce/plugins/paste/plugin.js (modified) (7 diffs)

trunk/src/wp-includes/js/tinymce/plugins/paste/plugin.js

@@ -346 +346 @@
             }
 
+            /**
+             * Returns the rect of the current caret if the caret is in an empty block before a
+             * BR we insert a temporary invisible character that we get the rect this way we always get a proper rect.
+             *
+             * TODO: This might be useful in core.
+             */
+            function getCaretRect(rng) {
+                var rects, textNode, node, container = rng.startContainer;
+
+                rects = rng.getClientRects();
+                if (rects.length) {
+                    return rects[0];
+                }
+
+                if (!rng.collapsed || container.nodeType != 1) {
+                    return;
+                }
+
+                node = container.childNodes[lastRng.startOffset];
+
+                // Skip empty whitespace nodes
+                while (node && node.nodeType == 3 && !node.data.length) {
+                    node = node.nextSibling;
+                }
+
+                if (!node) {
+                    return;
+                }
+
+                // Check if the location is |<br>
+                // TODO: Might need to expand this to say |<table>
+                if (node.tagName == 'BR') {
+                    textNode = dom.doc.createTextNode('\uFEFF');
+                    node.parentNode.insertBefore(textNode, node);
+
+                    rng = dom.createRng();
+                    rng.setStartBefore(textNode);
+                    rng.setEndAfter(textNode);
+
+                    rects = rng.getClientRects();
+                    dom.remove(textNode);
+                }
+
+                if (rects.length) {
+                    return rects[0];
+                }
+            }
+
             // Calculate top cordinate this is needed to avoid scrolling to top of document
             // We want the paste bin to be as close to the caret as possible to avoid scrolling
             if (lastRng.getClientRects) {
-                var rects = lastRng.getClientRects();
-
-                if (rects.length) {
+                var rect = getCaretRect(lastRng);
+
+                if (rect) {
                     // Client rects gets us closes to the actual
                     // caret location in for example a wrapped paragraph block
-                    top = scrollTop + (rects[0].top - dom.getPos(body).y);
+                    top = scrollTop + (rect.top - dom.getPos(body).y);
                 } else {
                     top = scrollTop;
@@ -532 +580 @@
 
         /**
-         * Chrome on Andoid doesn't support proper clipboard access so we have no choice but to allow the browser default behavior.
+         * Chrome on Android doesn't support proper clipboard access so we have no choice but to allow the browser default behavior.
          *
          * @param {Event} e Paste event object to check if it contains any data.
          * @return {Boolean} true/false if the clipboard is empty or not.
          */
-        function isBrokenAndoidClipboardEvent(e) {
+        function isBrokenAndroidClipboardEvent(e) {
             var clipboardData = e.clipboardData;
 
@@ -631 +679 @@
                 keyboardPastePlainTextState = false;
 
-                if (e.isDefaultPrevented() || isBrokenAndoidClipboardEvent(e)) {
+                if (e.isDefaultPrevented() || isBrokenAndroidClipboardEvent(e)) {
                     removePasteBin();
                     return;
@@ -985 +1033 @@
                 }
 
-                var paragraphs = node.getAll('p');
-
-                for (var i = 0; i < paragraphs.length; i++) {
-                    node = paragraphs[i];
+                // Build a list of all root level elements before we start
+                // altering them in the loop below.
+                var elements = [], child = node.firstChild;
+                while (typeof child !== 'undefined' && child !== null) {
+                    elements.push(child);
+
+                    child = child.walk();
+                    if (child !== null) {
+                        while (typeof child !== 'undefined' && child.parent !== node) {
+                            child = child.walk();
+                        }
+                    }
+                }
+
+                for (var i = 0; i < elements.length; i++) {
+                    node = elements[i];
 
                     if (node.name == 'p' && node.firstChild) {
@@ -1003 +1063 @@
                         if (isNumericList(nodeText)) {
                             // Parse OL start number
-                            var matches = /([0-9])\./.exec(nodeText);
+                            var matches = /([0-9]+)\./.exec(nodeText);
                             var start = 1;
                             if (matches) {
@@ -1019 +1079 @@
                         }
 
+                        currentListNode = null;
+                    } else {
+                        // If the root level element isn't a p tag which can be
+                        // processed by convertParagraphToLi, it interrupts the
+                        // lists, causing a new list to start instead of having
+                        // elements from the next list inserted above this tag.
+                        prevListNode = currentListNode;
                         currentListNode = null;
                     }
@@ -1153 +1220 @@
                 var validElements = settings.paste_word_valid_elements;
                 if (!validElements) {
-                    validElements = '-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-p/div,' +
-                        '-table[width],-tr,-td[colspan|rowspan|width],-th,-thead,-tfoot,-tbody,-a[href|name],sub,sup,strike,br,del';
+                    validElements = (
+                        '-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,' +
+                        '-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,' +
+                        'td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody'
+                    );
                 }