c_oAscError combined into a single variable

cell/apiDefines.js

@@ -12,74 +12,6 @@ function (window, undefined) {
   // Import
   var CColor = AscCommon.CColor;
 
-var c_oAscError = {
-  Level: {
-    Critical: -1,
-    NoCritical: 0
-  },
-  ID: {
-    ServerSaveComplete: 3,
-    ConvertationProgress: 2,
-    DownloadProgress: 1,
-    No: 0,
-    Unknown: -1,
-    ConvertationTimeout: -2,
-    ConvertationError: -3,
-    DownloadError: -4,
-    UnexpectedGuid: -5,
-    Database: -6,
-    FileRequest: -7,
-    FileVKey: -8,
-    UplImageSize: -9,
-    UplImageExt: -10,
-    UplImageFileCount: -11,
-    NoSupportClipdoard: -12,
-    PastInMergeAreaError: -13,
-    StockChartError: -14,
-    DataRangeError: -15,
-    CannotMoveRange: -16,
-    UplImageUrl: -17,
-    CoAuthoringDisconnect: -18,
-    ConvertationPassword: -19,
-
-    VKeyEncrypt: -20,
-    KeyExpire: -21,
-    UserCountExceed: -22,
-
-    /* для формул */
-    FrmlWrongCountParentheses: -300,
-    FrmlWrongOperator: -301,
-    FrmlWrongMaxArgument: -302,
-    FrmlWrongCountArgument: -303,
-    FrmlWrongFunctionName: -304,
-    FrmlAnotherParsingError: -305,
-    FrmlWrongArgumentRange: -306,
-    FrmlOperandExpected: -307,
-    FrmlParenthesesCorrectCount: -308,
-    FrmlWrongReferences: -309,
-
-    InvalidReferenceOrName: -310,
-    LockCreateDefName: -311,
-
-
-    AutoFilterDataRangeError: -50,
-    AutoFilterChangeFormatTableError: -51,
-    AutoFilterChangeError: -52,
-    AutoFilterMoveToHiddenRangeError: -53,
-    LockedAllError: -54,
-    LockedWorksheetRename: -55,
-
-    PasteMaxRangeError: -65,
-
-    MaxDataSeriesError: -80,
-    CannotFillRange: -81,
-
-    UserDrop: -100,
-    Warning: -101,
-
-    OpenWarning: 500
-  }
-};
 var c_oAscConfirm = {
   ConfirmReplaceRange: 0
 };
@@ -367,7 +299,6 @@ var c_oAscPopUpSelectorType = {
   window['AscCommonExcel'].c_oAscLockNameTabColor = c_oAscLockNameTabColor;
 
   window['Asc'] = window['Asc'] || {};
-  window['Asc']['c_oAscError'] = window['Asc'].c_oAscError = c_oAscError;
   window['Asc']['c_oAscConfirm'] = window['Asc'].c_oAscConfirm = c_oAscConfirm;
   window['Asc']['c_oAscMergeOptions'] = window['Asc'].c_oAscMergeOptions = c_oAscMergeOptions;
   window['Asc']['c_oAscInsertOptions'] = window['Asc'].c_oAscInsertOptions = c_oAscInsertOptions;

common/commonDefines.js

@@ -42,6 +42,86 @@ var c_oAscFileType = {
 	ODP		: 0x0083
 };
 
+  var c_oAscError = {
+    Level: {
+      Critical: -1,
+      NoCritical: 0
+    },
+    ID: {
+      ServerSaveComplete: 3,
+      ConvertationProgress: 2,
+      DownloadProgress: 1,
+      No: 0,
+      Unknown: -1,
+      ConvertationTimeout: -2,
+      ConvertationError: -3,
+      DownloadError: -4,
+      UnexpectedGuid: -5,
+      Database: -6,
+      FileRequest: -7,
+      FileVKey: -8,
+      UplImageSize: -9,
+      UplImageExt: -10,
+      UplImageFileCount: -11,
+      NoSupportClipdoard: -12,
+      UplImageUrl: -13,
+
+      StockChartError: -17,
+      CoAuthoringDisconnect: -18,
+      ConvertationPassword: -19,
+      VKeyEncrypt: -20,
+      KeyExpire: -21,
+      UserCountExceed: -22,
+
+      SplitCellMaxRows: -30,
+      SplitCellMaxCols: -31,
+      SplitCellRowsDivider: -32,
+
+      MobileUnexpectedCharCount: -35,
+
+      // Mail Merge
+      MailMergeLoadFile: -40,
+      MailMergeSaveFile: -41,
+
+      // for AutoFilter
+      AutoFilterDataRangeError: -50,
+      AutoFilterChangeFormatTableError: -51,
+      AutoFilterChangeError: -52,
+      AutoFilterMoveToHiddenRangeError: -53,
+      LockedAllError: -54,
+      LockedWorksheetRename: -55,
+
+      PasteMaxRangeError: -64,
+      PastInMergeAreaError: -65,
+
+      DataRangeError: -72,
+      CannotMoveRange: -71,
+
+      MaxDataSeriesError: -80,
+      CannotFillRange: -81,
+
+      UserDrop: -100,
+      Warning: -101,
+
+      /* для формул */
+      FrmlWrongCountParentheses: -300,
+      FrmlWrongOperator: -301,
+      FrmlWrongMaxArgument: -302,
+      FrmlWrongCountArgument: -303,
+      FrmlWrongFunctionName: -304,
+      FrmlAnotherParsingError: -305,
+      FrmlWrongArgumentRange: -306,
+      FrmlOperandExpected: -307,
+      FrmlParenthesesCorrectCount: -308,
+      FrmlWrongReferences: -309,
+
+      InvalidReferenceOrName: -310,
+      LockCreateDefName: -311,
+
+      OpenWarning: 500
+    }
+  };
+
 var c_oAscAsyncAction = {
 	Open				: 0,  // открытие документа
 	Save				: 1,  // сохранение
@@ -793,6 +873,7 @@ window['Asc']['FONT_THUMBNAIL_HEIGHT'] = FONT_THUMBNAIL_HEIGHT;
 window['Asc']['c_oAscMaxColumnWidth'] = window['Asc'].c_oAscMaxColumnWidth = c_oAscMaxColumnWidth;
 window['Asc']['c_oAscMaxRowHeight'] = window['Asc'].c_oAscMaxRowHeight = c_oAscMaxRowHeight;
 window['Asc']['c_oAscFileType'] = window['Asc'].c_oAscFileType = c_oAscFileType;
+window['Asc']['c_oAscError'] = window['Asc'].c_oAscError = c_oAscError;
 window['Asc']['c_oAscAsyncAction'] = window['Asc'].c_oAscAsyncAction = c_oAscAsyncAction;
 window['Asc']['c_oAscAdvancedOptionsID'] = window['Asc'].c_oAscAdvancedOptionsID = c_oAscAdvancedOptionsID;
 window['Asc']['c_oAscFontRenderingModeType'] = window['Asc'].c_oAscFontRenderingModeType = c_oAscFontRenderingModeType;

slide/apiDefines.js

@@ -28,45 +28,6 @@ var c_oAscAlignType = {
   BOTTOM: 6
 };
 
-/*Error level & ID*/
-var c_oAscError = {
-  Level: {
-    Critical: -1,
-    NoCritical: 0
-  },
-  ID: {
-    ServerSaveComplete: 3,
-    ConvertationProgress: 2,
-    DownloadProgress: 1,
-    No: 0,
-    Unknown: -1,
-    ConvertationTimeout: -2,
-    ConvertationError: -3,
-    DownloadError: -4,
-    UnexpectedGuid: -5,
-    Database: -6,
-    FileRequest: -7,
-    FileVKey: -8,
-    UplImageSize: -9,
-    UplImageExt: -10,
-    UplImageFileCount: -11,
-    NoSupportClipdoard: -12,
-    StockChartError: -16,
-    CoAuthoringDisconnect: -18,
-    ConvertationPassword: -19,
-    VKeyEncrypt: -20,
-    KeyExpire: -21,
-    UserCountExceed: -22,
-    SplitCellMaxRows: -23,
-    SplitCellMaxCols: -24,
-    SplitCellRowsDivider: -25,
-
-    UserDrop: -100,
-    Warning: -101
-  }
-};
-
-
 var c_oAscContextMenuTypes = {
   Main: 0,
   Thumbnails: 1
@@ -148,13 +109,10 @@ var TABLE_STYLE_WIDTH_PIX = 70;
 var TABLE_STYLE_HEIGHT_PIX = 50;
 
 //------------------------------------------------------------export---------------------------------------------------
-if (undefined === window['Asc']) {
-  window['Asc'] = {};
-}
+window['Asc'] = window['Asc'] || {};
 window['Asc']['c_oAscCollaborativeMarksShowType'] = c_oAscCollaborativeMarksShowType;
 window['Asc']['c_oAscVertAlignJc'] = c_oAscVertAlignJc;
 window['Asc']['c_oAscTableLayout'] = c_oAscTableLayout;
-window['Asc']['c_oAscError'] = window['Asc'].c_oAscError = c_oAscError;
 window['Asc']['c_oAscContextMenuTypes'] = c_oAscContextMenuTypes;
 window['Asc']['c_oAscAlignShapeType'] = c_oAscAlignShapeType;
 window['Asc']['c_oAscSlideTransitionTypes'] = c_oAscSlideTransitionTypes;

word/apiDefines.js

@@ -27,50 +27,6 @@ var c_oAscWrapStyle2 = {
   InFront: 6
 };
 
-/*Error level & ID*/
-var c_oAscError = {
-  Level: {
-    Critical: -1,
-    NoCritical: 0
-  },
-  ID: {
-    ServerSaveComplete: 3,
-    ConvertationProgress: 2,
-    DownloadProgress: 1,
-    No: 0,
-    Unknown: -1,
-    ConvertationTimeout: -2,
-    ConvertationError: -3,
-    DownloadError: -4,
-    UnexpectedGuid: -5,
-    Database: -6,
-    FileRequest: -7,
-    FileVKey: -8,
-    UplImageSize: -9,
-    UplImageExt: -10,
-    UplImageFileCount: -11,
-    NoSupportClipdoard: -12,
-    SplitCellMaxRows: -13,
-    SplitCellMaxCols: -14,
-    SplitCellRowsDivider: -15,
-    StockChartError: -16,
-
-    CoAuthoringDisconnect: -18,
-    ConvertationPassword: -19,
-
-    VKeyEncrypt: -20,
-    KeyExpire: -21,
-    UserCountExceed: -22,
-    MobileUnexpectedCharCount: -23,
-
-    MailMergeLoadFile: -24,
-    MailMergeSaveFile: -25,
-
-    UserDrop: -100,
-    Warning: -101
-  }
-};
-
 var c_oAscTableSelectionType = {
   Cell: 0,
   Row: 1,
@@ -672,11 +628,8 @@ var c_oAscRevisionsObjectType =
 window["flat_desine"] = false;
 
 //------------------------------------------------------------export---------------------------------------------------
-if (undefined === window['Asc']) {
-  window['Asc'] = {};
-}
+window['Asc'] = window['Asc'] || {};
 window['Asc']['c_oAscWrapStyle2'] = c_oAscWrapStyle2;
-window['Asc']['c_oAscError'] = window['Asc'].c_oAscError = c_oAscError;
 window['Asc']['c_oAscContextMenuTypes'] = c_oAscContextMenuTypes;
 window['Asc']['c_oAscCollaborativeMarksShowType'] = c_oAscCollaborativeMarksShowType;
 window['Asc']['c_oAscAlignH'] = c_oAscAlignH;