Merge pull request #17 from venveo/develop

Fixed saving bulk edit jobs in Firefox
venveo · Feb 13, 2020 · 368f7fb · 368f7fb
2 parents a366fae + a26aed2
commit 368f7fb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Bulk Edit Changelog
 
+## 2.0.1 - 2020-02-13
+### Fixed
+- Fixed problem with saving bulk edit jobs in Firefox
+
 ## 2.0.0 - 2020-01-24
 {warning} The FieldProcessorInterface has slightly changed to better
 support old versions of PHP. If you wrote your own FieldProcessor,

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "venveo/craft-bulkedit",
     "description": "Bulk edit entries",
     "type": "craft-plugin",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/assetbundles/bulkeditelementaction/BulkEditElementActionAsset.php b/src/assetbundles/bulkeditelementaction/BulkEditElementActionAsset.php
@@ -16,7 +16,7 @@ class BulkEditElementActionAsset extends AssetBundle
     public function init()
     {
         // define the path that your publishable resources live
-        $this->sourcePath = "@venveo/bulkedit/assetbundles/bulkeditelementaction/dist";
+        $this->sourcePath = __DIR__ . '/dist';
 
         // define the dependencies
         $this->depends = [

diff --git a/src/assetbundles/bulkeditelementaction/dist/js/BulkEditModal.js b/src/assetbundles/bulkeditelementaction/dist/js/BulkEditModal.js
@@ -156,6 +156,7 @@ Craft.BulkEditModal = Garnish.Modal.extend(
         },
 
         _handleFieldEditorSubmit: function(e) {
+            e.preventDefault();
             this.$container.find('.submit').attr('disabled', 'disabled');
             this.$container.find('.submit').addClass('disabled')
             const formValues = this.$container.find('#bulk-edit-values-modal').serializeArray();

diff --git a/src/templates/elementactions/BulkEdit/_edit.twig b/src/templates/elementactions/BulkEdit/_edit.twig
@@ -20,7 +20,7 @@
     <div class="field-edit-modal-bar">
       <div class="buttons right">
         <div class="btn" id="field-edit-cancel">Cancel</div>
-        <input type="submit" value="Save {{ elementIds|length }} Elements" class="btn submit"></div>
+        <input type="button" value="Save {{ elementIds|length }} Elements" class="btn submit"></div>
     </div>
      {% else %}
     <p>It doesn't look like there are any fields that support bulk editing on these elements.</p>