Skip to content

Commit

Permalink
Merge branch 'develop' into 4.3
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/web/assets/garnish/dist/garnish.js
#	src/web/assets/garnish/dist/garnish.js.map
  • Loading branch information
brandonkelly committed Sep 13, 2022
2 parents a56ed26 + 3931134 commit 2a05b62
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
- Fixed a bug where newly-created subfolders on the Assets index page could appear to have the wrong indentation.
- Fixed a UI bug where renaming a newly-created volume subfolder didn’t appear to have any effect.
- Fixed a bug where empty URL fields would be marked as changed, even when no change was made to them. ([#11908](https://github.com/craftcms/cms/issues/11908))
- Fixed a UI bug where autosuggest menus weren’t getting filtered when first opened for inputs with existing values. ([#11896](https://github.com/craftcms/cms/issues/11896))
- Fixed a bug where Entry Type condition rules weren’t working for conditions that were applied to a single element. ([#11914](https://github.com/craftcms/cms/issues/11914))
- Fixed a bug where form action keyboard shortcuts weren’t available when a custom select menu was focused. ([#11919](https://github.com/craftcms/cms/issues/11919))
- Fixed a bug where transforming an animated GIF into a WebP file would only include the first frame. ([#11889](https://github.com/craftcms/cms/issues/11889))

### Security
- Fixed XSS vulnerabilities.
Expand Down
2 changes: 1 addition & 1 deletion src/elements/conditions/entries/TypeConditionRule.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ public function modifyQuery(ElementQueryInterface $query): void
public function matchElement(ElementInterface $element): bool
{
/** @var Entry $element */
return $this->matchValue((string)$element->getType()->id);
return $this->matchValue((string)$element->getType()->uid);
}
}
2 changes: 2 additions & 0 deletions src/image/Raster.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ public function crop(int $x1, int $x2, int $y1, int $y2): self
$gif = $this->_instance->create($newSize);
$gif->layers()->remove(0);

$this->_image->layers()->coalesce();
foreach ($this->_image->layers() as $layer) {
$croppedLayer = $layer->crop($startingPoint, $newSize);
$gif->layers()->add($croppedLayer);
Expand Down Expand Up @@ -701,6 +702,7 @@ private function _getSaveOptions(?int $quality, ?string $extension = null): arra
return ['jpeg_quality' => $quality, 'flatten' => true];

case 'gif':
case 'webp':
return ['animated' => $this->_isAnimatedGif];

case 'png':
Expand Down
2 changes: 1 addition & 1 deletion src/templates/_includes/forms/autosuggest.twig
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ new Vue({
data() {
{% block data %}
var data = {{ {
query: '',
query: (value ?? '')|lower,
selected: '',
filteredOptions: [],
suggestions: suggestions ?? [],
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/garnish/dist/garnish.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/garnish/dist/garnish.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/web/assets/garnish/src/MenuBtn.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ export default Base.extend(
},

onKeyDown: function (ev) {
if (Garnish.isCtrlKeyPressed(ev)) {
return;
}

// Searching for an option?
if (
ev.key &&
Expand Down

0 comments on commit 2a05b62

Please sign in to comment.