Commit c2b8edc7 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

правка для бага #21324

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50737 954022d7-b5bf-4e40-9824-e11837661b57
parent 9bdabf0d
...@@ -2026,8 +2026,8 @@ ...@@ -2026,8 +2026,8 @@
span.title = hyperlink.Tooltip; span.title = hyperlink.Tooltip;
} }
if( val[i].sFormula ){ if( val[i].sFormula ){
span.textContent = "="+val[i].sFormula; span.textContent = val[i].text;
$(span).addClass("cellFrom_"+val[i].sId); $(span).addClass("cellFrom_"+val[i].sId + "textFormula_" + "=" + val[i].sFormula);
} }
else{ else{
span.textContent = val[i].text; span.textContent = val[i].text;
...@@ -2491,12 +2491,20 @@ ...@@ -2491,12 +2491,20 @@
var va = style.verticalAlign.toLowerCase(); var va = style.verticalAlign.toLowerCase();
var prefix = ""; var prefix = "";
var cL = null ,cellFrom = null; var cL = null ,cellFrom = null, splitCL, text;
if( parent.getAttribute("class") != null ){ if( parent.getAttribute("class") != null ){
cL = parent.getAttribute("class").split(" "); cL = parent.getAttribute("class").split(" ");
for (var i = 0; i < cL.length; i++){ for (var i = 0; i < cL.length; i++){
if(cL[i].indexOf("cellFrom_") > -1){ if(cL[i].indexOf("cellFrom_") > -1){
cellFrom = cL[i].replace("cellFrom_","");
splitCL = cL[i].split('textFormula_');
if(splitCL && splitCL[0] && splitCL[1])
{
cellFrom = splitCL[0].replace("cellFrom_","");
text = splitCL[1];
}
else
cellFrom = cL[i].replace("cellFrom_","");
break; break;
} }
else if(cL[i].indexOf("qPrefix") > -1) else if(cL[i].indexOf("qPrefix") > -1)
...@@ -2506,7 +2514,8 @@ ...@@ -2506,7 +2514,8 @@
} }
} }
} }
var text = elem.textContent.replace('\t',''); if(!text)
text = elem.textContent.replace('\t','');
if(elem.nodeName.toLowerCase() == 'br') if(elem.nodeName.toLowerCase() == 'br')
text = '\n'; text = '\n';
var colorText = style.getPropertyValue("color"); var colorText = style.getPropertyValue("color");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment