diff --git a/src/dateinput/dateinput.js b/src/dateinput/dateinput.js index c8a1e07..036268a 100644 --- a/src/dateinput/dateinput.js +++ b/src/dateinput/dateinput.js @@ -28,6 +28,7 @@ conf: { format: 'mm/dd/yy', + formatfn: null, selectors: false, yearRange: [-5, 5], lang: 'en', @@ -284,7 +285,8 @@ if (e.isDefaultPrevented()) { return; } // formatting - input.val(format(date, conf.format, conf.lang)); + var formatFn = conf.formatfn || format; + input.val(formatFn(date, conf.format, conf.lang)); // store value into input input.data("date", date); diff --git a/src/validator/validator.js b/src/validator/validator.js index 7bb6a4c..75c46e7 100644 --- a/src/validator/validator.js +++ b/src/validator/validator.js @@ -21,7 +21,7 @@ // http://net.tutsplus.com/tutorials/other/8-regular-expressions-you-should-know/ emailRe = /^([a-z0-9_\.\-\+]+)@([\da-z\.\-]+)\.([a-z\.]{2,6})$/i, - urlRe = /^(https?:\/\/)?[\da-z\.\-]+\.[a-z\.]{2,6}[#&+_\?\/\w \.\-=]*$/i, + urlRe = /^(https?:\/\/)[\da-z\.\-]+\.[a-z\.]{2,6}[#&+_\?\/\w \.\-=]*$/i, v; v = $.tools.validator = {