Commit 9b38bbd9 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил c_oAscSelectionDialogType для разделения выбора диапазона в...

Добавил c_oAscSelectionDialogType для разделения выбора диапазона в форматированной таблице и в диаграммах.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56780 954022d7-b5bf-4e40-9824-e11837661b57
parent 309cdf19
...@@ -3051,13 +3051,13 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -3051,13 +3051,13 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
/** /**
* Режим выбора диапазона * Режим выбора диапазона
* @param {Boolean} isSelectionDialogMode * @param {c_oAscSelectionDialogType} selectionDialogType
* @param selectRange * @param selectRange
*/ */
asc_setSelectionDialogMode: function (isSelectionDialogMode, selectRange) { asc_setSelectionDialogMode: function (selectionDialogType, selectRange) {
this.controller.setSelectionDialogMode(isSelectionDialogMode); this.controller.setSelectionDialogMode(c_oAscSelectionDialogType.None !== selectionDialogType);
if (this.wb) if (this.wb)
this.wb.setSelectionDialogMode(isSelectionDialogMode, selectRange); this.wb.setSelectionDialogMode(selectionDialogType, selectRange);
}, },
asc_SendThemeColors : function (colors, standart_colors) { asc_SendThemeColors : function (colors, standart_colors) {
......
...@@ -182,6 +182,12 @@ var c_oAscSelectionType = { ...@@ -182,6 +182,12 @@ var c_oAscSelectionType = {
RangeFrozen : 10 RangeFrozen : 10
}; };
var c_oAscSelectionDialogType = {
None : 0,
FormatTable : 1,
Chart : 2
};
var c_oAscGraphicOption = { var c_oAscGraphicOption = {
ScrollVertical : 1, ScrollVertical : 1,
ScrollHorizontal : 2, ScrollHorizontal : 2,
......
...@@ -1664,8 +1664,8 @@ ...@@ -1664,8 +1664,8 @@
} }
}; };
WorkbookView.prototype.setSelectionDialogMode = function (isSelectionDialogMode, selectRange) { WorkbookView.prototype.setSelectionDialogMode = function (selectionDialogType, selectRange) {
this.getWorksheet().setSelectionDialogMode(isSelectionDialogMode, selectRange); this.getWorksheet().setSelectionDialogMode(selectionDialogType, selectRange);
}; };
WorkbookView.prototype._cleanFindResults = function () { WorkbookView.prototype._cleanFindResults = function () {
......
...@@ -433,6 +433,7 @@ ...@@ -433,6 +433,7 @@
this.isFormatPainter = false; this.isFormatPainter = false;
this.selectionDialogType = c_oAscSelectionDialogType.None;
this.isSelectionDialogMode = false; this.isSelectionDialogMode = false;
this.copyOfActiveRange = null; this.copyOfActiveRange = null;
...@@ -10214,10 +10215,11 @@ ...@@ -10214,10 +10215,11 @@
return this.isFormulaEditMode; return this.isFormulaEditMode;
}; };
WorksheetView.prototype.setSelectionDialogMode = function (isSelectionDialogMode, selectRange) { WorksheetView.prototype.setSelectionDialogMode = function (selectionDialogType, selectRange) {
if (isSelectionDialogMode === this.isSelectionDialogMode) if (selectionDialogType === this.selectionDialogType)
return; return;
this.isSelectionDialogMode = isSelectionDialogMode; this.selectionDialogType = selectionDialogType;
this.isSelectionDialogMode = c_oAscSelectionDialogType.None !== this.selectionDialogType;
this.cleanSelection(); this.cleanSelection();
if (false === this.isSelectionDialogMode) { if (false === this.isSelectionDialogMode) {
......
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