Commit 38cd2c29 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил span для отображения иконки в списке формул.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65393 954022d7-b5bf-4e40-9824-e11837661b57
parent 9c292f0a
This diff is collapsed.
......@@ -1522,35 +1522,37 @@
}
};
WorkbookView.prototype._onUpdateCellEditor = function (text, cursorPosition, isFormula, formulaPos, formulaName) {
if (this.skipHelpSelector)
return;
// ToDo для ускорения можно завести объект, куда класть результаты поиска по формулам и второй раз не искать.
var arrResult = [], defNamesList, defName;
if (isFormula && formulaName) {
formulaName = formulaName.toUpperCase();
for (var i = 0; i < this.formulasList.length; ++i) {
if (0 === this.formulasList[i].indexOf(formulaName))
arrResult.push(this.formulasList[i]);
}
/*defNamesList = this.getDefinedNames(c_oAscGetDefinedNamesList.WorksheetWorkbook)
for(var id in defNamesList){
defName = defNamesList[id];
console.log(defName.Name)
if (0 === defName.Name.toLowerCase().indexOf(formulaName.toLowerCase()))
arrResult.push(defName.Name);
}*/
}
if (0 < arrResult.length) {
this.popUpSelector.show(true, arrResult, this.getWorksheet().getActiveCellCoord());
this.lastFormulaPos = formulaPos;
this.lastFormulaName = formulaName;
} else {
this.popUpSelector.hide();
this.lastFormulaPos = -1;
this.lastFormulaName = "";
}
};
WorkbookView.prototype._onUpdateCellEditor = function(text, cursorPosition, isFormula, formulaPos, formulaName) {
if (this.skipHelpSelector) {
return;
}
// ToDo для ускорения можно завести объект, куда класть результаты поиска по формулам и второй раз не искать.
var arrResult = [], defNamesList, defName;
if (isFormula && formulaName) {
formulaName = formulaName.toUpperCase();
for (var i = 0; i < this.formulasList.length; ++i) {
if (0 === this.formulasList[i].indexOf(formulaName)) {
arrResult.push(this.formulasList[i]);
}
}
/*defNamesList = this.getDefinedNames(c_oAscGetDefinedNamesList.WorksheetWorkbook)
for(var id in defNamesList){
defName = defNamesList[id];
console.log(defName.Name)
if (0 === defName.Name.toLowerCase().indexOf(formulaName.toLowerCase()))
arrResult.push(defName.Name);
}*/
}
if (0 < arrResult.length) {
this.popUpSelector.show(true, arrResult, this.getWorksheet().getActiveCellCoord());
this.lastFormulaPos = formulaPos;
this.lastFormulaName = formulaName;
} else {
this.popUpSelector.hide();
this.lastFormulaPos = -1;
this.lastFormulaName = '';
}
};
WorkbookView.prototype._onPopUpSelectorKeyDown = function (event) {
if (!this.popUpSelector.getVisible())
return true;
......
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