diff --git a/app/assets/javascripts/validator.js b/app/assets/javascripts/validator.js index 1318246..fe606d0 100644 --- a/app/assets/javascripts/validator.js +++ b/app/assets/javascripts/validator.js @@ -38,6 +38,13 @@ var FormValidator = function(form){ } var reg = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/); return reg.test(value); + }, + urlwithip : function(value){ + if(value == "#"){ + return true; + } + var reg = new RegExp(/^https?\:\/\/[^\/\s]+(\/.*)?$/); + return reg.test(value); } } diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb index a0a5e11..d78f74e 100644 --- a/app/views/pages/_form_link.html.erb +++ b/app/views/pages/_form_link.html.erb @@ -44,7 +44,7 @@ url = "#" end %> - <%= n.text_field locale, class:"input-xlarge change", data: {"fv-validation" => "required;url;", "fv-messages" => "Cannot be empty.;Must be valid url.;"}, :value=>url rescue "#" %> + <%= n.text_field locale, class:"input-xlarge change", data: {"fv-validation" => "required;urlwithip;", "fv-messages" => "Cannot be empty.;Must be valid url.;"}, :value=>url rescue "#" %> <% end %> <% end %>