From 5e82cc38a0276f445801ba22849d929ba32cdaef Mon Sep 17 00:00:00 2001 From: chschy Date: Mon, 5 Nov 2012 06:38:32 +0000 Subject: [PATCH] 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 --- modules/menu/tpl/sitemap.html | 39 +++++++---------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index 67a49c771..e864897ea 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -81,7 +81,7 @@
  • {$lang->menu_img_btn}
  • {$lang->design}
  • {$lang->grant}
  • -
  • {$lang->full_settings}
  • +
  • {$lang->full_settings}
  • @@ -3288,9 +3288,15 @@ exec_xml("module","procModuleAdminSetDesignInfo", params, completeTmp) }); } top.fullSetupDone = function(htData){ - alert('done!'); + jQuery('#properties').show(); } $('a._openFullSetup').click(function(ev){ + if($._xeAdminVar.oSetupWin){ + $._xeAdminVar.oSetupWin.close(); + } + + $._xeAdminVar.oSetupWin = window.open("about:blank", "xe_fullSetup"); + ev.preventDefault(); var t = this; @@ -3303,10 +3309,6 @@ exec_xml("module","procModuleAdminSetDesignInfo", params, completeTmp) menu_item_srl : htNodeInfo[$._xeAdminVar.sSelectedMenuSrl].sNodeSrl }, function(htData){ console.log(htData); - - if($._xeAdminVar.oSetupWin){ - $._xeAdminVar.oSetupWin.close(); - } //window.open(htData.setupUrl, "xe_fullSetup", "resizable=yes"); $._xeAdminVar.oSetupWin = window.open(htData.setupUrl, "xe_fullSetup"); @@ -3317,31 +3319,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'); - });