Commit 3ffec925 authored by GoshaZotov's avatar GoshaZotov Committed by Alexander.Trofimov

AscCommonExcel.c_oAscSortOptions -> Asc.c_oAscSortOptions

parent d854c883
...@@ -278,7 +278,6 @@ var c_oAscPopUpSelectorType = { ...@@ -278,7 +278,6 @@ var c_oAscPopUpSelectorType = {
//----------------------------------------------------------export---------------------------------------------------- //----------------------------------------------------------export----------------------------------------------------
window['AscCommonExcel'] = window['AscCommonExcel'] || {}; window['AscCommonExcel'] = window['AscCommonExcel'] || {};
window['AscCommonExcel'].c_oAscAlignType = c_oAscAlignType; window['AscCommonExcel'].c_oAscAlignType = c_oAscAlignType;
window['AscCommonExcel'].c_oAscSortOptions = c_oAscSortOptions;
window['AscCommonExcel'].c_oAscDrawDepOptions = c_oAscDrawDepOptions; window['AscCommonExcel'].c_oAscDrawDepOptions = c_oAscDrawDepOptions;
window['AscCommonExcel'].c_oAscGraphicOption = c_oAscGraphicOption; window['AscCommonExcel'].c_oAscGraphicOption = c_oAscGraphicOption;
window['AscCommonExcel'].c_oAscLockTypeElem = c_oAscLockTypeElem; window['AscCommonExcel'].c_oAscLockTypeElem = c_oAscLockTypeElem;
...@@ -303,6 +302,7 @@ var c_oAscPopUpSelectorType = { ...@@ -303,6 +302,7 @@ var c_oAscPopUpSelectorType = {
var prot; var prot;
window['Asc'] = window['Asc'] || {}; window['Asc'] = window['Asc'] || {};
window['Asc']['c_oAscSortOptions'] = window['Asc'].c_oAscSortOptions = c_oAscSortOptions;
window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm; window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm;
prot = c_oAscConfirm; prot = c_oAscConfirm;
prot['ConfirmReplaceRange'] = prot.ConfirmReplaceRange; prot['ConfirmReplaceRange'] = prot.ConfirmReplaceRange;
......
...@@ -8577,14 +8577,14 @@ Range.prototype.sort=function(nOption, nStartCol, color){ ...@@ -8577,14 +8577,14 @@ Range.prototype.sort=function(nOption, nStartCol, color){
nStartCol = merged.bbox.c1; nStartCol = merged.bbox.c1;
} }
this.worksheet.workbook.lockDraw(); this.worksheet.workbook.lockDraw();
var colorFill = nOption === AscCommonExcel.c_oAscSortOptions.ByColorFill ? color : null; var colorFill = nOption === Asc.c_oAscSortOptions.ByColorFill ? color : null;
var colorText = nOption === AscCommonExcel.c_oAscSortOptions.ByColorFont ? color : null; var colorText = nOption === Asc.c_oAscSortOptions.ByColorFont ? color : null;
var isSortColor = !!(colorFill || colorText); var isSortColor = !!(colorFill || colorText);
var oRes = null; var oRes = null;
var oThis = this; var oThis = this;
var bAscent = false; var bAscent = false;
if(nOption == AscCommonExcel.c_oAscSortOptions.Ascending) if(nOption == Asc.c_oAscSortOptions.Ascending)
bAscent = true; bAscent = true;
var nRowFirst0 = this.bbox.r1; var nRowFirst0 = this.bbox.r1;
var nRowLast0 = this.bbox.r2; var nRowLast0 = this.bbox.r2;
......
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