Commit 9172c8d2 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал hasBackground в редакторе ячейки

Убрал копирование background при копировании ячейки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52202 954022d7-b5bf-4e40-9824-e11837661b57
parent b67a86a3
......@@ -395,7 +395,7 @@
return false;
},
copyCellValue: function (value, background) {
copyCellValue: function (value) {
var t = this;
if(activateLocalStorage)
t._addValueToLocalStrg(value);
......@@ -413,7 +413,6 @@
t._cleanElement();
nodes.forEach(
function(node){
node.style.backgroundColor = background !== null ? background : "transparent";
t.element.appendChild(node);
});
if($.browser["mozilla"])
......@@ -422,7 +421,7 @@
t._selectElement();
},
copyCellValueButton: function (value, background) {
copyCellValueButton: function (value) {
if(AscBrowser.isIE)
{
var t = this;
......@@ -440,7 +439,6 @@
t._cleanElement();
nodes.forEach(
function(node){
node.style.backgroundColor = background !== null ? background : "transparent";
t.element.appendChild(node);
});
var t = this, selection, rangeToSelect;
......@@ -3100,7 +3098,7 @@ function Editor_CopyPaste_Create(api)
if((api.wb && api.wb.getWorksheet() && api.wb.getWorksheet().isCellEditMode))
{
var v = api.wb.cellEditor.copySelection();
if (v) {api.wb.clipboard.copyCellValue(v, api.wb.cellEditor.hasBackground ? api.wb.cellEditor.background : null);}
if (v) {api.wb.clipboard.copyCellValue(v);}
}
};
......@@ -3112,7 +3110,7 @@ function Editor_CopyPaste_Create(api)
if((api.wb && api.wb.getWorksheet() && api.wb.getWorksheet().isCellEditMode))
{
var v = api.wb.cellEditor.cutSelection();
if (v) {api.wb.clipboard.copyCellValue(v, api.wb.cellEditor.hasBackground ? api.wb.cellEditor.background : null);}
if (v) {api.wb.clipboard.copyCellValue(v);}
}
}
else
......
......@@ -1305,7 +1305,7 @@
t.clipboard.copyRange(ws.getSelectedRange(), ws);
} else {
v = t.cellEditor.copySelection();
if (v) {t.clipboard.copyCellValue(v, t.cellEditor.hasBackground ? t.cellEditor.background : null);}
if (v) {t.clipboard.copyCellValue(v);}
}
},
......@@ -1316,7 +1316,7 @@
return t.clipboard.copyRangeButton(ws.getSelectedRange(), ws);
} else {
v = t.cellEditor.copySelection();
if (v) {return t.clipboard.copyCellValueButton(v, t.cellEditor.hasBackground ? t.cellEditor.background : null);}
if (v) {return t.clipboard.copyCellValueButton(v);}
else {return true;}
}
},
......@@ -1365,7 +1365,7 @@
ws.setSelectionInfo("empty", c_oAscCleanOptions.All);
} else if(!window.USER_AGENT_SAFARI_MACOS){
v = t.cellEditor.cutSelection();
if (v) {t.clipboard.copyCellValue(v, t.cellEditor.hasBackground ? t.cellEditor.background : null);}
if (v) {t.clipboard.copyCellValue(v);}
}
},
......@@ -1379,7 +1379,7 @@
return result;
} else {
v = t.cellEditor.cutSelection();
if (v) {return t.clipboard.copyCellValueButton(v, t.cellEditor.hasBackground ? t.cellEditor.background : null);}
if (v) {return t.clipboard.copyCellValueButton(v);}
else {return true;}
}
},
......
......@@ -9483,7 +9483,6 @@
flags: fl,
font: new asc_FP(c.getFontname(), c.getFontsize()),
background: bg !== null ? bg : t.settings.cells.defaultState.background,
hasBackground: bg !== null,
textColor: oFontColor || t.settings.cells.defaultState.color,
cursorPos: cursorPos,
zoom: t.getZoom(),
......
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