Grouped merges for 5.0.14.

Follow up to [51758].
Built from https://develop.svn.wordpress.org/branches/5.0@51769


git-svn-id: http://core.svn.wordpress.org/branches/5.0@51376 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/css/dist/components/style-rtl.css

@@ -536,7 +536,8 @@
 
 .components-color-palette__custom-color .components-color-palette__custom-color-gradient::before {
   content: "";
-  filter: blur(6px) saturate(0.7) brightness(1.1);
+  -webkit-filter: blur(6px) saturate(0.7) brightness(1.1);
+          filter: blur(6px) saturate(0.7) brightness(1.1);
   display: block;
   width: 200%;
   height: 200%;
@@ -2045,11 +2046,13 @@ body.is-dragging-components-draggable {
   outline: 1px solid transparent;
   outline-offset: -1px;
   border: 1px solid #000;
-  filter: invert(100%) contrast(500%); }
+  -webkit-filter: invert(100%) contrast(500%);
+          filter: invert(100%) contrast(500%); }
 
 @supports (-ms-high-contrast-adjust: auto) {
   .components-form-toggle .components-form-toggle__on {
-    filter: none;
+    -webkit-filter: none;
+            filter: none;
     border: 1px solid #fff; } }
 
 .components-form-token-field__input-container {
@@ -2525,7 +2528,8 @@ body.is-dragging-components-draggable {
   body.rtl .components-panel__body-toggle.components-button .dashicons-arrow-right {
     transform: scaleX(-1);
     -ms-filter: fliph;
-    filter: FlipH;
+    -webkit-filter: FlipH;
+            filter: FlipH;
     margin-top: -10px; }
 
 .components-panel__icon {

wp-includes/css/dist/components/style.css

@@ -536,7 +536,8 @@
 
 .components-color-palette__custom-color .components-color-palette__custom-color-gradient::before {
   content: "";
-  filter: blur(6px) saturate(0.7) brightness(1.1);
+  -webkit-filter: blur(6px) saturate(0.7) brightness(1.1);
+          filter: blur(6px) saturate(0.7) brightness(1.1);
   display: block;
   width: 200%;
   height: 200%;
@@ -2049,11 +2050,13 @@ body.is-dragging-components-draggable {
   outline: 1px solid transparent;
   outline-offset: -1px;
   border: 1px solid #000;
-  filter: invert(100%) contrast(500%); }
+  -webkit-filter: invert(100%) contrast(500%);
+          filter: invert(100%) contrast(500%); }
 
 @supports (-ms-high-contrast-adjust: auto) {
   .components-form-toggle .components-form-toggle__on {
-    filter: none;
+    -webkit-filter: none;
+            filter: none;
     border: 1px solid #fff; } }
 
 .components-form-token-field__input-container {
@@ -2531,7 +2534,8 @@ body.is-dragging-components-draggable {
   body.rtl .components-panel__body-toggle.components-button .dashicons-arrow-right {
     transform: scaleX(-1);
     -ms-filter: fliph;
-    filter: FlipH;
+    -webkit-filter: FlipH;
+            filter: FlipH;
     margin-top: -10px; }
 
 .components-panel__icon {

wp-includes/css/dist/editor/style-rtl.css

@@ -263,10 +263,15 @@
 /**
  * Cross-block selection
  */
+.editor-block-list__layout .editor-block-list__block ::-moz-selection {
+  background-color: #b3e7fe; }
 
 .editor-block-list__layout .editor-block-list__block ::selection {
   background-color: #b3e7fe; }
 
+.editor-block-list__layout .editor-block-list__block.is-multi-selected *::-moz-selection {
+  background-color: transparent; }
+
 .editor-block-list__layout .editor-block-list__block.is-multi-selected *::selection {
   background-color: transparent; }
 
@@ -2280,6 +2285,8 @@ body.admin-color-light .editor-post-text-editor__link{
     box-shadow: 0 0 0 1px #e8eaeb; }
   .editor-rich-text__tinymce img[data-mce-selected] {
     outline: none; }
+  .editor-rich-text__tinymce img::-moz-selection {
+    background: none !important; }
   .editor-rich-text__tinymce img::selection {
     background: none !important; }
   .editor-rich-text__tinymce[data-is-placeholder-visible="true"] {
@@ -2310,6 +2317,12 @@ body.admin-color-light .editor-post-text-editor__link{
   .editor-rich-text__inline-toolbar ul.components-toolbar {
     box-shadow: 0 2px 10px rgba(25, 30, 35, 0.1), 0 0 2px rgba(25, 30, 35, 0.1); }
 
+[data-rich-text-script] {
+  display: inline; }
+  [data-rich-text-script]::before {
+    content: "</>";
+    background: yellow; }
+
 .editor-skip-to-selected-block {
   position: absolute;
   top: -9999em; }

wp-includes/css/dist/editor/style.css

@@ -263,10 +263,15 @@
 /**
  * Cross-block selection
  */
+.editor-block-list__layout .editor-block-list__block ::-moz-selection {
+  background-color: #b3e7fe; }
 
 .editor-block-list__layout .editor-block-list__block ::selection {
   background-color: #b3e7fe; }
 
+.editor-block-list__layout .editor-block-list__block.is-multi-selected *::-moz-selection {
+  background-color: transparent; }
+
 .editor-block-list__layout .editor-block-list__block.is-multi-selected *::selection {
   background-color: transparent; }
 
@@ -2292,6 +2297,8 @@ body.admin-color-light .editor-post-text-editor__link{
     box-shadow: 0 0 0 1px #e8eaeb; }
   .editor-rich-text__tinymce img[data-mce-selected] {
     outline: none; }
+  .editor-rich-text__tinymce img::-moz-selection {
+    background: none !important; }
   .editor-rich-text__tinymce img::selection {
     background: none !important; }
   .editor-rich-text__tinymce[data-is-placeholder-visible="true"] {
@@ -2322,6 +2329,12 @@ body.admin-color-light .editor-post-text-editor__link{
   .editor-rich-text__inline-toolbar ul.components-toolbar {
     box-shadow: 0 2px 10px rgba(25, 30, 35, 0.1), 0 0 2px rgba(25, 30, 35, 0.1); }
 
+[data-rich-text-script] {
+  display: inline; }
+  [data-rich-text-script]::before {
+    content: "</>";
+    background: yellow; }
+
 .editor-skip-to-selected-block {
   position: absolute;
   top: -9999em; }

wp-includes/js/dist/block-library.js

@@ -87,6 +87,13 @@ this["wp"] = this["wp"] || {}; this["wp"]["blockLibrary"] =
 /************************************************************************/
 /******/ ({
 
+/***/ "1CF3":
+/***/ (function(module, exports) {
+
+(function() { module.exports = this["wp"]["dom"]; }());
+
+/***/ }),
+
 /***/ "1OyB":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -11099,6 +11106,9 @@ var list_settings = {
   }
 };
 
+// EXTERNAL MODULE: external {"this":["wp","dom"]}
+var external_this_wp_dom_ = __webpack_require__("1CF3");
+
 // CONCATENATED MODULE: ./node_modules/@wordpress/block-library/build-module/missing/index.js
 
 
@@ -11112,6 +11122,7 @@ var list_settings = {
 
 
 
+
 function MissingBlockWarning(_ref) {
   var attributes = _ref.attributes,
       convertToHTML = _ref.convertToHTML;
@@ -11136,7 +11147,7 @@ function MissingBlockWarning(_ref) {
 
   return Object(external_this_wp_element_["createElement"])(external_this_wp_element_["Fragment"], null, Object(external_this_wp_element_["createElement"])(external_this_wp_editor_["Warning"], {
     actions: actions
-  }, messageHTML), Object(external_this_wp_element_["createElement"])(external_this_wp_element_["RawHTML"], null, originalUndelimitedContent));
+  }, messageHTML), Object(external_this_wp_element_["createElement"])(external_this_wp_element_["RawHTML"], null, Object(external_this_wp_dom_["safeHTML"])(originalUndelimitedContent)));
 }
 
 var missing_edit = Object(external_this_wp_data_["withDispatch"])(function (dispatch, _ref2) {
@@ -12360,7 +12371,7 @@ var shortcode_settings = {
   attributes: {
     text: {
       type: 'string',
-      source: 'html'
+      source: 'text'
     }
   },
   transforms: {

wp-includes/js/dist/dom.js

@@ -124,6 +124,7 @@ __webpack_require__.d(__webpack_exports__, "insertAfter", function() { return /*
 __webpack_require__.d(__webpack_exports__, "unwrap", function() { return /* reexport */ unwrap; });
 __webpack_require__.d(__webpack_exports__, "replaceTag", function() { return /* reexport */ replaceTag; });
 __webpack_require__.d(__webpack_exports__, "wrap", function() { return /* reexport */ wrap; });
+__webpack_require__.d(__webpack_exports__, "safeHTML", function() { return /* reexport */ safeHTML; });
 
 // NAMESPACE OBJECT: ./node_modules/@wordpress/dom/build-module/focusable.js
 var focusable_namespaceObject = {};
@@ -958,6 +959,48 @@ function wrap(newNode, referenceNode) {
   newNode.appendChild(referenceNode);
 }
 
+// CONCATENATED MODULE: ./node_modules/@wordpress/dom/build-module/safe-html.js
+/**
+ * Internal dependencies
+ */
+
+/**
+ * Strips scripts and on* attributes from HTML.
+ *
+ * @param {string} html HTML to sanitize.
+ *
+ * @return {string} The sanitized HTML.
+ */
+
+function safeHTML(html) {
+  var _document$implementat = document.implementation.createHTMLDocument(''),
+      body = _document$implementat.body;
+
+  body.innerHTML = html;
+  var elements = body.getElementsByTagName('*');
+  var elementIndex = elements.length;
+
+  while (elementIndex--) {
+    var element = elements[elementIndex];
+
+    if (element.tagName === 'SCRIPT') {
+      remove(element);
+    } else {
+      var attributeIndex = element.attributes.length;
+
+      while (attributeIndex--) {
+        var key = element.attributes[attributeIndex].name;
+
+        if (key.startsWith('on')) {
+          element.removeAttribute(key);
+        }
+      }
+    }
+  }
+
+  return body.innerHTML;
+}
+
 // CONCATENATED MODULE: ./node_modules/@wordpress/dom/build-module/index.js
 /**
  * Internal dependencies
@@ -971,6 +1014,7 @@ var build_module_focus = {
 
 
 
+
 /***/ }),
 
 /***/ "BsWD":

wp-includes/js/dist/editor.js

@@ -11202,6 +11202,8 @@ var diff = __webpack_require__("v2jn");
  */
 
 
+
+
 var block_view_BlockView = function BlockView(_ref) {
   var title = _ref.title,
       rawContent = _ref.rawContent,
@@ -11219,7 +11221,7 @@ var block_view_BlockView = function BlockView(_ref) {
     className: "editor-block-compare__html"
   }, rawContent), Object(external_this_wp_element_["createElement"])("div", {
     className: "editor-block-compare__preview edit-post-visual-editor"
-  }, renderedContent)), Object(external_this_wp_element_["createElement"])("div", {
+  }, Object(external_this_wp_element_["createElement"])(external_this_wp_element_["RawHTML"], null, Object(external_this_wp_dom_["safeHTML"])(renderedContent)))), Object(external_this_wp_element_["createElement"])("div", {
     className: "editor-block-compare__action"
   }, Object(external_this_wp_element_["createElement"])(external_this_wp_components_["Button"], {
     isLarge: true,
@@ -11283,14 +11285,6 @@ function (_Component) {
         }, item.value);
       });
     }
-  }, {
-    key: "getOriginalContent",
-    value: function getOriginalContent(block) {
-      return {
-        rawContent: block.originalContent,
-        renderedContent: Object(external_this_wp_blocks_["getSaveElement"])(block.name, block.attributes)
-      };
-    }
   }, {
     key: "getConvertedContent",
     value: function getConvertedContent(block) {
@@ -11300,13 +11294,7 @@ function (_Component) {
       var newContent = newBlocks.map(function (item) {
         return Object(external_this_wp_blocks_["getSaveContent"])(item.name, item.attributes, item.innerBlocks);
       });
-      var renderedContent = newBlocks.map(function (item) {
-        return Object(external_this_wp_blocks_["getSaveElement"])(item.name, item.attributes, item.innerBlocks);
-      });
-      return {
-        rawContent: newContent.join(''),
-        renderedContent: renderedContent
-      };
+      return newContent.join('');
     }
   }, {
     key: "render",
@@ -11317,9 +11305,8 @@ function (_Component) {
           onConvert = _this$props.onConvert,
           convertor = _this$props.convertor,
           convertButtonText = _this$props.convertButtonText;
-      var original = this.getOriginalContent(block);
       var converted = this.getConvertedContent(convertor(block));
-      var difference = this.getDifference(original.rawContent, converted.rawContent);
+      var difference = this.getDifference(block.originalContent, converted);
       return Object(external_this_wp_element_["createElement"])("div", {
         className: "editor-block-compare__wrapper"
       }, Object(external_this_wp_element_["createElement"])(block_view, {
@@ -11327,15 +11314,15 @@ function (_Component) {
         className: "editor-block-compare__current",
         action: onKeep,
         actionText: Object(external_this_wp_i18n_["__"])('Convert to HTML'),
-        rawContent: original.rawContent,
-        renderedContent: original.renderedContent
+        rawContent: block.originalContent,
+        renderedContent: block.originalContent
       }), Object(external_this_wp_element_["createElement"])(block_view, {
         title: Object(external_this_wp_i18n_["__"])('After Conversion'),
         className: "editor-block-compare__converted",
         action: onConvert,
         actionText: convertButtonText,
         rawContent: difference,
-        renderedContent: converted.renderedContent
+        renderedContent: converted
       }));
     }
   }]);
@@ -14024,7 +14011,7 @@ function (_Component) {
           clientId: clientId
         }), Object(external_this_wp_element_["createElement"])("div", {
           key: "invalid-preview"
-        }, Object(external_this_wp_blocks_["getSaveElement"])(blockType, attributes))]), shouldShowMobileToolbar && Object(external_this_wp_element_["createElement"])(block_mobile_toolbar, {
+        }, Object(external_this_wp_element_["createElement"])(external_this_wp_element_["RawHTML"], null, Object(external_this_wp_dom_["safeHTML"])(Object(external_this_wp_blocks_["getSaveContent"])(blockType, attributes))))]), shouldShowMobileToolbar && Object(external_this_wp_element_["createElement"])(block_mobile_toolbar, {
           clientId: clientId
         }), !!error && Object(external_this_wp_element_["createElement"])(block_crash_warning, null))), showEmptyBlockSideInserter && Object(external_this_wp_element_["createElement"])(external_this_wp_element_["Fragment"], null, Object(external_this_wp_element_["createElement"])("div", {
           className: "editor-block-list__side-inserter"

wp-includes/js/dist/rich-text.js

@@ -1658,6 +1658,22 @@ function createFromElement(_ref3) {
       continue;
     }
 
+    if (type === 'script') {
+      var _value = {
+        formats: [,],
+        replacements: [{
+          type: type,
+          attributes: {
+            'data-rich-text-script': node.getAttribute('data-rich-text-script') || encodeURIComponent(node.innerHTML)
+          }
+        }],
+        text: OBJECT_REPLACEMENT_CHARACTER
+      };
+      accumulateSelection(accumulator, node, range, _value);
+      mergePair(accumulator, _value);
+      continue;
+    }
+
     if (type === 'br') {
       accumulateSelection(accumulator, node, range, createEmptyValue());
       accumulator.text += '\n';
@@ -1891,8 +1907,9 @@ function getAttributes(_ref5) {
       continue;
     }
 
+    var safeName = /^on/i.test(name) ? 'data-disable-rich-text-' + name : name;
     accumulator = accumulator || {};
-    accumulator[name] = value;
+    accumulator[safeName] = value;
   }
 
   return accumulator;
@@ -2648,17 +2665,38 @@ function get_format_type_getFormatType(name) {
 
 
 
+function restoreOnAttributes(attributes, isEditableTree) {
+  if (isEditableTree) {
+    return attributes;
+  }
+
+  var newAttributes = {};
+
+  for (var key in attributes) {
+    var newKey = key;
+
+    if (key.startsWith('data-disable-rich-text-')) {
+      newKey = key.slice('data-disable-rich-text-'.length);
+    }
+
+    newAttributes[newKey] = attributes[key];
+  }
+
+  return newAttributes;
+}
+
 function fromFormat(_ref) {
   var type = _ref.type,
       attributes = _ref.attributes,
       unregisteredAttributes = _ref.unregisteredAttributes,
-      object = _ref.object;
+      object = _ref.object,
+      isEditableTree = _ref.isEditableTree;
   var formatType = get_format_type_getFormatType(type);
 
   if (!formatType) {
     return {
       type: type,
-      attributes: attributes,
+      attributes: restoreOnAttributes(attributes, isEditableTree),
       object: object
     };
   }
@@ -2686,7 +2724,7 @@ function fromFormat(_ref) {
   return {
     type: formatType.tagName,
     object: formatType.object,
-    attributes: elementAttributes
+    attributes: restoreOnAttributes(elementAttributes, isEditableTree)
   };
 }
 
@@ -2792,7 +2830,15 @@ function toTree(_ref2) {
         }
 
         var parent = getParent(pointer);
-        var newNode = append(parent, fromFormat(format));
+        var type = format.type,
+            attributes = format.attributes,
+            unregisteredAttributes = format.unregisteredAttributes;
+        var newNode = append(parent, fromFormat({
+          type: type,
+          attributes: attributes,
+          unregisteredAttributes: unregisteredAttributes,
+          isEditableTree: isEditableTree
+        }));
 
         if (isText(pointer) && getText(pointer).length === 0) {
           remove(pointer);
@@ -2821,19 +2867,35 @@ function toTree(_ref2) {
       }
     }
 
-    if (character !== OBJECT_REPLACEMENT_CHARACTER) {
-      if (character === '\n') {
-        pointer = append(getParent(pointer), {
-          type: 'br',
-          object: true
-        }); // Ensure pointer is text node.
-
-        pointer = append(getParent(pointer), '');
-      } else if (!isText(pointer)) {
-        pointer = append(getParent(pointer), character);
+    if (character === OBJECT_REPLACEMENT_CHARACTER) {
+      if (!isEditableTree && replacements[i].type === 'script') {
+        pointer = append(getParent(pointer), fromFormat({
+          type: 'script',
+          isEditableTree: isEditableTree
+        }));
+        append(pointer, {
+          html: decodeURIComponent(replacements[i].attributes['data-rich-text-script'])
+        });
       } else {
-        appendText(pointer, character);
-      }
+        pointer = append(getParent(pointer), fromFormat(Object(objectSpread["a" /* default */])({}, replacements[i], {
+          object: true,
+          isEditableTree: isEditableTree
+        })));
+      } // Ensure pointer is text node.
+
+
+      pointer = append(getParent(pointer), '');
+    } else if (character === '\n') {
+      pointer = append(getParent(pointer), {
+        type: 'br',
+        object: true
+      }); // Ensure pointer is text node.
+
+      pointer = append(getParent(pointer), '');
+    } else if (!isText(pointer)) {
+      pointer = append(getParent(pointer), character);
+    } else {
+      appendText(pointer, character);
     }
 
     pointer = setFormatPlaceholder(pointer, i + 1);
@@ -3307,6 +3369,10 @@ function createElementHTML(_ref6) {
 function createChildrenHTML() {
   var children = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return children.map(function (child) {
+    if (child.html !== undefined) {
+      return child.html;
+    }
+
     return child.text === undefined ? createElementHTML(child) : Object(external_this_wp_escapeHtml_["escapeHTML"])(child.text);
   }).join('');
 }