From 1e5fbed3580ec52620eee8c381fd8e16907e5376 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 14 Apr 2011 05:48:00 +0000
Subject: [PATCH] 

---
 classesphp/classe_alteraclasse.php |  1 +
 ferramentas/legenda/index.js.php   | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/classesphp/classe_alteraclasse.php b/classesphp/classe_alteraclasse.php
index 199bc67..0b7f522 100644
--- a/classesphp/classe_alteraclasse.php
+++ b/classesphp/classe_alteraclasse.php
@@ -220,6 +220,7 @@ $exps - lista com as novas expressões
 				$e = str_replace("\\","'",$e);
 				$e = str_replace('"',"'",$e);
 				$e = str_replace("''","'",$e);
+				$e = str_replace("##","'",$e);
 				$classe->setexpression($e);
 			}
 		}		
diff --git a/ferramentas/legenda/index.js.php b/ferramentas/legenda/index.js.php
index 677e8c1..9f26790 100644
--- a/ferramentas/legenda/index.js.php
+++ b/ferramentas/legenda/index.js.php
@@ -534,7 +534,9 @@ i3GEOF.legenda = {
 				n,
 				p,
 				cp,
-				temp;
+				temp,
+				expn,
+				re = new RegExp('"', "g");;
 			for (t=0;t<trs.length;t++){
 				if(trs[t].childNodes){
 					nn = trs[t].childNodes;
@@ -547,8 +549,10 @@ i3GEOF.legenda = {
 									temp = (isn[0].id).split("i3GEOlegendaid_");
 									ids.push(temp[1]);
 								}
-								if(isn[0].name == "expressao")
-								{exps.push(isn[0].value);}
+								if(isn[0].name == "expressao"){
+									expn = (isn[0].value).replace(re,'##');
+									exps.push(expn);
+								}
 							}
 						}
 					}
@@ -558,7 +562,8 @@ i3GEOF.legenda = {
 			nomes = nomes.join(";");
 			exps = exps.join(";");
 			temp = function(){
- 				i3GEOF.legenda.mostralegenda();
+ 				i3GEOF.legenda.aguarde.visibility = "hidden";
+				i3GEOF.legenda.mostralegenda();
 				i3GEO.atualiza();
 				i3GEO.Interface.atualizaTema("",i3GEOF.legenda.tema);
  				i3GEO.arvoreDeCamadas.atualizaLegenda(i3GEOF.legenda.tema);
--
libgit2 0.21.2