浏览代码

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

phuoc 11 年之前
父节点
当前提交
747704c3c5
共有 3 个文件被更改,包括 7 次插入6 次删除
  1. 4 3
      src/js/validator/between.js
  2. 2 2
      src/js/validator/greaterThan.js
  3. 1 1
      src/js/validator/lessThan.js

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

@@ -37,9 +37,10 @@
             }
 
             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));

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

@@ -33,8 +33,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));

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

@@ -34,7 +34,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));