c_oAscEditorsType->c_oEditorId

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49067 954022d7-b5bf-4e40-9824-e11837661b57

Common/commonDefines.js

@@ -95,10 +95,4 @@ var c_oAscLineDrawingRule = {
     Right  : 2,
     Top    : 0,
     Bottom : 2
-};
-
-var c_oAscEditorsType = {
-	Word			: 0,
-	Excel			: 1,
-	Presentation	: 2
 };
\ No newline at end of file

Common/docscoapi.js

@@ -771,8 +771,8 @@
 		this._serverPath = serverPath;
 		this.sockjs_url = this._url + '/doc/'+docid+'/c';
         this.sockjs = initSocksJs(this.sockjs_url, this);
-		this._isExcel = c_oAscEditorsType.Excel === editorType;
-		this._isPresentation = c_oAscEditorsType.Presentation === editorType;
+		this._isExcel = c_oEditorId.Speadsheet === editorType;
+		this._isPresentation = c_oEditorId.Presentation === editorType;
 		this._isAuth = false;
 
         this.dataHandler =

Common/editorscommon.js

-var g_sMainServiceLocalUrl = "/CanvasService.ashx";var g_sResourceServiceLocalUrl = "/ResourceService.ashx?path=";var g_sUploadServiceLocalUrl = "/UploadService.ashx";var g_sSpellCheckServiceLocalUrl = "/SpellChecker.ashx";
function fSortAscending(a, b){return a - b;}function fSortDescending(a, b){return b - a;}
var c_oEditorId = {
    Word : 0,
    Speadsheet : 1,
    Presentation : 2}
var PostMessageType = {
    UploadImage		: 0,
	ExtensionExist	:1}
var c_oAscServerError = {
	NoError : 0,
    Unknown : -1,
    ReadRequestStream : -3,
	
    TaskQueue : -20,
	
    TaskResult : -40,
	
    Storage : -60,
    StorageFileNoFound : -61,
    StorageRead : -62,
    StorageWrite : -63,
    StorageRemoveDir : -64,
    StorageCreateDir : -65,
    StorageGetInfo : -66,
	
	Convert : -80,
    ConvertDownload : -81,
    ConvertUnknownFormat : -82,
    ConvertTimeout : -83,
    ConvertReadFile : -84,
	
    Upload : -100,
    UploadContentLength : -101,
    UploadExtension : -102,
    UploadCountFiles : -103,
	
    VKey : -120,
    VKeyEncrypt : -121,
    VKeyKeyExpire : -122,
    VKeyUserCountExceed : -123}
+var g_sMainServiceLocalUrl = "/CanvasService.ashx";var g_sResourceServiceLocalUrl = "/ResourceService.ashx?path=";var g_sUploadServiceLocalUrl = "/UploadService.ashx";var g_sSpellCheckServiceLocalUrl = "/SpellChecker.ashx";
function fSortAscending(a, b){return a - b;}function fSortDescending(a, b){return b - a;}
var c_oEditorId = {
    Word : 0,
    Speadsheet : 1,
    Presentation : 2};
var PostMessageType = {
    UploadImage		: 0,
	ExtensionExist	:1};
var c_oAscServerError = {
	NoError : 0,
    Unknown : -1,
    ReadRequestStream : -3,
	
    TaskQueue : -20,
	
    TaskResult : -40,
	
    Storage : -60,
    StorageFileNoFound : -61,
    StorageRead : -62,
    StorageWrite : -63,
    StorageRemoveDir : -64,
    StorageCreateDir : -65,
    StorageGetInfo : -66,
	
	Convert : -80,
    ConvertDownload : -81,
    ConvertUnknownFormat : -82,
    ConvertTimeout : -83,
    ConvertReadFile : -84,
	
    Upload : -100,
    UploadContentLength : -101,
    UploadExtension : -102,
    UploadCountFiles : -103,
	
    VKey : -120,
    VKeyEncrypt : -121,
    VKeyKeyExpire : -122,
    VKeyUserCountExceed : -123}
\ No newline at end of file

Excel/api.js

@@ -1360,7 +1360,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 				};
 
 				this.CoAuthoringApi.init (user, docId, this.asc_getViewerMode(), 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){
-				}, c_oAscEditorsType.Excel);
+				}, c_oEditorId.Speadsheet);
 			},
 
 			// Set CoAuthoring server url

PowerPoint/api.js

@@ -288,7 +288,7 @@ asc_docs_api.prototype._coAuthoringInit = function (docId, user) {
 	};
 
     this.CoAuthoringApi.init (user, docId, this.isViewMode, 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){
-    }, c_oAscEditorsType.Presentation);
+    }, c_oEditorId.Presentation);
 
     // ToDo init other callbacks
 }

Word/api.js

@@ -1388,7 +1388,7 @@ asc_docs_api.prototype._coAuthoringInit = function()
 	};
 
     this.CoAuthoringApi.init (editor.User, documentId, this.isViewMode, 'fghhfgsjdgfjs', window.location.host, g_sMainServiceLocalUrl, function(){
-    }, c_oAscEditorsType.Word);
+    }, c_oEditorId.Word);
 
     // ToDo init other callbacks
 }