Download as
Browse Code »

Commit 5a382387c56c517269de2891c44c7be92e9fee40

Authored by Edmar Moretti
1 parent 89a17537
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Conclusão dos testes da interface Google Earth no IE e Chrome

Showing 4 changed files with 25 additions and 13 deletions   Show diff stats
aplicmap/flamingo.htm
  Diff comments   View file @5a38238
... ... @@ -13,7 +13,7 @@
13 13 </style>
14 14 <title>MMA - Mapa interativo</title>
15 15 <!-- Leitura dos programas javaScript e estilos. Pode-se ler os arquivos não compactados, bastando excluir a palavra _compacto -->
16   -<script type="text/javascript" src="../classesjs/i3geo.js"></script>
  16 +<script type="text/javascript" src="../classesjs/i3geonaocompacto.js"></script>
17 17 <script type="text/javascript" src="../pacotes/flamingo/js/swfobject.js"></script>
18 18 </head>
19 19 <body id=i3geo >
... ...
classesjs/classe_gadgets.js
  Diff comments   View file @5a38238
... ... @@ -919,7 +919,7 @@ i3GEO.gadgets = {
919 919 {id = i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.idhtml;}
920 920 else
921 921 {i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.idhtml = id;}
922   - var objid,ins,sobe,alinhamento,n,i,estilo,t,onMenuBarBeforeRender,temp;
  922 + var objid,ins,sobe,alinhamento,n,i,estilo,t,onMenuBarBeforeRender,temp,ifr;
923 923 objid = $i(id);
924 924 if(objid){
925 925 objid.className="yuimenubar";
... ... @@ -988,10 +988,14 @@ i3GEO.gadgets = {
988 988 }
989 989 }
990 990 };
991   - i3GEOoMenuBar=new YAHOO.widget.MenuBar(id,{autosubmenudisplay: true, showdelay: 100, hidedelay: 500, lazyload: false});
  991 + if(i3GEO.Interface.ATUAL == "googleearth" || i3GEO.Interface.ATUAL == "flamingo")
  992 + {ifr = true;}
  993 + else
  994 + {ifr = false;}
  995 + i3GEOoMenuBar=new YAHOO.widget.MenuBar(id,{iframe:ifr,autosubmenudisplay: true, showdelay: 100, hidedelay: 500, lazyload: false});
992 996 YAHOO.widget.MenuManager.addMenu(i3GEOoMenuBar);
993 997 i3GEOoMenuBar.beforeRenderEvent.subscribe(onMenuBarBeforeRender);
994   - i3GEOoMenuBar.render();
  998 + i3GEOoMenuBar.render();
995 999 //
996 1000 //marca o tipo de interface em uso
997 1001 //
... ...
classesjs/classe_interface.js
  Diff comments   View file @5a38238
... ... @@ -1819,6 +1819,11 @@ i3GEO.Interface = {
1819 1819 i3GEO.configura.listaDePropriedadesDoMapa.propriedades.push({text: texto,url:""});
1820 1820 i3GEO.util.arvore("<b>"+$trad("p13")+"</b>","listaPropriedades",i3GEO.configura.listaDePropriedadesDoMapa);
1821 1821  
  1822 + i3GEO.barraDeBotoes.INCLUIBOTAO.zoomli = false;
  1823 + i3GEO.barraDeBotoes.INCLUIBOTAO.pan = false;
  1824 + i3GEO.barraDeBotoes.INCLUIBOTAO.zoomtot = false;
  1825 + i3GEO.Interface.IDMAPA = "i3GeoMap3d";
  1826 + i3GEO.arvoreDeCamadas.ATIVATEMA = "i3GEO.Interface.googleearth.ligaDesliga(this)";
1822 1827 i = $i(i3GEO.Interface.IDCORPO);
1823 1828 if(i){
1824 1829 i3GeoMap3d = document.createElement("div");
... ... @@ -1826,13 +1831,9 @@ i3GEO.Interface = {
1826 1831 i3GeoMap3d.style.height = h;// + 45;
1827 1832 i.style.height = h ;//+ 45;
1828 1833 i3GeoMap3d.id = "i3GeoMap3d";
  1834 + i3GeoMap3d.style.zIndex = 0;
1829 1835 i.appendChild(i3GeoMap3d);
1830 1836 }
1831   - i3GEO.barraDeBotoes.INCLUIBOTAO.zoomli = false;
1832   - i3GEO.barraDeBotoes.INCLUIBOTAO.pan = false;
1833   - i3GEO.barraDeBotoes.INCLUIBOTAO.zoomtot = false;
1834   - i3GEO.Interface.IDMAPA = "i3GeoMap3d";
1835   - i3GEO.arvoreDeCamadas.ATIVATEMA = "i3GEO.Interface.googleearth.ligaDesliga(this)";
1836 1837 google.load("earth", "1");
1837 1838 i3GeoMap = null;
1838 1839 },
... ...
classesjs/classe_janela.js
  Diff comments   View file @5a38238
... ... @@ -258,17 +258,24 @@ i3GEO.janela = {
258 258 {underlay = "none";}
259 259 else
260 260 {underlay = "shadow";}
  261 + if(i3GEO.Interface.ATUAL === "googleearth" || i3GEO.Interface.ATUAL === "flamingo")
  262 + {ifr = true;}
  263 + else
  264 + {ifr = false;}
261 265 if(waltura === "auto")
262   - {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} );}
263   - else{
264   - 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} );
265   - }
  266 + {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} );}
  267 + 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} );}
  268 +
266 269 if(nx !== "" && nx !== "center"){
267 270 pos = [nx,ny];
268 271 YAHOO.janelaDoca.xp.panel.moveTo(pos[0],pos[1]+50);
269 272 }
270 273 YAHOO.janelaDoca.xp.manager.register(YAHOO.janelaDoca.xp.panel);
271 274 YAHOO.janelaDoca.xp.panel.render();
  275 + if(navm && id !== "i3geo_janelaMensagens")
  276 + {YAHOO.janelaDoca.xp.panel.moveTo(0,0);}
  277 + if(ifr == true)
  278 + {YAHOO.janelaDoca.xp.panel.iframe.style.zIndex = 0;}
272 279 if(modal === true){
273 280 if($i(id+"_mask"))
274 281 {$i(id+"_mask").style.zIndex = 9000;}
... ...