Merge branch 'yuanke' into develop

app/views/files/_org_subfield_list.html.erb

@@ -44,7 +44,7 @@
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
                   <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container.organization,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">

public/assets/kindeditor/pasteimg.js

@@ -371,7 +371,8 @@ function df(myself) {
                     sstr += that.attr("src") + "|";
             }
             else if (that.attr("src").indexOf("data:image") >= 0){
-                that.parents().removeAttr("href"); //删除所有父节点的href
+                //去掉外链
+//                that.parents().removeAttr("href"); //删除所有父节点的href
             }
         }
     });
@@ -421,10 +422,10 @@ function uploadpic(piclist,myself) {
 
                             //复制过来带的链接class等都要去掉 和视频图片有关系
                             that.removeAttr("class");
-                            that.parent().removeAttr("class");
-                            that.parents().removeAttr("href"); //删除所有父节点的href
-//                            that.parent().removeAttr("href");
-                            that.parent().removeAttr("data-ke-src");
+                            //去掉外链
+//                            that.parent().removeAttr("class");
+//                            that.parents().removeAttr("href"); //删除所有父节点的href
+//                            that.parent().removeAttr("data-ke-src");
                             tIndex = tIndex + 1;
                         }
                     }