diff --git a/src/elements/actions/CopyReferenceTag.php b/src/elements/actions/CopyReferenceTag.php index fae093a4843..c78fc6ba6d7 100644 --- a/src/elements/actions/CopyReferenceTag.php +++ b/src/elements/actions/CopyReferenceTag.php @@ -45,7 +45,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, activate: \$selectedItems => { Craft.ui.createCopyTextPrompt({ label: Craft.t('app', 'Copy the reference tag'), diff --git a/src/elements/actions/CopyUrl.php b/src/elements/actions/CopyUrl.php index 4f39247ffcb..c6d84140f35 100644 --- a/src/elements/actions/CopyUrl.php +++ b/src/elements/actions/CopyUrl.php @@ -38,7 +38,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => !!\$selectedItems.find('.element').data('url'), activate: \$selectedItems => { Craft.ui.createCopyTextPrompt({ diff --git a/src/elements/actions/DeleteUsers.php b/src/elements/actions/DeleteUsers.php index c3bc56fb90b..331c7b32534 100644 --- a/src/elements/actions/DeleteUsers.php +++ b/src/elements/actions/DeleteUsers.php @@ -82,7 +82,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: true, + bulk: true, validateSelection: \$selectedItems => { for (let i = 0; i < \$selectedItems.length; i++) { if ($.inArray(\$selectedItems.eq(i).find('.element').data('id').toString(), $undeletableIds) != -1) { diff --git a/src/elements/actions/Edit.php b/src/elements/actions/Edit.php index 812e61818b6..9476efedbcd 100644 --- a/src/elements/actions/Edit.php +++ b/src/elements/actions/Edit.php @@ -50,7 +50,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => Garnish.hasAttr(\$selectedItems.find('.element'), 'data-savable'), activate: \$selectedItems => { const \$element = \$selectedItems.find('.element:first'); diff --git a/src/elements/actions/EditImage.php b/src/elements/actions/EditImage.php index fd550dad9c1..0879ac48298 100644 --- a/src/elements/actions/EditImage.php +++ b/src/elements/actions/EditImage.php @@ -50,7 +50,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => Garnish.hasAttr(\$selectedItems.find('.element'), 'data-editable-image'), activate: \$selectedItems => { const \$element = \$selectedItems.find('.element:first'); diff --git a/src/elements/actions/NewChild.php b/src/elements/actions/NewChild.php index a96ebd93939..3d2a02c9426 100644 --- a/src/elements/actions/NewChild.php +++ b/src/elements/actions/NewChild.php @@ -67,7 +67,7 @@ public function getTriggerHtml(): ?string (() => { let trigger = new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => !$maxLevels || $maxLevels > \$selectedItems.find('.element').data('level'), activate: \$selectedItems => { const url = Craft.getUrl($newChildUrl, 'parentId=' + \$selectedItems.find('.element').data('id')); diff --git a/src/elements/actions/NewSiblingAfter.php b/src/elements/actions/NewSiblingAfter.php index 9de6d78280f..49239fa7bfd 100644 --- a/src/elements/actions/NewSiblingAfter.php +++ b/src/elements/actions/NewSiblingAfter.php @@ -62,7 +62,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, activate: \$selectedItems => { Craft.redirectTo(Craft.getUrl($newSiblingUrl, 'after=' + \$selectedItems.find('.element').data('id'))); }, diff --git a/src/elements/actions/NewSiblingBefore.php b/src/elements/actions/NewSiblingBefore.php index 27307b225b6..65ecdc3e968 100644 --- a/src/elements/actions/NewSiblingBefore.php +++ b/src/elements/actions/NewSiblingBefore.php @@ -62,7 +62,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, activate: \$selectedItems => { Craft.redirectTo(Craft.getUrl($newSiblingUrl, 'before=' + \$selectedItems.find('.element').data('id'))); }, diff --git a/src/elements/actions/PreviewAsset.php b/src/elements/actions/PreviewAsset.php index 5f545aa0e9a..53253a3ee70 100644 --- a/src/elements/actions/PreviewAsset.php +++ b/src/elements/actions/PreviewAsset.php @@ -50,7 +50,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => \$selectedItems.length === 1, activate: \$selectedItems => { const \$element = \$selectedItems.find('.element'); diff --git a/src/elements/actions/RenameFile.php b/src/elements/actions/RenameFile.php index 9b5b2d27e08..61568478c2a 100644 --- a/src/elements/actions/RenameFile.php +++ b/src/elements/actions/RenameFile.php @@ -36,7 +36,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => Garnish.hasAttr(\$selectedItems.find('.element'), 'data-movable'), activate: \$selectedItems => { const \$element = \$selectedItems.find('.element') diff --git a/src/elements/actions/ReplaceFile.php b/src/elements/actions/ReplaceFile.php index a1db4b00dbb..67987d122d7 100644 --- a/src/elements/actions/ReplaceFile.php +++ b/src/elements/actions/ReplaceFile.php @@ -35,7 +35,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => Garnish.hasAttr(\$selectedItems.find('.element'), 'data-replaceable'), activate: \$selectedItems => { $('.replaceFile').remove(); diff --git a/src/elements/actions/SuspendUsers.php b/src/elements/actions/SuspendUsers.php index b98b494172a..841a7fb61d9 100644 --- a/src/elements/actions/SuspendUsers.php +++ b/src/elements/actions/SuspendUsers.php @@ -41,7 +41,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: true, + bulk: true, validateSelection: \$selectedItems => { for (let i = 0; i < \$selectedItems.length; i++) { const \$element = \$selectedItems.eq(i).find('.element'); diff --git a/src/elements/actions/UnsuspendUsers.php b/src/elements/actions/UnsuspendUsers.php index 98de829d8e9..1da402c888c 100644 --- a/src/elements/actions/UnsuspendUsers.php +++ b/src/elements/actions/UnsuspendUsers.php @@ -39,7 +39,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: true, + bulk: true, validateSelection: \$selectedItems => { for (let i = 0; i < \$selectedItems.length; i++) { const \$element = \$selectedItems.eq(i).find('.element'); diff --git a/src/elements/actions/View.php b/src/elements/actions/View.php index b6693a0533e..18a2ff18e2d 100644 --- a/src/elements/actions/View.php +++ b/src/elements/actions/View.php @@ -50,7 +50,7 @@ public function getTriggerHtml(): ?string (() => { new Craft.ElementActionTrigger({ type: $type, - batch: false, + bulk: false, validateSelection: \$selectedItems => { const \$element = \$selectedItems.find('.element'); return ( diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js index 4b04b7d4bb3..75192af94dc 100644 --- a/src/web/assets/cp/dist/cp.js +++ b/src/web/assets/cp/dist/cp.js @@ -1,2 +1,2 @@ -(function(){var __webpack_modules__={3839:function(){Craft.AddressesInput=Garnish.Base.extend({$container:null,$addBtn:null,$addBtnItem:null,$cards:null,init:function(t,e){var i=this;this.$container=$(t),this.setSettings(e,Craft.AddressesInput.defaults),this.$container.data("addresses")&&(console.warn("Double-instantiating an address input on an element"),this.$container.data("addresses").destroy()),this.$container.data("addresses",this),this.$addBtn=this.$container.find(".address-cards__add-btn"),this.$addBtnItem=this.$addBtn.closest("li"),this.$cards=this.$container.find("> .address-card");for(var s=0;s=this.settings.maxItems)){var e=$(t).appendTo(this.$tbody),i=e.find(".delete");this.settings.sortable&&this.sorter.addItems(e),this.$deleteBtns=this.$deleteBtns.add(i),this.addListener(i,"click","handleDeleteBtnClick"),this.totalItems++,this.updateUI()}},reorderItems:function(){var t=this;if(this.settings.sortable){for(var e=[],i=0;i=this.settings.maxItems?$(this.settings.newItemBtnSelector).addClass("hidden"):$(this.settings.newItemBtnSelector).removeClass("hidden"))}},{defaults:{tableSelector:null,noItemsSelector:null,newItemBtnSelector:null,idAttribute:"data-id",nameAttribute:"data-name",sortable:!1,allowDeleteAll:!0,minItems:0,maxItems:null,reorderAction:null,deleteAction:null,reorderSuccessMessage:Craft.t("app","New order saved."),reorderFailMessage:Craft.t("app","Couldn’t save new order."),confirmDeleteMessage:Craft.t("app","Are you sure you want to delete “{name}”?"),deleteSuccessMessage:Craft.t("app","“{name}” deleted."),deleteFailMessage:Craft.t("app","Couldn’t delete “{name}”."),onReorderItems:$.noop,onDeleteItem:$.noop}})},6872:function(){Craft.AssetImageEditor=Garnish.Modal.extend({$body:null,$footer:null,$imageTools:null,$buttons:null,$cancelBtn:null,$replaceBtn:null,$saveBtn:null,$focalPointBtn:null,$editorContainer:null,$straighten:null,$croppingCanvas:null,$spinner:null,$constraintContainer:null,$constraintRadioInputs:null,$customConstraints:null,canvas:null,image:null,viewport:null,focalPoint:null,grid:null,croppingCanvas:null,clipper:null,croppingRectangle:null,cropperHandles:null,cropperGrid:null,croppingShade:null,imageStraightenAngle:0,viewportRotation:0,originalWidth:0,originalHeight:0,imageVerticeCoords:null,zoomRatio:1,animationInProgress:!1,currentView:"",assetId:null,cacheBust:null,draggingCropper:!1,scalingCropper:!1,draggingFocal:!1,previousMouseX:0,previousMouseY:0,shiftKeyHeld:!1,editorHeight:0,editorWidth:0,cropperState:!1,scaleFactor:1,flipData:{},focalPointState:!1,maxImageSize:null,lastLoadedDimensions:null,imageIsLoading:!1,mouseMoveEvent:null,croppingConstraint:!1,constraintOrientation:"landscape",showingCustomConstraint:!1,saving:!1,renderImage:null,renderCropper:null,_queue:null,init:function(t,e){var i=this;this._queue=new Craft.Queue,this.cacheBust=Date.now(),this.setSettings(e,Craft.AssetImageEditor.defaults),null===this.settings.allowDegreeFractions&&(this.settings.allowDegreeFractions=Craft.isImagick),Garnish.prefersReducedMotion()&&(this.settings.animationDuration=1),this.assetId=t,this.flipData={x:0,y:0},this.$container=$('').appendTo(Garnish.$bod),this.$body=$('
').appendTo(this.$container),this.$footer=$('