From f9dd55eea2144b03c24a52aa5e3ad0c8ea4cb47c Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 17 Jul 2015 14:53:50 +0800
Subject: [PATCH] fixed chinese detection for url.

---
 app/views/pages/_form_link.html.erb | 2 +-
 app/views/pages/edit.html.erb       | 4 ++++
 app/views/pages/new.html.erb        | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/pages/_form_link.html.erb b/app/views/pages/_form_link.html.erb
index c309406..094550f 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;urlwithip;", "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;detect_chinese;", "fv-messages" => "Cannot be empty.;Must be valid url.;Cannont have chinese.;"}, :value=>url rescue "#" %>
 		<% end %>
 	</div>
 	<% end %>
diff --git a/app/views/pages/edit.html.erb b/app/views/pages/edit.html.erb
index cd95d33..a76c45d 100644
--- a/app/views/pages/edit.html.erb
+++ b/app/views/pages/edit.html.erb
@@ -14,5 +14,9 @@
 <script type="text/javascript"> 
 $(document).ready(function(){
   var fromvalidator = new FormValidator($("form.edit_page"));
+
+  fromvalidator.validate_functions.detect_chinese = function(value){
+    return (value.match(/[\u3400-\u9FBF]/) == null);
+  }
 })
 </script>
\ No newline at end of file
diff --git a/app/views/pages/new.html.erb b/app/views/pages/new.html.erb
index 1e0b06c..4f4ccea 100644
--- a/app/views/pages/new.html.erb
+++ b/app/views/pages/new.html.erb
@@ -19,9 +19,10 @@ $(document).ready(function(){
   }
 
   fromvalidator.validate_functions.detect_chinese = function(value){
-    var re1 = new RegExp("^[\u4E00-\uFA29]*$"),
-        re2 = new RegExp("^[\uE7C7-\uE7F3]*$"); //Chinese character range
-    return (!(re1.test(value) && (! re2.test(value))));
+    // var re1 = new RegExp("^[\u4E00-\uFA29]*$"),
+    //     re2 = new RegExp("^[\uE7C7-\uE7F3]*$"); //Chinese character range
+    // return (!(re1.test(value) && (! re2.test(value))));
+    return (value.match(/[\u3400-\u9FBF]/) == null);
   }
 
   fromvalidator.validate_functions.cannot_have_dash = function(value){