Reengineer Form_Button setAttribute

As per what was done for https://github.com/pfsense/pfsense/pull/2765 -
do it to the rest of them.
Seems to work OK.

1 files changed, 2 insertions, 7 deletions

diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 21e719a..01312cc 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1366,7 +1366,7 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) {
 			'Display Advanced',
 			null,
 			'fa-cog'
-		))->addClass('btn-info btn-sm');
+		))->setAttribute('type','button')->addClass('btn-info btn-sm');
 	}
 
 	$portValues = ['' => gettext('(other)'), 'any' => gettext('any')];
@@ -1448,7 +1448,7 @@ $btnadv = new Form_Button(
 	'fa-cog'
 );
 
-$btnadv->addClass('btn-info btn-sm');
+$btnadv->setAttribute('type','button')->addClass('btn-info btn-sm');
 
 $section->addInput(new Form_StaticText(
 	'Advanced Options',
@@ -1767,8 +1767,6 @@ events.push(function() {
 		$('#btnadvopts').html('<i class="fa fa-cog"></i> ' + text);
 	}
 
-	$('#btnadvopts').prop('type', 'button');
-
 	$('#btnadvopts').click(function(event) {
 		show_advopts();
 	});
@@ -1963,9 +1961,6 @@ events.push(function() {
 		show_source_port_range();
 	<?php endif; ?>
 
-	// Make it a regular button, not a submit
-	$("#btnsrcadv").prop('type','button');
-
 	// on click . .
 	$('#srcbeginport').on('change', function() {
 		src_rep_change();