because of CSP updates

GrafiteInc · May 30, 2023 · d9ffc73 · d9ffc73
1 parent 06cfbe3
commit d9ffc73
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 44 deletions.
diff --git a/src/Builders/AttributeBuilder.php b/src/Builders/AttributeBuilder.php
@@ -146,8 +146,8 @@ public function validHtmlAttributes()
             'onblur',
             'oncanplay',
             'oncanplaythrough',
-            'data-formsjs-onchange',
-            'data-formsjs-onclick',
+            'onchange',
+            'onclick',
             'oncontextmenu',
             'oncopy',
             'oncuechange',

diff --git a/src/JavaScript/core.js b/src/JavaScript/core.js
@@ -0,0 +1,45 @@
+document.querySelectorAll('[data-formsjs-onload]').forEach(function (element) {
+    let _method = element.getAttribute('data-formsjs-onload');
+        window[_method](element);
+        element.setAttribute('data-formsjs-rendered', true);
+});
+
+document.querySelectorAll('[data-formsjs-onchange]').forEach(function (element) {
+    let _method = element.getAttribute('data-formsjs-onchange');
+        _method = _method.replace('(event)', '');
+
+        element.addEventListener('change', function (event) {
+            window[_method](event);
+        });
+});
+
+document.querySelectorAll('[data-formsjs-onclick]').forEach(function (element) {
+    let _method = element.getAttribute('data-formsjs-onclick');
+        _method = _method.replace('(event)', '');
+    element.addEventListener('click', function (event) {
+        event.preventDefault();
+        _method = _method.replace('return ', '');
+        _method = _method.replace('window.', '');
+
+        if (_method.includes('Forms_validate_submission')) {
+            window.Forms_validate_submission(event.target.form, '<i class=\"fas fa-circle-notch fa-spin mr-2\"></i> Save',event.target);
+        } else if (_method.includes('FormsJS_disableOnSubmit')) {
+            window.FormsJS_disableOnSubmit(event);
+        } else if (_method.includes('.')) {
+            let _path = _method.split('.');
+            if (_path.length == 2) {
+                window[_path[0]][_path[1]](event);
+            }
+
+            if (_path.length == 3) {
+                window[_path[0]][_path[1]][_path[2]](event);
+            }
+
+            if (_path.length == 4) {
+                throw new Error('Method nesting is too deep. Max of 3!');
+            }
+        } else if (typeof window[_method] === 'function') {
+            window[_method](event);
+        }
+    });
+});
diff --git a/src/Services/FormAssets.php b/src/Services/FormAssets.php
@@ -120,44 +120,8 @@ protected function compileScripts($type, $nonce = false)
 
         if (in_array($type, ['all', 'scripts'])) {
             $output .= collect($this->scripts)->unique()->implode("\n");
-            $js = collect($this->js)->push("document.querySelectorAll('[data-formsjs-onload]').forEach(function (element) { let _method = element.getAttribute('data-formsjs-onload');
-            window[_method](element); element.setAttribute('data-formsjs-rendered', true); });document.querySelectorAll('[data-formsjs-onchange]').forEach(function (element) {
-    let _method = element.getAttribute('data-formsjs-onchange');
-    _method = _method.replace('(event)', '');
-    element.addEventListener('change', function (event) {
-        window[_method](event);
-    }); });
-
-    document.querySelectorAll('[data-formsjs-onclick]').forEach(function (element) {
-    let _method = element.getAttribute('data-formsjs-onclick');
-    _method = _method.replace('(event)', '');
-    element.addEventListener('click', function (event) {
-        event.preventDefault();
-        _method = _method.replace('return ', '');
-        _method = _method.replace('window.', '');
-
-        if (_method.includes('Forms_validate_submission')) {
-            window.Forms_validate_submission(event.target.form, '<i class=\"fas fa-circle-notch fa-spin mr-2\"></i> Save',event.target);
-        } else if (_method.includes('FormsJS_disableOnSubmit')) {
-            window.FormsJS_disableOnSubmit(event);
-        } else if (_method.includes('.')) {
-            let _path = _method.split('.');
-            if (_path.length == 2) {
-                window[_path[0]][_path[1]](event);
-            }
-
-            if (_path.length == 3) {
-                window[_path[0]][_path[1]][_path[2]](event);
-            }
-
-            if (_path.length == 4) {
-                throw new Error('Method nesting is too deep. Max of 3!');
-            }
-        } else if (typeof window[_method] === 'function') {
-            window[_method](event);
-        }
-
-    }); });")->unique()->implode("\n");
+            $coreJavaScript = file_get_contents(__DIR__.'/../JavaScript/core.js');
+            $js = collect($this->js)->push($coreJavaScript)->unique()->implode("\n");
 
             if (app()->environment('production')) {
                 $minifierJS = new JS();

diff --git a/tests/Unit/FieldConfigProcessorTest.php b/tests/Unit/FieldConfigProcessorTest.php
@@ -208,7 +208,7 @@ public function testSubmitOnChange()
             'Ninja' => 3,
         ])->canSelectNone()->submitOnChange();
 
-        $this->assertEquals('<div class="form-group"><label class="control-label" for="Field">Field</label><select class="form-control" id="Field" onchange="this.form.submit()" name="field"><option value="" selected>None</option><option value="1">Superman</option><option value="2">Batman</option><option value="3">Ninja</option></select></div>', (string) $field);
+        $this->assertEquals('<div class="form-group"><label class="control-label" for="Field">Field</label><select class="form-control" id="Field" data-formsjs-onchange="FormsJS_submit" name="field"><option value="" selected>None</option><option value="1">Superman</option><option value="2">Batman</option><option value="3">Ninja</option></select></div>', (string) $field);
     }
 
     public function testSubmitOnKeyUp()
@@ -219,7 +219,7 @@ public function testSubmitOnKeyUp()
             'Ninja' => 3,
         ])->canSelectNone()->submitOnKeyUp();
 
-        $this->assertEquals('<div class="form-group"><label class="control-label" for="Field">Field</label><select class="form-control" id="Field" onkeyup="this.form.submit()" name="field"><option value="" selected>None</option><option value="1">Superman</option><option value="2">Batman</option><option value="3">Ninja</option></select></div>', (string) $field);
+        $this->assertEquals('<div class="form-group"><label class="control-label" for="Field">Field</label><select class="form-control" id="Field" data-formsjs-onkeyup="FormsJS_submit" name="field"><option value="" selected>None</option><option value="1">Superman</option><option value="2">Batman</option><option value="3">Ninja</option></select></div>', (string) $field);
     }
 
     public function testHiddenUnless()

diff --git a/tests/Unit/FormExtensiveBaseTest.php b/tests/Unit/FormExtensiveBaseTest.php
@@ -103,7 +103,7 @@ public function testMakeWithExtras()
         $this->assertStringContainsString('<div class="card-footer">', $form);
         $this->assertStringContainsString('<div class="form-group"><label class="control-label" for="Name">Name</label>', $form);
         $this->assertStringContainsString('<input class="form-control" id="Name" name="name" type="text" value=""></div>', $form);
-        $this->assertStringContainsString('<div class="col-md-12 d-flex justify-content-end"><button class="superman" type="submit" onclick="return window.Forms_validate_submission(this.form, &#039;&lt;i class=&quot;fas fa-circle-notch fa-spin mr-2&quot;&gt;&lt;/i&gt; Save &lt;span class=&quot;fas fa-save&quot;&gt;&lt;/span&gt;&#039;, this);">Save <span class="fas fa-save"></span></button>', $form);
+        $this->assertStringContainsString('<div class="col-md-12 d-flex justify-content-end"><button class="superman" type="submit" data-formsjs-onclick="return window.Forms_validate_submission(this.form, &#039;&lt;i class=&quot;fas fa-circle-notch fa-spin mr-2&quot;&gt;&lt;/i&gt; Save &lt;span class=&quot;fas fa-save&quot;&gt;&lt;/span&gt;&#039;, this);">Save <span class="fas fa-save"></span></button>', $form);
     }
 
     public function testMakeWithClassChanges()

diff --git a/tests/Unit/HtmlConfigProcessorTest.php b/tests/Unit/HtmlConfigProcessorTest.php
@@ -70,7 +70,7 @@ public function testButtonOnClick()
     {
         $html = Button::make('click Me!')->cssClass('are-you')->onClick('window.location.reload();');
 
-        $this->assertEquals('<button class="are-you" onclick="window.location.reload();">click Me!</button>', (string) $html);
+        $this->assertEquals('<button class="are-you" data-formsjs-onclick="window.location.reload();">click Me!</button>', (string) $html);
     }
 
     public function testOriginal()