jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2016-11-04 19:18:53 +08:00
parent 2f0ff68047 33386ecb50
commit 15a88b76c2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/attachments/upload_attachment_version.js.erb
View File

@ -1,7 +1,7 @@
<% if @flag %> <% if @flag %>
hideModal(); hideModal();
alert('更新成功') alert('更新成功');
$(".re_search").submit(); // 为了刷新 $(".re_search").submit(); // 为了刷新
<%else%> <%else%>
$("#upload_file_count").html('(更新失败)') $("#upload_file_count").html('(更新失败)');
<%end %> <%end %>

2
public/javascripts/application.js
View File

@ -426,6 +426,7 @@ function hideModal(el) {
if($("#popupWrap").length > 0){ if($("#popupWrap").length > 0){
$("#popupWrap").hide(); $("#popupWrap").hide();
} }
else{
var modal; var modal;
if (el) { if (el) {
modal = $(el).parents('.ui-dialog-content'); modal = $(el).parents('.ui-dialog-content');
@ -433,6 +434,7 @@ function hideModal(el) {
modal = $('#ajax-modal'); modal = $('#ajax-modal');
} }
modal.dialog("close"); modal.dialog("close");
}
} }
function submitPreview(url, form, target) { function submitPreview(url, form, target) {