Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # src/elements/actions/CopyReferenceTag.php # src/elements/actions/CopyUrl.php # src/elements/actions/DeleteUsers.php # src/elements/actions/Edit.php # src/elements/actions/EditImage.php # src/elements/actions/NewChild.php # src/elements/actions/NewSiblingAfter.php # src/elements/actions/NewSiblingBefore.php # src/elements/actions/PreviewAsset.php # src/elements/actions/RenameFile.php # src/elements/actions/ReplaceFile.php # src/elements/actions/View.php # src/web/assets/cp/dist/cp.js # src/web/assets/cp/dist/cp.js.map
michaelrog · Dec 7, 2022 · 5ad080d · 5ad080d
2 parents 926bd27 + 615c267
commit 5ad080d
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/dist/css/cp.css b/src/web/assets/cp/dist/css/cp.css
diff --git a/src/web/assets/cp/dist/css/cp.css.map b/src/web/assets/cp/dist/css/cp.css.map
diff --git a/src/web/assets/cp/src/js/ElementActionTrigger.js b/src/web/assets/cp/src/js/ElementActionTrigger.js
@@ -12,6 +12,24 @@ Craft.ElementActionTrigger = Garnish.Base.extend(
     triggerEnabled: true,
 
     init: function (settings) {
+      if (!$.isPlainObject(settings)) {
+        settings = {};
+      }
+
+      // batch => bulk
+      if (typeof settings.batch !== 'undefined') {
+        settings.bulk = settings.batch;
+        delete settings.batch;
+      }
+      Object.defineProperty(settings, 'batch', {
+        get() {
+          return this.bulk;
+        },
+        set(v) {
+          this.bulk = v;
+        },
+      });
+
       this.setSettings(settings, Craft.ElementActionTrigger.defaults);
 
       this.$trigger = $(
@@ -57,7 +75,7 @@ Craft.ElementActionTrigger = Garnish.Base.extend(
       var valid = true;
       this.$selectedItems = Craft.elementIndex.getSelectedElements();
 
-      if (!this.settings.batch && this.$selectedItems.length > 1) {
+      if (!this.settings.bulk && this.$selectedItems.length > 1) {
         valid = false;
       } else if (typeof this.settings.validateSelection === 'function') {
         valid = this.settings.validateSelection(this.$selectedItems);
@@ -96,7 +114,7 @@ Craft.ElementActionTrigger = Garnish.Base.extend(
   {
     defaults: {
       type: null,
-      batch: true,
+      bulk: true,
       validateSelection: null,
       activate: null,
     },