Commit 8231b7b3 authored by Alexander Trofimov's avatar Alexander Trofimov Committed by GitHub

Merge pull request #59 from ONLYOFFICE/release/v4.1.0

Release/v4.1.0
parents f500cfbb 059e56c8
...@@ -12089,15 +12089,15 @@ ...@@ -12089,15 +12089,15 @@
} }
var applyFilterProps = t.model.autoFilters.applyAutoFilter(autoFilterObject, ar); var applyFilterProps = t.model.autoFilters.applyAutoFilter(autoFilterObject, ar);
var rowChange = applyFilterProps.rowChange; var minChangeRow = applyFilterProps.minChangeRow;
var rangeOldFilter = applyFilterProps.rangeOldFilter; var rangeOldFilter = applyFilterProps.rangeOldFilter;
if (null !== rangeOldFilter && !t.model.workbook.bUndoChanges && !t.model.workbook.bRedoChanges) { if (null !== rangeOldFilter && !t.model.workbook.bUndoChanges && !t.model.workbook.bRedoChanges) {
t._onUpdateFormatTable(rangeOldFilter, false, true); t._onUpdateFormatTable(rangeOldFilter, false, true);
} }
if (null !== rowChange) { if (null !== minChangeRow) {
t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: rowChange}); t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow});
} }
}; };
this._isLockedAll(onChangeAutoFilterCallback); this._isLockedAll(onChangeAutoFilterCallback);
...@@ -12154,15 +12154,15 @@ ...@@ -12154,15 +12154,15 @@
t.model.autoFilters._resetTablePartStyle(); t.model.autoFilters._resetTablePartStyle();
var rowChange = applyFilterProps.rowChange; var minChangeRow = applyFilterProps.minChangeRow;
var updateRange = applyFilterProps.updateRange; var updateRange = applyFilterProps.updateRange;
if (updateRange && !t.model.workbook.bUndoChanges && !t.model.workbook.bRedoChanges) { if (updateRange && !t.model.workbook.bUndoChanges && !t.model.workbook.bRedoChanges) {
t._onUpdateFormatTable(updateRange, false, true); t._onUpdateFormatTable(updateRange, false, true);
} }
if (null !== rowChange) { if (null !== minChangeRow) {
t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: rowChange}); t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow});
} }
}; };
this._isLockedAll(onChangeAutoFilterCallback); this._isLockedAll(onChangeAutoFilterCallback);
...@@ -12243,15 +12243,15 @@ ...@@ -12243,15 +12243,15 @@
} }
var applyFilterProps = t.model.autoFilters.applyAutoFilter(autoFilterObject, ar); var applyFilterProps = t.model.autoFilters.applyAutoFilter(autoFilterObject, ar);
var rowChange = applyFilterProps.rowChange; var minChangeRow = applyFilterProps.minChangeRow;
var rangeOldFilter = applyFilterProps.rangeOldFilter; var rangeOldFilter = applyFilterProps.rangeOldFilter;
if (null !== rangeOldFilter && !t.model.workbook.bUndoChanges && !t.model.workbook.bRedoChanges) { if (null !== rangeOldFilter && !t.model.workbook.bUndoChanges && !t.model.workbook.bRedoChanges) {
t._onUpdateFormatTable(rangeOldFilter, false, true); t._onUpdateFormatTable(rangeOldFilter, false, true);
} }
if (null !== rowChange) { if (null !== minChangeRow) {
t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: rowChange}); t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow});
} }
} }
......
...@@ -37,6 +37,7 @@ AscCommon.baseEditorsApi.prototype._onEndPermissions = function() ...@@ -37,6 +37,7 @@ AscCommon.baseEditorsApi.prototype._onEndPermissions = function()
if (this.isOnFirstConnectEnd && this.isOnLoadLicense) if (this.isOnFirstConnectEnd && this.isOnLoadLicense)
{ {
var oResult = new AscCommon.asc_CAscEditorPermissions(); var oResult = new AscCommon.asc_CAscEditorPermissions();
oResult.setLicenseType(Asc.c_oLicenseResult.Success);
oResult.setCanLicense(true); oResult.setCanLicense(true);
oResult.setCanBranding(true); oResult.setCanBranding(true);
this.sendEvent('asc_onGetEditorPermissions', oResult); this.sendEvent('asc_onGetEditorPermissions', oResult);
......
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