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

app/views/forums/_forum_tag_list.html.erb

@@ -1,6 +1,6 @@
-<% forum.tag_list.each do |tag|%>
+<% forum.reload.tag_list.each do |tag|%>
     <span class="postlabel mr10">
-                <a href="javascript:void(0);" ondblclick="rename_tag($(this),<%= tag %>,<%= forum.id%>,5);" style="cursor: default" class="fontGrey2 mr5"><%= tag %></a>
+                <a  title="双击可编辑" ondblclick="rename_tag($(this),'<%= tag %>',<%= forum.id%>,5);" style="cursor: pointer" class="fontGrey2 mr5"><%= tag %></a>
       <%if forum.creator.id == User.current.id%>
                 <a href="javascript:void(0);" class="fontGrey2" onclick="delete_forum_tag($(this));">×</a>
        <% end %>

app/views/layouts/base_forums.html.erb

@@ -98,13 +98,8 @@
             domEle.parent().css("border","1px solid #ffffff");
             $("#renameTagName").focus();
         }
-        //监听所有的单击事件
-        $(document).click(function(e){
-            node = document.elementFromPoint(e.clientX, e.clientY);
-            if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
-                return;
-            }
-            if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+        $("#renameTagName").live('blur',function(){
+             if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
                 if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
                     ele.parent().css("border","");
                     ele.parent().html(tagNameHtml);
@@ -122,6 +117,30 @@
                 }
             }
         });
+        //监听所有的单击事件
+//        $(document).click(function(e){
+//            node = document.elementFromPoint(e.clientX, e.clientY);
+//            if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+//                return;
+//            }
+//            if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
+//                if($("#renameTagName").val().trim() == tagName){ //如果值一样，则恢复原来的状态
+//                    ele.parent().css("border","");
+//                    ele.parent().html(tagNameHtml);
+//
+//                }else{ //否则就要更新tag名称了
+//                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){
+//                        $.post(
+//                                '<%#= update_tag_name_path %>',
+//                                {"taggableId": taggableId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim()}
+//                        )
+//                    }else{
+//                        ele.parent().css("border","");
+//                        ele.parent().html(tagNameHtml);
+//                    }
+//                }
+//            }
+//        });
 
         function del_forum_confirm(){
             if(confirm('您确定要删除么?')){