Skip to content

S
sdkjs
Commit 27bac741 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
Browse files
Options

рефакторинг 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56005 954022d7-b5bf-4e40-9824-e11837661b57
parent 4d3e09c2
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 138 deletions
Excel/model/clipboard.js
View file @ 27bac741
...@@ -1497,7 +1497,8 @@ ...@@ -1497,7 +1497,8 @@
_pasteFromBinary: function(worksheet, node, onlyFromLocalStorage) _pasteFromBinary: function(worksheet, node, onlyFromLocalStorage)
{ {
var base64 = null; var base64 = null, base64FromWord = null;
if(onlyFromLocalStorage) if(onlyFromLocalStorage)
{ {
if(typeof t.lStorage == "object") if(typeof t.lStorage == "object")
...@@ -1518,10 +1519,8 @@ ...@@ -1518,10 +1519,8 @@
else else
base64 = t.lStorage; base64 = t.lStorage;
} }
else//find class xsl else//find class xslData or docData
{ {
var base64 = null;
var base64FromWord = null;
var classNode; var classNode;
if(node.children[0] && node.children[0].getAttribute("class") != null && (node.children[0].getAttribute("class").indexOf("xslData;") > -1 || node.children[0].getAttribute("class").indexOf("docData;") > -1)) if(node.children[0] && node.children[0].getAttribute("class") != null && (node.children[0].getAttribute("class").indexOf("xslData;") > -1 || node.children[0].getAttribute("class").indexOf("docData;") > -1))
classNode = node.children[0].getAttribute("class"); classNode = node.children[0].getAttribute("class");
...@@ -1543,7 +1542,7 @@ ...@@ -1543,7 +1542,7 @@
} }
} }
} }
} };
if(base64 != null)//from excel if(base64 != null)//from excel
{ {
...@@ -1591,8 +1590,8 @@ ...@@ -1591,8 +1590,8 @@
{ {
if(node == undefined) if(node == undefined)
return; return;
var pasteFragment = node;
var t = this; var aResult, binaryResult, textNode, pasteFragment = node, t = this;
if(isOnlyLocalBufferSafari && navigator.userAgent.toLowerCase().indexOf('safari') > -1 && navigator.userAgent.toLowerCase().indexOf('mac')) if(isOnlyLocalBufferSafari && navigator.userAgent.toLowerCase().indexOf('safari') > -1 && navigator.userAgent.toLowerCase().indexOf('mac'))
onlyFromLocalStorage = true; onlyFromLocalStorage = true;
...@@ -1613,7 +1612,6 @@ ...@@ -1613,7 +1612,6 @@
} }
//****binary**** //****binary****
var binaryResult;
if(copyPasteUseBinary) if(copyPasteUseBinary)
{ {
binaryResult = this._pasteFromBinary(worksheet, node, onlyFromLocalStorage); binaryResult = this._pasteFromBinary(worksheet, node, onlyFromLocalStorage);
...@@ -1627,7 +1625,7 @@ ...@@ -1627,7 +1625,7 @@
}; };
}; };
//local storage
if(activateLocalStorage) if(activateLocalStorage)
{ {
//в случае вставки по нажатию на правую кнопку мыши //в случае вставки по нажатию на правую кнопку мыши
...@@ -1663,7 +1661,7 @@ ...@@ -1663,7 +1661,7 @@
} }
//проверяем на равенство содержимому локального буфера //проверяем на равенство содержимому локального буфера
var textNode = t._getTextFromTable(node); textNode = t._getTextFromTable(node);
if(t._isEqualText(textNode, node) && !onlyFromLocalStorage) if(t._isEqualText(textNode, node) && !onlyFromLocalStorage)
{ {
if(t.copyText.isImage) if(t.copyText.isImage)
...@@ -1691,10 +1689,23 @@ ...@@ -1691,10 +1689,23 @@
} }
} }
} }
} };
var aResult = []; //parse HTML
aResult = this._parseHtml(pasteFragment, node, worksheet, isText);
//insert into document content
worksheet.setSelectionInfo('paste',aResult,t);
window.GlobalPasteFlagCounter = 0;
window.GlobalPasteFlag = false;
},
_parseHtml: function(pasteFragment, node, worksheet, isText)
{
var cellCountAll = [], rowSpanPlus = 0, tableRowCount = 0, l = 0, n = 0, s = 0, countEmptyRow = 0, rowCount = 0, arrTags = [], t = this, aResult = [];
var range = worksheet.activeRange.clone(true); var range = worksheet.activeRange.clone(true);
var testFragment = $.extend(true, {},node); var testFragment = $.extend(true, {},node);
var is_chrome = AscBrowser.isChrome; var is_chrome = AscBrowser.isChrome;
$(testFragment).children('br').remove(); $(testFragment).children('br').remove();
...@@ -1717,13 +1728,8 @@ ...@@ -1717,13 +1728,8 @@
if(!is_chrome) if(!is_chrome)
isText = true; isText = true;
} }
/*else
{
$(pasteFragment).children('br').remove()
}*/
//var children = t._getSignChildNodes(pasteFragment.childNodes);
var mainChildrens = t._getSignTags(pasteFragment.childNodes); var mainChildrens = t._getSignTags(pasteFragment.childNodes);
var countChild = mainChildrens.length; var countChild = mainChildrens.length;
...@@ -1740,20 +1746,13 @@ ...@@ -1740,20 +1746,13 @@
} }
this.fontsNew = {}; this.fontsNew = {};
var cellCountAll = [];
var rowSpanPlus = 0;
var tableRowCount = 0;
var l = 0;
var n = 0;
var s = 0;
var countEmptyRow = 0;
var rowCount = 0;
if(null != $(pasteFragment).find('table') && 1 == countChild && pasteFragment.children[0] != undefined && pasteFragment.children[0].children[0] != undefined && pasteFragment.children[0].children[0].nodeName.toLowerCase() == 'table') if(null != $(pasteFragment).find('table') && 1 == countChild && pasteFragment.children[0] != undefined && pasteFragment.children[0].children[0] != undefined && pasteFragment.children[0].children[0].nodeName.toLowerCase() == 'table')
{ {
pasteFragment = pasteFragment.children[0]; pasteFragment = pasteFragment.children[0];
} }
var arrTags = [];
var countTrueTags = t._countTags(mainChildrens,arrTags); var countTrueTags = t._countTags(mainChildrens, arrTags);
if(countTrueTags.length != 0 && node.length != countTrueTags.length && node.children[0] != countTrueTags[0]) if(countTrueTags.length != 0 && node.length != countTrueTags.length && node.children[0] != countTrueTags[0])
{ {
...@@ -1774,6 +1773,7 @@ ...@@ -1774,6 +1773,7 @@
var imCount = 0; var imCount = 0;
//пробегаемся по html //пробегаемся по html
for (var r = range.r1;r - range.r1 < countChild; ++r) {//цикл по r for (var r = range.r1;r - range.r1 < countChild; ++r) {//цикл по r
var firstRow = mainChildrens[r - range.r1 - countEmptyRow]; var firstRow = mainChildrens[r - range.r1 - countEmptyRow];
if(firstRow.nodeName.toLowerCase() == 'br') if(firstRow.nodeName.toLowerCase() == 'br')
r++; r++;
...@@ -1781,6 +1781,8 @@ ...@@ -1781,6 +1781,8 @@
var tag = mainChildrens[r - range.r1 - countEmptyRow]; var tag = mainChildrens[r - range.r1 - countEmptyRow];
if(pasteFragment.children.length == 1 && pasteFragment.children[0].nodeName.toLowerCase() == 'table') if(pasteFragment.children.length == 1 && pasteFragment.children[0].nodeName.toLowerCase() == 'table')
aResult.isOneTable = true; aResult.isOneTable = true;
for (var c = range.c1; c <= range.c2; ++c) { for (var c = range.c1; c <= range.c2; ++c) {
if((tag.nodeName.toLowerCase() == 'div' || tag.nodeName.toLowerCase() == 'p' || tag.nodeName.toLowerCase() == 'h' || tag.nodeName.toLowerCase().search('h') != -1) && c == range.c1 || tag.nodeName.toLowerCase() == 'li') if((tag.nodeName.toLowerCase() == 'div' || tag.nodeName.toLowerCase() == 'p' || tag.nodeName.toLowerCase() == 'h' || tag.nodeName.toLowerCase().search('h') != -1) && c == range.c1 || tag.nodeName.toLowerCase() == 'li')
{ {
...@@ -1873,26 +1875,11 @@ ...@@ -1873,26 +1875,11 @@
if(tableBody.children.length == 1 && tableBody.children[0].children.length == 1 && tableBody.children[0].children[0].rowSpan != '' && tableBody.children[0].children[0].rowSpan != null) if(tableBody.children.length == 1 && tableBody.children[0].children.length == 1 && tableBody.children[0].children[0].rowSpan != '' && tableBody.children[0].children[0].rowSpan != null)
rowSpanPlus = tableBody.children[0].children[0].rowSpan - 1; rowSpanPlus = tableBody.children[0].children[0].rowSpan - 1;
//aResult.cellCount = cellCount;
cellCountAll[s] = cellCount; cellCountAll[s] = cellCount;
s++; s++;
/*if(tag.children.length == 1 && tag.children[0].children.length == 1 && tag.offsetParent != null && tag.offsetParent != undefined && tag.offsetParent.children.length == 1 && $(tag).find('td')[0].rowSpan == 1 && $(tag).find('td')[0].colSpan == 1 && isMerge.hasMerged() == null && tableBody.children.length == 1 && tableBody.children[0].children != undefined && tableBody.children[0].children.length == 1)//сделать ещё для вставки из Excel
{
for (tR = startNum; tR <= range.r2; ++tR) {
aResult[tR] = [];
var cNew = 0;
for(tC = range.c1; tC <= range.c2; ++tC) {
var _tBody = tableBody.children[0].children[0];
aResult[tR][tC] = t._getArray(_tBody);
}
}
cellCountAll[s] = range.c2 - range.c1 + 1;
s++;
r = tR;
break;
}
else
{*/
for (var tR = startNum; tR < tableBody.children.length + startNum; ++tR) { for (var tR = startNum; tR < tableBody.children.length + startNum; ++tR) {
aResult[tR] = []; aResult[tR] = [];
var cNew = 0; var cNew = 0;
...@@ -1928,8 +1915,6 @@ ...@@ -1928,8 +1915,6 @@
}; };
imCount++; imCount++;
} }
//worksheet.objectRender.addImageDrawingObject(tag.src, { cell: curCell, width: tag.width, height: tag.height });
} }
if(_tBody == undefined) if(_tBody == undefined)
_tBody = document.createElement('td'); _tBody = document.createElement('td');
...@@ -1986,13 +1971,14 @@ ...@@ -1986,13 +1971,14 @@
} }
} }
} }
//tableRowCount += tableBody.children.length + 1;
if(countChild == 1)//если только таблица приходит if(countChild == 1)//если только таблица приходит
r = tR; r = tR;
else//если помимо таблицы есть ещё и прочее содержимое else//если помимо таблицы есть ещё и прочее содержимое
tableRowCount += tableBody.children.length -1; tableRowCount += tableBody.children.length -1;
break; break;
//}
onlyImages = false; onlyImages = false;
} }
...@@ -2031,7 +2017,7 @@ ...@@ -2031,7 +2017,7 @@
textArr = text.split('\n'); textArr = text.split('\n');
} }
for(k=0;k < textArr.length ; ++k) for(k = 0;k < textArr.length; ++k)
{ {
aResult[r + tableRowCount] = []; aResult[r + tableRowCount] = [];
var newP = document.createElement('p'); var newP = document.createElement('p');
...@@ -2050,7 +2036,8 @@ ...@@ -2050,7 +2036,8 @@
onlyImages = false; onlyImages = false;
} }
} }
} };
if(cellCountAll.length == 0) if(cellCountAll.length == 0)
aResult.cellCount = 0; aResult.cellCount = 0;
else else
...@@ -2062,9 +2049,8 @@ ...@@ -2062,9 +2049,8 @@
aResult.fontsNew = t.fontsNew; aResult.fontsNew = t.fontsNew;
aResult.onlyImages = onlyImages; aResult.onlyImages = onlyImages;
worksheet.setSelectionInfo('paste',aResult,t);
window.GlobalPasteFlagCounter = 0; return aResult;
window.GlobalPasteFlag = false;
}, },
ReadFromBinaryWord : function(sBase64) ReadFromBinaryWord : function(sBase64)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7