Skip to content

Commit

Permalink
Block Editor: Bug fixes targeted for WordPress 5.3.1.
Browse files Browse the repository at this point in the history
The list of included fixes:

- Edge scrolling issues WordPress/gutenberg#17707
- Intermittent JavaScript issues WordPress/gutenberg#18559
- Remove embed CollegeHumor WordPress/gutenberg#18591 

Updated packages:

- @wordpress/block-directory@1.0.6
- @wordpress/block-editor@3.2.5
- @wordpress/block-library@2.9.6
- @wordpress/core-data@2.7.5
- @wordpress/edit-post@3.8.6
- @wordpress/editor@9.7.6
- @wordpress/format-library@1.9.5

Props youknowriad, ellatrix, epiqueras, audrasjb, gziolo, mcsf, kyliesabra.
Merges [46860] to the 5.3 branch.
Fixes #48884.
Built from https://develop.svn.wordpress.org/branches/5.3@46861


git-svn-id: http://core.svn.wordpress.org/branches/5.3@46661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
SergeyBiryukov committed Dec 9, 2019
1 parent 01bd5c0 commit 44bff0d
Show file tree
Hide file tree
Showing 16 changed files with 193 additions and 99 deletions.
14 changes: 7 additions & 7 deletions wp-includes/js/dist/block-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -4928,7 +4928,7 @@ var external_this_wp_hooks_ = __webpack_require__(27);
var external_this_wp_data_ = __webpack_require__(4);

// EXTERNAL MODULE: ./node_modules/tinycolor2/tinycolor.js
var tinycolor = __webpack_require__(48);
var tinycolor = __webpack_require__(49);
var tinycolor_default = /*#__PURE__*/__webpack_require__.n(tinycolor);

// CONCATENATED MODULE: ./node_modules/@wordpress/block-editor/build-module/components/colors/utils.js
Expand Down Expand Up @@ -19749,7 +19749,7 @@ function (_Component) {
return;
}

var diff = currentCaretRect.y - this.caretRect.y;
var diff = currentCaretRect.top - this.caretRect.top;

if (diff === 0) {
return;
Expand All @@ -19763,8 +19763,8 @@ function (_Component) {

var windowScroll = scrollContainer === document.body;
var scrollY = windowScroll ? window.scrollY : scrollContainer.scrollTop;
var scrollContainerY = windowScroll ? 0 : scrollContainer.getBoundingClientRect().y;
var relativeScrollPosition = windowScroll ? this.caretRect.y / window.innerHeight : (this.caretRect.y - scrollContainerY) / (window.innerHeight - scrollContainerY); // If the scroll position is at the start, the active editable element
var scrollContainerY = windowScroll ? 0 : scrollContainer.getBoundingClientRect().top;
var relativeScrollPosition = windowScroll ? this.caretRect.top / window.innerHeight : (this.caretRect.top - scrollContainerY) / (window.innerHeight - scrollContainerY); // If the scroll position is at the start, the active editable element
// is the last one, and the caret is positioned within the initial
// trigger percentage of the page, do not scroll the page.
// The typewriter effect should not kick in until an empty page has been
Expand All @@ -19781,8 +19781,8 @@ function (_Component) {
// view.

if ( // The caret is under the lower fold.
this.caretRect.y + this.caretRect.height > scrollContainerY + scrollContainerHeight || // The caret is above the upper fold.
this.caretRect.y < scrollContainerY) {
this.caretRect.top + this.caretRect.height > scrollContainerY + scrollContainerHeight || // The caret is above the upper fold.
this.caretRect.top < scrollContainerY) {
// Reset the caret position to maintain.
this.caretRect = currentCaretRect;
return;
Expand Down Expand Up @@ -23627,7 +23627,7 @@ try {

/***/ }),

/***/ 48:
/***/ 49:
/***/ (function(module, exports, __webpack_require__) {

var __WEBPACK_AMD_DEFINE_RESULT__;// TinyColor v1.4.1
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/dist/block-editor.min.js

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions wp-includes/js/dist/block-library.js
Original file line number Diff line number Diff line change
Expand Up @@ -3027,13 +3027,17 @@ var others = [{
},
patterns: [/^https?:\/\/cloudup\.com\/.+/i]
}, {
// Deprecated since CollegeHumor content is now powered by YouTube
name: 'core-embed/collegehumor',
settings: {
title: 'CollegeHumor',
icon: embedVideoIcon,
description: Object(external_this_wp_i18n_["__"])('Embed CollegeHumor content.')
description: Object(external_this_wp_i18n_["__"])('Embed CollegeHumor content.'),
supports: {
inserter: false
}
},
patterns: [/^https?:\/\/(www\.)?collegehumor\.com\/.+/i]
patterns: []
}, {
name: 'core-embed/crowdsignal',
settings: {
Expand Down Expand Up @@ -10353,7 +10357,7 @@ var dist = __webpack_require__(221);
var dist_default = /*#__PURE__*/__webpack_require__.n(dist);

// EXTERNAL MODULE: ./node_modules/tinycolor2/tinycolor.js
var tinycolor = __webpack_require__(48);
var tinycolor = __webpack_require__(49);
var tinycolor_default = /*#__PURE__*/__webpack_require__.n(tinycolor);

// CONCATENATED MODULE: ./node_modules/@wordpress/block-library/build-module/cover/icon.js
Expand Down Expand Up @@ -20601,7 +20605,7 @@ module.exports = function memize( fn, options ) {

/***/ }),

/***/ 48:
/***/ 49:
/***/ (function(module, exports, __webpack_require__) {

var __WEBPACK_AMD_DEFINE_RESULT__;// TinyColor v1.4.1
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/dist/block-library.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions wp-includes/js/dist/blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -6090,7 +6090,7 @@ var v4_default = /*#__PURE__*/__webpack_require__.n(v4);
var external_this_wp_hooks_ = __webpack_require__(27);

// EXTERNAL MODULE: ./node_modules/tinycolor2/tinycolor.js
var tinycolor = __webpack_require__(48);
var tinycolor = __webpack_require__(49);
var tinycolor_default = /*#__PURE__*/__webpack_require__.n(tinycolor);

// EXTERNAL MODULE: external {"this":["wp","element"]}
Expand Down Expand Up @@ -11974,7 +11974,7 @@ function _nonIterableRest() {

/***/ }),

/***/ 48:
/***/ 49:
/***/ (function(module, exports, __webpack_require__) {

var __WEBPACK_AMD_DEFINE_RESULT__;// TinyColor v1.4.1
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/dist/blocks.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 44bff0d

Please sign in to comment.