Commit 222bd14f60603aa524c0dacbf044a2e46200f8ba
1 parent
664947e2
Exists in
master
and in
7 other branches
correção no refresh da árvore quando se cria uma nova classe
Showing
1 changed file
with
40 additions
and
29 deletions
Show diff stats
admin/js/editormapfile.js
| ... | ... | @@ -278,7 +278,7 @@ function montaNosRaiz(redesenha) |
| 278 | 278 | } |
| 279 | 279 | conteudo += " <img style=\"width:12px;position:relative;cursor:pointer;top:2px\" onclick=\"excluirMapfile('"+$mapfiles[i].codigo+"')\" title=excluir src=\"../imagens/01.png\" />"; |
| 280 | 280 | if(iconePlus) |
| 281 | - {conteudo += " <img style=\"width:12px;position:relative;cursor:pointer;top:2px\" onclick=\"clonarMapfile('"+$mapfiles[i].codigo+"')\" title='cria uma cópia' src=\"../imagens/clonar.png\" />";} | |
| 281 | + {conteudo += " <img style=\"width:12px;position:relative;cursor:pointer;top:2px\" onclick=\"clonarMapfile('"+$mapfiles[i].codigo+"')\" title='cria uma copia' src=\"../imagens/clonar.png\" />";} | |
| 282 | 282 | conteudo += " <img style=\"width:12px;position:relative;cursor:pointer;top:2px\" onclick=\"limparCacheMapfile('"+$mapfiles[i].codigo+"')\" title='limpa o chache de imagens se houver' src=\"../imagens/limparcache.png\" />"; |
| 283 | 283 | conteudo += " <img style=\"width:12px;position:relative;cursor:pointer;top:2px\" onclick=\"editorTemaMapfile('"+$mapfiles[i].codigo+"')\" title='editar tema associado' src=\"../imagens/03.png\" />"; |
| 284 | 284 | if(iconePlus){ |
| ... | ... | @@ -837,39 +837,43 @@ function classesAuto(codigoMap,codigoLayer) |
| 837 | 837 | core_carregando("ativa"); |
| 838 | 838 | core_carregando(" gerando as classes"); |
| 839 | 839 | var sUrl = "../php/editormapfile.php?funcao=autoClassesLayer&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer+"&itemExpressao="+itemExpressao+"&itemNome="+itemNome; |
| 840 | - var callback2 = | |
| 841 | - { | |
| 842 | - success:function(o) | |
| 843 | - { | |
| 844 | - try | |
| 845 | - { | |
| 846 | - var dados = YAHOO.lang.JSON.parse(o.responseText); | |
| 847 | - var nos = tree.getNodesByProperty("classes",codigoMap+"_"+codigoLayer); | |
| 848 | - if(nos){ | |
| 849 | - for (var i=0, j=nos.length; i<j; i++) | |
| 850 | - {tree.removeNode(nos[i],false);} | |
| 840 | + var callback2 = { | |
| 841 | + success:function(o) { | |
| 842 | + try { | |
| 843 | + var dados = YAHOO.lang.JSON.parse(o.responseText); | |
| 844 | + var nos = tree.getNodesByProperty("classes",codigoMap+"_"+codigoLayer); | |
| 845 | + if(nos){ | |
| 846 | + //for (var i=0, j=nos.length; i<j; i++) | |
| 847 | + //{tree.removeNode(nos[i],false);} | |
| 848 | + } | |
| 849 | + //tree.draw(); | |
| 850 | + | |
| 851 | + var no = tree.getNodeByProperty("etiquetaClasses",codigoMap+"_"+codigoLayer); | |
| 852 | + nos.refresh(); | |
| 853 | + //montaParametrosTemas(no,dados); | |
| 854 | + core_carregando("desativa"); | |
| 855 | + YAHOO.admin.container.panelEditorAutoClasses.destroy(); | |
| 856 | + YAHOO.admin.container.panelEditorAutoClasses = null; | |
| 857 | + //core_pegaMapfiles("montaArvore()"); | |
| 851 | 858 | } |
| 852 | - var no = tree.getNodeByProperty("etiquetaClasses",codigoMap+"_"+codigoLayer); | |
| 853 | - montaParametrosTemas(no,dados); | |
| 859 | + catch(e){ | |
| 860 | + core_handleFailure(o,o.responseText); | |
| 854 | 861 | core_carregando("desativa"); |
| 855 | - YAHOO.admin.container.panelEditorAutoClasses.destroy(); | |
| 856 | - YAHOO.admin.container.panelEditorAutoClasses = null; | |
| 862 | + YAHOO.admin.container.panelEditorAutoClasses.destroy(); | |
| 863 | + YAHOO.admin.container.panelEditorAutoClasses = null; | |
| 857 | 864 | } |
| 858 | - catch(e){core_handleFailure(o,o.responseText);core_carregando("desativa");} | |
| 859 | 865 | }, |
| 860 | 866 | failure:core_handleFailure, |
| 861 | 867 | argument: { foo:"foo", bar:"bar" } |
| 862 | 868 | }; |
| 863 | 869 | core_makeRequest(sUrl,callback2); |
| 864 | 870 | } |
| 865 | - else | |
| 866 | - { | |
| 871 | + else{ | |
| 867 | 872 | YAHOO.admin.container.panelEditorAutoClasses.destroy(); |
| 868 | 873 | YAHOO.admin.container.panelEditorAutoClasses = null; |
| 869 | 874 | } |
| 870 | 875 | }; |
| 871 | - if(!YAHOO.admin.container.panelEditorAutoClasses) | |
| 872 | - { | |
| 876 | + if(!YAHOO.admin.container.panelEditorAutoClasses){ | |
| 873 | 877 | var novoel = document.createElement("div"); |
| 874 | 878 | novoel.id = "janela_editor_auto"; |
| 875 | 879 | var ins = '<div class="hd">Editor</div>'; |
| ... | ... | @@ -884,14 +888,21 @@ function classesAuto(codigoMap,codigoLayer) |
| 884 | 888 | ]); |
| 885 | 889 | editorBotoes.on("checkedButtonChange", on_editorCheckBoxChange); |
| 886 | 890 | YAHOO.admin.container.panelEditorAutoClasses = new YAHOO.widget.Panel("janela_editor_auto", { fixedcenter:true,close:true,width:"400px", height:"400px",overflow:"auto", visible:false,constraintoviewport:true } ); |
| 891 | + var fecha = function() | |
| 892 | + { | |
| 893 | + try{ | |
| 894 | + YAHOO.admin.container.panelEditorAutoClasses.destroy(); | |
| 895 | + YAHOO.admin.container.panelEditorAutoClasses = null; | |
| 896 | + } | |
| 897 | + catch(e){} | |
| 898 | + }; | |
| 899 | + YAHOO.util.Event.addListener(YAHOO.admin.container.panelEditorAutoClasses.close, "click", fecha); | |
| 900 | + | |
| 887 | 901 | YAHOO.admin.container.panelEditorAutoClasses.render(); |
| 888 | 902 | var sUrl = "../php/editormapfile.php?funcao=pegaItensLayer&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer; |
| 889 | - var callback = | |
| 890 | - { | |
| 891 | - success:function(o) | |
| 892 | - { | |
| 893 | - try | |
| 894 | - { | |
| 903 | + var callback = { | |
| 904 | + success:function(o) { | |
| 905 | + try { | |
| 895 | 906 | var itens = core_comboObjeto(YAHOO.lang.JSON.parse(o.responseText).itens,"","",""); |
| 896 | 907 | var ins = "<p>Item da tabela de atributos que será utilizado para compor a expressão de seleção de cada classe</p>"; |
| 897 | 908 | ins += "<select id='itemExpressao' >"; |
| ... | ... | @@ -2264,8 +2275,8 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo, |
| 2264 | 2275 | if(d.name != codigoLayer) |
| 2265 | 2276 | { |
| 2266 | 2277 | core_pegaMapfiles("montaArvore()"); |
| 2267 | - YAHOO.admin.container.panelEditor.destroy(); | |
| 2268 | - YAHOO.admin.container.panelEditor = null; | |
| 2278 | + YAHOO.admin.container.panelEditor.destroy(); | |
| 2279 | + YAHOO.admin.container.panelEditor = null; | |
| 2269 | 2280 | } |
| 2270 | 2281 | } |
| 2271 | 2282 | if(tipo=="classeGeral") | ... | ... |