From 009dc089f04de802e7455fe750c1e830003b725c Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 18 Dec 2015 17:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource.html.erb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index ae17eb733..418809917 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -148,6 +148,10 @@
     $("#resources_list").mousedown(function(e) {
         //如果是右键的话
         if (3 == e.which) {
+            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
+                e.preventDefault();
+                return ;
+            }
             document.oncontextmenu = function() {return false;}
             pageX = e.clientX;
             pageY = e.clientY;
@@ -195,6 +199,9 @@
         //隐藏右键菜单
         //e.preventDefault();
         $("#contextMenu").hide();
+        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
+            return ;
+        }
         document.oncontextmenu = function() {return true;}
         //如果当前行为空，那么要将当前行的拿到
         var ele;
@@ -363,7 +370,8 @@
             res_link = line.children().eq(1).html();
             line.children().eq(1).html(
                     '<input name="res_name" id="res_name" ' +
-                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
+                    'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
                     'value="'+res_name+
                     '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
             $("#res_name").focus();
@@ -401,7 +409,7 @@
                         type:'get',
                         success:function (data)
                             {
-                                if (data != 'fail') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
                                     last_line.children().eq(1).html(res_link);
                                     last_line.children().eq(1).children().attr('title', name);
                                     last_line.children().eq(1).children().attr('href', data);