From 841b0fc1f4bec0d8c3ba7fb834aa746799a13106 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 4 May 2011 18:30:38 +0000 Subject: [PATCH] --- classesjs/classe_arvoredecamadas.js | 6 +++--- classesjs/classe_barradebotoes.js | 2 +- classesjs/classe_guias.js | 6 +++--- classesjs/classe_i3geo.js | 17 ++--------------- classesjs/classe_util.js | 38 -------------------------------------- 5 files changed, 9 insertions(+), 60 deletions(-) diff --git a/classesjs/classe_arvoredecamadas.js b/classesjs/classe_arvoredecamadas.js index 13453f6..abf6ea0 100644 --- a/classesjs/classe_arvoredecamadas.js +++ b/classesjs/classe_arvoredecamadas.js @@ -525,7 +525,7 @@ i3GEO.arvoreDeCamadas = { } } } - YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", i3GEO.util.stopProp); + YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", YAHOO.util.Event.stopEvent); } } catch(e){ @@ -562,7 +562,7 @@ i3GEO.arvoreDeCamadas = { else {temaNode = new YAHOO.widget.HTMLNode(d, tempNode);} temaNode.setDynamicLoad(i3GEO.arvoreDeCamadas.montaOpcoes, 1); - YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", i3GEO.util.stopProp); + YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", YAHOO.util.Event.stopEvent); incluidos.push(ltema.name); } } @@ -582,7 +582,7 @@ i3GEO.arvoreDeCamadas = { if (n === false){ temaNode = new YAHOO.widget.HTMLNode({enableHighlight:false,expanded:false,html:i3GEO.arvoreDeCamadas.montaTextoTema(ltema),id:ltema.name,tipo:"tema"}, grupoNode, i3GEO.arvoreDeCamadas.EXPANDIDA,true); temaNode.setDynamicLoad(i3GEO.arvoreDeCamadas.montaOpcoes, 1); - YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", i3GEO.util.stopProp); + YAHOO.util.Event.addListener($i("arrastar_"+ltema), "click", YAHOO.util.Event.stopEvent); } } } diff --git a/classesjs/classe_barradebotoes.js b/classesjs/classe_barradebotoes.js index d12ec8c..9b26551 100644 --- a/classesjs/classe_barradebotoes.js +++ b/classesjs/classe_barradebotoes.js @@ -504,7 +504,7 @@ i3GEO.barraDeBotoes = { if(l[b].constroiconteudo) {eval(l[b].constroiconteudo);} } - YAHOO.util.Event.addListener($i(l[b].iddiv), "click", i3GEO.util.stopProp); + YAHOO.util.Event.addListener($i(l[b].iddiv), "click", YAHOO.util.Event.stopEvent); //$i("i3geo_barra2").onclick = function(){alert("oi");} } while (b--); diff --git a/classesjs/classe_guias.js b/classesjs/classe_guias.js index 8c6bcf3..d5c8b72 100644 --- a/classesjs/classe_guias.js +++ b/classesjs/classe_guias.js @@ -308,7 +308,7 @@ i3GEO.guias = { onf = function(event){ var bcg,cor; - i3GEO.util.stopDef(event); + YAHOO.util.Event.stopEvent(event); bcg = this.parentNode.parentNode.style; cor = bcg.background.split(" ")[0]; if(cor !== "white" && bcg.backgroundColor !== "white") @@ -316,7 +316,7 @@ i3GEO.guias = { }; outf = function(event){ var bcg,cor; - i3GEO.util.stopDef(event); + YAHOO.util.Event.stopEvent(event); bcg = this.parentNode.parentNode.style; cor = bcg.background.split(" ")[0]; if(cor !== "white" && bcg.backgroundColor !== "white") @@ -371,7 +371,7 @@ i3GEO.guias = { guiaconteudo = $i(id); if(guiaconteudo){ if(guia.click === "" || guia.click === undefined) - {eval('$i("'+id+'").onclick = function(event){i3GEO.guias.mostra("'+guias[g]+'");i3GEO.util.stopDef(event);}');} + {eval('$i("'+id+'").onclick = function(event){i3GEO.guias.mostra("'+guias[g]+'");YAHOO.util.Event.stopEvent(event);}');} else {guiaconteudo.onclick = guia.click;} guiaconteudo.onmouseover = onf; diff --git a/classesjs/classe_i3geo.js b/classesjs/classe_i3geo.js index 4a6a546..68f5ebc 100644 --- a/classesjs/classe_i3geo.js +++ b/classesjs/classe_i3geo.js @@ -211,21 +211,6 @@ i3GEO = { else {i3GEO.configura.sid = "";} // - //para efeitos de compatibilidade (depreciado) - // - /* - g_panM = "nao"; - g_sid = i3GEO.configura.sid; - try {i3GEO.configura.locaplic = g_locaplic;} - catch(e){ - g_locaplic = i3GEO.configura.locaplic; - } - try{i3GEO.configura.diminuixM = g_diminuixM;}catch(e){} - try{i3GEO.configura.diminuixN = g_diminuixN;}catch(e){} - try{i3GEO.configura.diminuiyM = g_diminuiyM;}catch(e){} - try{i3GEO.configura.diminuiyN = g_diminuiyN;}catch(e){} - */ - // //tenta definir automaticamente a variável que indica a localização do i3geo // if(!i3GEO.configura.locaplic || i3GEO.configura.locaplic === ""){ @@ -613,11 +598,13 @@ i3GEO = { if(temp){ temp.style.height=h + "px"; temp.style.width=w + "px"; + YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.stopEvent); } temp = $i(i3GEO.Interface.IDCORPO); if(temp){ temp.style.height=h + "px"; temp.style.width=w + "px"; + YAHOO.util.Event.addListener(temp, "click", YAHOO.util.Event.stopEvent); } temp = $i("mst"); if(temp){ diff --git a/classesjs/classe_util.js b/classesjs/classe_util.js index 09251ae..f20207d 100644 --- a/classesjs/classe_util.js +++ b/classesjs/classe_util.js @@ -2327,44 +2327,6 @@ i3GEO.util = { },25); }, /* - Function: stopProp - - Para a propagação de eventos em um elemento do DOM - - Crossbrowser - - http://javascript.about.com/library/bldom21.htm - - Parametro: - - event - evento - */ - stopProp: function(event) { - if (event && event.stopPropogation) - {event.stopPropogation;} - else - {event.cancelBubble = true;} - }, - /* - Function: stopDef - - Anula o evento default de um elemento do DOM - - Crossbrowser - - http://javascript.about.com/library/bldom21.htm - - Parametro: - - event - evento - */ - stopDef: function(event) { - if (event && event.preventDefault) - {event.preventDefault();} - else - {window.eventReturnValue = false;} - }, - /* Function: tamanhoBrowser Calcula o tamanho da área útil do navegador considerando-se as propriedades nativas do objeto window -- libgit2 0.21.2