Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhangshilin
2018-04-08 17:56:14 +08:00
2 changed files with 0 additions and 28 deletions

View File

@@ -171,19 +171,6 @@ $(function(){
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
$.validator.addMethod(
"checkIp",
function(value, element, params) {
var checkIp;
if ($("[name=ipType]").val() == 4) {
checkIp = /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/;
} else {
checkIp = /\S+/;
}
return this.optional(element) || (checkIp.test(value) && (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256));
}
);
}); });
</script> </script>
</head> </head>

View File

@@ -40,19 +40,6 @@ $(function(){
errorContainer: "#messageBox" errorContainer: "#messageBox"
}); });
$.validator.addMethod(
"checkIp",
function(value, element, params) {
var checkIp;
if ($("[name$=ipType]").val() == 4) {
checkIp = /((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/;
} else {
checkIp = /\S+/;
}
return this.optional(element) || (checkIp.test(value) && (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256));
}
);
$("#ipSelect").change(function(){ $("#ipSelect").change(function(){
if($(this).prop("checked")){ if($(this).prop("checked")){
$("[name^='ipCfg']").removeProp("disabled"); $("[name^='ipCfg']").removeProp("disabled");
@@ -116,8 +103,6 @@ $(function(){
}); });
$(".ipType").on("change",function(){ $(".ipType").on("change",function(){
var mainTableType="${mainTableType}";
var otherTables='${_cfg.otherTables}';
var tableName=$(this).attr("name").replace(".ipType",""); var tableName=$(this).attr("name").replace(".ipType","");
var type=$(this).val(); var type=$(this).val();
if(4==type){ if(4==type){