summaryrefslogtreecommitdiffstats
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:30:48 -0400
commit0ed3b15981b4451efb11839d6ee7b9acf1ed1d84 (patch)
treed8c1968795332613efbf271dedf66e81d42d4164
parent4d4782fcd7213b5f279cb372853f5fedb07f6178 (diff)
downloadpfsense-0ed3b15981b4451efb11839d6ee7b9acf1ed1d84.zip
pfsense-0ed3b15981b4451efb11839d6ee7b9acf1ed1d84.tar.gz
Improved solution to #6716
-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 0db1987..58548a7 100644
--- a/src/usr/local/www/classes/Form/IpAddress.class.php
+++ b/src/usr/local/www/classes/Form/IpAddress.class.php
@@ -53,6 +53,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 2581fbc..c2b8aed 100644
--- a/src/usr/local/www/js/pfSenseHelpers.js
+++ b/src/usr/local/www/js/pfSenseHelpers.js
@@ -196,7 +196,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