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

+ к ревизии 65018

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56023 954022d7-b5bf-4e40-9824-e11837661b57
parent 289b315a
...@@ -622,7 +622,9 @@ var gUndoInsDelCellsFlag = true; ...@@ -622,7 +622,9 @@ var gUndoInsDelCellsFlag = true;
History.TurnOn(); History.TurnOn();
return true; return true;
} }
} else if(paramsForCallBackAdd) { }
else if(paramsForCallBackAdd)
{
switch(paramsForCallBackAdd) switch(paramsForCallBackAdd)
{ {
case "addTableFilterOneCell": case "addTableFilterOneCell":
...@@ -5900,7 +5902,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -5900,7 +5902,7 @@ var gUndoInsDelCellsFlag = true;
{ {
var startRange, endRange, range; var startRange, endRange, range;
if(isNaN(parseFloat(parseRef[1]))) if(!this._isStringContainDigit(parseRef[1]))
{ {
startRange = this._idToRange(parseRef[0]); startRange = this._idToRange(parseRef[0]);
endRange = this._idToRange((this.worksheet.rows.length - 1).toString()); endRange = this._idToRange((this.worksheet.rows.length - 1).toString());
...@@ -5930,6 +5932,18 @@ var gUndoInsDelCellsFlag = true; ...@@ -5930,6 +5932,18 @@ var gUndoInsDelCellsFlag = true;
return false; return false;
}, },
_isStringContainDigit: function(str)
{
var regexp = /[1-9]/gi;
var matches = str.match(regexp);
var result = false;
if(matches && matches.length)
result = true;
return result;
},
//ShowButton(в случае объединенных ячеек в автофильтрах) //ShowButton(в случае объединенных ячеек в автофильтрах)
_isShowButton: function(filterColumns, colId) _isShowButton: function(filterColumns, colId)
{ {
......
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