ソースを参照

#305, #306, #307: Fix inclusive option in between, greaterThan, lessThan; thanks to @johanronn77

phuoc 11 年 前
コミット
4744c2fa29

ファイルの差分が大きいため隠しています
+ 1 - 1
CHANGELOG.md


+ 6 - 6
dist/js/bootstrapValidator.js

@@ -1343,9 +1343,9 @@
             }
 
             value = parseFloat(value);
-            return (options.inclusive === true)
-                        ? (value > options.min && value < options.max)
-                        : (value >= options.min && value <= options.max);
+			return (options.inclusive === true || options.inclusive == undefined)
+				    ? (value >= options.min && value <= options.max)
+				    : (value > options.min && value < options.max);
         }
     };
 }(window.jQuery));
@@ -1995,8 +1995,8 @@
             if (value == '') {
                 return true;
             }
-            value = parseFloat(value);           
-			return (options.inclusive === false || options.inclusive==undefined) ? (value >= options.value) : (value > options.value);
+            value = parseFloat(value);
+			return (options.inclusive === true || options.inclusive == undefined) ? (value >= options.value) : (value > options.value);
         }
     }
 }(window.jQuery));
@@ -3380,7 +3380,7 @@
                 return true;
             }
             value = parseFloat(value);
-            return (options.inclusive === false || options.inclusive == undefined) ? (value <= options.value) : (value < options.value);
+            return (options.inclusive === true || options.inclusive == undefined) ? (value <= options.value) : (value < options.value);
         }
     };
 }(window.jQuery));

ファイルの差分が大きいため隠しています
+ 2 - 2
dist/js/bootstrapValidator.min.js


+ 3 - 4
src/js/validator/between.js

@@ -37,10 +37,9 @@
             }
 
             value = parseFloat(value);
-			return (options.inclusive === true || options.inclusive==undefined)
-				? (value >= options.min && value <= options.max)
-				: (value > options.min && value < options.max);
-			
+			return (options.inclusive === true || options.inclusive == undefined)
+				    ? (value >= options.min && value <= options.max)
+				    : (value > options.min && value < options.max);
         }
     };
 }(window.jQuery));

+ 1 - 1
src/js/validator/greaterThan.js

@@ -34,7 +34,7 @@
                 return true;
             }
             value = parseFloat(value);
-			return (options.inclusive === true || options.inclusive==undefined) ? (value >= options.value) : (value > options.value);
+			return (options.inclusive === true || options.inclusive == undefined) ? (value >= options.value) : (value > options.value);
         }
     }
 }(window.jQuery));

+ 1 - 1
src/js/validator/lessThan.js

@@ -34,7 +34,7 @@
                 return true;
             }
             value = parseFloat(value);
-            return (options.inclusive === true || options.inclusive==undefined) ? (value <= options.value) : (value < options.value);
+            return (options.inclusive === true || options.inclusive == undefined) ? (value <= options.value) : (value < options.value);
         }
     };
 }(window.jQuery));