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

Добавил в c_oTargetType frozen

Поправил баг http://bugzserver/show_bug.cgi?id=24963
На dblClick не обрабатывать frozen

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56912 954022d7-b5bf-4e40-9824-e11837661b57
parent 3de30e7f
......@@ -448,7 +448,9 @@ var c_oTargetType = {
Corner : 9,
Hyperlink : 10,
Cells : 11,
Shape : 12
Shape : 12,
FrozenAnchorH : 14,
FrozenAnchorV : 15
};
var c_oAscCoAuthoringMeBorderColor = new window.CColor(22, 156, 0);
......
......@@ -1305,7 +1305,8 @@
this.isMoveResizeChartsRange = true;
t._moveResizeRangeHandle(event, t.targetInfo);
return;
} else if ( t.targetInfo && ((t.targetInfo.target === "frozenAnchorV") || (t.targetInfo.target === "frozenAnchorH")) ) {
} else if ( t.targetInfo && ((t.targetInfo.target === c_oTargetType.FrozenAnchorV) ||
(t.targetInfo.target === c_oTargetType.FrozenAnchorH)) ) {
// Режим установки закреплённых областей
this.isFrozenAnchorMode = t.targetInfo.target;
t._moveFrozenAnchorHandle(event, t.targetInfo);
......
......@@ -936,9 +936,10 @@
if (ct.col >=0 && ct.row >= 0)
this.controller.setStrictClose(!ws._isCellEmptyText(ct.col, ct.row));
// Для нажатия на колонку/строку/all обрабатывать dblClick не нужно
// Для нажатия на колонку/строку/all/frozenMove обрабатывать dblClick не нужно
if (c_oTargetType.ColumnHeader === ct.target || c_oTargetType.RowHeader === ct.target ||
c_oTargetType.Corner === ct.target) {
c_oTargetType.Corner === ct.target || c_oTargetType.FrozenAnchorH === ct.target ||
c_oTargetType.FrozenAnchorV === ct.target) {
asc_applyFunction(callback);
return;
}
......
......@@ -3137,7 +3137,7 @@
this._drawSelection();
switch (targetInfo.target) {
case "frozenAnchorV":
case c_oTargetType.FrozenAnchorV:
x *= asc_getcvt(0/*px*/, 1/*pt*/, this._getPPIX());
data = this._findColUnderCursor(x, true);
if (data && 0 <= data.col) {
......@@ -3149,7 +3149,7 @@
.fillRect(this.cols[data.col].left - offsetX - this.width_1px, 0, this.width_1px, h);
}
break;
case "frozenAnchorH":
case c_oTargetType.FrozenAnchorH:
y *= asc_getcvt(0/*px*/, 1/*pt*/, this._getPPIY());
data = this._findRowUnderCursor(y, true);
if (data && 0 <= data.row) {
......@@ -3188,7 +3188,7 @@
var h = _this.headersHeight;
if (isPointInAnchor(x, y, _x, _y, w, h)) {
result.result = true;
result.name = "frozenAnchorV";
result.name = c_oTargetType.FrozenAnchorV;
}
// horizontal
......@@ -3198,7 +3198,7 @@
h = 0;
if (isPointInAnchor(x, y, _x, _y, w, h)) {
result.result = true;
result.name = "frozenAnchorH";
result.name = c_oTargetType.FrozenAnchorH;
}
return result;
......@@ -3221,13 +3221,13 @@
lastRow = t.topLeftFrozenCell.getRow0();
}
switch (targetInfo.target) {
case "frozenAnchorV":
case c_oTargetType.FrozenAnchorV:
x *= asc_getcvt(0/*px*/, 1/*pt*/, t._getPPIX());
data = t._findColUnderCursor(x, true);
if (data && 0 <= data.col)
lastCol = data.col;
break;
case "frozenAnchorH":
case c_oTargetType.FrozenAnchorH:
y *= asc_getcvt(0/*px*/, 1/*pt*/, t._getPPIY());
data = t._findRowUnderCursor(y, true);
if (data && 0 <= data.row)
......
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