Commit 841b0fc1f4bec0d8c3ba7fb834aa746799a13106
1 parent
798aa9b8
Exists in
master
and in
7 other branches
--no commit message
Showing
5 changed files
with
9 additions
and
60 deletions
Show diff stats
classesjs/classe_arvoredecamadas.js
| ... | ... | @@ -525,7 +525,7 @@ i3GEO.arvoreDeCamadas = { |
| 525 | 525 | } |
| 526 | 526 | } |
| 527 | 527 | } |
| 528 | - YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", i3GEO.util.stopProp); | |
| 528 | + YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", YAHOO.util.Event.stopEvent); | |
| 529 | 529 | } |
| 530 | 530 | } |
| 531 | 531 | catch(e){ |
| ... | ... | @@ -562,7 +562,7 @@ i3GEO.arvoreDeCamadas = { |
| 562 | 562 | else |
| 563 | 563 | {temaNode = new YAHOO.widget.HTMLNode(d, tempNode);} |
| 564 | 564 | temaNode.setDynamicLoad(i3GEO.arvoreDeCamadas.montaOpcoes, 1); |
| 565 | - YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", i3GEO.util.stopProp); | |
| 565 | + YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", YAHOO.util.Event.stopEvent); | |
| 566 | 566 | incluidos.push(ltema.name); |
| 567 | 567 | } |
| 568 | 568 | } |
| ... | ... | @@ -582,7 +582,7 @@ i3GEO.arvoreDeCamadas = { |
| 582 | 582 | if (n === false){ |
| 583 | 583 | temaNode = new YAHOO.widget.HTMLNode({enableHighlight:false,expanded:false,html:i3GEO.arvoreDeCamadas.montaTextoTema(ltema),id:ltema.name,tipo:"tema"}, grupoNode, i3GEO.arvoreDeCamadas.EXPANDIDA,true); |
| 584 | 584 | temaNode.setDynamicLoad(i3GEO.arvoreDeCamadas.montaOpcoes, 1); |
| 585 | - YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", i3GEO.util.stopProp); | |
| 585 | + YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", YAHOO.util.Event.stopEvent); | |
| 586 | 586 | } |
| 587 | 587 | } |
| 588 | 588 | } | ... | ... |
classesjs/classe_barradebotoes.js
| ... | ... | @@ -504,7 +504,7 @@ i3GEO.barraDeBotoes = { |
| 504 | 504 | if(l[b].constroiconteudo) |
| 505 | 505 | {eval(l[b].constroiconteudo);} |
| 506 | 506 | } |
| 507 | - YAHOO.util.Event.addListener($i(l[b].iddiv), "click", i3GEO.util.stopProp); | |
| 507 | + YAHOO.util.Event.addListener($i(l[b].iddiv), "click", YAHOO.util.Event.stopEvent); | |
| 508 | 508 | //$i("i3geo_barra2").onclick = function(){alert("oi");} |
| 509 | 509 | } |
| 510 | 510 | while (b--); | ... | ... |
classesjs/classe_guias.js
| ... | ... | @@ -308,7 +308,7 @@ i3GEO.guias = { |
| 308 | 308 | |
| 309 | 309 | onf = function(event){ |
| 310 | 310 | var bcg,cor; |
| 311 | - i3GEO.util.stopDef(event); | |
| 311 | + YAHOO.util.Event.stopEvent(event); | |
| 312 | 312 | bcg = this.parentNode.parentNode.style; |
| 313 | 313 | cor = bcg.background.split(" ")[0]; |
| 314 | 314 | if(cor !== "white" && bcg.backgroundColor !== "white") |
| ... | ... | @@ -316,7 +316,7 @@ i3GEO.guias = { |
| 316 | 316 | }; |
| 317 | 317 | outf = function(event){ |
| 318 | 318 | var bcg,cor; |
| 319 | - i3GEO.util.stopDef(event); | |
| 319 | + YAHOO.util.Event.stopEvent(event); | |
| 320 | 320 | bcg = this.parentNode.parentNode.style; |
| 321 | 321 | cor = bcg.background.split(" ")[0]; |
| 322 | 322 | if(cor !== "white" && bcg.backgroundColor !== "white") |
| ... | ... | @@ -371,7 +371,7 @@ i3GEO.guias = { |
| 371 | 371 | guiaconteudo = $i(id); |
| 372 | 372 | if(guiaconteudo){ |
| 373 | 373 | if(guia.click === "" || guia.click === undefined) |
| 374 | - {eval('$i("'+id+'").onclick = function(event){i3GEO.guias.mostra("'+guias[g]+'");i3GEO.util.stopDef(event);}');} | |
| 374 | + {eval('$i("'+id+'").onclick = function(event){i3GEO.guias.mostra("'+guias[g]+'");YAHOO.util.Event.stopEvent(event);}');} | |
| 375 | 375 | else |
| 376 | 376 | {guiaconteudo.onclick = guia.click;} |
| 377 | 377 | guiaconteudo.onmouseover = onf; | ... | ... |
classesjs/classe_i3geo.js
| ... | ... | @@ -211,21 +211,6 @@ i3GEO = { |
| 211 | 211 | else |
| 212 | 212 | {i3GEO.configura.sid = "";} |
| 213 | 213 | // |
| 214 | - //para efeitos de compatibilidade (depreciado) | |
| 215 | - // | |
| 216 | - /* | |
| 217 | - g_panM = "nao"; | |
| 218 | - g_sid = i3GEO.configura.sid; | |
| 219 | - try {i3GEO.configura.locaplic = g_locaplic;} | |
| 220 | - catch(e){ | |
| 221 | - g_locaplic = i3GEO.configura.locaplic; | |
| 222 | - } | |
| 223 | - try{i3GEO.configura.diminuixM = g_diminuixM;}catch(e){} | |
| 224 | - try{i3GEO.configura.diminuixN = g_diminuixN;}catch(e){} | |
| 225 | - try{i3GEO.configura.diminuiyM = g_diminuiyM;}catch(e){} | |
| 226 | - try{i3GEO.configura.diminuiyN = g_diminuiyN;}catch(e){} | |
| 227 | - */ | |
| 228 | - // | |
| 229 | 214 | //tenta definir automaticamente a variável que indica a localização do i3geo |
| 230 | 215 | // |
| 231 | 216 | if(!i3GEO.configura.locaplic || i3GEO.configura.locaplic === ""){ |
| ... | ... | @@ -613,11 +598,13 @@ i3GEO = { |
| 613 | 598 | if(temp){ |
| 614 | 599 | temp.style.height=h + "px"; |
| 615 | 600 | temp.style.width=w + "px"; |
| 601 | + YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.stopEvent); | |
| 616 | 602 | } |
| 617 | 603 | temp = $i(i3GEO.Interface.IDCORPO); |
| 618 | 604 | if(temp){ |
| 619 | 605 | temp.style.height=h + "px"; |
| 620 | 606 | temp.style.width=w + "px"; |
| 607 | + YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.stopEvent); | |
| 621 | 608 | } |
| 622 | 609 | temp = $i("mst"); |
| 623 | 610 | if(temp){ | ... | ... |
classesjs/classe_util.js
| ... | ... | @@ -2327,44 +2327,6 @@ i3GEO.util = { |
| 2327 | 2327 | },25); |
| 2328 | 2328 | }, |
| 2329 | 2329 | /* |
| 2330 | - Function: stopProp | |
| 2331 | - | |
| 2332 | - Para a propagação de eventos em um elemento do DOM | |
| 2333 | - | |
| 2334 | - Crossbrowser | |
| 2335 | - | |
| 2336 | - http://javascript.about.com/library/bldom21.htm | |
| 2337 | - | |
| 2338 | - Parametro: | |
| 2339 | - | |
| 2340 | - event - evento | |
| 2341 | - */ | |
| 2342 | - stopProp: function(event) { | |
| 2343 | - if (event && event.stopPropogation) | |
| 2344 | - {event.stopPropogation;} | |
| 2345 | - else | |
| 2346 | - {event.cancelBubble = true;} | |
| 2347 | - }, | |
| 2348 | - /* | |
| 2349 | - Function: stopDef | |
| 2350 | - | |
| 2351 | - Anula o evento default de um elemento do DOM | |
| 2352 | - | |
| 2353 | - Crossbrowser | |
| 2354 | - | |
| 2355 | - http://javascript.about.com/library/bldom21.htm | |
| 2356 | - | |
| 2357 | - Parametro: | |
| 2358 | - | |
| 2359 | - event - evento | |
| 2360 | - */ | |
| 2361 | - stopDef: function(event) { | |
| 2362 | - if (event && event.preventDefault) | |
| 2363 | - {event.preventDefault();} | |
| 2364 | - else | |
| 2365 | - {window.eventReturnValue = false;} | |
| 2366 | - }, | |
| 2367 | - /* | |
| 2368 | 2330 | Function: tamanhoBrowser |
| 2369 | 2331 | |
| 2370 | 2332 | Calcula o tamanho da área útil do navegador considerando-se as propriedades nativas do objeto window | ... | ... |