mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-31 00:59:58 +09:00
fixed full setup popup blocking issue in Chrome
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12121 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
19ab9d786e
commit
5e82cc38a0
1 changed files with 8 additions and 31 deletions
|
|
@ -81,7 +81,7 @@
|
||||||
<li><a href="#imgbtn" data-admin-show="#imgbtn">{$lang->menu_img_btn} <i class="x_icon-circle-arrow-right"></i></a></li>
|
<li><a href="#imgbtn" data-admin-show="#imgbtn">{$lang->menu_img_btn} <i class="x_icon-circle-arrow-right"></i></a></li>
|
||||||
<li class="design"><a href="#design" data-admin-show="#design">{$lang->design} <i class="x_icon-circle-arrow-right"></i></a></li>
|
<li class="design"><a href="#design" data-admin-show="#design">{$lang->design} <i class="x_icon-circle-arrow-right"></i></a></li>
|
||||||
<li><a href="#auth" data-admin-show="#auth">{$lang->grant} <i class="x_icon-circle-arrow-right"></i></a></li>
|
<li><a href="#auth" data-admin-show="#auth">{$lang->grant} <i class="x_icon-circle-arrow-right"></i></a></li>
|
||||||
<li class="details"><a href="#details" class="_openFullSetup">{$lang->full_settings} <i class="x_icon-cog"></i></a></li>
|
<li class="details"><a href="#" class="_openFullSetup">{$lang->full_settings} <i class="x_icon-cog"></i></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -3288,9 +3288,15 @@ exec_xml("module","procModuleAdminSetDesignInfo", params, completeTmp)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
top.fullSetupDone = function(htData){
|
top.fullSetupDone = function(htData){
|
||||||
alert('done!');
|
jQuery('#properties').show();
|
||||||
}
|
}
|
||||||
$('a._openFullSetup').click(function(ev){
|
$('a._openFullSetup').click(function(ev){
|
||||||
|
if($._xeAdminVar.oSetupWin){
|
||||||
|
$._xeAdminVar.oSetupWin.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
$._xeAdminVar.oSetupWin = window.open("about:blank", "xe_fullSetup");
|
||||||
|
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
|
|
||||||
var t = this;
|
var t = this;
|
||||||
|
|
@ -3303,10 +3309,6 @@ exec_xml("module","procModuleAdminSetDesignInfo", params, completeTmp)
|
||||||
menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl
|
menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl
|
||||||
}, function(htData){
|
}, function(htData){
|
||||||
console.log(htData);
|
console.log(htData);
|
||||||
|
|
||||||
if($._xeAdminVar.oSetupWin){
|
|
||||||
$._xeAdminVar.oSetupWin.close();
|
|
||||||
}
|
|
||||||
//window.open(htData.setupUrl, "xe_fullSetup", "resizable=yes");
|
//window.open(htData.setupUrl, "xe_fullSetup", "resizable=yes");
|
||||||
$._xeAdminVar.oSetupWin = window.open(htData.setupUrl, "xe_fullSetup");
|
$._xeAdminVar.oSetupWin = window.open(htData.setupUrl, "xe_fullSetup");
|
||||||
|
|
||||||
|
|
@ -3318,31 +3320,6 @@ exec_xml("module","procModuleAdminSetDesignInfo", params, completeTmp)
|
||||||
*/
|
*/
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
|
||||||
params['menu_item_srl'] = '41390';
|
|
||||||
exec_xml("menu","getMenuAdminDetailSetup", params, completeTmp, response_tags);
|
|
||||||
|
|
||||||
$('#details').on('show', function(ev){
|
|
||||||
if(this !== ev.target) return;
|
|
||||||
|
|
||||||
$.exec_json("menu.getMenuAdminDetailSetup", {
|
|
||||||
menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl
|
|
||||||
}, function(htData){
|
|
||||||
console.log(htData);
|
|
||||||
$.ajax({
|
|
||||||
url: htData.setupUrl,
|
|
||||||
context: document.body
|
|
||||||
}).done(function(sData) {
|
|
||||||
console.log(999, sData);
|
|
||||||
});
|
|
||||||
//htData.setupUrl
|
|
||||||
});
|
|
||||||
});
|
|
||||||
*/
|
|
||||||
//window.open($('input[name=_pc_preview_ifr]').attr('src'), "xe_preview", "resizable=yes");
|
|
||||||
//console.log('test');
|
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Set #site height fix
|
// Set #site height fix
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue