fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 20:12:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

Common dialog bug fixes

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12453 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
nagoon97 2012-12-24 09:31:07 +00:00
parent 7ec02806be
commit b6e1e42338
2 changed files with 74 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/admin/tpl/js/admin.js
View file

@ -1002,7 +1002,7 @@ jQuery(function($){
</div>'); </div>');
//console.log($msgBox.html()); //console.log($msgBox.html());
$($("body")).append($msgBox); $("body").append($msgBox);
//console.log($msgBox); //console.log($msgBox);
//console.log($.find("body")); //console.log($.find("body"));
//$msgBox.show(); //$msgBox.show();
@ -1179,8 +1179,54 @@ jQuery(function($){
$.xeMsgBox._hideFoggy = function(){ $.xeMsgBox._hideFoggy = function(){
$foggyLayer.hide(); $foggyLayer.hide();
} }
});
jQuery(function($){
$.xeFoggy = {};
var $foggyLayer = $.xeFoggy.$foggyLayer = $("<div>");
$foggyLayer.css({
position: 'absolute',
top:0,
left:0,
backgroundColor:'#000',
opacity: 0.5,
display:'none',
zIndex:9998
});
$("body").append($foggyLayer);
$.xeFoggy._resizeFoggy = function(){
$foggyLayer.css({
width: 0,
height: 0
});
setTimeout(function(){
$foggyLayer.css({
width: $(document).width(),
height: $(document).height()
});
}, 0);
}
$(window).resize($.xeFoggy._resizeFoggy);
$.xeFoggy._resizeFoggy();
$.xeFoggy.show = function(bClear){
if(bClear){
$foggyLayer.css({
opacity: 0
});
}else{
$foggyLayer.css({
opacity: 0.5
});
}
$foggyLayer.show();
}
$.xeFoggy.hide = function(){
$foggyLayer.hide();
}
}); });
// Sortable table // Sortable table

50
modules/menu/tpl/sitemap.html
View file

@ -1515,7 +1515,7 @@ jQuery(function($){
}); });
$("._delSiteMap").click(function(){ $("._delSiteMap").click(function(){
confirmDialog({ $.xeMsgBox.confirmDialog({
sTitle : xe.lang.confirm_menu_delete, sTitle : xe.lang.confirm_menu_delete,
sText : '<label><input type="checkbox"> ' + xe.lang.confirm_delete_all_item + '</label>', sText : '<label><input type="checkbox"> ' + xe.lang.confirm_delete_all_item + '</label>',
@ -1523,7 +1523,7 @@ jQuery(function($){
bDanger : true, bDanger : true,
fnOnOK : function(){ fnOnOK : function(){
if(!$msgBox.find('input[type="checkbox"]').attr('checked')) return true; if(!$.xeMsgBox.$msgBox.find('input[type="checkbox"]').attr('checked')) return true;
var sSelectedMenuSrl = $._xeAdminVar.sSelectedMenuSrl; var sSelectedMenuSrl = $._xeAdminVar.sSelectedMenuSrl;
var params = {}; var params = {};
@ -1534,19 +1534,19 @@ jQuery(function($){
}, },
fnOnShow : function(){ fnOnShow : function(){
$msgBox.find("._ok").addClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").addClass("x_disabled");
$msgBox.find('input[type="checkbox"]').click(function(){ $.xeMsgBox.$msgBox.find('input[type="checkbox"]').click(function(){
if($(this).attr('checked')){ if($(this).attr('checked')){
$msgBox.find("._ok").removeClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").removeClass("x_disabled");
}else{ }else{
$msgBox.find("._ok").addClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").addClass("x_disabled");
} }
}); });
}, },
fnOnHide : function(){ fnOnHide : function(){
$msgBox.find("._ok").removeClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").removeClass("x_disabled");
} }
}); });
}); });
@ -3042,7 +3042,7 @@ jQuery(function($){
if(!htNamesAsKey[sCurName]) break; if(!htNamesAsKey[sCurName]) break;
} }
confirmDialog({ $.xeMsgBox.confirmDialog({
sTitle : xe.lang.input_new_layout_name, sTitle : xe.lang.input_new_layout_name,
sText : '<input type="text" name="layout_name" style="width: 95%"/><br/><div style="text-align:right">* ' + xe.lang.skip_new_layout_name + '</div>', sText : '<input type="text" name="layout_name" style="width: 95%"/><br/><div style="text-align:right">* ' + xe.lang.skip_new_layout_name + '</div>',
@ -3050,7 +3050,7 @@ jQuery(function($){
bSmall: true, bSmall: true,
fnOnOK : function(){ fnOnOK : function(){
var sTitle = $msgBox.find('input[type="text"]').val(); var sTitle = $.xeMsgBox.$msgBox.find('input[type="text"]').val();
$.exec_json("layout.procLayoutAdminCopyLayout", { $.exec_json("layout.procLayoutAdminCopyLayout", {
layout_srl : sLayoutSrl, layout_srl : sLayoutSrl,
title : sTitle.split(',') title : sTitle.split(',')
@ -3061,7 +3061,7 @@ jQuery(function($){
fnOnShow : function(){ fnOnShow : function(){
setTimeout(function(){ setTimeout(function(){
$msgBox.find('input[type="text"]').val(sCurName).focus().select(); $.xeMsgBox.$msgBox.find('input[type="text"]').val(sCurName).focus().select();
}, 10); }, 10);
} }
}); });
@ -3077,7 +3077,7 @@ jQuery(function($){
$thumbnail.css('border', '1px solid #888'); $thumbnail.css('border', '1px solid #888');
$thumbnail.css('padding', '3px'); $thumbnail.css('padding', '3px');
confirmDialog({ $.xeMsgBox.confirmDialog({
sTitle : xe.lang.confirm_delete, sTitle : xe.lang.confirm_delete,
sText : $thumbnail.outerHTML() + '<div style="float:right;width:240px;text-align:left">' + $label.text() + '</div>', sText : $thumbnail.outerHTML() + '<div style="float:right;width:240px;text-align:left">' + $label.text() + '</div>',
@ -3223,7 +3223,7 @@ jQuery(function($){
$.exec_json("menu.procMenuAdminDeleteItem", params, function(htData){ $.exec_json("menu.procMenuAdminDeleteItem", params, function(htData){
if(htData.error === -1001){ if(htData.error === -1001){
confirmDialog({ $.xeMsgBox.confirmDialog({
sTitle : xe.lang.confirm_delete_all_sub_items_title, sTitle : xe.lang.confirm_delete_all_sub_items_title,
sText : xe.lang.confirm_delete_all_sub_items, sText : xe.lang.confirm_delete_all_sub_items,
@ -3247,7 +3247,7 @@ jQuery(function($){
} }
$('._deleteMenu').click(function(){ $('._deleteMenu').click(function(){
confirmDialog({ $.xeMsgBox.confirmDialog({
sTitle : xe.lang.confirm_menu_delete, sTitle : xe.lang.confirm_menu_delete,
sText : '<label><input type="checkbox"> ' + xe.lang.confirm_delete_all_contents + '</label>', sText : '<label><input type="checkbox"> ' + xe.lang.confirm_delete_all_contents + '</label>',
@ -3255,7 +3255,7 @@ jQuery(function($){
bDanger : true, bDanger : true,
fnOnOK : function(){ fnOnOK : function(){
if(!$msgBox.find('input[type="checkbox"]').attr('checked')) return true; if(!$.xeMsgBox.$msgBox.find('input[type="checkbox"]').attr('checked')) return true;
var sSelectedMenuSrl = $._xeAdminVar.sSelectedMenuSrl; var sSelectedMenuSrl = $._xeAdminVar.sSelectedMenuSrl;
@ -3265,19 +3265,19 @@ jQuery(function($){
}, },
fnOnShow : function(){ fnOnShow : function(){
$msgBox.find("._ok").addClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").addClass("x_disabled");
$msgBox.find('input[type="checkbox"]').click(function(){ $.xeMsgBox.$msgBox.find('input[type="checkbox"]').click(function(){
if($(this).attr('checked')){ if($(this).attr('checked')){
$msgBox.find("._ok").removeClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").removeClass("x_disabled");
}else{ }else{
$msgBox.find("._ok").addClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").addClass("x_disabled");
} }
}); });
}, },
fnOnHide : function(){ fnOnHide : function(){
$msgBox.find("._ok").removeClass("x_disabled"); $.xeMsgBox.$msgBox.find("._ok").removeClass("x_disabled");
} }
}); });
}); });
@ -3532,7 +3532,7 @@ jQuery(function($){
// FTP 비밀번호 뿐만 아니라 정보가 전혀 없을 경우? // FTP 비밀번호 뿐만 아니라 정보가 전혀 없을 경우?
switch(htData.is_authed){ switch(htData.is_authed){
case -1: case -1:
confirmDialog( $.xeMsgBox.confirmDialog(
{ {
sTitle : xe.lang.need_to_ftp_setup, sTitle : xe.lang.need_to_ftp_setup,
sText : xe.lang.go_to_ftp_setup, sText : xe.lang.go_to_ftp_setup,
@ -3547,13 +3547,13 @@ jQuery(function($){
break; break;
case 0: case 0:
confirmDialog( $.xeMsgBox.confirmDialog(
{ {
sTitle : 'FTP 계정 정보가 필요 합니다.', sTitle : 'FTP 계정 정보가 필요 합니다.',
sText : 'FTP 비밀번호: <input type="password"/>', sText : 'FTP 비밀번호: <input type="password"/>',
bSmall : true, bSmall : true,
fnOnOK : function(){ fnOnOK : function(){
var sPw = $msgBox.find('input[type="password"]').val(); var sPw = $.xeMsgBox.$msgBox.find('input[type="password"]').val();
setTimeout(function(){ setTimeout(function(){
doInstallPackage(sPackageSrl, sPackageType, sPw, $item); doInstallPackage(sPackageSrl, sPackageType, sPw, $item);
}, 0); }, 0);
@ -3578,13 +3578,15 @@ jQuery(function($){
downloadSkin: fillInInstalledSkinList downloadSkin: fillInInstalledSkinList
}; };
showFoggy(); //showFoggy();
$.xeFoggy.show(true);
$.exec_json("admin.procAutoinstallAdminPackageinstall", { $.exec_json("admin.procAutoinstallAdminPackageinstall", {
package_srl : sPackageSrl, package_srl : sPackageSrl,
ftp_password : sPw ftp_password : sPw
}, function(htData){ }, function(htData){
hideFoggy(); //hideFoggy();
$.xeFoggy.hide();
if($item){ if($item){
$item.addClass('installed'); $item.addClass('installed');