summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-08-15 15:30:48 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-08-15 15:31:23 -0400
commit4c1c9e525a3b400bbb75d2bdde78f79cb91c1b97 (patch)
tree91877ae21c80e1373886c7b5c7acb3e3122084ce /src/usr/local/www
parenteb53e87330d1928ad7c3fe1425cd2b29590d171b (diff)
downloadpfsense-4c1c9e525a3b400bbb75d2bdde78f79cb91c1b97.zip
pfsense-4c1c9e525a3b400bbb75d2bdde78f79cb91c1b97.tar.gz
Improved solution to #6716
(cherry picked from commit 0ed3b15981b4451efb11839d6ee7b9acf1ed1d84)
Diffstat (limited to 'src/usr/local/www')
-rw-r--r--src/usr/local/www/classes/Form/IpAddress.class.php2
-rw-r--r--src/usr/local/www/js/pfSenseHelpers.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/usr/local/www/classes/Form/IpAddress.class.php b/src/usr/local/www/classes/Form/IpAddress.class.php
index ddebadc..30792d7 100644
--- a/src/usr/local/www/classes/Form/IpAddress.class.php
+++ b/src/usr/local/www/classes/Form/IpAddress.class.php
@@ -85,6 +85,8 @@ class Form_IpAddress extends Form_Input
array_combine(range($max, $min), range($max, $min))
);
+ $this->_mask->addClass("pfIpMask");
+
return $this;
}
diff --git a/src/usr/local/www/js/pfSenseHelpers.js b/src/usr/local/www/js/pfSenseHelpers.js
index e5f3b43..9ddabcf 100644
--- a/src/usr/local/www/js/pfSenseHelpers.js
+++ b/src/usr/local/www/js/pfSenseHelpers.js
@@ -228,7 +228,7 @@ function moveHelpText(id) {
var helpSpan;
- if (!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn') && ! fromId.startsWith("mask")) {
+ if (!$(this).hasClass('pfIpMask') && !$(this).hasClass('btn')) {
if ($('#' + decrStringInt(fromId)).parent('div').hasClass('input-group')) {
helpSpan = $('#' + fromId).parent('div').parent('div').find('span:last').clone();
} else {
OpenPOWER on IntegriCloud