Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/files/index.html.erb

@@ -255,6 +255,7 @@
        isdb = false; //这是单击
        node = document.elementFromPoint(e.clientX, e.clientY);
        if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+           isdb = true; //
            return;
        }
            if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态

public/javascripts/course.js

@@ -752,7 +752,7 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
     //clearTimeout(clickFunction);
     clickFunction = setTimeout(function() {
         search_func()
-    }, 200);
+    }, 500);
     function search_func(){
         if(isdb!= false ) return;
         $.get(