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

Merge branch 'yuanke_youhua' into develop

This commit is contained in:
yuanke 2016-11-04 20:30:44 +08:00
parent 4377fc1f9e d71ebb08b0
commit 76a62af858
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/javascripts/application.js
View File

@ -426,13 +426,14 @@ 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');
} else { } else {
modal = $('#ajax-modal'); modal = $('#ajax-modal');
} }
if(modal != null){
modal.dialog("close"); modal.dialog("close");
} }
} }