Commit edad1ae0 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил баг http://bugzserver/show_bug.cgi?id=25050

Во view режиме не давать двигать закрепленные области.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57201 954022d7-b5bf-4e40-9824-e11837661b57
parent 5f85d9a6
...@@ -270,7 +270,8 @@ var c_oAscLayoutPageType = { ...@@ -270,7 +270,8 @@ var c_oAscLayoutPageType = {
ActualSize : 1 // По реальным размерам ActualSize : 1 // По реальным размерам
}; };
var c_oAscCustomAutoFilter = { /** @enum */
var c_oAscCustomAutoFilter = {
equals: 1, equals: 1,
isGreaterThan: 2, isGreaterThan: 2,
isGreaterThanOrEqualTo: 3, isGreaterThanOrEqualTo: 3,
...@@ -283,7 +284,7 @@ var c_oAscLayoutPageType = { ...@@ -283,7 +284,7 @@ var c_oAscLayoutPageType = {
doesNotEndWith: 10, doesNotEndWith: 10,
contains: 11, contains: 11,
doesNotContain: 12 doesNotContain: 12
}; };
// Состояние редактора ячейки // Состояние редактора ячейки
var c_oAscCellEditorState = { var c_oAscCellEditorState = {
......
...@@ -1263,15 +1263,15 @@ ...@@ -1263,15 +1263,15 @@
} else if (t.targetInfo && t.targetInfo.target === c_oTargetType.FilterObject) { } else if (t.targetInfo && t.targetInfo.target === c_oTargetType.FilterObject) {
t._autoFiltersClick(t.targetInfo.idFilter); t._autoFiltersClick(t.targetInfo.idFilter);
return; return;
} else if (t.targetInfo && (undefined !== t.targetInfo.commentIndexes) && (false === this.settings.isViewerMode)) { } else if (t.targetInfo && undefined !== t.targetInfo.commentIndexes && false === this.settings.isViewerMode) {
t._commentCellClick(event); t._commentCellClick(event);
} else if ( t.targetInfo && t.targetInfo.target === c_oTargetType.MoveResizeRange && false === this.settings.isViewerMode ){ } else if ( t.targetInfo && t.targetInfo.target === c_oTargetType.MoveResizeRange && false === this.settings.isViewerMode ){
this.isMoveResizeRange = true; this.isMoveResizeRange = true;
this.isMoveResizeChartsRange = true; this.isMoveResizeChartsRange = true;
t._moveResizeRangeHandle(event, t.targetInfo); t._moveResizeRangeHandle(event, t.targetInfo);
return; return;
} else if ( t.targetInfo && ((t.targetInfo.target === c_oTargetType.FrozenAnchorV) || } else if (t.targetInfo && (t.targetInfo.target === c_oTargetType.FrozenAnchorV ||
(t.targetInfo.target === c_oTargetType.FrozenAnchorH)) ) { t.targetInfo.target === c_oTargetType.FrozenAnchorH) && false === this.settings.isViewerMode) {
// Режим установки закреплённых областей // Режим установки закреплённых областей
this.isFrozenAnchorMode = t.targetInfo.target; this.isFrozenAnchorMode = t.targetInfo.target;
t._moveFrozenAnchorHandle(event, t.targetInfo); t._moveFrozenAnchorHandle(event, t.targetInfo);
......
...@@ -5683,7 +5683,7 @@ ...@@ -5683,7 +5683,7 @@
isSelGraphicObject, isNotFirst; isSelGraphicObject, isNotFirst;
var frozenCursor = this._isFrozenAnchor(x, y); var frozenCursor = this._isFrozenAnchor(x, y);
if (frozenCursor.result) { if (!isViewerMode && frozenCursor.result) {
lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Object, null, sheetId, c_oAscLockNameFrozenPane); lockInfo = this.collaborativeEditing.getLockInfo(c_oAscLockTypeElem.Object, null, sheetId, c_oAscLockNameFrozenPane);
isLocked = this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther, false); isLocked = this.collaborativeEditing.getLockIntersection(lockInfo, c_oAscLockTypes.kLockTypeOther, false);
if (false !== isLocked) { if (false !== isLocked) {
......
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