Commit ca6f11b1 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov

дополнительно для ревизии 68053

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68105 954022d7-b5bf-4e40-9824-e11837661b57
parent 1cf07481
......@@ -453,7 +453,7 @@
CellEditor.prototype.activateCellRange = function () {
var res = this._findRangeUnderCursor();
res.range ? this.handlers.trigger( "existedRange", res.range ) : this.handlers.trigger( "newRange" );
res.range ? this.handlers.trigger( "existedRange", res.range, res.wsName ) : this.handlers.trigger( "newRange" );
};
CellEditor.prototype.enterCellRange = function ( rangeStr ) {
......@@ -826,7 +826,7 @@
switch( r.oper.type ){
case cElementType.cell :{
if( this.handlers.trigger("getCellFormulaEnterWSOpen") ){
continue;
wsName = this.handlers.trigger("getCellFormulaEnterWSOpen").model.getName();
}
ret = true;
break;
......@@ -839,7 +839,7 @@
}
case cElementType.cellsRange :{
if( this.handlers.trigger("getCellFormulaEnterWSOpen") ){
continue;
wsName = this.handlers.trigger("getCellFormulaEnterWSOpen").model.getName();
}
ret = true;
break;
......@@ -920,7 +920,7 @@
switch( r.oper.type ){
case cElementType.cell :{
if( this.handlers.trigger("getCellFormulaEnterWSOpen") ){
continue;
wsName = this.handlers.trigger("getCellFormulaEnterWSOpen").model.getName();
}
ret = true;
break;
......@@ -933,7 +933,7 @@
}
case cElementType.cellsRange :{
if( this.handlers.trigger("getCellFormulaEnterWSOpen") ){
continue;
wsName = this.handlers.trigger("getCellFormulaEnterWSOpen").model.getName();
}
ret = true;
break;
......@@ -953,14 +953,17 @@
if ( ret && t.cursorPos > _s && t.cursorPos <= _s + r.oper.value.length ) {
range = t._parseRangeStr( r.oper.value );
if( range ){
return {index: _s, length: r.oper.value.length, range: range};
if( this.handlers.trigger("getActiveWS") && this.handlers.trigger("getActiveWS").getName() != wsName ){
return {index: -1, length: 0, range: null};
}
return {index: _s, length: r.oper.value.length, range: range, wsName: wsName};
}
}
}
}
return !range ?
{index: -1, length: 0, range: null} :
{index: _s, length: r.oper.value.length, range: range};
{index: _s, length: r.oper.value.length, range: range, wsName: wsName};
};
......
This diff is collapsed.
......@@ -340,7 +340,7 @@
this.nColsCount = 0;
// Массив ячеек для текущей формулы
this.arrActiveFormulaRanges = [];
this.arrActiveFormulaRangesPosition = 0;
this.arrActiveFormulaRangesPosition = -1;
this.arrActiveChartsRanges = [];
//------------------------
......@@ -11614,7 +11614,7 @@
};
WorksheetView.prototype.activeFormulaRange = function ( range ) {
this.arrActiveFormulaRangesPosition = 0;
this.arrActiveFormulaRangesPosition = -1;
for ( var i = 0; i < this.arrActiveFormulaRanges.length; ++i ) {
if ( this.arrActiveFormulaRanges[i].isEqual( range ) ) {
this.arrActiveFormulaRangesPosition = i;
......
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