Commit 3ed85c7e authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил эвент asc_onUpdateSheetSettings (для freeze pane).

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56108 954022d7-b5bf-4e40-9824-e11837661b57
parent 6d0afcf0
...@@ -1183,7 +1183,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -1183,7 +1183,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
* asc_onGetEditorPermissions (permission) - эвент о правах редактора * asc_onGetEditorPermissions (permission) - эвент о правах редактора
* asc_onGetLicense (license) - эвент о лицензии * asc_onGetLicense (license) - эвент о лицензии
* asc_onStopFormatPainter () - эвент об окончании форматирования по образцу * asc_onStopFormatPainter () - эвент об окончании форматирования по образцу
//* asc_onShowAutoComplete (isFormula, arrValues) - эвент о вызове всплывающего меню для дополнения ячейки * asc_onUpdateSheetSettings () - 'эвент об обновлении свойств листа (закрепленная область, показывать сетку/заголовки)
*/ */
asc_StartAction: function (type, id) { asc_StartAction: function (type, id) {
......
...@@ -498,7 +498,8 @@ ...@@ -498,7 +498,8 @@
"getDCForCharts" : function () { return self.drawingCtxCharts; }, "getDCForCharts" : function () { return self.drawingCtxCharts; },
"onRenameCellTextEnd" : function (countFind, countReplace) {self.handlers.trigger("asc_onRenameCellTextEnd", countFind, countReplace);}, "onRenameCellTextEnd" : function (countFind, countReplace) {self.handlers.trigger("asc_onRenameCellTextEnd", countFind, countReplace);},
"onStopFormatPainter" : function () {self.handlers.trigger("asc_onStopFormatPainter");}, "onStopFormatPainter" : function () {self.handlers.trigger("asc_onStopFormatPainter");},
"onDocumentPlaceChanged" : function () {self._onDocumentPlaceChanged();} "onDocumentPlaceChanged" : function () {self._onDocumentPlaceChanged();},
"updateSheetSettings" : function () {self.handlers.trigger("asc_onUpdateSheetSettings");}
}, this.buffers, this.stringRender, this.maxDigitWidth, this.collaborativeEditing, opt); }, this.buffers, this.stringRender, this.maxDigitWidth, this.collaborativeEditing, opt);
}; };
...@@ -842,7 +843,6 @@ ...@@ -842,7 +843,6 @@
var ws = this.getWorksheet(); var ws = this.getWorksheet();
var arrValues = ws.getCellAutoCompleteValues(ws.activeRange.startCol, ws.activeRange.startRow); var arrValues = ws.getCellAutoCompleteValues(ws.activeRange.startCol, ws.activeRange.startRow);
this.popUpSelector.show(false, arrValues, this.getWorksheet().getActiveCellCoord()); this.popUpSelector.show(false, arrValues, this.getWorksheet().getActiveCellCoord());
//this.handlers.trigger("asc_onShowAutoComplete", false, arrValues);
}; };
WorkbookView.prototype._onAutoFiltersClick = function (idFilter) { WorkbookView.prototype._onAutoFiltersClick = function (idFilter) {
...@@ -1417,7 +1417,6 @@ ...@@ -1417,7 +1417,6 @@
} }
if (0 < arrResult.length) { if (0 < arrResult.length) {
this.popUpSelector.show(true, arrResult, this.getWorksheet().getActiveCellCoord()); this.popUpSelector.show(true, arrResult, this.getWorksheet().getActiveCellCoord());
//this.handlers.trigger("asc_onShowAutoComplete", true, arrResult);
this.lastFormulaPos = formulaPos; this.lastFormulaPos = formulaPos;
this.lastFormulaName = formulaName; this.lastFormulaName = formulaName;
} else { } else {
......
...@@ -3175,11 +3175,14 @@ ...@@ -3175,11 +3175,14 @@
new UndoRedoData_BBox(new asc_Range(col, row, col, row)), null); new UndoRedoData_BBox(new asc_Range(col, row, col, row)), null);
History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ChangeFrozenCell, this.model.getId(), null, oData); History.Add(g_oUndoRedoWorksheet, historyitem_Worksheet_ChangeFrozenCell, this.model.getId(), null, oData);
if (0 === col && 0 === row) { var isUpdate = false;
// Очистка if (0 === col && 0 === row) { // Очистка
if (null !== this.topLeftFrozenCell)
isUpdate = true;
this.topLeftFrozenCell = this.model.sheetViews[0].pane = null; this.topLeftFrozenCell = this.model.sheetViews[0].pane = null;
} else { } else { // Создание
// Создание if (null === this.topLeftFrozenCell)
isUpdate = true;
var pane = this.model.sheetViews[0].pane = new asc.asc_CPane(); var pane = this.model.sheetViews[0].pane = new asc.asc_CPane();
this.topLeftFrozenCell = pane.topLeftFrozenCell = new CellAddress(row, col, 0); this.topLeftFrozenCell = pane.topLeftFrozenCell = new CellAddress(row, col, 0);
} }
...@@ -3189,6 +3192,10 @@ ...@@ -3189,6 +3192,10 @@
this.objectRender.drawingArea.init(); this.objectRender.drawingArea.init();
if (!lockDraw) if (!lockDraw)
this.draw(); this.draw();
// Эвент на обновление
if (isUpdate)
this.handlers.trigger("updateSheetSettings");
}; };
/** */ /** */
......
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