Fixed enqueing head html

venveo · Sep 13, 2018 · 839cb50 · 839cb50
1 parent bf0b134
commit 839cb50
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/assetbundles/bulkeditelementaction/dist/js/BulkEditModal.js b/src/assetbundles/bulkeditelementaction/dist/js/BulkEditModal.js
@@ -70,6 +70,9 @@ Craft.BulkEditModal = Garnish.Modal.extend(
                         this.loaded = true;
                         this.$container.append(response.modalHtml);
                         Craft.initUiElements(this.$container);
+                        Craft.appendHeadHtml(response.headHtml);
+                        Craft.appendFootHtml(response.footHtml);
+
                         this._unbindEventHandlersForFieldSelect();
                         this._bindEventHandlersForFieldEditor();
                     } else {

diff --git a/src/controllers/BulkEditController.php b/src/controllers/BulkEditController.php
@@ -78,13 +78,18 @@ public function actionGetFields(): Response
             'site' => $site
         ]);
 
-        return $this->asJson([
+        $responseData = [
             'success' => true,
             'modalHtml' => $modalHtml,
             'requestId' => $requestId,
             'elementIds' => $elementIds,
             'siteId' => $site->id
-        ]);
+        ];
+        $responseData['headHtml'] = $view->getHeadHtml();
+        $responseData['footHtml'] = $view->getBodyHtml();
+
+
+        return $this->asJson($responseData);
     }
 
     public function actionGetEditScreen(): Response {
@@ -126,7 +131,6 @@ public function actionGetEditScreen(): Response {
         } catch (\Exception $e) {
             throw $e;
         }
-//        $transaction->commit();
 
         $baseEntry = null;
         $view = \Craft::$app->getView();
@@ -137,13 +141,16 @@ public function actionGetEditScreen(): Response {
             'baseElement' => $baseEntry,
             'site' => $site
         ]);
-
-        return $this->asJson([
+        $responseData = [
             'success' => true,
             'modalHtml' => $modalHtml,
             'requestId' => $requestId,
             'siteId' => $site->id
-        ]);
+        ];
+        $responseData['headHtml'] = $view->getHeadHtml();
+        $responseData['footHtml'] = $view->getBodyHtml();
+
+        return $this->asJson($responseData);
 
     }