From 615c267a496dcacb6e008130590dfc4b690f61ec Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Wed, 7 Dec 2022 11:09:57 -0800 Subject: [PATCH] =?UTF-8?q?batch=20=E2=86=92=20bulk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/elements/actions/CopyReferenceTag.php | 2 +- src/elements/actions/CopyUrl.php | 2 +- src/elements/actions/DeleteUsers.php | 2 +- src/elements/actions/Edit.php | 2 +- src/elements/actions/EditImage.php | 2 +- src/elements/actions/NewChild.php | 2 +- src/elements/actions/NewSiblingAfter.php | 2 +- src/elements/actions/NewSiblingBefore.php | 2 +- src/elements/actions/PreviewAsset.php | 2 +- src/elements/actions/RenameFile.php | 2 +- src/elements/actions/ReplaceFile.php | 2 +- src/elements/actions/SuspendUsers.php | 2 +- src/elements/actions/UnsuspendUsers.php | 2 +- src/elements/actions/View.php | 2 +- src/web/assets/cp/dist/cp.js | 2 +- src/web/assets/cp/dist/cp.js.map | 2 +- .../assets/cp/src/js/ElementActionTrigger.js | 22 +++++++++++++++++-- 17 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/elements/actions/CopyReferenceTag.php b/src/elements/actions/CopyReferenceTag.php index 36fbc8822dd..dd2add5a6f4 100644 --- a/src/elements/actions/CopyReferenceTag.php +++ b/src/elements/actions/CopyReferenceTag.php @@ -53,7 +53,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, activate: function(\$selectedItems) { Craft.ui.createCopyTextPrompt({ diff --git a/src/elements/actions/CopyUrl.php b/src/elements/actions/CopyUrl.php index 65ebd9c8910..9d23ee1fc89 100644 --- a/src/elements/actions/CopyUrl.php +++ b/src/elements/actions/CopyUrl.php @@ -41,7 +41,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { return !!\$selectedItems.find('.element').data('url'); diff --git a/src/elements/actions/DeleteUsers.php b/src/elements/actions/DeleteUsers.php index 1c81572eb70..ce0d6d79788 100644 --- a/src/elements/actions/DeleteUsers.php +++ b/src/elements/actions/DeleteUsers.php @@ -86,7 +86,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: true, + bulk: true, validateSelection: function(\$selectedItems) { for (var i = 0; i < \$selectedItems.length; i++) diff --git a/src/elements/actions/Edit.php b/src/elements/actions/Edit.php index ac5399fa93b..36cdd1d82a3 100644 --- a/src/elements/actions/Edit.php +++ b/src/elements/actions/Edit.php @@ -53,7 +53,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { return Garnish.hasAttr(\$selectedItems.find('.element'), 'data-editable'); diff --git a/src/elements/actions/EditImage.php b/src/elements/actions/EditImage.php index 73195210329..b169f138a3b 100644 --- a/src/elements/actions/EditImage.php +++ b/src/elements/actions/EditImage.php @@ -53,7 +53,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, _imageEditor: null, validateSelection: function(\$selectedItems) { diff --git a/src/elements/actions/NewChild.php b/src/elements/actions/NewChild.php index 9804d70016f..ef720e44b3e 100644 --- a/src/elements/actions/NewChild.php +++ b/src/elements/actions/NewChild.php @@ -65,7 +65,7 @@ public function getTriggerHtml() (() => { let trigger = new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { return (!$maxLevels || $maxLevels > \$selectedItems.find('.element').data('level')); diff --git a/src/elements/actions/NewSiblingAfter.php b/src/elements/actions/NewSiblingAfter.php index 640e03612b3..f5472a4ae86 100644 --- a/src/elements/actions/NewSiblingAfter.php +++ b/src/elements/actions/NewSiblingAfter.php @@ -49,7 +49,7 @@ public function getTriggerHtml() (() => { let trigger = new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, activate: function(\$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 8e6f0b57324..932788439cb 100644 --- a/src/elements/actions/NewSiblingBefore.php +++ b/src/elements/actions/NewSiblingBefore.php @@ -49,7 +49,7 @@ public function getTriggerHtml() (() => { let trigger = new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, activate: function(\$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 f482d6e3473..3dbd6d6a0f9 100644 --- a/src/elements/actions/PreviewAsset.php +++ b/src/elements/actions/PreviewAsset.php @@ -53,7 +53,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { return \$selectedItems.length === 1; diff --git a/src/elements/actions/RenameFile.php b/src/elements/actions/RenameFile.php index 2269373d3a5..b14cfdaa40b 100644 --- a/src/elements/actions/RenameFile.php +++ b/src/elements/actions/RenameFile.php @@ -39,7 +39,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { return Garnish.hasAttr(\$selectedItems.find('.element'), 'data-movable'); diff --git a/src/elements/actions/ReplaceFile.php b/src/elements/actions/ReplaceFile.php index b2b3a33dad1..5a1eef08308 100644 --- a/src/elements/actions/ReplaceFile.php +++ b/src/elements/actions/ReplaceFile.php @@ -38,7 +38,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { return Garnish.hasAttr(\$selectedItems.find('.element'), 'data-replaceable'); diff --git a/src/elements/actions/SuspendUsers.php b/src/elements/actions/SuspendUsers.php index 9e894624e89..00ec7d125ac 100644 --- a/src/elements/actions/SuspendUsers.php +++ b/src/elements/actions/SuspendUsers.php @@ -39,7 +39,7 @@ public function getTriggerHtml() (() => { 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 32f2f654389..2d1fcbee8fe 100644 --- a/src/elements/actions/UnsuspendUsers.php +++ b/src/elements/actions/UnsuspendUsers.php @@ -38,7 +38,7 @@ public function getTriggerHtml() (() => { 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 eedb0342008..b0e60e1703a 100644 --- a/src/elements/actions/View.php +++ b/src/elements/actions/View.php @@ -53,7 +53,7 @@ public function getTriggerHtml() (() => { new Craft.ElementActionTrigger({ type: {$type}, - batch: false, + bulk: false, validateSelection: function(\$selectedItems) { var \$element = \$selectedItems.find('.element'); diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js index 90ecec9fda9..268821bbdb0 100644 --- a/src/web/assets/cp/dist/cp.js +++ b/src/web/assets/cp/dist/cp.js @@ -1,2 +1,2 @@ -!function(){var t={7452:function(){Craft.AdminTable=Garnish.Base.extend({settings:null,totalItems:null,sorter:null,$noItems:null,$table:null,$tbody:null,$deleteBtns:null,init:function(t){this.setSettings(t,Craft.AdminTable.defaults),this.settings.allowDeleteAll||(this.settings.minItems=1),this.$noItems=$(this.settings.noItemsSelector),this.$table=$(this.settings.tableSelector),this.$tbody=this.$table.children("tbody"),this.totalItems=this.$tbody.children().length,this.settings.sortable&&(this.sorter=new Craft.DataTableSorter(this.$table,{onSortChange:this.reorderItems.bind(this)})),this.$deleteBtns=this.$table.find(".delete:not(.disabled)"),this.addListener(this.$deleteBtns,"click","handleDeleteBtnClick"),this.updateUI()},addRow:function(t){if(!(this.settings.maxItems&&this.totalItems>=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}})},76:function(){Craft.AssetEditor=Craft.BaseElementEditor.extend({$filenameInput:null,originalBasename:null,originalExtension:null,reloadIndex:!1,init:function(t,e){var i=this;this.on("updateForm",(function(){i.addListener(i.$sidebar.find(".preview-thumb-container .edit-btn"),"click","showImageEditor"),i.addListener(i.$sidebar.find(".preview-thumb-container .preview-btn"),"click","showImagePreview"),i.$filenameInput=i.$sidebar.find(".filename"),i.addListener(i.$filenameInput,"focus","selectFilename")})),this.on("closeSlideout",(function(){i.reloadIndex&&(i.settings.elementIndex?i.settings.elementIndex.updateElements():i.settings.input&&i.settings.input.refreshThumbnail(i.$element.data("id")))})),this.base(t,e),this.settings.validators.push((function(){return i.validateExtension()}))},showImageEditor:function(){var t=this;new Craft.AssetImageEditor(this.$element.data("id"),{onSave:function(){t.reloadIndex=!0,t.load()}})},showImagePreview:function(){var t={};this.$element.data("image-width")&&(t.startingWidth=this.$element.data("image-width"),t.startingHeight=this.$element.data("image-height")),new Craft.PreviewFileModal(this.$element.data("id"),null,t)},selectFilename:function(){var t=this;if(void 0!==this.$filenameInput[0].selectionStart){var e=this._parseFilename(),i=e.basename,s=e.extension;null===this.originalBasename&&(this.originalBasename=i,this.originalExtension=s),this.$filenameInput[0].selectionStart=0,this.$filenameInput[0].selectionEnd=i.length,this.$filenameInput.one("mouseup.keepselection",(function(t){t.preventDefault()})),setTimeout((function(){t.$filenameInput.off("mouseup.keepselection")}),500)}},validateExtension:function(){if(null===this.originalBasename)return!0;var t=this._parseFilename(),e=t.basename,i=t.extension;return i===this.originalExtension||(i?confirm(Craft.t("app","Are you sure you want to change the extension from “.{oldExt}” to “.{newExt}”?",{oldExt:this.originalExtension,newExt:i})):this.originalFilename!==e?(this.$filenameInput.val("".concat(Craft.rtrim(e,"."),".").concat(this.originalExtension)),!0):confirm(Craft.t("app","Are you sure you want to remove the extension “.{ext}”?",{ext:this.originalExtension})))},_parseFilename:function(){var t=this.$filenameInput.val().split("."),e=t.length>1?t.pop():null;return{basename:t.join("."),extension:e}}}),Craft.registerElementEditorClass("craft\\elements\\Asset",Craft.AssetEditor)},6872:function(){Craft.AssetImageEditor=Garnish.Modal.extend({$body:null,$footer:null,$imageTools:null,$buttons:null,$cancelBtn:null,$replaceBtn:null,$saveBtn:null,$editorContainer:null,$straighten:null,$croppingCanvas:null,$spinnerCanvas: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,spinnerInterval:null,maxImageSize:null,lastLoadedDimensions:null,imageIsLoading:!1,mouseMoveEvent:null,croppingConstraint:!1,constraintOrientation:"landscape",showingCustomConstraint:!1,renderImage:null,renderCropper:null,init:function(t,e){this.cacheBust=Date.now(),this.setSettings(e,Craft.AssetImageEditor.defaults),null===this.settings.allowDegreeFractions&&(this.settings.allowDegreeFractions=Craft.isImagick),this.assetId=t,this.flipData={x:0,y:0},this.$container=$('').appendTo(Garnish.$bod),this.$body=$('
').appendTo(this.$container),this.$footer=$('