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

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57395 954022d7-b5bf-4e40-9824-e11837661b57
parent 4d74cf3e
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
}; };
PopUpSelector.prototype.show = function (isFormula, arrItems, cellRect) { PopUpSelector.prototype.show = function (isFormula, arrItems, cellRect) {
this._clearList(); this._clearList();
this.setPosition(cellRect);
if (!this.isVisible) { if (!this.isVisible) {
this.selector.className = 'combobox open'; this.selector.className = 'combobox open';
this.isVisible = true; this.isVisible = true;
...@@ -129,6 +128,8 @@ ...@@ -129,6 +128,8 @@
this.selectorListEl.push(item); this.selectorListEl.push(item);
} }
this.setPosition(cellRect);
// Для того, чтобы работал scroll // Для того, чтобы работал scroll
this.selectorListJQ.perfectScrollbar("update"); this.selectorListJQ.perfectScrollbar("update");
...@@ -146,8 +147,17 @@ ...@@ -146,8 +147,17 @@
} }
}; };
PopUpSelector.prototype.setPosition = function (cellRect) { PopUpSelector.prototype.setPosition = function (cellRect) {
this.selectorStyle['left'] = (cellRect.asc_getX() + 10) + 'px'; var top = cellRect.asc_getY() + cellRect.asc_getHeight(),
this.selectorStyle['top'] = (cellRect.asc_getY() + cellRect.asc_getHeight()) + 'px'; left = cellRect.asc_getX();
var diff = top + this.selectorList.offsetHeight - this.element.offsetHeight;
if (0 < diff) {
top -= diff;
left += cellRect.asc_getWidth();
} else
left += 10;
this.selectorStyle['left'] = left + 'px';
this.selectorStyle['top'] = top + 'px';
}; };
PopUpSelector.prototype.getVisible = function () { PopUpSelector.prototype.getVisible = function () {
return this.isVisible; return this.isVisible;
......
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