Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3262573 by longwave, nod_, xjm, Spokje, alexpott, lauriii, catch: Update our yarn dev dependencies to the extent allowed by current constraints

merge-requests/1998/head
longwave 2022-03-04 13:17:47 +00:00 committed by bnjmnm
parent e85bd405b2
commit f170243963
39 changed files with 1743 additions and 1740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/vendor/jquery.ui/ui/widgets/resizable-min.js vendored
View File

File diff suppressed because one or more lines are too long

28
core/misc/cspell/dictionary.txt
View File

@ -61,7 +61,6 @@ arrowstop
arrowthick
arrowthickstop
arrr
asdf
asdrsad
assertable
asterix
@ -187,7 +186,6 @@ bubbleable
buildable
buildinfo
buildtest
bundable
bundleable
bundleless
buttonpane
@ -296,7 +294,6 @@ contextual's
contextuals
contrained
controlgroup
coord
corefake
coretest
corge
@ -311,7 +308,6 @@ crossout
crudui
crypted
cscript
csrf
csrftoken
cssidentifier
csslintrc
@ -357,7 +353,6 @@ ddblock
ddev
deckard
deconstructor
dedupe
deduplicated
deduplicates
defalt
@ -395,7 +390,6 @@ desaturates
desaturating
descripcion
deserialization
deserializes
destid
destructable
deutsch
@ -427,7 +421,6 @@ doubleclick
downcasting
doxygen
drag'n'drop
draggable
dragtable
dramallama
dramallamas
@ -471,7 +464,6 @@ easyrdf
ecmascript
editables
editdrupalimage
editorconfig
editunblock
eerste
egroe
@ -535,8 +527,6 @@ fapi
farb
farbtastic
fatals
favicon
favicons
favourite
favstar
fcgi
@ -572,7 +562,6 @@ filtertypes
findwith
firstcolumn
fixnull
flexbox
flexslider
flickr
flipfit
@ -633,8 +622,6 @@ getview
gids
gifs
giggabyte
gitattributes
gitignored
gloop
gnumeric
goldfinger
@ -658,7 +645,6 @@ guzzle's
guzzlehttp
gzipped
hande
hant
hardcode
hardcodes
hardcoding
@ -746,7 +732,6 @@ isdst
isid
isinstallable
items's
iteratable
itoa
itok
itunesentry
@ -808,7 +793,6 @@ langcodes
langname
languageswitcher
larowlan
latn
layouted
lazybuilder
lazyload
@ -1045,7 +1029,6 @@ nothere
notnull
notsimpletest
nourriture
nowdoc
nplurals
nresponse
ntfs
@ -1054,7 +1037,6 @@ nyancat
nyans
nzdt
nœud
objectid
objectindex
oembed
officedocument
@ -1113,17 +1095,14 @@ pathnames
pcre
pcss
pdo's
pecl
peole
percona
performant
perma
permissionless
persistable
phpass
phpcbf
phpcs
phpdoc
phpdocumentor
phpfile
phpserialize
@ -1158,7 +1137,6 @@ postcondition
postcss
postfields
postfoo
postgres
postgresql
postorder
postprocess
@ -1288,9 +1266,6 @@ reparenting
reparsed
replyto
require'd
rerender
rerendered
rerendering
resampling
resave
resaved
@ -1418,7 +1393,6 @@ sourceid
spacebar
spagna
spamspan
spdx
specialchar
specialchars
spiffiness
@ -1435,7 +1409,6 @@ ssess
ssid
stardivision
starrrrr
starterkit
startpunt
starzzzz
statuscode
@ -1889,7 +1862,6 @@ yourmodule
youtube
yowser
yygroup
yyyymm
zartan
zendframework
zettabyte

2
core/misc/date.js
View File

@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
(function ($, Modernizr, Drupal, once) {
Drupal.behaviors.date = {

4
core/misc/jquery.cookie.shim.js
View File

@ -5,9 +5,9 @@
* @preserve
**/
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

2
core/misc/message.js
View File

@ -9,7 +9,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
(function (Drupal) {
Drupal.Message = function () {

12
core/misc/states.js
View File

@ -158,16 +158,16 @@
}
}
} else if ($.isPlainObject(constraints)) {
for (var n in constraints) {
if (constraints.hasOwnProperty(n)) {
result = ternary(result, this.checkConstraints(constraints[n], selector, n));
for (var n in constraints) {
if (constraints.hasOwnProperty(n)) {
result = ternary(result, this.checkConstraints(constraints[n], selector, n));
if (result === false) {
return false;
}
if (result === false) {
return false;
}
}
}
}
return result;
},

4
core/misc/tabbingmanager.js
View File

@ -119,8 +119,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
if (data.tabindex) {
$el[0].setAttribute('tabindex', data.tabindex);
} else {
$el[0].removeAttribute('tabindex');
}
$el[0].removeAttribute('tabindex');
}
if (data.autofocus) {
$el[0].setAttribute('autofocus', 'autofocus');

86
core/misc/tabledrag.js
View File

@ -5,7 +5,7 @@
* @preserve
**/
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
(function ($, Drupal, drupalSettings) {
var showWeight = JSON.parse(localStorage.getItem('Drupal.tableDrag.showWeight'));
@ -158,8 +158,8 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
if (displayWeight) {
this.showColumns();
} else {
this.hideColumns();
}
this.hideColumns();
}
this.$toggleWeightButton.html(Drupal.theme('toggleButtonContent', displayWeight));
$('table').findOnce('tabledrag').trigger('columnschange', !!displayWeight);
@ -538,8 +538,8 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
if (row.offsetHeight === 0) {
rowHeight = parseInt(row.firstChild.offsetHeight, 10) / 2;
} else {
rowHeight = parseInt(row.offsetHeight, 10) / 2;
}
rowHeight = parseInt(row.offsetHeight, 10) / 2;
}
if (y > rowY - rowHeight && y < rowY + rowHeight) {
if (_this3.indentEnabled) {
@ -551,10 +551,10 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
};
}
} else if (row === _this3.rowObject.element) {
return {
v: null
};
}
return {
v: null
};
}
if (!_this3.rowObject.isValidSwap(row)) {
return {
@ -601,51 +601,51 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
if (rowSettings.relationship === 'self' || rowSettings.relationship === 'group') {
sourceRow = changedRow;
} else if (rowSettings.relationship === 'sibling') {
$previousRow = $changedRow.prev('tr:first-of-type');
previousRow = $previousRow.get(0);
var $nextRow = $changedRow.next('tr:first-of-type');
var nextRow = $nextRow.get(0);
sourceRow = changedRow;
$previousRow = $changedRow.prev('tr:first-of-type');
previousRow = $previousRow.get(0);
var $nextRow = $changedRow.next('tr:first-of-type');
var nextRow = $nextRow.get(0);
sourceRow = changedRow;
if ($previousRow.is('.draggable') && $previousRow.find(".".concat(group)).length) {
if (this.indentEnabled) {
if ($previousRow.find('.js-indentations').length === $changedRow.find('.js-indentations').length) {
sourceRow = previousRow;
}
} else {
if ($previousRow.is('.draggable') && $previousRow.find(".".concat(group)).length) {
if (this.indentEnabled) {
if ($previousRow.find('.js-indentations').length === $changedRow.find('.js-indentations').length) {
sourceRow = previousRow;
}
} else if ($nextRow.is('.draggable') && $nextRow.find(".".concat(group)).length) {
if (this.indentEnabled) {
if ($nextRow.find('.js-indentations').length === $changedRow.find('.js-indentations').length) {
sourceRow = nextRow;
}
} else {
} else {
sourceRow = previousRow;
}
} else if ($nextRow.is('.draggable') && $nextRow.find(".".concat(group)).length) {
if (this.indentEnabled) {
if ($nextRow.find('.js-indentations').length === $changedRow.find('.js-indentations').length) {
sourceRow = nextRow;
}
} else {
sourceRow = nextRow;
}
} else if (rowSettings.relationship === 'parent') {
$previousRow = $changedRow.prev('tr');
previousRow = $previousRow;
}
} else if (rowSettings.relationship === 'parent') {
$previousRow = $changedRow.prev('tr');
previousRow = $previousRow;
while ($previousRow.length && $previousRow.find('.js-indentation').length >= this.rowObject.indents) {
$previousRow = $previousRow.prev('tr');
previousRow = $previousRow;
}
while ($previousRow.length && $previousRow.find('.js-indentation').length >= this.rowObject.indents) {
$previousRow = $previousRow.prev('tr');
previousRow = $previousRow;
}
if ($previousRow.length) {
sourceRow = $previousRow.get(0);
} else {
sourceRow = $(this.table).find('tr.draggable:first-of-type').get(0);
if ($previousRow.length) {
sourceRow = $previousRow.get(0);
} else {
sourceRow = $(this.table).find('tr.draggable:first-of-type').get(0);
if (sourceRow === this.rowObject.element) {
sourceRow = $(this.rowObject.group[this.rowObject.group.length - 1]).next('tr.draggable').get(0);
}
useSibling = true;
}
if (sourceRow === this.rowObject.element) {
sourceRow = $(this.rowObject.group[this.rowObject.group.length - 1]).next('tr.draggable').get(0);
}
useSibling = true;
}
}
this.copyDragClasses(sourceRow, changedRow, group);
rowSettings = this.rowSettings(group, changedRow);

40
core/misc/tableresponsive.js
View File

@ -66,30 +66,30 @@
});
this.$link.text(this.hideText).data('pegged', 1);
} else {
this.$revealedCells.hide();
this.$revealedCells.each(function (index, element) {
var $cell = $(this);
var properties = $cell.attr('style').split(';');
var newProps = [];
var match = /^display\s*:\s*none$/;
this.$revealedCells.hide();
this.$revealedCells.each(function (index, element) {
var $cell = $(this);
var properties = $cell.attr('style').split(';');
var newProps = [];
var match = /^display\s*:\s*none$/;
for (var i = 0; i < properties.length; i++) {
var prop = properties[i];
prop.trim();
var isDisplayNone = match.exec(prop);
for (var i = 0; i < properties.length; i++) {
var prop = properties[i];
prop.trim();
var isDisplayNone = match.exec(prop);
if (isDisplayNone) {
continue;
}
newProps.push(prop);
if (isDisplayNone) {
continue;
}
$cell.attr('style', newProps.join(';'));
});
this.$link.text(this.showText).data('pegged', 0);
$(window).trigger('resize.tableresponsive');
}
newProps.push(prop);
}
$cell.attr('style', newProps.join(';'));
});
this.$link.text(this.showText).data('pegged', 0);
$(window).trigger('resize.tableresponsive');
}
}
});
Drupal.TableResponsive = TableResponsive;

4
core/misc/tableselect.js
View File

@ -84,8 +84,8 @@
break;
}
} else if ($.filter(to, [i]).r.length) {
break;
}
break;
}
}
};
})(jQuery, Drupal);

8
core/misc/timezone.js
View File

@ -32,10 +32,10 @@
if (offsetJan === offsetJul) {
isDaylightSavingTime = '';
} else if (Math.max(offsetJan, offsetJul) === offsetNow) {
isDaylightSavingTime = 1;
} else {
isDaylightSavingTime = 0;
}
isDaylightSavingTime = 1;
} else {
isDaylightSavingTime = 0;
}
var path = "system/timezone/".concat(abbreviation, "/").concat(offsetNow, "/").concat(isDaylightSavingTime);
$.ajax({

4
core/misc/vertical-tabs.js
View File

@ -118,8 +118,8 @@
if ($firstTab.length) {
$firstTab.data('verticalTab').focus();
} else {
this.item.closest('.js-form-type-vertical-tabs').hide();
}
this.item.closest('.js-form-type-vertical-tabs').hide();
}
return this;
}

8
core/modules/block/js/block.js
View File

@ -59,8 +59,8 @@
if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
$this.removeClass('region-populated').addClass('region-empty');
} else if ($this.is('.region-empty')) {
$this.removeClass('region-empty').addClass('region-populated');
}
$this.removeClass('region-empty').addClass('region-populated');
}
});
}
@ -122,8 +122,8 @@
if (regionItems.length) {
regionItems.last().after(row);
} else {
regionMessage.after(row);
}
regionMessage.after(row);
}
updateBlockWeights(table, select[0].value);
checkEmptyRegions(table, tableDrag.rowObject);

24
core/modules/ckeditor/js/plugins/drupallink/plugin.js
View File

@ -111,8 +111,8 @@
if (linkElement && linkElement.$) {
existingValues = parseAttributes(editor, linkElement);
} else if (focusedLinkableWidget && focusedLinkableWidget.data.link) {
existingValues = CKEDITOR.tools.clone(focusedLinkableWidget.data.link);
}
existingValues = CKEDITOR.tools.clone(focusedLinkableWidget.data.link);
}
var saveCallback = function saveCallback(returnValues) {
if (focusedLinkableWidget) {
@ -142,16 +142,16 @@
range.select();
linkElement = getSelectedLink(editor);
} else if (linkElement) {
Object.keys(returnValues.attributes || {}).forEach(function (attrName) {
if (returnValues.attributes[attrName].length > 0) {
var value = returnValues.attributes[attrName];
linkElement.data("cke-saved-".concat(attrName), value);
linkElement.setAttribute(attrName, value);
} else {
linkElement.removeAttribute(attrName);
}
});
}
Object.keys(returnValues.attributes || {}).forEach(function (attrName) {
if (returnValues.attributes[attrName].length > 0) {
var value = returnValues.attributes[attrName];
linkElement.data("cke-saved-".concat(attrName), value);
linkElement.setAttribute(attrName, value);
} else {
linkElement.removeAttribute(attrName);
}
});
}
editor.fire('saveSnapshot');
};

40
core/modules/ckeditor/js/views/AuralView.js
View File

@ -90,28 +90,28 @@
text += "\n".concat(Drupal.t('Press the down arrow key to activate.'));
Drupal.announce(text, 'assertive');
} else if ($group.not('.placeholder').length === 1) {
text = Drupal.t('@name @type in position @position of @positionCount in @groupName button group in row @row of @rowCount.', {
'@name': $button.children().attr('aria-label'),
'@type': type,
'@position': position,
'@positionCount': positionCount,
'@groupName': $group.attr('data-drupal-ckeditor-toolbar-group-name'),
'@row': row,
'@rowCount': rowCount
});
text = Drupal.t('@name @type in position @position of @positionCount in @groupName button group in row @row of @rowCount.', {
'@name': $button.children().attr('aria-label'),
'@type': type,
'@position': position,
'@positionCount': positionCount,
'@groupName': $group.attr('data-drupal-ckeditor-toolbar-group-name'),
'@row': row,
'@rowCount': rowCount
});
if (groupPosition === 1 && position === 1 && row === rowCount) {
text += '\n';
text += Drupal.t('Press the down arrow key to create a new button group in a new row.');
}
if (groupPosition === groupPositionCount && position === positionCount) {
text += '\n';
text += Drupal.t('This is the last group. Move the button forward to create a new group.');
}
Drupal.announce(text, 'assertive');
if (groupPosition === 1 && position === 1 && row === rowCount) {
text += '\n';
text += Drupal.t('Press the down arrow key to create a new button group in a new row.');
}
if (groupPosition === groupPositionCount && position === positionCount) {
text += '\n';
text += Drupal.t('This is the last group. Move the button forward to create a new group.');
}
Drupal.announce(text, 'assertive');
}
},
announceButtonHelp: function announceButtonHelp(event) {
var $link = $(event.currentTarget);

82
core/modules/ckeditor/js/views/KeyboardView.js
View File

@ -46,43 +46,43 @@
if (index > 0) {
$button.insertBefore($container.children().eq(index - 1));
} else {
$group = $container.parent().prev();
$group = $container.parent().prev();
if ($group.length > 0) {
$group.find('.ckeditor-toolbar-group-buttons').append($button);
} else {
$container.closest('.ckeditor-row').prev().find('.ckeditor-toolbar-group').not('.placeholder').find('.ckeditor-toolbar-group-buttons').eq(-1).append($button);
}
if ($group.length > 0) {
$group.find('.ckeditor-toolbar-group-buttons').append($button);
} else {
$container.closest('.ckeditor-row').prev().find('.ckeditor-toolbar-group').not('.placeholder').find('.ckeditor-toolbar-group-buttons').eq(-1).append($button);
}
} else if (_.indexOf([39, 63235], event.keyCode) > -1) {
if (index < $siblings.length - 1) {
$button.insertAfter($container.children().eq(index + 1));
} else {
$container.parent().next().find('.ckeditor-toolbar-group-buttons').prepend($button);
}
}
} else if (_.indexOf(upDownKeys, event.keyCode) > -1) {
dir = _.indexOf([38, 63232], event.keyCode) > -1 ? 'prev' : 'next';
$row = $container.closest('.ckeditor-row')[dir]();
if (dir === 'prev' && $row.length === 0) {
if ($button.data('drupal-ckeditor-type') === 'separator') {
$button.off().remove();
$activeButtons.find('.ckeditor-toolbar-group-buttons').eq(0).children().eq(0).children().trigger('focus');
} else {
$availableButtons.prepend($button);
}
} else if (_.indexOf([39, 63235], event.keyCode) > -1) {
if (index < $siblings.length - 1) {
$button.insertAfter($container.children().eq(index + 1));
} else {
$row.find('.ckeditor-toolbar-group-buttons').eq(0).prepend($button);
$container.parent().next().find('.ckeditor-toolbar-group-buttons').prepend($button);
}
}
} else if (containerType === 'dividers') {
if (_.indexOf([40, 63233], event.keyCode) > -1) {
$button = $button.clone(true);
$activeButtons.find('.ckeditor-toolbar-group-buttons').eq(0).prepend($button);
$target = $button.children();
} else if (_.indexOf(upDownKeys, event.keyCode) > -1) {
dir = _.indexOf([38, 63232], event.keyCode) > -1 ? 'prev' : 'next';
$row = $container.closest('.ckeditor-row')[dir]();
if (dir === 'prev' && $row.length === 0) {
if ($button.data('drupal-ckeditor-type') === 'separator') {
$button.off().remove();
$activeButtons.find('.ckeditor-toolbar-group-buttons').eq(0).children().eq(0).children().trigger('focus');
} else {
$availableButtons.prepend($button);
}
} else {
$row.find('.ckeditor-toolbar-group-buttons').eq(0).prepend($button);
}
}
} else if (containerType === 'dividers') {
if (_.indexOf([40, 63233], event.keyCode) > -1) {
$button = $button.clone(true);
$activeButtons.find('.ckeditor-toolbar-group-buttons').eq(0).prepend($button);
$target = $button.children();
}
}
view = this;
Drupal.ckeditor.registerButtonMove(this, $button, function (result) {
@ -123,20 +123,20 @@
if (index > 0) {
$group.insertBefore($siblings.eq(index - 1));
} else {
var $rowChildElement = $container.closest('.ckeditor-row').prev().find('.ckeditor-toolbar-groups').children().eq(-1);
$group.insertBefore($rowChildElement);
}
} else if (_.indexOf([39, 63235], event.keyCode) > -1) {
if (!$siblings.eq(index + 1).hasClass('placeholder')) {
$group.insertAfter($container.children().eq(index + 1));
} else {
$container.closest('.ckeditor-row').next().find('.ckeditor-toolbar-groups').prepend($group);
}
var $rowChildElement = $container.closest('.ckeditor-row').prev().find('.ckeditor-toolbar-groups').children().eq(-1);
$group.insertBefore($rowChildElement);
}
} else if (_.indexOf([39, 63235], event.keyCode) > -1) {
if (!$siblings.eq(index + 1).hasClass('placeholder')) {
$group.insertAfter($container.children().eq(index + 1));
} else {
$container.closest('.ckeditor-row').next().find('.ckeditor-toolbar-groups').prepend($group);
}
} else if (_.indexOf(upDownKeys, event.keyCode) > -1) {
dir = _.indexOf([38, 63232], event.keyCode) > -1 ? 'prev' : 'next';
$group.closest('.ckeditor-row')[dir]().find('.ckeditor-toolbar-groups').eq(0).prepend($group);
}
} else if (_.indexOf(upDownKeys, event.keyCode) > -1) {
dir = _.indexOf([38, 63232], event.keyCode) > -1 ? 'prev' : 'next';
$group.closest('.ckeditor-row')[dir]().find('.ckeditor-toolbar-groups').eq(0).prepend($group);
}
Drupal.ckeditor.registerGroupMove(this, $group);
$group.trigger('focus');

4
core/modules/ckeditor/js/views/VisualView.js
View File

@ -130,8 +130,8 @@
if ($button.length === 0) {
$row.children('.ckeditor-toolbar-groups').append(Drupal.theme('ckeditorNewButtonGroup'));
} else if (!$groups.eq(-1).hasClass('ckeditor-add-new-group')) {
$button.appendTo($row.children('.ckeditor-toolbar-groups'));
}
$button.appendTo($row.children('.ckeditor-toolbar-groups'));
}
});
}
});

4
core/modules/comment/js/node-new-comments-link.js
View File

@ -32,8 +32,8 @@
if (timestamp > lastViewTimestamp) {
$placeholdersToUpdate[nodeID] = $placeholder;
} else {
remove($placeholder);
}
remove($placeholder);
}
});
var nodeIDs = Object.keys($placeholdersToUpdate);

8
core/modules/editor/js/editor.formattedTextEditor.js
View File

@ -66,10 +66,10 @@
fieldModel.set('state', 'active');
});
} else {
_.defer(function () {
fieldModel.set('state', 'active');
});
}
_.defer(function () {
fieldModel.set('state', 'active');
});
}
break;

36
core/modules/editor/js/editor.js
View File

@ -15,23 +15,23 @@
if (format.editor.isXssSafe) {
callback(field, format);
} else {
$.ajax({
url: Drupal.url("editor/filter_xss/".concat(format.format)),
type: 'POST',
data: {
value: field.value,
original_format_id: originalFormatID
},
dataType: 'json',
success: function success(xssFilteredValue) {
if (xssFilteredValue !== false) {
field.value = xssFilteredValue;
}
callback(field, format);
$.ajax({
url: Drupal.url("editor/filter_xss/".concat(format.format)),
type: 'POST',
data: {
value: field.value,
original_format_id: originalFormatID
},
dataType: 'json',
success: function success(xssFilteredValue) {
if (xssFilteredValue !== false) {
field.value = xssFilteredValue;
}
});
}
callback(field, format);
}
});
}
}
function changeTextEditor(field, newFormatID) {
@ -40,8 +40,8 @@
if (drupalSettings.editor.formats[previousFormatID]) {
Drupal.editorDetach(field, drupalSettings.editor.formats[previousFormatID]);
} else {
$(field).off('.editor');
}
$(field).off('.editor');
}
if (drupalSettings.editor.formats[newFormatID]) {
var format = drupalSettings.editor.formats[newFormatID];

4
core/modules/field_ui/field_ui.js
View File

@ -104,8 +104,8 @@
if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
$this.removeClass('region-populated').addClass('region-empty');
} else if ($this.is('.region-empty')) {
$this.removeClass('region-empty').addClass('region-populated');
}
$this.removeClass('region-empty').addClass('region-populated');
}
});
},
AJAXRefreshRows: function AJAXRefreshRows(rows) {

46
core/modules/filter/filter.filter_html.admin.js
View File

@ -67,8 +67,8 @@
this.$allowedHTMLFormItem.val("".concat(this._generateSetting(userTagsWithoutOverrides), " ").concat(this._generateSetting(this.autoTags)));
} else {
this.$allowedHTMLFormItem.val(this._generateSetting(this.userTags));
}
this.$allowedHTMLFormItem.val(this._generateSetting(this.userTags));
}
},
_calculateAutoAllowedTags: function _calculateAutoAllowedTags(userAllowedTags, newFeatures) {
var editorRequiredTags = {};
@ -91,10 +91,10 @@
filterRule.restrictedTags.allowed.classes = featureRule.required.classes.slice(0);
editorRequiredTags[tag] = filterRule;
} else {
filterRule = editorRequiredTags[tag];
filterRule.restrictedTags.allowed.attributes = _.union(filterRule.restrictedTags.allowed.attributes, featureRule.required.attributes);
filterRule.restrictedTags.allowed.classes = _.union(filterRule.restrictedTags.allowed.classes, featureRule.required.classes);
}
filterRule = editorRequiredTags[tag];
filterRule.restrictedTags.allowed.attributes = _.union(filterRule.restrictedTags.allowed.attributes, featureRule.required.attributes);
filterRule.restrictedTags.allowed.classes = _.union(filterRule.restrictedTags.allowed.classes, featureRule.required.classes);
}
}
}
});
@ -103,28 +103,28 @@
if (!_.has(userAllowedTags, tag)) {
autoAllowedTags[tag] = editorRequiredTags[tag];
} else {
var requiredAttributes = editorRequiredTags[tag].restrictedTags.allowed.attributes;
var allowedAttributes = userAllowedTags[tag].restrictedTags.allowed.attributes;
var requiredAttributes = editorRequiredTags[tag].restrictedTags.allowed.attributes;
var allowedAttributes = userAllowedTags[tag].restrictedTags.allowed.attributes;
var needsAdditionalAttributes = requiredAttributes.length && _.difference(requiredAttributes, allowedAttributes).length;
var needsAdditionalAttributes = requiredAttributes.length && _.difference(requiredAttributes, allowedAttributes).length;
var requiredClasses = editorRequiredTags[tag].restrictedTags.allowed.classes;
var allowedClasses = userAllowedTags[tag].restrictedTags.allowed.classes;
var requiredClasses = editorRequiredTags[tag].restrictedTags.allowed.classes;
var allowedClasses = userAllowedTags[tag].restrictedTags.allowed.classes;
var needsAdditionalClasses = requiredClasses.length && _.difference(requiredClasses, allowedClasses).length;
var needsAdditionalClasses = requiredClasses.length && _.difference(requiredClasses, allowedClasses).length;
if (needsAdditionalAttributes || needsAdditionalClasses) {
autoAllowedTags[tag] = userAllowedTags[tag].clone();
}
if (needsAdditionalAttributes) {
autoAllowedTags[tag].restrictedTags.allowed.attributes = _.union(allowedAttributes, requiredAttributes);
}
if (needsAdditionalClasses) {
autoAllowedTags[tag].restrictedTags.allowed.classes = _.union(allowedClasses, requiredClasses);
}
if (needsAdditionalAttributes || needsAdditionalClasses) {
autoAllowedTags[tag] = userAllowedTags[tag].clone();
}
if (needsAdditionalAttributes) {
autoAllowedTags[tag].restrictedTags.allowed.attributes = _.union(allowedAttributes, requiredAttributes);
}
if (needsAdditionalClasses) {
autoAllowedTags[tag].restrictedTags.allowed.classes = _.union(allowedClasses, requiredClasses);
}
}
});
return autoAllowedTags;
},

4
core/modules/quickedit/js/editors/formEditor.js
View File

@ -95,8 +95,8 @@
if (state === 'invalid') {
fieldModel.set('state', 'activating');
} else {
fieldModel.set('state', 'changed');
}
fieldModel.set('state', 'changed');
}
}).on('keypress.quickedit', 'input', function (event) {
if (event.keyCode === 13) {
return false;

2
core/modules/quickedit/js/models/BaseModel.js
View File

@ -5,7 +5,7 @@
* @preserve
**/
function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
(function (Drupal, Backbone) {
Drupal.quickedit.BaseModel = Backbone.Model.extend({

16
core/modules/quickedit/js/models/EntityModel.js
View File

@ -123,8 +123,8 @@
fieldsInTempStore = _.uniq(fieldsInTempStore);
entityModel.set('fieldsInTempStore', fieldsInTempStore);
} else if (current === 'candidate' && previous === 'inactive') {
fieldModel.set('inTempStore', _.intersection([fieldModel.get('fieldID')], fieldsInTempStore).length > 0);
}
fieldModel.set('inTempStore', _.intersection([fieldModel.get('fieldID')], fieldsInTempStore).length > 0);
}
},
fieldStateChange: function fieldStateChange(fieldModel, state) {
var entityModel = this;
@ -278,12 +278,12 @@
if (from === 'closing' && to === 'closed') {
accept = true;
} else if (from === 'committing' && to === 'opened' && context.reason && (context.reason === 'invalid' || context.reason === 'networkerror')) {
accept = true;
} else if (from === 'deactivating' && to === 'opened' && context.confirming) {
accept = true;
} else if (from === 'opened' && to === 'deactivating' && context.confirmed) {
accept = true;
}
accept = true;
} else if (from === 'deactivating' && to === 'opened' && context.confirming) {
accept = true;
} else if (from === 'opened' && to === 'deactivating' && context.confirmed) {
accept = true;
}
}
return accept;

14
core/modules/quickedit/js/quickedit.js
View File

@ -209,13 +209,13 @@
})) {
initializeField(fieldElement, fieldID, entityID, entityInstanceID);
} else {
fieldsAvailableQueue.push({
el: fieldElement,
fieldID: fieldID,
entityID: entityID,
entityInstanceID: entityInstanceID
});
}
fieldsAvailableQueue.push({
el: fieldElement,
fieldID: fieldID,
entityID: entityID,
entityInstanceID: entityInstanceID
});
}
}
function deleteContainedModelsAndQueues($context) {

110
core/modules/quickedit/js/views/AppView.js
View File

@ -70,59 +70,59 @@
accept = true;
}
} else {
if (!Drupal.quickedit.FieldModel.followsStateSequence(from, to)) {
accept = false;
if (!Drupal.quickedit.FieldModel.followsStateSequence(from, to)) {
accept = false;
if (_.indexOf(this.activeFieldStates, from) !== -1 && to === 'candidate') {
accept = true;
} else if ((from === 'changed' || from === 'invalid') && to === 'candidate') {
accept = true;
} else if (from === 'highlighted' && to === 'candidate') {
accept = true;
} else if (from === 'saved' && to === 'candidate') {
accept = true;
} else if (from === 'invalid' && to === 'saving') {
accept = true;
} else if (from === 'invalid' && to === 'activating') {
accept = true;
}
}
if (accept) {
var activeField;
var activeFieldState;
if ((this.readyFieldStates.indexOf(from) !== -1 || from === 'invalid') && this.activeFieldStates.indexOf(to) !== -1) {
activeField = this.model.get('activeField');
if (activeField && activeField !== fieldModel) {
activeFieldState = activeField.get('state');
if (this.activeFieldStates.indexOf(activeFieldState) !== -1) {
activeField.set('state', 'candidate');
} else if (activeFieldState === 'changed' || activeFieldState === 'invalid') {
activeField.set('state', 'saving');
}
if (from === 'invalid') {
this.model.set('activeField', fieldModel);
accept = false;
}
}
} else if (_.indexOf(this.activeFieldStates, from) !== -1 && to === 'candidate') {
if (context && context.reason === 'mouseleave') {
accept = false;
}
} else if ((from === 'changed' || from === 'invalid') && to === 'candidate') {
if (context && context.reason === 'mouseleave') {
accept = false;
} else if (context && context.confirmed) {
accept = true;
}
}
if (_.indexOf(this.activeFieldStates, from) !== -1 && to === 'candidate') {
accept = true;
} else if ((from === 'changed' || from === 'invalid') && to === 'candidate') {
accept = true;
} else if (from === 'highlighted' && to === 'candidate') {
accept = true;
} else if (from === 'saved' && to === 'candidate') {
accept = true;
} else if (from === 'invalid' && to === 'saving') {
accept = true;
} else if (from === 'invalid' && to === 'activating') {
accept = true;
}
}
if (accept) {
var activeField;
var activeFieldState;
if ((this.readyFieldStates.indexOf(from) !== -1 || from === 'invalid') && this.activeFieldStates.indexOf(to) !== -1) {
activeField = this.model.get('activeField');
if (activeField && activeField !== fieldModel) {
activeFieldState = activeField.get('state');
if (this.activeFieldStates.indexOf(activeFieldState) !== -1) {
activeField.set('state', 'candidate');
} else if (activeFieldState === 'changed' || activeFieldState === 'invalid') {
activeField.set('state', 'saving');
}
if (from === 'invalid') {
this.model.set('activeField', fieldModel);
accept = false;
}
}
} else if (_.indexOf(this.activeFieldStates, from) !== -1 && to === 'candidate') {
if (context && context.reason === 'mouseleave') {
accept = false;
}
} else if ((from === 'changed' || from === 'invalid') && to === 'candidate') {
if (context && context.reason === 'mouseleave') {
accept = false;
} else if (context && context.confirmed) {
accept = true;
}
}
}
}
return accept;
},
setupEditor: function setupEditor(fieldModel) {
@ -274,12 +274,12 @@
logicalFieldID: updatedField.get('logicalFieldID')
}).forEach(function (field) {
if (field === updatedField) {} else if (field.getViewMode() === updatedField.getViewMode()) {
field.set('html', updatedField.get('html'));
} else if (field.getViewMode() in htmlForOtherViewModes) {
field.set('html', htmlForOtherViewModes[field.getViewMode()], {
propagation: true
});
}
field.set('html', updatedField.get('html'));
} else if (field.getViewMode() in htmlForOtherViewModes) {
field.set('html', htmlForOtherViewModes[field.getViewMode()], {
propagation: true
});
}
});
},
rerenderedFieldToCandidate: function rerenderedFieldToCandidate(fieldModel) {

20
core/modules/settings_tray/js/settings_tray.js
View File

@ -73,19 +73,19 @@
});
}
} else {
$editables = $('[data-drupal-settingstray="editable"]').removeOnce('settingstray');
$editables = $('[data-drupal-settingstray="editable"]').removeOnce('settingstray');
if ($editables.length) {
document.querySelector('[data-off-canvas-main-canvas]').removeEventListener('click', preventClick, true);
$editables.off('.settingstray');
$(quickEditItemSelector).off('.settingstray');
}
$editButton.text(Drupal.t('Edit'));
closeOffCanvas();
disableQuickEdit();
if ($editables.length) {
document.querySelector('[data-off-canvas-main-canvas]').removeEventListener('click', preventClick, true);
$editables.off('.settingstray');
$(quickEditItemSelector).off('.settingstray');
}
$editButton.text(Drupal.t('Edit'));
closeOffCanvas();
disableQuickEdit();
}
getItemsToToggle().toggleClass('js-settings-tray-edit-mode', editMode);
$('.edit-mode-inactive').toggleClass('visually-hidden', editMode);
}

14
core/modules/toolbar/js/views/ToolbarVisualView.js
View File

@ -164,13 +164,13 @@
if (isVertical && subtreesHash === cachedSubtreesHash && cachedSubtrees) {
Drupal.toolbar.setSubtrees.resolve(cachedSubtrees);
} else if (isVertical) {
localStorage.removeItem("Drupal.toolbar.subtreesHash.".concat(theme));
localStorage.removeItem("Drupal.toolbar.subtrees.".concat(theme));
Drupal.ajax({
url: endpoint
}).execute();
localStorage.setItem("Drupal.toolbar.subtreesHash.".concat(theme), subtreesHash);
}
localStorage.removeItem("Drupal.toolbar.subtreesHash.".concat(theme));
localStorage.removeItem("Drupal.toolbar.subtrees.".concat(theme));
Drupal.ajax({
url: endpoint
}).execute();
localStorage.setItem("Drupal.toolbar.subtreesHash.".concat(theme), subtreesHash);
}
}
}
});

8
core/modules/views_ui/js/views-admin.js
View File

@ -441,11 +441,11 @@
if ($existingOperatorLabel.length) {
$existingOperatorLabel.replaceWith(operatorLabel);
} else {
$firstCell.append(operatorLabel);
}
} else {
$existingOperatorLabel.remove();
$firstCell.append(operatorLabel);
}
} else {
$existingOperatorLabel.remove();
}
}
}
},

2
core/package.json
View File

@ -63,7 +63,7 @@
"stylelint-checkstyle-formatter": "^0.1.1",
"stylelint-config-standard": "^20.0.0",
"stylelint-order": "^4.0.0",
"terser": "^5.3.4"
"terser": "^5.3.4 <5.10.0"
},
"//": "'development is the default environment, and legacy is for transpiling the old jQuery codebase",
"babel": {

6
core/tests/Drupal/Nightwatch/Tests/oliveroDesktopMenuTest.js
View File

@ -53,14 +53,16 @@ module.exports = {
.drupalRelativeURL('/node')
.waitForElementVisible(headerNavSelector)
.assert.visible(headerNavSelector)
.moveToElement('link text', 'home')
.assert.not.visible(`#${linkSubMenuId}`)
.moveToElement(`[aria-controls="${linkSubMenuId}"]`, 0, 0)
.assert.visible(`#${linkSubMenuId}`)
.assert.attributeEquals(
`[aria-controls="${linkSubMenuId}"]`,
'aria-expanded',
'true',
)
.moveToElement('link text', 'button')
.assert.not.visible(`#${buttonSubMenuId}`)
.moveToElement(`[aria-controls="${buttonSubMenuId}"]`, 0, 0)
.assert.visible(`#${buttonSubMenuId}`)
.assert.attributeEquals(
`[aria-controls="${buttonSubMenuId}"]`,

4
core/themes/claro/js/vertical-tabs.js
View File

@ -153,8 +153,8 @@
if ($firstTab.length) {
$firstTab.data('verticalTab').focus(false);
} else {
this.item.closest('.js-form-type-vertical-tabs').hide();
}
this.item.closest('.js-form-type-vertical-tabs').hide();
}
return this;
}

1
core/themes/olivero/css/components/breadcrumb.css
View File

@ -132,7 +132,6 @@
.breadcrumb__list {
overflow-x: auto;
width: -webkit-max-content;
width: max-content;
margin-top: 0;
margin-bottom: 0;

3
core/themes/olivero/css/components/content-moderation.css
View File

@ -87,10 +87,9 @@
width: 100%
}
@supports ((width: -webkit-max-content) or (width: max-content)) {
@supports (width: max-content) {
.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
width: -webkit-max-content;
width: max-content
}
}

1
core/themes/olivero/css/components/navigation/nav-primary-wide.css
View File

@ -153,7 +153,6 @@
position: relative; /* Anchor secondary menu */
display: flex;
align-items: center;
width: -webkit-max-content;
width: max-content;
max-width: 12.5rem;
margin-top: 0;

1
core/themes/olivero/css/components/navigation/nav-secondary.css
View File

@ -65,7 +65,6 @@
*/
/* @todo should this be scoped to desktop nav? */
width: -webkit-max-content;
width: max-content;
max-width: 12.5rem
}

3
core/themes/olivero/css/layout/social-bar.css
View File

@ -148,10 +148,9 @@
transform-origin: left /* LTR */
}
@supports ((width: -webkit-max-content) or (width: max-content)) {
@supports (width: max-content) {
.rotate {
width: -webkit-max-content;
width: max-content
}
}

2822
core/yarn.lock
View File

File diff suppressed because it is too large Load Diff