From 5a382387c56c517269de2891c44c7be92e9fee40 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 4 Nov 2010 18:38:12 +0000 Subject: [PATCH] Conclusão dos testes da interface Google Earth no IE e Chrome --- aplicmap/flamingo.htm | 2 +- classesjs/classe_gadgets.js | 10 +++++++--- classesjs/classe_interface.js | 11 ++++++----- classesjs/classe_janela.js | 15 +++++++++++---- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/aplicmap/flamingo.htm b/aplicmap/flamingo.htm index a7bd73b..563657e 100644 --- a/aplicmap/flamingo.htm +++ b/aplicmap/flamingo.htm @@ -13,7 +13,7 @@ MMA - Mapa interativo - + diff --git a/classesjs/classe_gadgets.js b/classesjs/classe_gadgets.js index 0adedef..f9f32d9 100644 --- a/classesjs/classe_gadgets.js +++ b/classesjs/classe_gadgets.js @@ -919,7 +919,7 @@ i3GEO.gadgets = { {id = i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.idhtml;} else {i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.idhtml = id;} - var objid,ins,sobe,alinhamento,n,i,estilo,t,onMenuBarBeforeRender,temp; + var objid,ins,sobe,alinhamento,n,i,estilo,t,onMenuBarBeforeRender,temp,ifr; objid = $i(id); if(objid){ objid.className="yuimenubar"; @@ -988,10 +988,14 @@ i3GEO.gadgets = { } } }; - i3GEOoMenuBar=new YAHOO.widget.MenuBar(id,{autosubmenudisplay: true, showdelay: 100, hidedelay: 500, lazyload: false}); + if(i3GEO.Interface.ATUAL == "googleearth" || i3GEO.Interface.ATUAL == "flamingo") + {ifr = true;} + else + {ifr = false;} + i3GEOoMenuBar=new YAHOO.widget.MenuBar(id,{iframe:ifr,autosubmenudisplay: true, showdelay: 100, hidedelay: 500, lazyload: false}); YAHOO.widget.MenuManager.addMenu(i3GEOoMenuBar); i3GEOoMenuBar.beforeRenderEvent.subscribe(onMenuBarBeforeRender); - i3GEOoMenuBar.render(); + i3GEOoMenuBar.render(); // //marca o tipo de interface em uso // diff --git a/classesjs/classe_interface.js b/classesjs/classe_interface.js index 6f63241..e781815 100644 --- a/classesjs/classe_interface.js +++ b/classesjs/classe_interface.js @@ -1819,6 +1819,11 @@ i3GEO.Interface = { i3GEO.configura.listaDePropriedadesDoMapa.propriedades.push({text: texto,url:""}); i3GEO.util.arvore(""+$trad("p13")+"","listaPropriedades",i3GEO.configura.listaDePropriedadesDoMapa); + i3GEO.barraDeBotoes.INCLUIBOTAO.zoomli = false; + i3GEO.barraDeBotoes.INCLUIBOTAO.pan = false; + i3GEO.barraDeBotoes.INCLUIBOTAO.zoomtot = false; + i3GEO.Interface.IDMAPA = "i3GeoMap3d"; + i3GEO.arvoreDeCamadas.ATIVATEMA = "i3GEO.Interface.googleearth.ligaDesliga(this)"; i = $i(i3GEO.Interface.IDCORPO); if(i){ i3GeoMap3d = document.createElement("div"); @@ -1826,13 +1831,9 @@ i3GEO.Interface = { i3GeoMap3d.style.height = h;// + 45; i.style.height = h ;//+ 45; i3GeoMap3d.id = "i3GeoMap3d"; + i3GeoMap3d.style.zIndex = 0; i.appendChild(i3GeoMap3d); } - i3GEO.barraDeBotoes.INCLUIBOTAO.zoomli = false; - i3GEO.barraDeBotoes.INCLUIBOTAO.pan = false; - i3GEO.barraDeBotoes.INCLUIBOTAO.zoomtot = false; - i3GEO.Interface.IDMAPA = "i3GeoMap3d"; - i3GEO.arvoreDeCamadas.ATIVATEMA = "i3GEO.Interface.googleearth.ligaDesliga(this)"; google.load("earth", "1"); i3GeoMap = null; }, diff --git a/classesjs/classe_janela.js b/classesjs/classe_janela.js index c6acb32..dc2d112 100644 --- a/classesjs/classe_janela.js +++ b/classesjs/classe_janela.js @@ -258,17 +258,24 @@ i3GEO.janela = { {underlay = "none";} else {underlay = "shadow";} + if(i3GEO.Interface.ATUAL === "googleearth" || i3GEO.Interface.ATUAL === "flamingo") + {ifr = true;} + else + {ifr = false;} if(waltura === "auto") - {YAHOO.janelaDoca.xp.panel = new YAHOO.widget.Panel(id, { modal:modal, width: wlargura_,underlay:"none", fixedcenter: fix, constraintoviewport: false, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );} - else{ - YAHOO.janelaDoca.xp.panel = new YAHOO.widget.ResizePanel(id, { iframe:false,underlay:underlay, modal:modal, width: wlargura_, fixedcenter: fix, constraintoviewport: false, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} ); - } + {YAHOO.janelaDoca.xp.panel = new YAHOO.widget.Panel(id, { iframe:ifr,modal:modal, width: wlargura_,underlay:"none", fixedcenter: fix, constraintoviewport: false, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );} + else{YAHOO.janelaDoca.xp.panel = new YAHOO.widget.ResizePanel(id, { iframe:ifr,underlay:underlay, modal:modal, width: wlargura_, fixedcenter: fix, constraintoviewport: false, visible: true,monitorresize:false,dragOnly:true,keylisteners:null} );} + if(nx !== "" && nx !== "center"){ pos = [nx,ny]; YAHOO.janelaDoca.xp.panel.moveTo(pos[0],pos[1]+50); } YAHOO.janelaDoca.xp.manager.register(YAHOO.janelaDoca.xp.panel); YAHOO.janelaDoca.xp.panel.render(); + if(navm && id !== "i3geo_janelaMensagens") + {YAHOO.janelaDoca.xp.panel.moveTo(0,0);} + if(ifr == true) + {YAHOO.janelaDoca.xp.panel.iframe.style.zIndex = 0;} if(modal === true){ if($i(id+"_mask")) {$i(id+"_mask").style.zIndex = 9000;} -- libgit2 0.21.2