fix #624

resources/views/widgets/form.blade.php

@@ -33,18 +33,3 @@
 
     {!! $footer !!}
 {!! $end !!}
-
-@if(! empty($ajax))
-<script>
-    $('#{{ $elementId }}').form({
-        validate: true,
-        confirm: {!! admin_javascript_json($confirm) !!},
-        success: function (data) {
-            {!! $savedScript !!}
-        },
-        error: function (response) {
-            {!! $errorScript !!}
-        }
-    });
-</script>
-@endif

src/Form/Builder.php

@@ -808,12 +808,10 @@ EOF;
     protected function doWrap(Renderable $view)
     {
         if ($wrapper = $this->wrapper) {
-            return Admin::resolveHtml($wrapper($view))['html'];
+            return Helper::render($wrapper($view));
         }
 
-        $html = Admin::resolveHtml($view->render())['html'];
-
-        return "<div class='card'>{$html}</div>";
+        return "<div class='card'>{$view->render()}</div>";
     }
 
     /**

src/Grid.php

@@ -897,7 +897,7 @@ HTML;
             return $view->render();
         }
 
-        return $wrapper($view);
+        return Helper::render($wrapper($view));
     }
 
     /**

src/Widgets/Form.php

@@ -855,11 +855,7 @@ HTML;
         $this->prepareHandler();
 
         if ($this->allowAjaxSubmit()) {
-            $this->addVariables([
-                'confirm'     => $this->confirm,
-                'savedScript' => $this->savedScript(),
-                'errorScript' => $this->errorScript(),
-            ]);
+            $this->addAjaxScript();
         }
 
         $tabObj = $this->getTab();
@@ -872,7 +868,27 @@ HTML;
             'tabObj' => $tabObj,
         ]);
 
-        return Admin::view($this->view, $this->variables());
+        return view($this->view, $this->variables())->render();
+    }
+
+    protected function addAjaxScript()
+    {
+        $confirm = admin_javascript_json($this->confirm);
+
+        Admin::script(
+            <<<JS
+$('#{$this->getElementId()}').form({
+    validate: true,
+    confirm: {$confirm},
+    success: function (data) {
+        {$this->savedScript()}
+    },
+    error: function (response) {
+        {$this->errorScript()}
+    }
+});
+JS
+        );
     }
 
     /**