From d23a9560855d81e845bb170ff309dcdffbc3bafe Mon Sep 17 00:00:00 2001
From: manson <manson@rulingcom.com>
Date: Wed, 16 Apr 2014 10:03:32 +0800
Subject: [PATCH] Update site search js and add .ruby-version to .gitignore

---
 .gitignore                    |  1 +
 app/views/layouts/_search.erb | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c1d214..84ef7b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ uploads/**/*
 config/mongoid.yml
 *.
 sftp-config.json
+.ruby-version
\ No newline at end of file
diff --git a/app/views/layouts/_search.erb b/app/views/layouts/_search.erb
index 20340c5..d4c7ba9 100644
--- a/app/views/layouts/_search.erb
+++ b/app/views/layouts/_search.erb
@@ -7,34 +7,36 @@
   <div id='search_footer'></div>
 </div>
 <script>
+
+var Search = function(){
+  var s = this;
   var interval = 0;
   var keyword;
   var processLock=false;
+  this.init = function(){
+    $("#q").keyup(function(){s.queueSearch();});
+    $("#search_form").submit(function(){s.queueSearch(); return false; });
+    $("#search_close").click(function(){$("#search_container").fadeOut(300);});
+  }
 
-  $("#q").keyup(function(){queueSearch();});
-  $("#search_form").submit(function(){queueSearch(); return false; });
-
-  function queueSearch(){
+  this.queueSearch = function(){
     if($("#q").val() != keyword && $("#q").val()!=""){
       keyword = $("#q").val();
       interval=500;
-      if(!processLock) processSearch();
+      if(!processLock) s.processSearch();
     }else if($("#q").val()==""){
       keyword = ""
       $("#search_container").fadeOut(300);
     }
   }
-
-  $("#search_close").click(function(){$("#search_container").fadeOut(300);});
-
-  function processSearch(){
+  this.processSearch = function(){
     keyword_tmp = keyword;
     processLock = true;
     if(interval==0 && keyword!=""){
-      $.getJSON("/site_search?keywords="+keyword, function(data){
+      $.getJSON("/site_search", {"keywords" : keyword}, function(data){
         if(keyword_tmp != keyword) {
             processLock = false;
-            processSearch();
+            s.processSearch();
             return;
           }
         $("#search_results").scrollTop(0);
@@ -55,7 +57,10 @@
       });
     }else if(interval>0){
       interval -= 100;
-      setTimeout(processSearch,100);
+      setTimeout(s.processSearch,100);
     }
   }
+  s.init();
+}();
+
 </script>
\ No newline at end of file